版本1.4.1

src/api/gas/roadSectionInspection.js

@@ -35,6 +35,15 @@ export function updateRoadSectionInspection(data) {
   })
 }
 
+// 路段巡查 批量审核
+export function batchReviewsRoadSectionInspection(data) {
+  return request({
+    url: '/gas/roadSectionInspection/batchReviews',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除路段巡查
 export function delRoadSectionInspection(id) {
   return request({

src/components/ImageUpload/cad.vue

@@ -205,15 +205,14 @@
       // 预览
       handlePictureCardPreview(file) {
         this.dialogImageUrl = file.url;
-        this.type=file.name.slice(file.name.lastIndexOf(".")+1);
+        this.type=file.fileName.slice(file.fileName.lastIndexOf(".")+1);
         if (this.type === 'mp4')
         this.dialogVisible = true;
         else{
-          this.imgIndex = this.fileList.findIndex((item) => item.name == file.url)
+          this.imgIndex = this.fileList.findIndex((item) => item.url == file.url)
           console.log(this.imgIndex)
           this.dialogVisible2 = true
         }
-        console.log(this.type)
       },
     }
   };

src/views/gas/area/index.vue

@@ -1,18 +1,19 @@
 <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 label="队伍" prop="ranks">
+        <el-select v-model="queryParams.ranks"  :disabled="postName.indexOf('xx') > -1" clearable placeholder="请选择" @change="getUsers">
+          <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="userId">
         <el-select v-model="queryParams.userId" filterable placeholder="请选择负责人" clearable size="small">
-          <el-option v-for="item in workerList"
+          <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"/>
@@ -28,6 +29,15 @@
           />
         </el-select>
       </el-form-item>
+      <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>
         <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>
@@ -271,8 +281,8 @@ import {
   clearFlushProgress
 } from "@/api/gas/area";
 import {getWorker} from "@/api/gas/user";
-import el from "element-ui/src/locale/lang/el";
 import {getToken} from "@/utils/auth";
+import {listPostAll} from "@/api/system/post";
 
 export default {
   name: "Area",
@@ -317,6 +327,8 @@ export default {
       total: 0,
       // 小区表格数据
       areaList: [],
+      // 岗位选项
+      postOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -329,7 +341,9 @@ export default {
         name: undefined,
         userId: undefined,
         district: undefined,
+        ranks: (Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
+      postName: Cookies.get("postName"),
       // 表单参数
       form: {},
       // 表单校验
@@ -347,6 +361,7 @@ export default {
           {required: true, message: "行政区不能为空", trigger: "change"}
         ],
       },
+      workerListSelect: [],
       workerList: [],
       installList:[],
       value:'庭院网管'
@@ -356,8 +371,21 @@ export default {
     this.getWorkerList();
     this.getList();
     this.getdictList();
+    this.getPostList();
   },
   methods: {
+    getUsers(value){
+      if (!value) return;
+      getWorker({ranks:value}).then(response => {
+        this.workerListSelect = response.data;
+      });
+    },
+    //获取岗位列
+    getPostList(){
+      listPostAll({remark:'ranks'}).then(response => {
+        this.postOptions = response.data;
+      });
+    },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true
@@ -492,6 +520,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.workerListSelect=[]
       this.handleQuery();
     },
     // 多选框选中数据

src/views/gas/building/index.vue

@@ -78,6 +78,11 @@
     <el-table v-loading="loading" :data="buildingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="所属小区" align="center" prop="areaName"/>
       <el-table-column label="楼宇名" align="center" prop="name"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/gas/cad/index.vue

@@ -73,6 +73,11 @@
     <el-table v-loading="loading" :data="cadList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" v-if="true"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="队伍" align="center" prop="postId" >
         <template slot-scope="scope">

src/views/gas/courtyardNetworkManagement/index.vue

@@ -1,9 +1,16 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="小区名称" prop="areaName">
-        <el-input v-model="queryParams.areaName" placeholder="请输入小区名称" clearable size="small"
-                  @keyup.enter.native="handleQuery"/>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="小区名称" prop="areaId">
+<!--        <el-input v-model="queryParams.areaName" placeholder="请输入小区名称" clearable size="small"-->
+<!--                  @keyup.enter.native="handleQuery"/>-->
+        <el-select v-model="queryParams.areaId" filterable placeholder="请选择所属楼宇"
+                   clearable size="small" >
+          <el-option v-for="item in areaList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
       </el-form-item>
       <el-form-item label="发现问题" prop="findProblem">
         <el-select v-model="queryParams.findProblem" placeholder="请选择发现问题" clearable size="small">
@@ -16,8 +23,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="队伍">
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍"
-                   :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy = undefined">
+        <el-select v-model="queryParams.ranks" :disabled="postName.indexOf('xx') > -1" clearable placeholder="请选择" @change="getUsers">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -28,7 +34,7 @@
       </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"
+          <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"/>
@@ -116,6 +122,11 @@
     <el-table v-loading="loading" :data="courtyardNetworkManagementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="所属小区" align="center" prop="areaName"/>
       <el-table-column label="所属楼宇" align="center" prop="buildingName"/>
       <!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
@@ -141,6 +152,7 @@
           </el-image>
         </template>
       </el-table-column>
+      <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
@@ -297,6 +309,7 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        areaId:undefined,
         pageNum: 1,
         pageSize: 10,
         unitId: undefined,
@@ -331,7 +344,8 @@ export default {
         remarks: [
           {required: false, message: "备注不能为空", trigger: "blur"}
         ],
-      }
+      },
+      workerListSelect:[]
     };
   },
   created() {
@@ -341,6 +355,12 @@ export default {
     this.getList();
   },
   methods: {
+    getUsers(value){
+      if (!value) return;
+      getWorker({ranks:value}).then(response => {
+        this.workerListSelect = response.data;
+      });
+    },
     getPostList() {
       listPostAll({remark: 'ranks'}).then(response => {
         this.postOptions = response.data;
@@ -448,6 +468,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.workerListSelect=[]
       this.handleQuery();
     },
     // 多选框选中数据

src/views/gas/emergencyRepair/index.vue

@@ -137,6 +137,11 @@
     <el-table v-loading="loading" :data="emergencyRepairList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="报修时间" align="center" prop="repairTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.repairTime, '{y}-{m}-{d}') }}</span>

src/views/gas/notice/index.vue

@@ -40,6 +40,11 @@
 
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="内容" align="center" prop="text" />
       <el-table-column label="备注" align="center" prop="remark" />

src/views/gas/patrolRecord/index.vue

@@ -79,6 +79,11 @@
     <el-table v-loading="loading" :data="patrolRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="true"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="巡查人员" align="center" prop="userName"/>
       <el-table-column label="警示桩名称" align="center" prop="warningPileName"/>
       <el-table-column label="照片" align="center">

src/views/gas/patrolTeam/index.vue

@@ -11,19 +11,19 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="队伍" >
-        <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"
-            :label="item.postName"
-            :value="item.postId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+        <el-form-item label="队伍" prop="ranks">
+          <el-select v-model="queryParams.ranks" clearable placeholder="请选择" @change="getUsers" :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="createBy">
         <el-select v-model="queryParams.createBy" filterable placeholder="请选择上传人" clearable size="small">
-          <el-option v-for="item in workerList"
+          <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"/>
@@ -104,6 +104,11 @@
     <el-table v-loading="loading" :data="patrolTeamList" @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="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="班组" align="center" prop="team">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.team" :value="scope.row.team"/>
@@ -230,6 +235,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      workerListSelect:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -260,10 +266,16 @@ export default {
   },
   created() {
     this.getPostList();
-    this.getWorkerList();
+    // this.getWorkerList();
     this.getList();
   },
   methods: {
+    getUsers(value){
+      if (!value) return;
+      getWorker({ranks:value}).then(response => {
+        this.workerListSelect = response.data;
+      });
+    },
     getWorkerList(ranks) {
       let data = null
       if(ranks){
@@ -317,6 +329,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.workerListSelect=[]
       this.handleQuery();
     },
     // 多选框选中数据

src/views/gas/pipelineGasUser/index.vue

@@ -102,7 +102,12 @@
     <el-table v-loading="loading" :data="pipelineGasUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键id" align="center" prop="id" v-if="true"/>-->
-      <el-table-column  label="编号" type="index" width="50"></el-table-column>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
+<!--      <el-table-column  label="编号" type="index" width="50"></el-table-column>-->
       <el-table-column label="用户名称" align="center" prop="userName" />
       <el-table-column label="用户编号" align="center" prop="userNumber" />
       <el-table-column label="用户类型" align="center" prop="userType" >

src/views/gas/pressureRegulatingBox/index.vue

@@ -30,6 +30,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+        <el-form-item label="时间范围" prop="createTimes">
+          <el-date-picker
+            v-model="queryParams.createTimes"
+            type="datetimerange"
+            :picker-options="pickerOptions"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            align="right">
+          </el-date-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>
@@ -99,7 +110,7 @@
 
     <el-table v-loading="loading" :data="pressureRegulatingBoxList" @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="id" v-if="false"/>-->
       <el-table-column label="序号" width="70">
         <template slot-scope="scope">
           {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
@@ -121,6 +132,7 @@
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
       <el-table-column label="巡检次数" align="center" prop="inspectionFrequency"/>
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -458,6 +470,33 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -470,6 +509,7 @@ export default {
         name: undefined,
         longitude: undefined,
         latitude: undefined,
+        createTimes: []
       },
       // 表单参数
       form: {},
@@ -599,6 +639,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createTimes = [];
       this.handleQuery();
     },
     // 多选框选中数据

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,9 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="队伍">
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍"
-                   :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy=undefined">
+      <el-form-item label="队伍" prop="ranks">
+        <el-select v-model="queryParams.ranks" :disabled="postName.indexOf('xx') > -1" clearable placeholder="请选择队伍" @change="getUsers">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -23,7 +22,7 @@
       </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"
+          <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"/>
@@ -68,6 +67,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="时间范围" prop="createTimes">
+        <el-date-picker
+          v-model="queryParams.createTimes"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right">
+        </el-date-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>
@@ -139,6 +149,11 @@
     <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="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="编号" align="center" prop="number"/>
       <el-table-column label="管理所" align="center" prop="administrativeOffice">
@@ -169,6 +184,7 @@
           </el-image>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -325,6 +341,33 @@ export default {
       // 选中数组
       ids: [],
       workerList: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -351,6 +394,7 @@ export default {
         administrativeOffice: undefined,
         maintenanceItem: undefined,
         remarks: undefined,
+        createTimes: [],
         ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
@@ -381,7 +425,8 @@ export default {
         remarks: [
           {required: true, message: "备注不能为空", trigger: "blur"}
         ],
-      }
+      },
+      workerListSelect:[]
     };
   },
   created() {
@@ -390,6 +435,12 @@ export default {
     this.getWorkerList();
   },
   methods: {
+    getUsers(value){
+      if (!value) return;
+      getWorker({ranks:value}).then(response => {
+        this.workerListSelect = response.data;
+      });
+    },
     getWorkerList(ranks) {
       let data = null
       if(ranks){
@@ -477,6 +528,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createTimes=[]
+      this.workerListSelect=[]
       this.handleQuery();
     },
     // 多选框选中数据

src/views/gas/regulatorBox/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
       <el-form-item label="调压箱名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入调压箱名称" clearable size="small" @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -22,8 +22,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy = undefined">
+      <el-form-item label="队伍" prop="ranks">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -34,12 +34,23 @@
       </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"
+          <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="时间范围" prop="createTimes">
+        <el-date-picker
+          v-model="queryParams.createTimes"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right">
+        </el-date-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>
@@ -112,6 +123,11 @@
     <el-table v-loading="loading" :data="regulatorBoxList" @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="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="调压箱名称" align="center" prop="name"/>
       <!--      <el-table-column label="所属楼宇" align="center" prop="buildingName"/>-->
       <!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
@@ -138,6 +154,7 @@
           </el-image>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" show-overflow-tooltip/>
       <el-table-column label="操作" width="180" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -644,6 +661,33 @@ export default {
       regulatorBoxList: [],
       workerList: [],
       dialogVisible: false,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       shFrom:{
         id: '',
         uids: [],
@@ -660,6 +704,7 @@ export default {
         pageSize: 10,
         administrativeOffice: undefined,
         number: undefined,
+        createTimes:[],
         ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 岗位选项
@@ -759,7 +804,8 @@ export default {
         // valveWellCondition: [
         //   {required: true, message: "阀井情况不能为空", trigger: "change"}
         // ]
-      }
+      },
+      workerListSelect:[]
     };
   },
   created() {
@@ -769,6 +815,12 @@ export default {
     this.getList();
   },
   methods: {
+    getUsers(value){
+      if (!value) return;
+      getWorker({ranks:value}).then(response => {
+        this.workerListSelect = response.data;
+      });
+    },
     upprocess(){
       if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
         this.$message.warning("请选择审核状态")
@@ -890,6 +942,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createTimes=[]
+      this.workerListSelect=[]
       this.handleQuery();
     },
     // 多选框选中数据

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" @change="getWorkerList(queryParams.ranks);queryParams.createBy=undefined">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -32,7 +32,7 @@
       </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"
+          <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"/>
@@ -79,6 +79,18 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="openshShow"
+          v-hasPermi="['gas:roadSectionInspection:edit']"
+        >批量审核
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -94,6 +106,11 @@
     <el-table v-loading="loading" :data="roadSectionInspectionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="路段名称" align="center" prop="sectionName" />
       <el-table-column label="抽检米数" align="center" prop="samplingMeterCount" />
       <el-table-column label="发现问题" align="center" prop="findProblem">
@@ -175,7 +192,30 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog
+      title="审核"
+      :visible.sync="openSH"
+      width="30%">
+      <el-form ref="formSH" :model="formSH" label-width="80px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="formSH.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="formSH.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="openSH = false">取 消</el-button>
+    <el-button type="primary" @click="batchReviews">确 定</el-button>
+  </span>
+    </el-dialog>
     <el-dialog
       title="审核"
       :visible.sync="dialogVisible"
@@ -261,11 +301,16 @@
 </template>
 
 <script>
-import { listRoadSectionInspection, getRoadSectionInspection, delRoadSectionInspection, addRoadSectionInspection, updateRoadSectionInspection } from "@/api/gas/roadSectionInspection";
-import fa from "element-ui/src/locale/lang/fa";
+import {
+  listRoadSectionInspection,
+  getRoadSectionInspection,
+  delRoadSectionInspection,
+  addRoadSectionInspection,
+  updateRoadSectionInspection,
+  batchReviewsRoadSectionInspection
+} from "@/api/gas/roadSectionInspection";
 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 {
@@ -319,6 +364,8 @@ export default {
         processStatus:'',
         remarks: ""
       },
+      openSH:false,
+      formSH:{},
       // 表单校验
       rules: {
         id: [
@@ -339,7 +386,8 @@ export default {
         remark: [
           { required: true, message: "备注不能为空", trigger: "blur" }
         ],
-      }
+      },
+      workerListSelect:[]
     };
   },
   created() {
@@ -348,6 +396,23 @@ export default {
     this.getWorkerList();
   },
   methods: {
+    getUsers(value){
+      if (!value) return;
+      getWorker({ranks:value}).then(response => {
+        this.workerListSelect = response.data;
+      });
+    },
+    openshShow() {
+      this.formSH = {
+        id: undefined,
+        uids: [],
+        processStatus: undefined,
+        remarks: undefined,
+      }
+      this.resetForm("formSH");
+      this.formSH.uids = this.ids
+      this.openSH = true
+    },
     getWorkerList(ranks) {
       let data = null
       if(ranks){
@@ -359,6 +424,17 @@ export default {
         this.workerList = req.data
       })
     },
+    batchReviews(){
+      if (this.formSH.processStatus == undefined || this.formSH.processStatus == ''){
+        this.$message.warning("请选择审核状态")
+      }
+      batchReviewsRoadSectionInspection(this.formSH).then(response => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      }).finally(() => {
+        this.openSH = false;
+      });
+    },
     upprocess(){
       if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
         this.$message.warning("请选择审核状态")

src/views/gas/rotation/index.vue

@@ -40,6 +40,11 @@
 
     <el-table v-loading="loading" :data="rotationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="图片" align="center" prop="picUrl" >
         <template slot-scope="scope">

src/views/gas/transmissionStation/index.vue

@@ -84,6 +84,11 @@
     <el-table v-loading="loading" :data="transmissionStationList" @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="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="输配站名称" align="center" prop="name" />
       <el-table-column label="输入管道" align="center" prop="pipeline">
         <template slot-scope="scope">

src/views/gas/unit/index.vue

@@ -87,6 +87,11 @@
     <el-table v-loading="loading" :data="unitList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="true"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="所属小区" align="center" prop="areaName"/>
       <el-table-column label="所属楼宇" align="center" prop="buildingName"/>
       <el-table-column label="单元名" align="center" prop="name"/>

src/views/gas/user/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="队伍" prop="ranks">
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -77,6 +77,11 @@
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="队伍" align="center" prop="ranks">
         <template slot-scope="scope">
           <dict-post :options="postOptions" :value="scope.row.ranks"/>

src/views/gas/valveWellInspection/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="98px">
       <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" @change="getWorkerList(queryParams.ranks);queryParams.createBy=undefined">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -16,7 +16,7 @@
       </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"
+          <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"/>
@@ -42,6 +42,17 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="上传时间范围" prop="createTimes">
+        <el-date-picker
+          v-model="queryParams.createTimes"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right">
+        </el-date-picker>
+      </el-form-item>
 <!--      <el-form-item label="发现时间" prop="discoverTime">-->
 <!--        <el-date-picker clearable size="small"-->
 <!--                        v-model="queryParams.discoverTime"-->
@@ -110,6 +121,11 @@
     <el-table v-loading="loading" :data="valveWellInspectionList" @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="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="阀井名称" align="center" prop="valveWellName"/>
       <el-table-column label="阀井位置" align="center" prop="positionName"/>
       <el-table-column label="发现问题" align="center" prop="discoverProblems">
@@ -290,6 +306,33 @@ export default {
         processStatus:'',
         remarks: ""
       },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       isDisabled: false,
       dialogVisible: false,
       // 按钮loading
@@ -327,6 +370,7 @@ export default {
         positionId: undefined,
         discoverProblems: undefined,
         discoverTime: undefined,
+        createTimes:[],
         ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
@@ -343,6 +387,7 @@ export default {
           {required: true, message: "发现问题不能为空", trigger: "blur"}
         ],
       },
+      workerListSelect:[],
       listValveWellPositionList: []
     };
   },
@@ -352,8 +397,13 @@ export default {
     this.getList();
     this.getWorkerList();
   },
-
   methods: {
+    getUsers(value){
+      if (!value) return;
+      getWorker({ranks:value}).then(response => {
+        this.workerListSelect = response.data;
+      });
+    },
     getWorkerList(ranks) {
       let data = null
       if(ranks){
@@ -421,6 +471,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createTimes=[]
       this.handleQuery();
     },
     // 多选框选中数据

src/views/gas/warningPile/index.vue

@@ -79,6 +79,11 @@
     <el-table v-loading="loading" :data="warningPileList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="序号" width="70">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column label="巡查人员" align="center" prop="userName">
 <!--        <template slot-scope="scope">-->
 <!--          {{ getUserName(scope.row.userId) }}-->