提交代码

src/api/gas/patrolRecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询巡查记录列表
+export function listPatrolRecord(query) {
+  return request({
+    url: '/gas/patrolRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询巡查记录详细
+export function getPatrolRecord(id) {
+  return request({
+    url: '/gas/patrolRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增巡查记录
+export function addPatrolRecord(data) {
+  return request({
+    url: '/gas/patrolRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改巡查记录
+export function updatePatrolRecord(data) {
+  return request({
+    url: '/gas/patrolRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除巡查记录
+export function delPatrolRecord(id) {
+  return request({
+    url: '/gas/patrolRecord/' + id,
+    method: 'delete'
+  })
+}

src/api/gas/warningPile.js

@@ -1,5 +1,11 @@
 import request from '@/utils/request'
 
+export function getWarningPiles() {
+  return request({
+    url: '/gas/warningPile/getWarningPile',
+    method: 'get',
+  })
+}
 // 查询警示桩列表
 export function listWarningPile(query) {
   return request({

src/views/gas/courtyardNetworkManagement/index.vue

@@ -18,27 +18,27 @@
     </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:courtyardNetworkManagement: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:courtyardNetworkManagement:edit']"
-        >修改</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['gas:courtyardNetworkManagement: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:courtyardNetworkManagement:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -48,7 +48,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['gas:courtyardNetworkManagement:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -59,13 +60,14 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['gas:courtyardNetworkManagement:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="courtyardNetworkManagementList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <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="所属小区" align="center" prop="areaName"/>
       <el-table-column label="所属楼宇" align="center" prop="buildingName"/>
@@ -75,7 +77,13 @@
           <dict-tag :options="dict.type.find_problem" :value="scope.row.findProblem"/>
         </template>
       </el-table-column>
-      <el-table-column label="照片" align="center" >
+      <el-table-column label="审核状态" align="center" prop="processStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.processStatus == null">未审核</span>
+          <dict-tag v-else :options="dict.type.process_status" :value="scope.row.processStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="照片" align="center">
         <template slot-scope="scope">
           <el-image
             style="width: 50px; height: 50px"
@@ -92,14 +100,25 @@
             icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:courtyardNetworkManagement:edit']"
-          >查看</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['gas:courtyardNetworkManagement:remove']"-->
-<!--          >删除</el-button>-->
+          >查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="openshShow(scope.row)"
+            v-show="scope.row.processStatus != 0"
+            v-hasPermi="['gas:emergencyRepair:remove']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['gas:courtyardNetworkManagement:remove']"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,7 +130,27 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog title="审核" :visible.sync="openSH" width="500px" append-to-body>
+      <el-form ref="formSH" :model="formSH" :rules="rulesSH" label-width="100px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="formSH.processStatus" placeholder="请选择审核状态" :style="{width: '100%'}">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="remarks">
+          <el-input v-model="formSH.processComments" type="textarea" placeholder="请输入审核意见" maxlength="255"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitFormSH">确 定</el-button>
+        <el-button @click="openSH = false">关 闭</el-button>
+      </div>
+    </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="disabled">
@@ -152,11 +191,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="照片" prop="photoList" >
+        <el-form-item label="照片" prop="photoList">
           <imageUpload v-model="form.photoList" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" maxlength="255" />
+          <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" maxlength="255"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -168,14 +207,21 @@
 </template>
 
 <script>
-import { listCourtyardNetworkManagement, getCourtyardNetworkManagement, delCourtyardNetworkManagement, addCourtyardNetworkManagement, updateCourtyardNetworkManagement } from "@/api/gas/courtyardNetworkManagement";
+import {
+  listCourtyardNetworkManagement,
+  getCourtyardNetworkManagement,
+  delCourtyardNetworkManagement,
+  addCourtyardNetworkManagement,
+  updateCourtyardNetworkManagement
+} from "@/api/gas/courtyardNetworkManagement";
 import {getAreaList} from "@/api/gas/area";
 import {getBuildingList} from "@/api/gas/building";
 import {getUnitList} from "@/api/gas/unit";
+import {updateEmergencyRepair} from "@/api/gas/emergencyRepair";
 
 export default {
   name: "CourtyardNetworkManagement",
-  dicts: ['find_problem'],
+  dicts: ['process_status', 'find_problem'],
   data() {
     return {
       buildingList: [], // 楼宇集合
@@ -183,6 +229,7 @@ export default {
       unitList: [], // 单元集合
       // 按钮loading
       buttonLoading: false,
+      openSH: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -213,6 +260,12 @@ export default {
       },
       // 表单参数
       form: {},
+      formSH: {},
+      rulesSH: {
+        processStatus: [
+          {required: true, message: "审核状态不能为空", trigger: "blur"}
+        ],
+      },
       // 表单校验
       rules: {
         areaId: [
@@ -222,13 +275,13 @@ export default {
           {required: true, message: "所属楼宇不能为空", trigger: "blur"}
         ],
         unitId: [
-          { required: true, message: "单元id不能为空", trigger: "blur" }
+          {required: true, message: "单元id不能为空", trigger: "blur"}
         ],
         findProblem: [
-          { required: true, message: "发现问题不能为空", trigger: "change" }
+          {required: true, message: "发现问题不能为空", trigger: "change"}
         ],
         remarks: [
-          { required: false, message: "备注不能为空", trigger: "blur" }
+          {required: false, message: "备注不能为空", trigger: "blur"}
         ],
       }
     };
@@ -238,6 +291,31 @@ export default {
     this.getList();
   },
   methods: {
+    submitFormSH() {
+      this.$refs["formSH"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.formSH.id != null) {
+            updateCourtyardNetworkManagement(this.formSH).then(response => {
+              this.$modal.msgSuccess("审核成功");
+              this.openSH = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      })
+    },
+    openshShow(data) {
+      this.formSH = {
+        id: undefined,
+        processStatus: undefined,
+        processComments: undefined,
+      }
+      this.formSH.id = data.id
+      this.openSH = true
+    },
     // 小区下拉
     getAreaList() {
       getAreaList().then(req => this.areaList = req.data)
@@ -297,7 +375,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -371,7 +449,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-        this.$download.excel('/gas/courtyardNetworkManagement/export', this.queryParams);
+      this.$download.excel('/gas/courtyardNetworkManagement/export', this.queryParams);
     }
   }
 };

src/views/gas/emergencyRepair/index.vue

@@ -47,17 +47,17 @@
     </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:emergencyRepair:add']"
-        >新增
-        </el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['gas:emergencyRepair:add']"-->
+      <!--        >新增-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          type="success"-->
@@ -105,9 +105,9 @@
           <span>{{ parseTime(scope.row.repairTime, '{y}-{m}-{d}') }}</span>
         </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"/>-->
+      <!--      <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="repairName"/>
       <el-table-column label="报修人电话" align="center" prop="repairPhone"/>
       <el-table-column label="报修类型" align="center" prop="repairType">
@@ -127,6 +127,12 @@
           <span>{{ parseTime(scope.row.maintenanceTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="processStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.processStatus == null">未审核</span>
+          <dict-tag v-else :options="dict.type.process_status" :value="scope.row.processStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
           <el-image
@@ -146,14 +152,23 @@
             v-hasPermi="['gas:emergencyRepair:edit']"
           >查看
           </el-button>
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-delete"-->
-          <!--            @click="handleDelete(scope.row)"-->
-          <!--            v-hasPermi="['gas:emergencyRepair:remove']"-->
-          <!--          >删除-->
-          <!--          </el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="openshShow(scope.row)"
+            v-show="scope.row.processStatus != 0"
+            v-hasPermi="['gas:emergencyRepair:remove']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['gas:emergencyRepair:remove']"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -165,7 +180,27 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog title="审核" :visible.sync="openSH" width="500px" append-to-body>
+      <el-form ref="formSH" :model="formSH" :rules="rulesSH" label-width="100px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="formSH.processStatus" placeholder="请选择审核状态" :style="{width: '100%'}">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="remarks">
+          <el-input v-model="formSH.processComments" type="textarea" placeholder="请输入审核意见" maxlength="255"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitFormSH">确 定</el-button>
+        <el-button @click="openSH = false">关 闭</el-button>
+      </div>
+    </el-dialog>
     <!-- 添加或修改抢险维修对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="disabled">
@@ -181,44 +216,44 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="所属小区" prop="areaId">-->
-<!--              <el-select v-model="form.areaId" filterable placeholder="请选择所属小区" clearable size="small"-->
-<!--                         @change="getBuildingList" style="width: 100%">-->
-<!--                <el-option v-for="item in areaList"-->
-<!--                           :key="item.id"-->
-<!--                           :label="item.name"-->
-<!--                           :value="item.id"/>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="所属小区" prop="areaId">-->
+          <!--              <el-select v-model="form.areaId" filterable placeholder="请选择所属小区" clearable size="small"-->
+          <!--                         @change="getBuildingList" style="width: 100%">-->
+          <!--                <el-option v-for="item in areaList"-->
+          <!--                           :key="item.id"-->
+          <!--                           :label="item.name"-->
+          <!--                           :value="item.id"/>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
 
-<!--        </el-row>-->
-<!--        <el-row :gutter="10">-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="所属楼宇" prop="buildingId">-->
-<!--              <el-select v-model="form.buildingId" filterable placeholder="请选择所属楼宇" @change="getUnitList"-->
-<!--                         clearable size="small" style="width: 100%">-->
-<!--                <el-option v-for="item in buildingList"-->
-<!--                           :key="item.id"-->
-<!--                           :label="item.name"-->
-<!--                           :value="item.id"/>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="所属单元" prop="unitId">-->
-<!--              <el-select v-model="form.unitId" filterable placeholder="请输入所属单元" clearable size="small"-->
-<!--                         style="width: 100%">-->
-<!--                <el-option v-for="item in unitList"-->
-<!--                           :key="item.id"-->
-<!--                           :label="item.name"-->
-<!--                           :value="item.id"/>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row :gutter="10">-->
+          <!--        </el-row>-->
+          <!--        <el-row :gutter="10">-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="所属楼宇" prop="buildingId">-->
+          <!--              <el-select v-model="form.buildingId" filterable placeholder="请选择所属楼宇" @change="getUnitList"-->
+          <!--                         clearable size="small" style="width: 100%">-->
+          <!--                <el-option v-for="item in buildingList"-->
+          <!--                           :key="item.id"-->
+          <!--                           :label="item.name"-->
+          <!--                           :value="item.id"/>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="所属单元" prop="unitId">-->
+          <!--              <el-select v-model="form.unitId" filterable placeholder="请输入所属单元" clearable size="small"-->
+          <!--                         style="width: 100%">-->
+          <!--                <el-option v-for="item in unitList"-->
+          <!--                           :key="item.id"-->
+          <!--                           :label="item.name"-->
+          <!--                           :value="item.id"/>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--        </el-row>-->
+          <!--        <el-row :gutter="10">-->
           <el-col :span="12">
             <el-form-item label="报修人名称" prop="repairName">
               <el-input v-model="form.repairName" placeholder="请输入报修人名称"/>
@@ -338,7 +373,7 @@ import {getUnitList} from "@/api/gas/unit";
 
 export default {
   name: "EmergencyRepair",
-  dicts: ['repair_type', 'causes_of_damage', 'pipeline_pressure'],
+  dicts: ['repair_type', 'causes_of_damage', 'process_status', 'pipeline_pressure'],
   data() {
     return {
       buildingList: [], // 楼宇集合
@@ -347,6 +382,7 @@ export default {
       // 按钮loading
       buttonLoading: false,
       disabled: false,
+      openSH: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -378,6 +414,12 @@ export default {
       },
       // 表单参数
       form: {},
+      formSH: {},
+      rulesSH:{
+        processStatus: [
+          {required: true, message: "审核状态不能为空", trigger: "blur"}
+        ],
+      },
       // 表单校验
       rules: {
         // areaId: [
@@ -436,6 +478,31 @@ export default {
     this.getList();
   },
   methods: {
+    submitFormSH() {
+      this.$refs["formSH"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.formSH.id != null) {
+            updateEmergencyRepair(this.formSH).then(response => {
+              this.$modal.msgSuccess("审核成功");
+              this.openSH = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      })
+    },
+    openshShow(data) {
+      this.formSH = {
+        id: undefined,
+        processStatus: undefined,
+        processComments: undefined,
+      }
+      this.formSH.id = data.id
+      this.openSH = true
+    },
     // 小区下拉
     getAreaList() {
       getAreaList().then(req => this.areaList = req.data)

src/views/gas/patrolRecord/index.vue

@@ -0,0 +1,355 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="巡查人员" prop="userId">
+        <el-select v-model="queryParams.userId" placeholder="请选择巡查人员" clearable size="small">
+          <el-option
+            v-for="item in workerList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="警示桩" prop="warningPileId">
+        <el-select v-model="queryParams.warningPileId" placeholder="请选择警示桩" clearable size="small">
+          <el-option
+            v-for="item in warningPileList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </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:patrolRecord: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:patrolRecord: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:patrolRecord: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:patrolRecord:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <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="巡查人员" align="center" prop="userName"/>
+      <el-table-column label="警示桩名称" align="center" prop="warningPileName"/>
+      <el-table-column label="照片" align="center">
+        <template slot-scope="scope">
+          <el-image
+            style="width: 50px; height: 50px"
+            :src="scope.row.photoList!=null?scope.row.photoList[0]:''"
+            :preview-src-list="[scope.row.photoList!=null?scope.row.photoList[0]:'']">
+          </el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['gas:patrolRecord:edit']"
+          >查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['gas:patrolRecord: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="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" disabled>
+        <el-form-item label="巡查人员" prop="userId">
+          <el-select v-model="form.userId" placeholder="请选择巡查人员" style="width: 100%">
+            <el-option
+              v-for="item in workerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="警示桩" prop="warningPileId">
+          <el-select v-model="form.warningPileId" placeholder="请选择警示桩" style="width: 100%">
+            <el-option
+              v-for="item in warningPileList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="照片" prop="photoList">
+          <imageUpload v-model="form.photoList" disabled/>
+        </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">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listPatrolRecord,
+  getPatrolRecord,
+  delPatrolRecord,
+  addPatrolRecord,
+  updatePatrolRecord
+} from "@/api/gas/patrolRecord";
+import {getWorker} from "@/api/gas/user";
+import {getWarningPiles} from "@/api/gas/warningPile";
+
+export default {
+  name: "PatrolRecord",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 巡查记录表格数据
+      patrolRecordList: [],
+      workerList: [],
+      warningPileList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: undefined,
+        warningPileId: undefined,
+        createTime: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          {required: true, message: "主键id不能为空", trigger: "blur"}
+        ],
+        userId: [
+          {required: true, message: "巡查人员id不能为空", trigger: "change"}
+        ],
+        warningPileId: [
+          {required: true, message: "警示桩id不能为空", trigger: "change"}
+        ],
+        remarks: [
+          {required: false, message: "备注不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getWorker();
+    this.getWarningPiles();
+    this.getList();
+  },
+  methods: {
+    getWarningPiles() {
+      getWarningPiles().then(req => this.warningPileList = req.data)
+    },
+    getWorker() {
+      getWorker().then(req => this.workerList = req.data)
+    },
+    /** 查询巡查记录列表 */
+    getList() {
+      this.loading = true;
+      listPatrolRecord(this.queryParams).then(response => {
+        this.patrolRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        userId: undefined,
+        warningPileId: undefined,
+        remarks: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        photoList: '',
+        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) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getPatrolRecord(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        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(',')
+            }
+            updatePatrolRecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            this.form.photoList = this.form.photoList.split(',')
+            addPatrolRecord(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 delPatrolRecord(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$download.excel('/gas/patrolRecord/export', this.queryParams);
+    }
+  }
+};
+</script>

src/views/gas/regulatorBox/index.vue

@@ -27,15 +27,15 @@
 
     <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:regulatorBox:add']"
-        >新增
-        </el-button>
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['gas:regulatorBox:add']"-->
+<!--        >新增-->
+<!--        </el-button>-->
       </el-col>
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->

src/views/gas/warningPile/index.vue

@@ -107,14 +107,14 @@
             v-hasPermi="['gas:warningPile:edit']"
           >查看
           </el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['gas:warningPile:remove']"-->
-<!--          >删除-->
-<!--          </el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['gas:warningPile:remove']"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://123.249.30.140:8080`,
-        // target: `http://localhost:8081`,
-        target: `http://124.221.101.24:8082`,
+        target: `http://localhost:8080`,
+        // target: `http://124.221.101.24:8082`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''