Merge remote-tracking branch 'origin/master'

src/assets/styles/ruoyi.scss

@@ -109,25 +109,25 @@
 }
 
 .el-input.is-disabled .el-input__inner {
-  background-color: #f5f7fa ;
-  border-color: #dfe4ed00 ;
-  color: #7e8289 ;
-  cursor: not-allowed ;
+  background-color: #f5f7fa !important;
+  border-color: #dfe4ed00 !important;
+  color: #606266 !important;
+  cursor: not-allowed !important;
 }
 .el-input-group__append{
-  border-color: #dfe4ed00 ;
+  border-color: #dfe4ed00 !important;
 }
 
 .el-radio__input.is-disabled.is-checked .el-radio__inner {
-  background-color: #F5F7FA;
-  color: #7e8289 ;
+  background-color: #F5F7FA !important;
+  color: #606266 !important;
 }
 .el-textarea.is-disabled .el-textarea__inner{
-  color: #7e8289 ;
-  border-color: #dfe4ed00;
+  color: #606266 !important;
+  border-color: #606266 !important;
 }
 .el-radio__input.is-disabled + span.el-radio__label {
-  color: #7e8289 ;
+  color: #606266 !important;
 }
 
 /** 表单布局 **/

src/views/gas/courtyardNetworkManagement/index.vue

@@ -126,7 +126,7 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <span v-if="scope.row.processStatus == null">未审核</span>
+          <span v-if="scope.row.processStatus == null && scope.row.processStatus == '-1'">未审核</span>
           <dict-tag v-else :options="dict.type.process_status" :value="scope.row.processStatus"/>
         </template>
       </el-table-column>
@@ -156,7 +156,7 @@
             type="text"
             icon="el-icon-edit"
             @click="openshShow(scope.row)"
-            v-show="scope.row.processStatus != 0"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             v-hasPermi="['gas:courtyardNetworkManagement:edit']"
           >审核
           </el-button>

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"
@@ -104,7 +112,7 @@
       <el-table-column label="上传位置" align="center" prop="uploadLocation" />
       <el-table-column label="是否正常巡检" align="center" prop="isNormalInspection" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.yes_and_no" :value="scope.row.team"/>
+          <dict-tag :options="dict.type.yes_and_no" :value="scope.row.isNormalInspection"/>
         </template>
       </el-table-column>
       <el-table-column label="上传人" align="center" prop="createByName" />
@@ -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: "",
@@ -227,6 +237,7 @@ export default {
         team: undefined,
         uploadLocation: undefined,
         isNormalInspection: undefined,
+        ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
       form: {},
@@ -249,9 +260,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"
@@ -148,7 +156,7 @@
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"
-                    v-if="scope.row.processStatus != null"/>
+                    v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -182,7 +190,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
@@ -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,
       // 非多个禁用
@@ -341,6 +351,7 @@ export default {
         administrativeOffice: undefined,
         maintenanceItem: undefined,
         remarks: undefined,
+        ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
       form: {},
@@ -376,8 +387,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/regulatorBox/index.vue

@@ -125,7 +125,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -159,7 +159,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"

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>
@@ -37,16 +45,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:roadSectionInspection:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['gas:roadSectionInspection:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -102,7 +110,7 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -118,14 +126,14 @@
 <!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleUpdate(scope.row,true)"
-            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
-          >查看
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-view"-->
+<!--            @click="handleUpdate(scope.row,true)"-->
+<!--            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"-->
+<!--          >查看-->
+<!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -136,7 +144,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
@@ -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,
       // 非多个禁用
@@ -300,6 +310,7 @@ export default {
         samplingMeterCount: undefined,
         findProblem: undefined,
         findTime: undefined,
+        ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
       form: {},
@@ -334,8 +345,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"
@@ -118,7 +126,7 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -153,7 +161,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
@@ -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: "",
       // 是否显示弹出层
@@ -317,6 +327,7 @@ export default {
         positionId: undefined,
         discoverProblems: undefined,
         discoverTime: undefined,
+        ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
       form: {},
@@ -339,8 +350,21 @@ 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;
@@ -382,6 +406,7 @@ export default {
         remark: undefined,
         delFlag: undefined,
         createBy: undefined,
+        photoList: [],
         createTime: undefined,
         updateBy: undefined,
         updateTime: undefined
@@ -462,7 +487,8 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            this.form.photoList = this.form.photoList.split(',')
+            if (this.form.photoList.length > 0)
+              this.form.photoList = this.form.photoList.split(',')
             addValveWellInspection(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

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>