提交代码

src/views/gas/patrolTeam/index.vue

@@ -12,7 +12,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy=undefined">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -21,6 +21,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="上传人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择上传人" clearable size="small">
+          <el-option v-for="item in workerList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="上传位置" prop="uploadLocation">
         <el-input
           v-model="queryParams.uploadLocation"
@@ -188,6 +196,7 @@
 import { listPatrolTeam, getPatrolTeam, delPatrolTeam, addPatrolTeam, updatePatrolTeam } from "@/api/gas/patrolTeam";
 import {listPostAll} from "@/api/system/post";
 import Cookies from "js-cookie";
+import {getWorker} from "@/api/gas/user";
 
 export default {
   name: "PatrolTeam",
@@ -215,6 +224,7 @@ export default {
       patrolTeamList: [],
       // 岗位选项
       postOptions: [],
+      workerList: [],
       postName:Cookies.get("postName"),
       // 弹出层标题
       title: "",
@@ -249,9 +259,21 @@ export default {
   },
   created() {
     this.getPostList();
+    this.getWorkerList();
     this.getList();
   },
   methods: {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
+        this.workerList = req.data
+      })
+    },
     getPostList(){
       listPostAll({remark:'ranks'}).then(response => {
         this.postOptions = response.data;

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -12,7 +12,7 @@
       </el-form-item>
       <el-form-item label="队伍">
         <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍"
-                   :disabled="postName.indexOf('xx') > -1">
+                   :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy=undefined">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -21,6 +21,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="上传人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择上传人" clearable size="small">
+          <el-option v-for="item in workerList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="编号" prop="number">
         <el-input
           v-model="queryParams.number"
@@ -298,6 +306,7 @@ import {
 } from "@/api/gas/regulatingBoxMaintenance";
 import Cookies from "js-cookie";
 import {listPostAll} from "@/api/system/post";
+import {getWorker} from "@/api/gas/user";
 
 export default {
   name: "RegulatingBoxMaintenance",
@@ -315,6 +324,7 @@ export default {
       exportLoading: false,
       // 选中数组
       ids: [],
+      workerList: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -376,8 +386,20 @@ export default {
   created() {
     this.getPostList();
     this.getList();
+    this.getWorkerList();
   },
   methods: {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
+        this.workerList = req.data
+      })
+    },
     upprocess() {
       if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == '') {
         this.$message.warning("请选择审核状态")

src/views/gas/roadSectionInspection/index.vue

@@ -21,7 +21,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy=undefined">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -30,6 +30,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="上传人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择上传人" clearable size="small">
+          <el-option v-for="item in workerList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -258,6 +266,7 @@ import fa from "element-ui/src/locale/lang/fa";
 import {listPostAll} from "@/api/system/post";
 import Cookies from "js-cookie";
 import {updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
+import {getWorker} from "@/api/gas/user";
 
 export default {
   name: "RoadSectionInspection",
@@ -275,6 +284,7 @@ export default {
       exportLoading: false,
       // 选中数组
       ids: [],
+      workerList: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -334,8 +344,20 @@ export default {
   created() {
     this.getPostList();
     this.getList();
+    this.getWorkerList();
   },
   methods: {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
+        this.workerList = req.data
+      })
+    },
     upprocess(){
       if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
         this.$message.warning("请选择审核状态")

src/views/gas/valveWellInspection/index.vue

@@ -5,7 +5,7 @@
         <el-input v-model="queryParams.valveWellName" placeholder="请输入阀井名称" clearable size="small"/>
       </el-form-item>
       <el-form-item label="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy=undefined">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -14,9 +14,17 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="上传人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择上传人" clearable size="small">
+          <el-option v-for="item in workerList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="位置" prop="positionId">
         <el-select v-model="queryParams.positionId" placeholder="请选择位置" filterable clearable size="small"
-                   @keyup.enter.native="handleQuery" style="width: 100%">
+                   @keyup.enter.native="handleQuery" style="width: 100%" >
           <el-option
             v-for="item in listValveWellPositionList"
             :key="item.id"
@@ -270,6 +278,7 @@ import {listValveWellPosition} from "@/api/gas/valveWellPosition";
 import Cookies from "js-cookie";
 import {listPostAll} from "@/api/system/post";
 import {updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
+import {getWorker} from "@/api/gas/user";
 
 export default {
   name: "ValveWellInspection",
@@ -306,6 +315,7 @@ export default {
       total: 0,
       // 阀井巡查表格数据
       valveWellInspectionList: [],
+      workerList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -339,8 +349,20 @@ export default {
     this.listValveWellPosition();
     this.getPostList();
     this.getList();
+    this.getWorkerList();
   },
   methods: {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
+        this.workerList = req.data
+      })
+    },
     getPostList(){
       listPostAll({remark:'ranks'}).then(response => {
         this.postOptions = response.data;

src/views/gas/valveWellPosition/index.vue

@@ -19,24 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="经度" prop="longitude">
-        <el-input
-          v-model="queryParams.longitude"
-          placeholder="请输入经度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="纬度" prop="latitude">
-        <el-input
-          v-model="queryParams.latitude"
-          placeholder="请输入纬度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -211,10 +193,10 @@
           <el-input v-model="form.latitude" placeholder="请输入纬度" />
         </el-form-item>
         <el-form-item label="控制区域" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入内容" />
+          <el-input v-model="form.remark" placeholder="请输入内容"/>
         </el-form-item>
         <el-form-item label="行政区" prop="district">
-          <el-select v-model="form.district" placeholder="请选择行政区" style="width: 100%">
+          <el-select v-model="form.district" placeholder="请选择行政区" style="width: 202px">
             <el-option
               v-for="dict in dict.type.district"
               :key="dict.value"
@@ -223,8 +205,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="阀头形状" prop="valveHeadShape">
+          <el-input v-model="form.valveHeadShape" placeholder="请输入内容" />
+        </el-form-item>
         <el-form-item label="队伍" prop="team">
-          <el-select v-model="form.team" clearable placeholder="请选择队伍">
+          <el-select v-model="form.team" clearable placeholder="请选择队伍" style="width: 202px">
           <el-option
             v-for="item in postOptions"
             :key="item.postName"
@@ -233,13 +218,10 @@
           ></el-option>
         </el-select>
         </el-form-item>
-        <el-form-item label="阀头形状" prop="valveHeadShape">
-          <el-input v-model="form.valveHeadShape" placeholder="请输入内容" />
-        </el-form-item>
         <el-form-item label="阀井深度(米)" prop="valveWellDepth">
           <el-input v-model="form.valveWellDepth" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="井盖代别" prop="manholeCoverInstead">
+        <el-form-item label="井盖代别" prop="manholeCoverInstead" >
           <el-input v-model="form.manholeCoverInstead" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="积水情况" prop="waterCondition">
@@ -508,3 +490,10 @@ export default {
   }
 };
 </script>
+<style>
+.ftzt-class{
+  ::v-deep .el-form-item--medium .el-form-item__label{
+    width: 165px !important;
+  }
+}
+</style>