Merge remote-tracking branch 'origin/master'

src/api/gas/area.js

@@ -14,6 +14,12 @@ export function flushProgress() {
     method: 'get',
   })
 }
+export function flushProgressA() {
+  return request({
+    url: '/gas/valveWellPosition/flushProgress',
+    method: 'get',
+  })
+}
 // 小区导入滚动条监控接口
 export function flushProgressqqq() {
   return request({
@@ -29,6 +35,12 @@ export function clearFlushProgresddd() {
   })
 }
 // 小区导入滚动条停止监控接口
+export function clearFlushProgressA() {
+  return request({
+    url: '/gas/valveWellPosition/clearFlushProgress',
+    method: 'get',
+  })
+}
 export function clearFlushProgress() {
   return request({
     url: '/gas/area/clearFlushProgress',

src/api/gas/courtyardNetworkManagement.js

@@ -34,6 +34,13 @@ export function updateCourtyardNetworkManagement(data) {
     data: data
   })
 }
+export function batchReview(data) {
+  return request({
+    url: '/gas/courtyardNetworkManagement/batchReview',
+    method: 'POST',
+    data: data
+  })
+}
 
 // 删除庭院网管
 export function delCourtyardNetworkManagement(id) {

src/api/gas/regulatingBoxMaintenance.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询调压箱维护列表
+export function listRegulatingBoxMaintenance(query) {
+  return request({
+    url: '/gas/regulatingBoxMaintenance/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询调压箱维护详细
+export function getRegulatingBoxMaintenance(id) {
+  return request({
+    url: '/gas/regulatingBoxMaintenance/' + id,
+    method: 'get'
+  })
+}
+
+// 新增调压箱维护
+export function addRegulatingBoxMaintenance(data) {
+  return request({
+    url: '/gas/regulatingBoxMaintenance',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改调压箱维护
+export function updateRegulatingBoxMaintenance(data) {
+  return request({
+    url: '/gas/regulatingBoxMaintenance',
+    method: 'put',
+    data: data
+  })
+}
+export function batchReview(data) {
+  return request({
+    url: '/gas/regulatingBoxMaintenance/batchReview',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除调压箱维护
+export function delRegulatingBoxMaintenance(id) {
+  return request({
+    url: '/gas/regulatingBoxMaintenance/' + id,
+    method: 'delete'
+  })
+}

src/api/gas/regulatorBox.js

@@ -35,6 +35,14 @@ export function updateRegulatorBox(data) {
   })
 }
 
+export function batchReview(data) {
+  return request({
+    url: '/gas/regulatorBox/batchReview',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除调压箱管理
 export function delRegulatorBox(id) {
   return request({

src/assets/styles/ruoyi.scss

@@ -47,6 +47,7 @@
 .mb10 {
   margin-bottom: 10px;
 }
+
 .ml10 {
   margin-left: 10px;
 }
@@ -62,6 +63,7 @@
 .mb20 {
   margin-bottom: 20px;
 }
+
 .ml20 {
   margin-left: 20px;
 }
@@ -73,12 +75,12 @@
   color: inherit;
 }
 
-.el-message-box__status + .el-message-box__message{
+.el-message-box__status + .el-message-box__message {
   word-break: break-word;
 }
 
 .el-dialog:not(.is-fullscreen) {
-  margin-top: 6vh !important;
+  margin-top: 6vh ;
 }
 
 .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
@@ -106,6 +108,28 @@
   }
 }
 
+.el-input.is-disabled .el-input__inner {
+  background-color: #f5f7fa ;
+  border-color: #dfe4ed00 ;
+  color: #7e8289 ;
+  cursor: not-allowed ;
+}
+.el-input-group__append{
+  border-color: #dfe4ed00 ;
+}
+
+.el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #F5F7FA;
+  color: #7e8289 ;
+}
+.el-textarea.is-disabled .el-textarea__inner{
+  color: #7e8289 ;
+  border-color: #dfe4ed00;
+}
+.el-radio__input.is-disabled + span.el-radio__label {
+  color: #7e8289 ;
+}
+
 /** 表单布局 **/
 .form-header {
   font-size: 15px;
@@ -121,7 +145,7 @@
   height: 25px;
   margin-bottom: 10px;
   margin-top: 15px;
-  padding: 10px 20px !important;
+  padding: 10px 20px ;
 }
 
 /* tree border */
@@ -139,10 +163,10 @@
 
 @media (max-width: 768px) {
   .pagination-container .el-pagination > .el-pagination__jump {
-    display: none !important;
+    display: none ;
   }
   .pagination-container .el-pagination > .el-pagination__sizes {
-    display: none !important;
+    display: none ;
   }
 }
 
@@ -153,7 +177,7 @@
 }
 
 /** 表格更多操作下拉样式 */
-.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
+.el-table .el-dropdown-link, .el-table .el-dropdown-selfdefine {
   cursor: pointer;
   margin-left: 5px;
 }
@@ -188,7 +212,7 @@
 }
 
 .pull-right {
-  float: right !important;
+  float: right ;
 }
 
 .el-card__header {
@@ -281,8 +305,8 @@
 /* 拖拽列样式 */
 .sortable-ghost {
   opacity: .8;
-  color: #fff !important;
-  background: #42b983 !important;
+  color: #fff ;
+  background: #42b983 ;
 }
 
 .top-right-btn {

src/views/gas/courtyardNetworkManagement/index.vue

@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="小区名称" prop="areaName">
-        <el-input v-model="queryParams.areaName" placeholder="请输入小区名称" clearable size="small" @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.areaName" placeholder="请输入小区名称" clearable size="small"
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="发现问题" prop="findProblem">
         <el-select v-model="queryParams.findProblem" placeholder="请选择发现问题" clearable size="small">
@@ -15,15 +16,16 @@
         </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="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1">
+        <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="队伍">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍"
+                   :disabled="postName.indexOf('xx') > -1">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -74,6 +76,18 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="openshShow(null,true)"
+          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+        >批量审核
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -92,7 +106,7 @@
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
       <el-table-column label="所属小区" align="center" prop="areaName"/>
       <el-table-column label="所属楼宇" align="center" prop="buildingName"/>
-<!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
+      <!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
       <el-table-column label="发现问题" align="center" prop="findProblem">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.find_problem" :value="scope.row.findProblem"/>
@@ -201,7 +215,8 @@
               v-for="dict in dict.type.find_problem"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="照片" prop="photoList">
@@ -225,7 +240,7 @@ import {
   getCourtyardNetworkManagement,
   delCourtyardNetworkManagement,
   addCourtyardNetworkManagement,
-  updateCourtyardNetworkManagement
+  updateCourtyardNetworkManagement, batchReview
 } from "@/api/gas/courtyardNetworkManagement";
 import {getAreaList} from "@/api/gas/area";
 import {getBuildingList} from "@/api/gas/building";
@@ -274,11 +289,11 @@ export default {
         pageSize: 10,
         unitId: undefined,
         findProblem: undefined,
-        ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
+        ranks: (Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 岗位选项
       postOptions: [],
-      postName:Cookies.get("postName"),
+      postName: Cookies.get("postName"),
       // 表单参数
       form: {},
       formSH: {},
@@ -314,8 +329,8 @@ export default {
     this.getList();
   },
   methods: {
-    getPostList(){
-      listPostAll({remark:'ranks'}).then(response => {
+    getPostList() {
+      listPostAll({remark: 'ranks'}).then(response => {
         this.postOptions = response.data;
       });
     },
@@ -336,17 +351,29 @@ export default {
             }).finally(() => {
               this.buttonLoading = false;
             });
+          }else if (this.formSH.uids.length > 0) {
+            batchReview(this.formSH).then(response => {
+              this.$modal.msgSuccess("审核成功");
+              this.openSH = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
           }
         }
       })
     },
-    openshShow(data) {
+    openshShow(data, isBatch) {
       this.formSH = {
         id: undefined,
+        uids: [],
         processStatus: undefined,
         processComments: undefined,
       }
-      this.formSH.id = data.id
+      if (isBatch)
+        this.formSH.uids = this.ids
+      else
+        this.formSH.id = data.id
       this.openSH = true
     },
     // 小区下拉

src/views/gas/emergencyRepair/index.vue

@@ -20,7 +20,8 @@
         />
       </el-form-item>
       <el-form-item label="报修类型" prop="repairType">
-        <el-select v-model="queryParams.repairType" placeholder="请选择报修类型" clearable size="small">
+        <el-select v-model="queryParams.repairType" placeholder="请选择报修类型" clearable size="small"
+                   @keyup.enter.native="handleQuery">
           <el-option
             v-for="dict in dict.type.repair_type"
             :key="dict.value"
@@ -60,6 +61,22 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="报修时间">
+        <el-date-picker
+          value-format="yyyy-MM-dd"
+          v-model="queryParams.ydm"
+          type="date"
+          placeholder="报修时间年月日">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="报修时间">
+        <el-time-picker
+          v-model="queryParams.hsm"
+          value-format="HH:mm:ss"
+          placeholder="报修时间时分秒">
+        </el-time-picker>
+      </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>
@@ -190,17 +207,17 @@
             v-hasPermi="['gas:emergencyRepair:remove']"
           >审核记录
           </el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            v-show="postName == 'admin' && (scope.row.processList.length == 0-->
-<!--            || scope.row.processList.filter(item => item.userPost == 'admin').length == 0-->
-<!--            || scope.row.processList.filter(item => item.userPost == 'admin' && item.processStatus == '0').length == 0)"-->
-<!--            @click="openshShow(scope.row,'admin',true)"-->
-<!--            v-hasPermi="['gas:emergencyRepair:remove']"-->
-<!--          >工程审核-->
-<!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            v-show="postName == 'admin' && (scope.row.processList.length == 0-->
+          <!--            || scope.row.processList.filter(item => item.userPost == 'admin').length == 0-->
+          <!--            || scope.row.processList.filter(item => item.userPost == 'admin' && item.processStatus == '0').length == 0)"-->
+          <!--            @click="openshShow(scope.row,'admin',true)"-->
+          <!--            v-hasPermi="['gas:emergencyRepair:remove']"-->
+          <!--          >工程审核-->
+          <!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -263,7 +280,7 @@
             label="岗位"
             width="65">
             <template slot-scope="scope">
-<!--              <span v-if="scope.row.userPost == 'admin'">管理员</span>-->
+              <!--              <span v-if="scope.row.userPost == 'admin'">管理员</span>-->
               <span v-if="scope.row.userPost == 'deputyDirector'">副处长</span>
               <span v-if="scope.row.userPost == 'director'">处长</span>
             </template>
@@ -526,6 +543,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
         repairName: undefined,
+        enginName: undefined,
+        time: undefined,
+        ydm: '',
+        hsm: '',
         repairType: undefined,
         causesOfDamage: undefined,
         pipelinePressure: undefined,
@@ -644,6 +665,8 @@ export default {
     /** 查询抢险维修列表 */
     getList() {
       this.loading = true;
+      console.log(this.queryParams)
+      debugger
       listEmergencyRepair(this.queryParams).then(response => {
         this.emergencyRepairList = response.rows;
         this.total = response.total;
@@ -685,6 +708,11 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      if ((this.queryParams.hsm != '' && this.queryParams.hsm != null && this.queryParams.hsm != undefined )
+        && (this.queryParams.ydm == '' || this.queryParams.ydm == null || this.queryParams.ydm == undefined)) {
+        this.$message.info("请选择报修日期")
+        return
+      }
       this.queryParams.pageNum = 1;
       this.getList();
     },

src/views/gas/patrolTeam/index.vue

@@ -11,6 +11,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="队伍" >
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1">
+          <el-option
+            v-for="item in postOptions"
+            :key="item.postId"
+            :label="item.postName"
+            :value="item.postId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="上传位置" prop="uploadLocation">
         <el-input
           v-model="queryParams.uploadLocation"
@@ -176,6 +186,8 @@
 
 <script>
 import { listPatrolTeam, getPatrolTeam, delPatrolTeam, addPatrolTeam, updatePatrolTeam } from "@/api/gas/patrolTeam";
+import {listPostAll} from "@/api/system/post";
+import Cookies from "js-cookie";
 
 export default {
   name: "PatrolTeam",
@@ -201,6 +213,9 @@ export default {
       total: 0,
       // 巡检车队表格数据
       patrolTeamList: [],
+      // 岗位选项
+      postOptions: [],
+      postName:Cookies.get("postName"),
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -233,9 +248,15 @@ export default {
     };
   },
   created() {
+    this.getPostList();
     this.getList();
   },
   methods: {
+    getPostList(){
+      listPostAll({remark:'ranks'}).then(response => {
+        this.postOptions = response.data;
+      });
+    },
     /** 查询巡检车队列表 */
     getList() {
       this.loading = true;

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -0,0 +1,536 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="队伍">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍"
+                   :disabled="postName.indexOf('xx') > -1">
+          <el-option
+            v-for="item in postOptions"
+            :key="item.postId"
+            :label="item.postName"
+            :value="item.postId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="编号" prop="number">
+        <el-input
+          v-model="queryParams.number"
+          placeholder="请输入编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="管理所" prop="administrativeOffice">
+        <el-select v-model="queryParams.administrativeOffice" placeholder="请选择维护项目" clearable size="small"
+                   @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in dict.type.administrative_office"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="维护项目" prop="maintenanceItem">
+        <el-select v-model="queryParams.maintenanceItem" placeholder="请选择维护项目" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.regulating_box_maintenance"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          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>
+      </el-form-item>
+    </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:regulatingBoxMaintenance:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="process(null,true)"
+          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+        >批量审核
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['gas:regulatingBoxMaintenance:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="regulatingBoxMaintenanceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键" align="center" prop="id" v-if="false"/>
+      <el-table-column label="名称" align="center" prop="name"/>
+      <el-table-column label="编号" align="center" prop="number"/>
+      <el-table-column label="管理所" align="center" prop="administrativeOffice">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.administrative_office" :value="scope.row.administrativeOffice"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="维护项目" align="center" prop="maintenanceItem">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.regulating_box_maintenance" :value="scope.row.maintenanceItem.split(',')"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="上传人" align="center" prop="createByName"/>
+      <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"/>
+          <span v-else>未审核</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="照片" align="center">
+        <template slot-scope="scope">
+          <el-image
+            style="width: 50px; height: 50px;border-radius: 5px"
+            :src="scope.row.photoList[0]"
+            :preview-src-list="scope.row.photoList">
+          </el-image>
+        </template>
+      </el-table-column>
+      <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-edit"
+            @click="handleUpdate(scope.row,false)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-show="scope.row.processStatus == null"
+            icon="el-icon-edit"
+            @click="process(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <el-dialog
+      title="审核"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <el-form ref="shFrom" :model="shFrom" label-width="80px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="shFrom.processStatus" placeholder="请选择审核状态" clearable size="small"
+                     @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="upprocess">确 定</el-button>
+  </span>
+    </el-dialog>
+    <!-- 添加或修改调压箱维护对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isDisabled">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称"/>
+        </el-form-item>
+        <el-form-item label="编号" prop="number">
+          <el-input v-model="form.number" placeholder="请输入编号"/>
+        </el-form-item>
+        <el-form-item label="管理所" prop="administrativeOffice">
+          <el-select v-model="form.administrativeOffice" placeholder="请选择管理所" clearable multiple>
+            <el-option
+              v-for="dict in dict.type.administrative_office"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="维护项目" prop="maintenanceItem">
+          <el-select v-model="form.maintenanceItem" placeholder="请选择维护项目" clearable multiple>
+            <el-option
+              v-for="dict in dict.type.regulating_box_maintenance"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="照片" prop="photoList">
+          <imageUpload v-model="form.photoList" :disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+          <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small"
+                     @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listRegulatingBoxMaintenance,
+  getRegulatingBoxMaintenance,
+  delRegulatingBoxMaintenance,
+  addRegulatingBoxMaintenance,
+  updateRegulatingBoxMaintenance, batchReview
+} from "@/api/gas/regulatingBoxMaintenance";
+import Cookies from "js-cookie";
+import {listPostAll} from "@/api/system/post";
+
+export default {
+  name: "RegulatingBoxMaintenance",
+  dicts: ['regulating_box_maintenance', 'administrative_office', 'process_status'],
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      dialogVisible: false,
+      disabled: false,
+      // 遮罩层
+      loading: true,
+      isDisabled: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 调压箱维护表格数据
+      regulatingBoxMaintenanceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 岗位选项
+      postOptions: [],
+      postName: Cookies.get("postName"),
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        number: undefined,
+        administrativeOffice: undefined,
+        maintenanceItem: undefined,
+        remarks: undefined,
+      },
+      // 表单参数
+      form: {},
+      shFrom: {
+        id: '',
+        uids: [],
+        processStatus: '',
+        remarks: ""
+      },
+      // 表单校验
+      rules: {
+        id: [
+          {required: true, message: "主键不能为空", trigger: "blur"}
+        ],
+        name: [
+          {required: true, message: "名称不能为空", trigger: "blur"}
+        ],
+        number: [
+          {required: true, message: "编号不能为空", trigger: "blur"}
+        ],
+        administrativeOffice: [
+          {required: true, message: "管理所不能为空", trigger: "blur"}
+        ],
+        maintenanceItem: [
+          {required: true, message: "维护项目不能为空", trigger: "change"}
+        ],
+        remarks: [
+          {required: true, message: "备注不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getPostList();
+    this.getList();
+  },
+  methods: {
+    upprocess() {
+      if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == '') {
+        this.$message.warning("请选择审核状态")
+      }
+      if (this.shFrom.uids.length == 0){
+        updateRegulatingBoxMaintenance(this.shFrom).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.getList();
+        }).finally(() => {
+          this.dialogVisible = false;
+        });
+      }else {
+        batchReview(this.shFrom).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.getList();
+        }).finally(() => {
+          this.dialogVisible = false;
+        });
+      }
+
+    },
+    process(data, isBatch) {
+      this.shFrom.id = undefined
+      this.shFrom.uids = []
+      if (isBatch)
+        this.shFrom.uids = this.ids
+      else
+        this.shFrom.id = data.id;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
+    },
+    getPostList() {
+      listPostAll({remark: 'ranks'}).then(response => {
+        this.postOptions = response.data;
+      });
+    },
+    /** 查询调压箱维护列表 */
+    getList() {
+      this.loading = true;
+      listRegulatingBoxMaintenance(this.queryParams).then(response => {
+        this.regulatingBoxMaintenanceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        number: undefined,
+        administrativeOffice: undefined,
+        maintenanceItem: undefined,
+        remarks: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加调压箱维护";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row, isDisabled) {
+      this.loading = true;
+      this.isDisabled = isDisabled;
+      this.reset();
+      const id = row.id || this.ids
+      getRegulatingBoxMaintenance(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.form.maintenanceItem = response.data.maintenanceItem.split(",");
+        this.open = true;
+        this.title = "修改调压箱维护";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            if (typeof this.form.photoList === 'string') {
+              this.form.photoList = this.form.photoList.split(',')
+            }
+            this.form.maintenanceItem = this.form.maintenanceItem.join()
+            updateRegulatingBoxMaintenance(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            this.form.maintenanceItem = this.form.maintenanceItem.join()
+            this.form.photoList = this.form.photoList.split(',')
+            addRegulatingBoxMaintenance(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除调压箱维护编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delRegulatingBoxMaintenance(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$download.excel('/gas/regulatingBoxMaintenance/export', this.queryParams);
+    }
+  }
+};
+</script>

src/views/gas/regulatorBox/index.vue

@@ -84,6 +84,18 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="process(null,true)"
+          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+        >批量审核
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -111,6 +123,12 @@
       <el-table-column label="编号" align="center" prop="number"/>
       <el-table-column label="创建人" align="center" prop="createByName"/>
       <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"/>
+          <span v-else>未审核</span>
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
           <el-image
@@ -138,6 +156,15 @@
             v-hasPermi="['gas:regulatorBox:edit']"
           >修改
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-show="scope.row.processStatus == null"
+            icon="el-icon-edit"
+            @click="process(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >审核
+          </el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
           <!--            type="text"-->
@@ -157,14 +184,37 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog
+      title="审核"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <el-form ref="shFrom" :model="shFrom" label-width="80px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="shFrom.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="upprocess">确 定</el-button>
+  </span>
+    </el-dialog>
     <!-- 添加或修改调压箱管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="180px" :disabled="disabled">
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="调压箱名称" prop="areaId">
-              <el-input v-model="form.areaName" placeholder="请输入调压箱名称"/>
+              <el-input v-model="form.name" placeholder="请输入调压箱名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -518,9 +568,22 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remarks">
-              <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容"/>
-            </el-form-item>
-          </el-col>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+            <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+              <el-option
+                v-for="dict in dict.type.process_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+            <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+          </el-form-item>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -537,7 +600,7 @@ import {
   getRegulatorBox,
   delRegulatorBox,
   addRegulatorBox,
-  updateRegulatorBox
+  updateRegulatorBox, batchReview
 } from "@/api/gas/regulatorBox";
 import {getAreaList} from "@/api/gas/area";
 import {getBuildingList} from "@/api/gas/building";
@@ -552,7 +615,7 @@ export default {
   dicts: ['appearance', 'administrative_office', 'square_brick', 'business_service',
     'yes_and_no','on_off','yes_or_no','cutoff_test_certification','secondary_roads',
     'guardrail', 'foundation', 'pressure_gage', 'valve', 'voltage_regulator', 'xtv',
-    'disconnector_test_status', 'filter', 'special_case_of_pressure_regulating_facilities',
+    'disconnector_test_status', 'filter','process_status', 'special_case_of_pressure_regulating_facilities',
     'overdue_inspection_days', 'reason_for_overdue_inspection', 'valve_well_condition'],
   data() {
     return {
@@ -562,6 +625,7 @@ export default {
       // 按钮loading
       buttonLoading: false,
       disabled: false,
+      isDisabled: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -579,6 +643,13 @@ export default {
       // 调压箱管理表格数据
       regulatorBoxList: [],
       workerList: [],
+      dialogVisible: false,
+      shFrom:{
+        id: '',
+        uids: [],
+        processStatus:'',
+        remarks: ""
+      },
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -698,6 +769,24 @@ export default {
     this.getList();
   },
   methods: {
+    upprocess(){
+      if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
+        this.$message.warning("请选择审核状态")
+      } if (this.shFrom.uids.length == 0){
+      updateRegulatorBox(this.shFrom).then(response => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      }).finally(() => {
+        this.dialogVisible = false;
+      });}else {
+        batchReview(this.shFrom).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.getList();
+        }).finally(() => {
+          this.dialogVisible = false;
+        });
+      }
+    },
     getPostList(){
       listPostAll({remark:'ranks'}).then(response => {
         this.postOptions = response.data;
@@ -814,6 +903,7 @@ export default {
     handleUpdate(row,disabled) {
       this.loading = true;
       this.disabled = disabled;
+      this.isDisabled = disabled;
       this.reset();
       const id = row.id || this.ids
       getRegulatorBox(id).then(response => {
@@ -829,6 +919,17 @@ export default {
         this.title = "查看调压箱管理";
       });
     },
+    process(data, isBatch) {
+      this.shFrom.id = undefined
+      this.shFrom.uids = []
+      if (isBatch)
+        this.shFrom.uids = this.ids
+      else
+        this.shFrom.id = data.id;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/gas/roadSectionInspection/index.vue

@@ -20,6 +20,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="队伍" >
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1">
+          <el-option
+            v-for="item in postOptions"
+            :key="item.postId"
+            :label="item.postName"
+            :value="item.postId"
+          ></el-option>
+        </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>
@@ -90,6 +100,12 @@
       </el-table-column>
       <el-table-column label="上传人" align="center" prop="createByName" width="180">
       </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"/>
+          <span v-else>未审核</span>
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
           <el-image
@@ -105,13 +121,30 @@
           <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-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row,false)"
             v-hasPermi="['gas:roadSectionInspection:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
+            v-show="scope.row.processStatus == null"
+            icon="el-icon-edit"
+            @click="process(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-view"
             @click="views(scope.row)"
             v-hasPermi="['gas:roadSectionInspection:views']"
@@ -135,9 +168,33 @@
       @pagination="getList"
     />
 
+    <el-dialog
+      title="审核"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <el-form ref="shFrom" :model="shFrom" label-width="80px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="shFrom.processStatus"  @change="$forceUpdate" placeholder="请选择审核状态" clearable size="small">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="upprocess">确 定</el-button>
+  </span>
+    </el-dialog>
     <!-- 添加或修改路段巡查对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="disabled">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isDisabled">
         <el-form-item label="路段名称" prop="sectionName">
           <el-input v-model="form.sectionName" placeholder="请输入路段名称" />
         </el-form-item>
@@ -171,6 +228,21 @@
             <imageUpload v-model="form.photoList" :disabled="disabled"/>
           </el-form-item>
         </el-col>
+
+        <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+          <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -183,14 +255,19 @@
 <script>
 import { listRoadSectionInspection, getRoadSectionInspection, delRoadSectionInspection, addRoadSectionInspection, updateRoadSectionInspection } from "@/api/gas/roadSectionInspection";
 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";
 
 export default {
   name: "RoadSectionInspection",
-  dicts: ['find_problem'],
+  dicts: ['find_problem','process_status'],
   data() {
     return {
       // 按钮loading
       buttonLoading: false,
+      dialogVisible: false,
+      isDisabled: true,
       disabled: false,
       // 遮罩层
       loading: true,
@@ -204,6 +281,7 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      postName:Cookies.get("postName"),
       // 总条数
       total: 0,
       // 路段巡查表格数据
@@ -212,6 +290,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 岗位选项
+      postOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -223,6 +303,11 @@ export default {
       },
       // 表单参数
       form: {},
+      shFrom:{
+        id: '',
+        processStatus:'',
+        remarks: ""
+      },
       // 表单校验
       rules: {
         id: [
@@ -247,9 +332,33 @@ export default {
     };
   },
   created() {
+    this.getPostList();
     this.getList();
   },
   methods: {
+    upprocess(){
+      if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
+        this.$message.warning("请选择审核状态")
+      }
+      updateRoadSectionInspection(this.shFrom).then(response => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      }).finally(() => {
+        this.dialogVisible = false;
+      });
+    },
+    process(data) {
+      this.shFrom.id = undefined
+      this.shFrom.id = data.id;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
+    },
+    getPostList(){
+      listPostAll({remark:'ranks'}).then(response => {
+        this.postOptions = response.data;
+      });
+    },
     /** 查询路段巡查列表 */
     getList() {
       this.loading = true;
@@ -305,8 +414,9 @@ export default {
       this.title = "添加路段巡查";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row,dis) {
       this.loading = true;
+      this.isDisabled = dis
       this.reset();
       const id = row.id || this.ids
       getRoadSectionInspection(id).then(response => {

src/views/gas/valveWellInspection/index.vue

@@ -4,6 +4,16 @@
       <el-form-item label="阀井名称" prop="valveWellName">
         <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-option
+            v-for="item in postOptions"
+            :key="item.postId"
+            :label="item.postName"
+            :value="item.postId"
+          ></el-option>
+        </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%">
@@ -106,6 +116,12 @@
       </el-table-column>
       <el-table-column label="上传人" align="center" prop="createByName" width="180">
       </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"/>
+          <span v-else>未审核</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
@@ -121,14 +137,31 @@
           <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-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row,false)"
             v-hasPermi="['gas:valveWellInspection:edit']"
           >修改
           </el-button>
           <el-button
             size="mini"
             type="text"
+            v-show="scope.row.processStatus == null"
+            icon="el-icon-edit"
+            @click="process(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['gas:valveWellInspection:remove']"
@@ -145,10 +178,33 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog
+      title="审核"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <el-form ref="shFrom" :model="shFrom" label-width="80px">
+        <el-form-item label="审核状态">
+          <el-select v-model="shFrom.processStatus" placeholder="请选择审核状态" clearable size="small"  @change="$forceUpdate()" >
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="upprocess">确 定</el-button>
+  </span>
+    </el-dialog>
     <!-- 添加或修改阀井巡查对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isDisabled">
         <el-form-item label="阀井名称" prop="position">
           <el-select v-model="form.positionId" placeholder="请选择阀井名称" filterable clearable size="small"
                      @change="getPositionName" style="width: 100%">
@@ -180,6 +236,19 @@
             <imageUpload v-model="form.photoList" :disabled="disabled"/>
           </el-form-item>
         </el-col>
+        <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+          <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -198,15 +267,28 @@ import {
   updateValveWellInspection
 } from "@/api/gas/valveWellInspection";
 import {listValveWellPosition} from "@/api/gas/valveWellPosition";
+import Cookies from "js-cookie";
+import {listPostAll} from "@/api/system/post";
+import {updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
 
 export default {
   name: "ValveWellInspection",
-  dicts: ['find_problem'],
+  dicts: ['find_problem','process_status'],
   data() {
     return {
+      shFrom:{
+        id: '',
+        processStatus:'',
+        remarks: ""
+      },
+      isDisabled: false,
+      dialogVisible: false,
       // 按钮loading
       buttonLoading: false,
       disabled: false,
+      // 岗位选项
+      postOptions: [],
+      postName:Cookies.get("postName"),
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -255,9 +337,15 @@ export default {
   },
   created() {
     this.listValveWellPosition();
+    this.getPostList();
     this.getList();
   },
   methods: {
+    getPostList(){
+      listPostAll({remark:'ranks'}).then(response => {
+        this.postOptions = response.data;
+      });
+    },
     getPositionName() {
       if (this.form.positionId === '') {
         this.weizhi = ''
@@ -324,9 +412,28 @@ export default {
       this.weizhi = ''
       this.title = "添加阀井巡查";
     },
+    upprocess(){
+      if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
+        this.$message.warning("请选择审核状态")
+      }
+      updateValveWellInspection(this.shFrom).then(response => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      }).finally(() => {
+        this.dialogVisible = false;
+      });
+    },
+    process(data) {
+      this.shFrom.id = undefined
+      this.shFrom.id = data.id;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
+    },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row,disabled) {
       this.loading = true;
+      this.isDisabled = disabled;
       this.reset();
       const id = row.id || this.ids
       getValveWellInspection(id).then(response => {

src/views/gas/valveWellPosition/index.vue

@@ -78,6 +78,17 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['system:user:import']"
+        >导入
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -103,6 +114,19 @@
       <el-table-column label="经度" align="center" prop="longitude" />
       <el-table-column label="纬度" align="center" prop="latitude" />
       <el-table-column label="控制区域" align="center" prop="remark" />
+      <el-table-column label="行政区" align="center" prop="district" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.district" :value="scope.row.district"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="队伍" align="center" prop="team" />
+      <el-table-column label="阀头形状" align="center" prop="valveHeadShape" />
+      <el-table-column label="阀井深度(米)" align="center" prop="valveWellDepth" />
+      <el-table-column label="井盖代别" align="center" prop="manholeCoverInstead" />
+      <el-table-column label="积水情况" align="center" prop="waterCondition" />
+      <el-table-column label="压力等级" align="center" prop="pressureRating" />
+      <el-table-column label="是否需要下井才能开关阀门" align="center" prop="isXyxjcnkg" />
+      <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -123,6 +147,46 @@
       </el-table-column>
     </el-table>
 
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!--<div class="el-upload__tip" slot="tip">-->
+          <!--<el-checkbox v-model="upload.updateSupport"/>-->
+          <!--是否更新已经存在的用户数据-->
+          <!--</div>-->
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                   @click="importTemplate"
+          >下载模板
+          </el-link>
+        </div>
+      </el-upload>
+      <div style="padding-top: 15px;line-height: 25px;font-size: 14px;">
+        完成度：{{ bfb }}%
+        <progress max="100" :value="bfb" style="width: 200px;height: 18px;"></progress>
+        <br>
+        导入结果：{{ jdtMsg }}
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false;bfb='0';jdtMsg=''">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -132,8 +196,8 @@
     />
 
     <!-- 添加或修改阀井位置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px"  :inline="true">
         <el-form-item label="阀井名称" prop="valveWellName">
           <el-input v-model="form.valveWellName" placeholder="请输入阀井名称" />
         </el-form-item>
@@ -147,7 +211,48 @@
           <el-input v-model="form.latitude" placeholder="请输入纬度" />
         </el-form-item>
         <el-form-item label="控制区域" prop="remark">
-          <el-input v-model="form.remark" type="textarea" 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-option
+              v-for="dict in dict.type.district"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="队伍" prop="team">
+          <el-select v-model="form.team" clearable placeholder="请选择队伍">
+          <el-option
+            v-for="item in postOptions"
+            :key="item.postName"
+            :label="item.postName"
+            :value="item.postName"
+          ></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-input v-model="form.manholeCoverInstead" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="积水情况" prop="waterCondition">
+          <el-input v-model="form.waterCondition" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="压力等级" prop="pressureRating">
+          <el-input v-model="form.pressureRating" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="是否需要下井才能开关阀门" prop="isXyxjcnkg">
+          <el-input v-model="form.isXyxjcnkg" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -160,17 +265,27 @@
 
 <script>
 import { listValveWellPosition, getValveWellPosition, delValveWellPosition, addValveWellPosition, updateValveWellPosition } from "@/api/gas/valveWellPosition";
+import {listPostAll} from "@/api/system/post";
+import {getToken} from "@/utils/auth";
+import {clearFlushProgress, clearFlushProgressA, flushProgress, flushProgressA} from "@/api/gas/area";
 
 export default {
   name: "ValveWellPosition",
+  dicts: ['district'],
   data() {
     return {
+      //进度条
+      timeInterval: null,
+      bfb: '0',
+      jdtMsg: '',
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
       exportLoading: false,
+      // 岗位选项
+      postOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -198,6 +313,21 @@ export default {
       },
       // 表单参数
       form: {},
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: '',
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/gas/valveWellPosition/importData'
+      },
       // 表单校验
       rules: {
         id: [
@@ -219,9 +349,54 @@ export default {
     };
   },
   created() {
+    this.getPostList();
     this.getList();
   },
   methods: {
+    /** 下载模板操作 */
+    importTemplate() {
+      this.$download.excel('/gas/valveWellPosition/importTemplate')
+    },
+    // 提交上传文件
+    submitFileForm() {
+      const ther = this
+      this.timeInterval = setInterval(function() {
+        ther.flushProgress()
+      }, 1500)
+      this.$refs.upload.submit()
+    },
+    // 提交上传文件
+    flushProgress() {
+      flushProgressA().then(response => {
+        this.bfb = parseInt(response.data.bfb) >= 100 ? 100 : response.data.bfb
+        this.jdtMsg = response.data.message
+        if (response.data.message != null && response.data.message != '') {
+          clearFlushProgressA().then(response => {
+          })
+          clearInterval(this.timeInterval)
+        }
+      })
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.getList()
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = '导入'
+      this.upload.open = true
+    },
+    getPostList(){
+      listPostAll({remark:'ranks'}).then(response => {
+        this.postOptions = response.data;
+      });
+    },
     /** 查询阀井位置列表 */
     getList() {
       this.loading = true;