1 隐患管理查询 之前存的是 user表的nikename, 如果 nikename改的话就查不到了，现在调整成 存id，根据id关联查 nikename 和 导出调整。

zh-baseversion-system/src/main/resources/mapper/system/THiddenTroubleInfoMapper.xml

@@ -38,13 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTHiddenTroubleInfoVo">
         select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type,hidden_source,
          longitude, latitude, picture_url, hidden_trouble_describe, report_time,reject_content,fuhe_group_num,
-         (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name,
-         report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, fuhe_time,deal_video,
+         suer.nick_name as report_person, report_person_id,hidden_trouble_deal_status, hidden_trouble_deal_condition, fuhe_time,deal_video,
          fuhe_person,deal_person,video_url,
          hidden_trouble_deal_finish_time, is_del, remarks,beyond_enterprise_id,deal_url,is_report
-         from t_hidden_trouble_info
+         from t_hidden_trouble_info info left join sys_user suer on info.report_person_id = suer.user_id
     </sql>
 
+
     <select id="selectTHiddenTroubleInfoList" parameterType="THiddenTroubleInfo" resultMap="THiddenTroubleInfoResult">
         <include refid="selectTHiddenTroubleInfoVo"/>
         <where>
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportTime != null "> and report_time = #{reportTime}</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != -2"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
             <if test="hiddenTroubleName != null  and hiddenTroubleName != ''"> and hidden_trouble_name like concat('%', #{hiddenTroubleName}, '%')</if>
-            <if test="reportPerson != null  and reportPerson != ''"> and report_person = #{reportPerson}</if>
+            <if test="reportPerson != null  and reportPerson != ''"> and suer.nick_name like concat('%', #{reportPerson}, '%')</if>
             <if test="hiddenTroubleDealStatus != null  and hiddenTroubleDealStatus != ''"> and hidden_trouble_deal_status = #{hiddenTroubleDealStatus}</if>
             <if test="hiddenTroubleDealCondition != null  and hiddenTroubleDealCondition != ''"> and hidden_trouble_deal_condition = #{hiddenTroubleDealCondition}</if>
             <if test="hiddenTroubleDealFinishTime != null "> and hidden_trouble_deal_finish_time = #{hiddenTroubleDealFinishTime}</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         COUNT(*) AS countNum
 
-        FROM t_hidden_trouble_info
+        FROM t_hidden_trouble_info info left join sys_user suer on info.report_person_id = suer.user_id
         <where>
             is_del='0'
             <if test="workId != null "> and work_id = #{workId}</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hiddenTroubleType != null  and hiddenTroubleType != ''"> and hidden_trouble_type = #{hiddenTroubleType}</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != -2"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
             <if test="hiddenTroubleName != null  and hiddenTroubleName != ''"> and hidden_trouble_name like concat('%', #{hiddenTroubleName}, '%')</if>
-            <if test="reportPerson != null  and reportPerson != ''"> and report_person = #{reportPerson}</if>
+            <if test="reportPerson != null  and reportPerson != ''"> and suer.nick_name like concat('%', #{reportPerson}, '%')</if>
             <if test="hiddenTroubleDealStatus != null  and hiddenTroubleDealStatus != ''"> and hidden_trouble_deal_status = #{hiddenTroubleDealStatus}</if>
         </where>
     </select>
@@ -107,15 +107,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (CASE hidden_trouble_level WHEN '1' THEN 'I级' WHEN '2' THEN 'II级'WHEN '3' THEN 'III级'end) as   hidden_trouble_level,
         (CASE hidden_trouble_type WHEN '1' THEN '漏气' WHEN '2' THEN '腐蚀'WHEN '3' THEN '裂缝' WHEN '4' THEN '设备故障' WHEN '5' THEN '安全距离不足' WHEN '6' THEN '管道承重'WHEN '7' THEN '其他'end) as   hidden_trouble_type,
          longitude, latitude, picture_url, hidden_trouble_describe,
-        report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name, report_person,
+        report_time, report_person,
         (CASE hidden_trouble_deal_status WHEN '1' THEN '待处理' WHEN '2' THEN '处理中'WHEN '3' THEN '已完成'end) as  hidden_trouble_deal_status,
         hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks,is_report
-        from t_hidden_trouble_info
+        from t_hidden_trouble_info  info left join sys_user suer on info.report_person_id = suer.user_id
         <where>
             is_del='0'
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != -2"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
             <if test="hiddenTroubleName != null  and hiddenTroubleName != ''"> and hidden_trouble_name like concat('%', #{hiddenTroubleName}, '%')</if>
-            <if test="reportPerson != null  and reportPerson != ''"> and report_person = #{reportPerson}</if>
+            <if test="reportPerson != null  and reportPerson != ''"> and suer.nick_name like concat('%', #{reportPerson}, '%')</if>
             <if test="hiddenSource!=null"> and hidden_source = #{hiddenSource}</if>
             <if test="reportBeginTime != null  and reportEndTime!=null">and report_time BETWEEN #{reportBeginTime} and #{reportEndTime}</if>
         </where>

zh-baseversion-web/src/views/system/info/index.vue

@@ -271,7 +271,7 @@
     </el-dialog>
 
     <!-- 燃气隐患详情对话框 -->
-    <el-dialog :title="detailsTitle" :visible.sync="detailsOpen"  width="800px" append-to-body>
+    <el-dialog :title="detailsTitle" :visible.sync="detailsOpen" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="hiddenDangerRules" label-width="150px">
 
         <el-row>
@@ -337,6 +337,7 @@
             <el-form-item label="上传照片" :disabled="true">
               <FileUpload
                 :disabled="true"
+                v-if="detailsOpen"
                 listType="picture"
                 @resFun="getFileInfo"
                 @remove="listRemove"
@@ -374,6 +375,7 @@
             <el-form-item label="上传照片" :disabled="true"  v-if="form.hiddenTroubleDealStatus==3">
               <FileUpload
                 :disabled="true"
+                v-if="detailsOpen"
                 listType="picture"
                 @resFun="getFileInfon"
                 @remove="listRemoven"
@@ -506,6 +508,7 @@
             <el-form-item label="上传照片">
               <FileUpload
                 listType="picture"
+                v-if="open" 
                 @resFun="getFileInfo"
                 @remove="listRemove"
                 :fileArr="fileList"
@@ -732,7 +735,7 @@
       // pictureUrlList
       // fileList
       /**上传图片*/
-      getFileInfo(res){
+      getFileInfo(res){ 
         this.form.dealPlan = res.fileName;
         this.pictureUrlList.push(res.url)
         this.form.pictureUrl=this.pictureUrlList.join(",");
@@ -745,7 +748,7 @@
       },
       
       /**处理隐患 上传图片*/
-      getFileInfon(res){
+      getFileInfon(res){ 
         this.form.dealPlan = res.fileName;
         this.pictureUrlListn.push(res.url)
         this.form.dealUrl=this.pictureUrlListn.join(",");
@@ -908,7 +911,7 @@
         this.reset();
 
         // 隐患信息 上传照片清空
-        this.filelist = [];
+        this.fileList = [];
         this.pictureUrlList = [];
         
         // 隐患处理 上传照片清空