更新更新

src/api/backstage/investigator.js

+import request from '@/utils/request'
+
+// 查询调查员列表
+export function listInvestigator(query) {
+  return request({
+    url: '/backstage/investigator/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询调查员详细
+export function getInvestigator(userId) {
+  return request({
+    url: '/backstage/investigator/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增调查员
+export function addInvestigator(data) {
+  return request({
+    url: '/backstage/investigator',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改调查员
+export function updateInvestigator(data) {
+  return request({
+    url: '/backstage/investigator',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除调查员
+export function delInvestigator(userId) {
+  return request({
+    url: '/backstage/investigator/' + userId,
+    method: 'delete'
+  })
+}
+
+export function changeInvestigatorStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/backstage/investigator/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/backstage/investigator/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 导出调查员
+export function exportInvestigator(query) {
+  return request({
+    url: '/backstage/investigator/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

src/views/backstage/area/index.vue

@@ -65,31 +65,32 @@
           v-hasPermi="['backstage:area:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['backstage:area:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['backstage:area:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="父id" align="center" prop="parentId" />
+<!--      <el-table-column label="父id" align="center" prop="parentId" />-->
+      <el-table-column label="上级地区名" align="center" prop="parentName" />
       <el-table-column label="地区名" align="center" prop="areaName" />
-      <el-table-column label="级别" align="center" prop="level" >
+      <el-table-column label="级别" align="center"  >
         <template slot-scope="scope">
-          <span v-if="scope.row.payStatus==1">省</span>
-          <span v-if="scope.row.payStatus==2">市</span>
-          <span v-if="scope.row.payStatus==3">县 区</span>
-          <span v-if="scope.row.payStatus==4">乡镇</span>
-          <span v-if="scope.row.payStatus==5">行政村</span>
-          <span v-if="scope.row.payStatus==6">自然村</span>
+          <span v-if="scope.row.level==1">省</span>
+          <span v-if="scope.row.level==2">市</span>
+          <span v-if="scope.row.level==3">县 区</span>
+          <span v-if="scope.row.level==4">乡镇</span>
+          <span v-if="scope.row.level==5">行政村</span>
+          <span v-if="scope.row.level==6">自然村</span>
         </template>
       </el-table-column>
 
@@ -146,11 +147,11 @@
             <el-option label="自然村" value="6" />
           </el-select>
         </el-form-item>
-        <el-form-item label="状态  1正常 0删除">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="状态  1正常 0删除">-->
+<!--          <el-radio-group v-model="form.status">-->
+<!--            <el-radio label="1">请选择字典生成</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button>

src/views/system/user/index.vue

@@ -2,31 +2,31 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
+<!--      <el-col :span="4" :xs="24">-->
+<!--        <div class="head-container">-->
+<!--          <el-input-->
+<!--            v-model="deptName"-->
+<!--            placeholder="请输入部门名称"-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            prefix-icon="el-icon-search"-->
+<!--            style="margin-bottom: 20px"-->
+<!--          />-->
+<!--        </div>-->
+<!--        <div class="head-container">-->
+<!--          <el-tree-->
+<!--            :data="deptOptions"-->
+<!--            :props="defaultProps"-->
+<!--            :expand-on-click-node="false"-->
+<!--            :filter-node-method="filterNode"-->
+<!--            ref="tree"-->
+<!--            default-expand-all-->
+<!--            @node-click="handleNodeClick"-->
+<!--          />-->
+<!--        </div>-->
+<!--      </el-col>-->
       <!--用户数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="24">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="userName">
             <el-input