隐患信息接口和页面调整

gassafety-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleServiceImpl.java

@@ -56,33 +56,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
         SysUser sysUser = sysUserMapper.selectUserById(tHiddenTrouble.getReportMan());
         hiddenTroubleVo.setReportManName(sysUser.getNickName());
 
-        if (StringUtils.isNotEmpty(tHiddenTrouble.getTroubleType())) {
-            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_type");
-            for (SysDictData sysDictData : sysDictDataList) {
-                if (tHiddenTrouble.getTroubleType().equals(sysDictData.getDictValue())) {
-                    hiddenTroubleVo.setTroubleType(sysDictData.getDictLabel());
-                }
-            }
-        }
-        if (StringUtils.isNotEmpty(tHiddenTrouble.getTroubleLevel())) {
-            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_level");
-            for (SysDictData sysDictData : sysDictDataList) {
-                if (tHiddenTrouble.getTroubleLevel().equals(sysDictData.getDictValue())) {
-                    hiddenTroubleVo.setTroubleLevel(sysDictData.getDictLabel());
-                }
-            }
-        }
-        if (StringUtils.isNotEmpty(tHiddenTrouble.getDealStatus())) {
-            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_deal_status");
-            for (SysDictData sysDictData : sysDictDataList) {
-                if(tHiddenTrouble.getDealStatus() == null){
-                    hiddenTroubleVo.setDealStatus("暂未处理");
-                } else if (tHiddenTrouble.getDealStatus().equals(sysDictData.getDictValue())) {
-                    hiddenTroubleVo.setDealStatus(sysDictData.getDictLabel());
-                }
-            }
-        }
-
         if(tHiddenTrouble.getDeviceId() != null){
             if("0".equals(tHiddenTrouble.getDeviceType())){
                 TPipe pipe = tPipeMapper.selectTPipeById(tHiddenTrouble.getDeviceId());
@@ -131,22 +104,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
                     hiddenTroubleVo.setReportManName(sysUser.getNickName());
                 }
 
-                if (StringUtils.isNotEmpty(trouble.getTroubleType())) {
-                    List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_type");
-                    for (SysDictData sysDictData : sysDictDataList) {
-                        if (trouble.getTroubleType().equals(sysDictData.getDictValue())) {
-                            hiddenTroubleVo.setTroubleType(sysDictData.getDictLabel());
-                        }
-                    }
-                }
-                if (StringUtils.isNotEmpty(trouble.getTroubleLevel())) {
-                    List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_level");
-                    for (SysDictData sysDictData : sysDictDataList) {
-                        if (trouble.getTroubleLevel().equals(sysDictData.getDictValue())) {
-                            hiddenTroubleVo.setTroubleLevel(sysDictData.getDictLabel());
-                        }
-                    }
-                }
                 list.add(hiddenTroubleVo);
             }
         }

gassafety-web/src/views/riskManagement/hiddenTrouble/index.vue

@@ -41,12 +41,22 @@
 
     <el-table v-loading="loading" :data="hiddenTroubleList" @selection-change="handleSelectionChange">
       <el-table-column label="隐患名称" align="center" prop="troubleName" />
-      <el-table-column label="隐患类型" align="center" prop="troubleType" />
-      <el-table-column label="隐患级别" align="center" prop="troubleLevel" />
+      <el-table-column label="隐患类型" align="center" prop="troubleType" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.troubleType == 1">设备老化</span>
+          <span v-if="scope.row.troubleType == 2">质保过期</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="隐患级别" align="center" prop="troubleLevel" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.troubleLevel == 1">Ⅰ级</span>
+          <span v-if="scope.row.troubleLevel == 2">Ⅱ级</span>
+          <span v-if="scope.row.troubleLevel == 3">Ⅲ级</span>
+        </template>
+      </el-table-column>
       <el-table-column label="图片" align="center" prop="pictureUrl" >
         <template slot-scope="scope">
           <el-image :src="scope.row.pictureUrl" :preview-src-list="[scope.row.pictureUrl]" v-if="scope.row.pictureUrl != '' && scope.row.pictureUrl != null" style="width: 16px;"></el-image>
-          <span v-if="scope.row.pictureUrl == '' || scope.row.pictureUrl == null">-</span>
         </template>
       </el-table-column>
       <el-table-column label="上报人" align="center" prop="reportManName" />
@@ -108,7 +118,7 @@
     />
 
     <!-- 添加或修改隐患信息对话框 -->
-    <el-dialog :title="title1" :visible.sync="open1" width="800px" append-to-body>
+    <el-dialog :title="title1" :visible.sync="open1" width="800px" append-to-body @close="cancel">
       <el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
         <el-col>
           <el-form-item label="隐患名称" prop="troubleName" style="width: 720px">
@@ -524,6 +534,7 @@ export default {
       const troubleId = row.troubleId || this.ids
       getHiddenTrouble(troubleId).then(response => {
         this.form1 = response.data;
+        console.log("this.form1", this.form1);
         if(this.form1.deviceType != null && this.form1.deviceId != null){
           this.form1.device = [this.form1.deviceType, this.form1.deviceId];
         }

gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue

@@ -29,10 +29,13 @@
                   <font>{{form.troubleName}}</font>
                 </el-form-item>
                 <el-form-item label="隐患类型:" prop="troubleType">
-                  <font>{{form.troubleType}}</font>
+                  <font v-if="form.troubleType == 1">设备老化</font>
+                  <font v-if="form.troubleType == 2">质保过期</font>
                 </el-form-item>
                 <el-form-item label="隐患等级:" prop="troubleLevel">
-                  <font>{{form.troubleLevel}}</font>
+                  <font v-if="form.troubleLevel == 1">Ⅰ级</font>
+                  <font v-if="form.troubleLevel == 2">Ⅱ级</font>
+                  <font v-if="form.troubleLevel == 3">Ⅲ级</font>
                 </el-form-item>
                 <el-form-item label="隐患描述:" prop="remarks">
                   <div style="height: 90px;width: 200%; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
@@ -50,12 +53,12 @@
                   <font>{{form.createTime}}</font>
                 </el-form-item>
                 <el-form-item label="处理状态:" prop="dealStatus">
-                    <span v-if="form.orderId == null || form.orderId == ''">未生成工单</span>
-                    <span v-if="(form.dealStatus == null || form.dealStatus == '') &&
-                                form.orderId != null && form.orderId != ''">暂未处理</span>
-                    <span v-if="form.dealStatus == 1">不需处理</span>
-                    <span v-if="form.dealStatus == 2">已处理完成</span>
-                    <span v-if="form.dealStatus == 3">未处理完成</span>
+                  <font v-if="form.orderId == null || form.orderId == ''">未生成工单</font>
+                  <font v-if="(form.dealStatus == null || form.dealStatus == '') &&
+                              form.orderId != null && form.orderId != ''">暂未处理</font>
+                  <font v-if="form.dealStatus == 1">不需处理</font>
+                  <font v-if="form.dealStatus == 2">已处理完成</font>
+                  <font v-if="form.dealStatus == 3">未处理完成</font>
                 </el-form-item>
               </el-form>
             </el-col>