提交代码

src/api/gas/area.js

@@ -22,6 +22,13 @@ export function flushProgressqqq() {
   })
 }
 // 小区导入滚动条停止监控接口
+export function clearFlushProgresddd() {
+  return request({
+    url: '/gas/pressureRegulatingBox/clearFlushProgress',
+    method: 'get',
+  })
+}
+// 小区导入滚动条停止监控接口
 export function clearFlushProgress() {
   return request({
     url: '/gas/area/clearFlushProgress',

src/views/gas/pressureRegulatingBox/index.vue

@@ -2,31 +2,34 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="性质" prop="nature">
-        <el-input
-          v-model="queryParams.nature"
-          placeholder="请输入性质"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.nature" placeholder="请选择性质" style="width: 100%" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in dict.type.tyx_nature"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="类型" prop="type">
-        <el-input
-          v-model="queryParams.type"
-          placeholder="请输入类型"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.type" placeholder="请选择类型" style="width: 100%" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in dict.type.tyx_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="路数" prop="numberOfRoutes">
-        <el-input
-          v-model="queryParams.numberOfRoutes"
-          placeholder="请输入路数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.numberOfRoutes" placeholder="请选择路数" style="width: 100%" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in dict.type.tyx_numberOfRoutes"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="管理所" prop="managementOffice">
         <el-select v-model="queryParams.managementOffice" placeholder="请输入管理所" style="width: 100%"
@@ -57,24 +60,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="经度" prop="longitude">
-        <el-input
-          v-model="queryParams.longitude"
-          placeholder="请输入经度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="纬度" prop="latitude">
-        <el-input
-          v-model="queryParams.latitude"
-          placeholder="请输入纬度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -145,9 +130,21 @@
     <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="true"/>
-      <el-table-column label="性质" align="center" prop="nature"/>
-      <el-table-column label="类型" align="center" prop="type"/>
-      <el-table-column label="路数" align="center" prop="numberOfRoutes"/>
+      <el-table-column label="性质" align="center" prop="nature">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tyx_nature" :value="scope.row.nature"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tyx_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="路数" align="center" prop="numberOfRoutes">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tyx_numberOfRoutes" :value="scope.row.numberOfRoutes"/>
+        </template>
+      </el-table-column>
       <el-table-column label="管理所" align="center" prop="managementOffice">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.administrative_office" :value="scope.row.managementOffice"/>
@@ -219,7 +216,9 @@
         完成度：{{ bfb }}%
         <progress max="100" :value="bfb" style="width: 200px;height: 18px;"></progress>
         <br>
-        导入结果：{{ jdtMsg }}
+        导入结果：{{ jdtMsg }}<br>
+        <span style="color: red">*提示:导入表格中数据项【类型、路数、管理所、性质】<br>
+          请根据系统内部名称填写全称</span>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
@@ -233,17 +232,38 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="性质" prop="nature">
-              <el-input v-model="form.nature" placeholder="请输入性质"/>
+                <el-select v-model="form.nature" placeholder="请选择性质" style="width: 100%">
+                  <el-option
+                    v-for="dict in dict.type.tyx_nature"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="类型" prop="type">
-              <el-input v-model="form.type" placeholder="请输入类型"/>
+              <el-select v-model="form.type" placeholder="请选择管理所" style="width: 100%">
+                <el-option
+                  v-for="dict in dict.type.tyx_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="路数" prop="numberOfRoutes">
-              <el-input v-model="form.numberOfRoutes" placeholder="请输入路数"/>
+              <el-select v-model="form.numberOfRoutes" placeholder="请选择路数" style="width: 100%">
+                <el-option
+                  v-for="dict in dict.type.tyx_numberOfRoutes"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -284,7 +304,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="巡检人" >
-              <el-select v-model="form.inspector" filterable placeholder="请选择巡检人" clearable size="small">
+              <el-select v-model="form.inspector" filterable placeholder="请选择巡检人" multiple clearable size="small">
                 <el-option v-for="item in workerList"
                            :key="item.id"
                            :label="item.name"
@@ -446,12 +466,12 @@ import {
   updatePressureRegulatingBox
 } from "@/api/gas/pressureRegulatingBox";
 import {getToken} from "@/utils/auth";
-import {clearFlushProgress, flushProgress, flushProgressqqq} from "@/api/gas/area";
+import {clearFlushProgresddd, clearFlushProgress, flushProgress, flushProgressqqq} from "@/api/gas/area";
 import {getWorker} from "@/api/gas/user";
 
 export default {
   name: "PressureRegulatingBox",
-  dicts: ['administrative_office'],
+  dicts: ['administrative_office','tyx_nature','tyx_type','tyx_numberOfRoutes',],
   data() {
     return {// 用户导入参数
       upload: {
@@ -568,7 +588,7 @@ export default {
         this.bfb = parseInt(response.data.bfb) >= 100 ? 100 : response.data.bfb
         this.jdtMsg = response.data.message
         if (response.data.message != null && response.data.message != '') {
-          clearFlushProgress().then(response => {
+          clearFlushProgresddd().then(response => {
           })
           clearInterval(this.timeInterval)
         }
@@ -647,6 +667,7 @@ export default {
       getPressureRegulatingBox(id).then(response => {
         this.loading = false;
         this.form = response.data;
+        this.form.inspector = response.data.inspector.split(",").map(Number);
         this.pressureRegulatingBoxDetailsBo = response.data.pressureRegulatingBoxDetailsVo[0];
         this.open = true;
         this.title = "修改调压箱管理";
@@ -659,6 +680,7 @@ export default {
           this.buttonLoading = true;
           this.form.pressureRegulatingBoxDetailsBo = this.pressureRegulatingBoxDetailsBo
           if (this.form.id != null) {
+            this.form.inspector = this.form.inspector.join(',')
             updatePressureRegulatingBox(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -667,6 +689,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
+            this.form.inspector = this.form.inspector.join(',')
             addPressureRegulatingBox(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/gas/transmissionStation/index.vue

@@ -144,13 +144,13 @@
         <el-form-item label="输配站名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入" disabled/>
         </el-form-item>
-        <el-form-item label="照片" prop="pressureGauge">
+        <el-form-item label="压力表照片" prop="pressureGauge">
           <imageUpload v-model="form.pressureGauge" :disabled="disabled"/>
         </el-form-item>
-        <el-form-item label="照片" prop="levelGauge">
+        <el-form-item label="液位计照片" prop="levelGauge">
           <imageUpload v-model="form.levelGauge" :disabled="disabled"/>
         </el-form-item>
-        <el-form-item label="照片" prop="flowMeter">
+        <el-form-item label="流量计照片" prop="flowMeter">
           <imageUpload v-model="form.flowMeter" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="输入管道" prop="pipeline">
@@ -212,12 +212,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="安全设施消防器材(其他说明)" prop="fireEquipmentIllustrate" disabled>
-          <el-input v-model="form.fireEquipmentIllustrate" placeholder="请输入安全设施消防器材(其他说明)" />
+        <el-form-item label="安全设施消防器材(其他说明)" prop="fireEquipmentIllustrate" >
+          <el-input v-model="form.fireEquipmentIllustrate" placeholder="请输入安全设施消防器材(其他说明)" disabled/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+<!--        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>-->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -354,7 +354,7 @@ export default {
         debugger
         this.form = response.data;
         this.open = true;
-        this.title = "修改输气站记录";
+        this.title = "输气站记录";
       });
     },
     /** 提交按钮 */