Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/THiddenDangerStandingBookForm.java

@@ -21,6 +21,9 @@ public class THiddenDangerStandingBookForm
     /** 隐患类型 */
     private String hiddenType;
 
+    /** 整治情况 */
+    private String remediation;
+
     /** 发现起始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hiddenFindDateStart;

gassafetyprogress-system/src/main/resources/mapper/system/THiddenDangerStandingBookMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  is_del = '0'
             <if test="hiddenTitle != null  and hiddenTitle != ''"> and hidden_title like concat('%', #{hiddenTitle}, '%')</if>
             <if test="hiddenType != null  and hiddenType != ''"> and hidden_type = #{hiddenType}</if>
+            <if test="remediation != null  and remediation != ''"> and remediation = #{remediation}</if>
             <if test="hiddenFindDateStart != null "> and hidden_find_date &gt;= #{hiddenFindDateStart}</if>
             <if test="hiddenFindDateEnd != null "> and hidden_find_date &lt;= #{hiddenFindDateEnd}</if>
         </where>

gassafetyprogress-web/src/views/standingBook/hidden/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="隐患名称" prop="hiddenTitle">
-        <el-input
-          v-model="queryParams.hiddenTitle"
-          placeholder="请输入隐患名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="隐患类型" prop="hiddenType">
         <el-select v-model="queryParams.hiddenType" placeholder="请选择隐患类型" clearable size="small">
           <el-option
@@ -20,6 +11,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="整治情况" prop="remediation">
+        <el-select v-model="queryParams.remediation" placeholder="请选择整治情况" clearable size="small">
+          <el-option
+            v-for="dict in remediationOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="发现时间" prop="hiddenFindDate">
         <el-date-picker clearable size="small"
                         v-model="queryParams.hiddenFindDateStart"
@@ -91,8 +92,8 @@
       </el-table-column>
       <el-table-column label="整治情况" align="center" prop="remediation">
         <template slot-scope="scope">
-          <span v-if="scope.row.remediation != '' && scope.row.remediation != null">{{ scope.row.remediation }}</span>
-          <span v-else>-</span>
+          <span v-if="scope.row.remediation == '1'">已完成</span>
+          <span v-if="scope.row.remediation == '2'">未完成</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180px">
@@ -215,7 +216,14 @@
           <el-row>
             <el-col :span="23">
               <el-form-item label="整治情况" prop="remediation">
-                <el-input v-model="form.remediation" placeholder="请输入整治情况" />
+                <el-select v-model="form.remediation" placeholder="请选择整治情况" clearable size="small">
+                  <el-option
+                    v-for="dict in remediationOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -273,8 +281,8 @@
               </el-row>
               <el-row>
                 <el-form-item label="整治情况:">
-                  <font v-if="detailForm.remediation != '' && detailForm.remediation != null">{{detailForm.remediation}}</font>
-                  <font v-else> - </font>
+                  <font v-if="detailForm.remediation == '1'">已完成</font>
+                  <font v-if="detailForm.remediation == '2'">未完成</font>
                 </el-form-item>
               </el-row>
               <el-row>
@@ -344,6 +352,8 @@ export default {
       open2: false,
       // 隐患类型字典
       typeOptions: [],
+      // 整治情况字典
+      remediationOptions: [],
       // 上传文件列表
       fileList: [],
       // 地图
@@ -356,6 +366,7 @@ export default {
         pageSize: 10,
         hiddenTitle: null,
         hiddenType: null,
+        remediation: null,
         hiddenFindDateStart: null,
         hiddenFindDateEnd: null
       },
@@ -385,6 +396,9 @@ export default {
         hiddenFindDate: [
           { required: true, message: "请选择发现时间", trigger: "change" },
         ],
+        remediation: [
+          { required: true, message: "请选择整治情况", trigger: "change" },
+        ],
         dealPlan: [
           { required: true, message: "请上传文件", trigger: "change" },
         ],
@@ -396,6 +410,9 @@ export default {
     this.getDicts("t_hidden_type").then(response => {
       this.typeOptions = response.data;
     });
+    this.getDicts("t_remediation").then(response => {
+      this.remediationOptions = response.data;
+    });
   },
   methods: {
     /** 查询隐患整治台账列表 */

gassafetyprogress-web/src/views/standingBook/trouble/index.vue

@@ -237,9 +237,13 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="是否处理" prop="isDeal">
-              <el-select v-model="form.isDeal" placeholder="请选择处理结果">
-                <el-option label="已处理" value="1" />
-                <el-option label="未处理" value="2" />
+              <el-select v-model="form.isDeal" placeholder="请选择处理结果" filterable style="width: 100%" >
+                <el-option
+                  v-for="dict in isDealOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>