fix

src/api/system/user.js

@@ -19,6 +19,15 @@ export function listXunUser(query) {
   })
 }
 
+// 查询巡检人员2
+export function listXunUserTwo(query) {
+  return request({
+    url: '/qdtl/patrolman/xunlist',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询用户详细
 export function getUser(userId) {
   return request({

src/views/qdtl/area/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
      <div class="divtitle"><div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;">{{title}}</div></div>
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="10rem">
-      <el-form-item label="编号" prop="areaCode">
+<!--      <el-form-item label="编号" prop="areaCode">
         <el-input
           v-model="queryParams.areaCode"
           placeholder="请输入编号"
@@ -11,7 +11,7 @@
           style="width:20rem"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="名称" prop="areaName">
         <el-input
           v-model="queryParams.areaName"
@@ -46,10 +46,9 @@
           plain
           icon="el-icon-plus"
           @click="handleAdd"
-          v-hasPermi="['qdtl:area:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           style="width:8rem;height:3.2rem;"
           type="primary"
@@ -57,7 +56,6 @@
           icon="el-icon-edit"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['qdtl:area:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -68,9 +66,8 @@
           icon="el-icon-delete"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['qdtl:area:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -105,7 +102,7 @@
           >{{scope.row.locationCount}}</el-button>
           </template>
       </el-table-column>
-      <el-table-column label="区域描述" align="center" prop="detail" />
+<!--      <el-table-column label="区域描述" align="center" prop="detail" />-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -114,14 +111,13 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['qdtl:area:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['qdtl:area:remove']"
+            v-if="scope.row.areaType !== '1'"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -158,18 +154,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="区域描述" prop="detail" style="margin-top:6rem">
+<!--        <el-form-item label="区域描述" prop="detail" style="margin-top:6rem">
           <el-input v-model="form.detail" type="textarea" placeholder="请输入内容" style="width:17rem"/>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="备注" prop="remark" style="margin-top:6rem">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width:17rem"/>
+          <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" style="width:17rem"/>
         </el-form-item>
         <el-form-item label="电子围栏" prop="fence" style="margin-top:6rem">
-          <el-input v-model="form.fence" type="textarea" placeholder="请输入内容" style="width:17rem"/>
+          <el-input v-model="form.fence" type="textarea" :rows="4" placeholder="请输入经纬度坐标" style="width:17rem"/>
         </el-form-item>
-        <el-form-item label="经纬度" prop="lnglat" style="margin-top:6rem">
+<!--        <el-form-item label="经纬度" prop="lnglat" style="margin-top:6rem">
           <el-input v-model="form.lnglat" placeholder="请输入经纬度" style="width:17rem"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       </div>
       <div style="float:left;height:60rem;width:100rem;margin-left:10rem;margin-top:5rem">

src/views/qdtl/device/index.vue

@@ -84,8 +84,11 @@
           <dict-tag :options="dict.type.tl_device_type" :value="scope.row.deviceType"/>
         </template>
       </el-table-column> -->
-      <el-table-column label="经纬度" align="center" prop="lnglat" />
-      <el-table-column label="所属区域" align="center" prop="areaId" />
+      <el-table-column label="所属区域" align="center" prop="areaId" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tl_xun_area" :value="scope.row.areaId"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -137,7 +140,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="所属区域" prop="areaId"  style="margin-top:6rem">
-          <el-select v-model="form.areaId" placeholder="请选择所属区域" >
+          <el-select v-model="form.areaId" placeholder="请选择所属区域"  disabled="true" >
             <el-option
               v-for="item in areaOptions"
               :key="item.id"
@@ -146,11 +149,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="经纬度" prop="lnglat"  style="margin-top:6rem">
+<!--        <el-form-item label="经纬度" prop="lnglat"  style="margin-top:6rem">
           <el-input v-model="form.lnglat" placeholder="请输入经纬度" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="备注" prop="remark"  style="margin-top:6rem">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input type="textarea" :rows="3" v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       </div>
@@ -161,7 +164,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button type="primary" @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="deleteLocation">清 除</el-button>
+<!--        <el-button type="primary" @click="deleteLocation">清 除</el-button>-->
       </div>
     </el-dialog>
   </div>
@@ -169,12 +172,12 @@
 
 <script>
 import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/qdtl/device";
-import { listArea, getArea, delArea, addArea, updateArea } from "@/api/qdtl/area";
+import { listArea } from "@/api/qdtl/area";
 import mapdiv from "@/components/map/index.vue"
 
 export default {
   name: "Device",
-  dicts: ['tl_device_type'],
+  dicts: ['tl_device_type','tl_xun_area'],
   data() {
     return {
       // 遮罩层

src/views/qdtl/location/index.vue

@@ -33,8 +33,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="locationCode" />
       <el-table-column label="名称" align="center" prop="locationName" />
-      <el-table-column label="描述" align="center" prop="detail" />
-      <el-table-column label="巡检设备" align="center" prop="deviceNamesText" />
+<!--      <el-table-column label="描述" align="center" prop="detail" />-->
+<!--      <el-table-column label="巡检设备" align="center" prop="deviceNamesText" />-->
       <el-table-column label="所属区域" align="center" prop="areaName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -88,16 +88,16 @@
       <div style="float:left;width:30rem">
         <el-form ref="form" :model="form" :rules="rules" label-width="8rem">
         <el-form-item label="编号" prop="locationCode" style="margin-top:2rem">
-          <el-input v-model="form.locationCode" placeholder="请输入编号" />
+          <el-input v-model="form.locationCode" placeholder="请输入编号" disabled />
         </el-form-item>
         <el-form-item label="名称" prop="locationName" style="margin-top:6rem">
-          <el-input v-model="form.locationName" placeholder="请输入名称" />
+          <el-input v-model="form.locationName" placeholder="请输入名称" disabled />
         </el-form-item>
-        <el-form-item label="描述" prop="detail" style="margin-top:6rem">
+<!--        <el-form-item label="描述" prop="detail" style="margin-top:6rem">
           <el-input v-model="form.detail" placeholder="请输入描述" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="所属区域" prop="areaId"  style="margin-top:6rem">
-          <el-select v-model="form.areaId" placeholder="请选择所属区域" >
+          <el-select v-model="form.areaId" placeholder="请选择所属区域" disabled>
             <el-option
               v-for="item in areaOptions"
               :key="item.id"
@@ -107,10 +107,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="经纬度" prop="lnglat" style="margin-top:6rem">
-          <el-input v-model="form.lnglat" placeholder="请输入经纬度" />
+          <el-input type="textarea" v-model="form.lnglat" placeholder="请输入经纬度" />
         </el-form-item>
         <el-form-item label="备注" prop="remark" style="margin-top:6rem">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input type="textarea" :rows="3" v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       </div>

src/views/qdtl/plan/index.vue

@@ -308,8 +308,8 @@
                 :row-class-name="tableRowClassName"
                 :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
                         <el-table-column type="index" label="序号" width="55" align="center" />
-                        <el-table-column label="编号" align="center" prop="userId" />
-                        <el-table-column label="姓名" align="center" prop="nickName" />
+                        <el-table-column label="编号" align="center" prop="card" />
+                        <el-table-column label="姓名" align="center" prop="name" />
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                           <template slot-scope="scope">
                             <el-button
@@ -339,9 +339,9 @@
          <el-select v-model="selectUser" multiple placeholder="请选择人员" style="width:25rem" @change="lineIdChange">
                     <el-option
                       v-for="obj in userList"
-                      :key="obj.userId"
-                      :label="obj.nickName"
-                      :value="obj.userId"
+                      :key="obj.card"
+                      :label="obj.name"
+                      :value="obj.card"
                     ></el-option>
           </el-select>
        <div slot="footer" class="dialog-footer">
@@ -355,7 +355,7 @@
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/qdtl/plan";
 import { listLine, getLine, delLine, addLine, updateLine } from "@/api/qdtl/line";
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,listXunUser } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,listXunUser,listXunUserTwo } from "@/api/system/user";
 
 export default {
   name: "Plan",
@@ -432,7 +432,7 @@ export default {
   },
   methods: {
     getUserList(){
-      listXunUser().then(response =>{
+      listXunUserTwo().then(response =>{
         this.userList = response.data
          console.log(this.userList);
         // console.log(response.rows);
@@ -553,7 +553,7 @@ export default {
       console.log(this.selectUser);
       for(var i in this.selectUser){
           for(var j in this.userList){
-                  if(this.selectUser[i] == this.userList[j].userId){
+                  if(this.selectUser[i] == this.userList[j].card){
                         this.selectUserList.push(this.userList[j]);
                   }
           }