详情反馈

gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionDataController.java

 package com.zehong.web.controller.deviceInspection;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.zehong.common.annotation.Log;
 import com.zehong.common.core.controller.BaseController;
 import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TInspectionData;
 import com.zehong.system.service.ITInspectionDataService;
-import com.zehong.common.utils.poi.ExcelUtil;
-import com.zehong.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 巡检记录Controller
@@ -45,6 +39,16 @@ public class TInspectionDataController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取所有巡检记录
+     * @param tInspectionData
+     * @return
+     */
+    @GetMapping("/getAllTInspectionInfo")
+    public AjaxResult getAllTInspectionInfo(TInspectionData tInspectionData){
+        return AjaxResult.success(tInspectionDataService.selectTInspectionDataList(tInspectionData));
+    }
+
     /**
      * 导出巡检记录列表
      */

gassafety-system/src/main/java/com/zehong/system/domain/TInspectionData.java

@@ -34,6 +34,10 @@ public class TInspectionData extends BaseEntity
     @Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
     private String dealStatus;
 
+    /** 是否存在隐患 */
+    @Excel(name = "是否存在隐患")
+    private String isHiddenDanger;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
@@ -47,6 +51,7 @@ public class TInspectionData extends BaseEntity
     {
         return dataId;
     }
+
     public void setPlanId(int planId)
     {
         this.planId = planId;
@@ -56,6 +61,7 @@ public class TInspectionData extends BaseEntity
     {
         return planId;
     }
+
     public void setDeviceCode(String deviceCode)
     {
         this.deviceCode = deviceCode;
@@ -83,7 +89,16 @@ public class TInspectionData extends BaseEntity
     {
         return dealStatus;
     }
-    public void setRemarks(String remarks) 
+
+    public String getIsHiddenDanger() {
+        return isHiddenDanger;
+    }
+
+    public void setIsHiddenDanger(String isHiddenDanger) {
+        this.isHiddenDanger = isHiddenDanger;
+    }
+
+    public void setRemarks(String remarks)
     {
         this.remarks = remarks;
     }
@@ -101,6 +116,7 @@ public class TInspectionData extends BaseEntity
             .append("deviceCode", getDeviceCode())
             .append("deviceType", getDeviceType())
             .append("dealStatus", getDealStatus())
+            .append("isHiddenDanger", getIsHiddenDanger())
             .append("updateTime", getUpdateTime())
             .append("createTime", getCreateTime())
             .append("remarks", getRemarks())

gassafety-system/src/main/java/com/zehong/system/domain/TOrderFeedback.java

@@ -57,10 +57,6 @@ public class TOrderFeedback extends BaseEntity
     @Excel(name = "图片地址3")
     private String pictureUrl3;
 
-    /** 备注 */
-    @Excel(name = "备注")
-    private String remarks;
-
     public void setFeedbackId(int feedbackId)
     {
         this.feedbackId = feedbackId;
@@ -151,15 +147,6 @@ public class TOrderFeedback extends BaseEntity
     {
         return pictureUrl3;
     }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
 
     @Override
     public String toString() {
@@ -174,7 +161,6 @@ public class TOrderFeedback extends BaseEntity
             .append("pictureUrl1", getPictureUrl1())
             .append("pictureUrl2", getPictureUrl2())
             .append("pictureUrl3", getPictureUrl3())
-            .append("remarks", getRemarks())
             .toString();
     }
 }

gassafety-system/src/main/java/com/zehong/system/domain/vo/OrderFeedbackVo.java

+package com.zehong.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 工单反馈信息对象 t_order_feedback
+ * 
+ * @author zehong
+ * @date 2021-07-19
+ */
+public class OrderFeedbackVo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工单反馈id */
+    private int feedbackId;
+
+    /** 工单id */
+    private String orderId;
+
+    /** 设备编号 */
+    private String deviceCode;
+
+    /** 设备名称 */
+    private String deviceName;
+
+    /** 设备类型 */
+    private String deviceType;
+
+    /** 反馈内容 */
+    private String contents;
+
+    /** 反馈时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date feedbackTime;
+
+    /** 是否存在隐患（1是，2否） */
+    private String isHiddenDanger;
+
+    /** 处理状态（1不需处理，2已处理完成，3未处理完成） */
+    private String dealStatus;
+
+    /** 图片地址1 */
+    private String pictureUrl1;
+
+    /** 图片地址2 */
+    private String pictureUrl2;
+
+    /** 图片地址3 */
+    private String pictureUrl3;
+
+    public void setFeedbackId(int feedbackId)
+    {
+        this.feedbackId = feedbackId;
+    }
+
+    public int getFeedbackId()
+    {
+        return feedbackId;
+    }
+
+    public void setOrderId(String orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() 
+    {
+        return orderId;
+    }
+
+    public void setDeviceCode(String deviceCode)
+    {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceCode()
+    {
+        return deviceCode;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public void setContents(String contents)
+    {
+        this.contents = contents;
+    }
+
+    public String getContents() 
+    {
+        return contents;
+    }
+
+    public void setFeedbackTime(Date feedbackTime) 
+    {
+        this.feedbackTime = feedbackTime;
+    }
+
+    public Date getFeedbackTime() 
+    {
+        return feedbackTime;
+    }
+
+    public void setIsHiddenDanger(String isHiddenDanger) 
+    {
+        this.isHiddenDanger = isHiddenDanger;
+    }
+
+    public String getIsHiddenDanger() 
+    {
+        return isHiddenDanger;
+    }
+
+    public void setDealStatus(String dealStatus) 
+    {
+        this.dealStatus = dealStatus;
+    }
+
+    public String getDealStatus() 
+    {
+        return dealStatus;
+    }
+
+    public void setPictureUrl1(String pictureUrl1) 
+    {
+        this.pictureUrl1 = pictureUrl1;
+    }
+
+    public String getPictureUrl1() 
+    {
+        return pictureUrl1;
+    }
+
+    public void setPictureUrl2(String pictureUrl2) 
+    {
+        this.pictureUrl2 = pictureUrl2;
+    }
+
+    public String getPictureUrl2() 
+    {
+        return pictureUrl2;
+    }
+
+    public void setPictureUrl3(String pictureUrl3) 
+    {
+        this.pictureUrl3 = pictureUrl3;
+    }
+
+    public String getPictureUrl3() 
+    {
+        return pictureUrl3;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("feedbackId", getFeedbackId())
+            .append("orderId", getOrderId())
+            .append("deviceId", getDeviceCode())
+            .append("contents", getContents())
+            .append("feedbackTime", getFeedbackTime())
+            .append("isHiddenDanger", getIsHiddenDanger())
+            .append("dealStatus", getDealStatus())
+            .append("pictureUrl1", getPictureUrl1())
+            .append("pictureUrl2", getPictureUrl2())
+            .append("pictureUrl3", getPictureUrl3())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java

 package com.zehong.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 import com.zehong.system.domain.TDeviceInfo;
 import com.zehong.system.domain.TOrderFeedback;
@@ -44,7 +43,7 @@ public class WorkOrderVo extends BaseEntity
     private List<TDeviceInfo> deviceInfoList;
 
     /** 反馈信息列表 */
-    private List<TOrderFeedback> feedbackList;
+    private List<OrderFeedbackVo> feedbackList;
 
     /** 设备数量 */
     private int deviceNum;
@@ -157,11 +156,11 @@ public class WorkOrderVo extends BaseEntity
         this.deviceInfoList = deviceInfoList;
     }
 
-    public List<TOrderFeedback> getFeedbackList() {
+    public List<OrderFeedbackVo> getFeedbackList() {
         return feedbackList;
     }
 
-    public void setFeedbackList(List<TOrderFeedback> feedbackList) {
+    public void setFeedbackList(List<OrderFeedbackVo> feedbackList) {
         this.feedbackList = feedbackList;
     }
 

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

@@ -69,6 +69,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
 
         String deviceCode = tOrderFeedback.getDeviceCode();
         String dealStatus = tOrderFeedback.getDealStatus();
+        String isHiddenDanger = tOrderFeedback.getIsHiddenDanger();
 
         // 根据工单类型和源id修改源数据状态
         TWorkOrder order = tWorkOrderMapper.selectTWorkOrderById(tOrderFeedback.getOrderId());
@@ -77,16 +78,20 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
         if("1".equals(orderType)){
             TInspectionData data = tInspectionDataMapper.selectTInspectionDataByCode(deviceCode);
             data.setDealStatus(dealStatus);
+            data.setIsHiddenDanger(isHiddenDanger);
+            data.setUpdateTime(DateUtils.getNowDate());
             tInspectionDataMapper.updateTInspectionData(data);
 
         } else if("2".equals(orderType)) {
             THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(order.getResourceId());
             trouble.setDealStatus(dealStatus);
+            trouble.setUpdateTime(DateUtils.getNowDate());
             tHiddenTroubleMapper.updateTHiddenTrouble(trouble);
 
         } else if("3".equals(orderType)) {
             TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(order.getResourceId());
             alarm.setDealStatus(dealStatus);
+            alarm.setUpdateTime(DateUtils.getNowDate());
             tDeviceAlarmMapper.updateTDeviceAlarm(alarm);
         }
 

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

@@ -7,6 +7,7 @@ import com.zehong.common.core.domain.entity.SysUser;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.system.domain.*;
 import com.zehong.system.domain.form.TWorkOrderForm;
+import com.zehong.system.domain.vo.OrderFeedbackVo;
 import com.zehong.system.domain.vo.WorkOrderVo;
 import com.zehong.system.mapper.*;
 import org.springframework.beans.BeanUtils;
@@ -139,8 +140,31 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         workOrderVo.setDeviceInfoList(deviceInfoList);
 
         List<TOrderFeedback> feedbackList = tOrderFeedbackMapper.selectTOrderFeedbackByOrderId(tWorkOrder.getOrderId());
+        List<OrderFeedbackVo> feedbackVoList = new ArrayList<>();
+        TDeviceInfo device = null;
+
         if(feedbackList.size() != 0) {
-            workOrderVo.setFeedbackList(feedbackList);
+
+            for (TOrderFeedback feedback : feedbackList) {
+                OrderFeedbackVo feedbackVo = new OrderFeedbackVo();
+                if (feedback != null) {
+                    BeanUtils.copyProperties(feedback, feedbackVo);
+                }
+
+                device = tDeviceInfoMapper.selectTDeviceInfoByCode(feedback.getDeviceCode());
+                if (device != null) {
+                    feedbackVo.setDeviceName(device.getDeviceName());
+                    feedbackVo.setDeviceType(device.getDeviceType());
+                }
+
+                if (feedbackVo != null) {
+                    feedbackVoList.add(feedbackVo);
+                }
+            }
+
+            if (feedbackVoList.size() != 0) {
+                workOrderVo.setFeedbackList(feedbackVoList);
+            }
         }
 
         return workOrderVo;

gassafety-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectInspectorList" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.del_flag = '0' and r.role_id = 102
+		where u.del_flag = '0' and r.role_key = 'inspector'
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">

gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planId"    column="plan_id"    />
         <result property="deviceCode"    column="device_code"    />
         <result property="deviceType"    column="device_type"    />
+        <result property="isHiddenDanger"    column="is_hidden_danger"    />
         <result property="dealStatus"    column="deal_status"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
@@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTInspectionDataVo">
-        select data_id, plan_id, device_code, device_type, deal_status, update_time, create_time, remarks from t_inspection_data
+        select data_id, plan_id, device_code, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
     </sql>
 
     <select id="selectTInspectionDataList" parameterType="TInspectionData" resultMap="TInspectionDataResult">
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCode != null "> and device_code = #{deviceCode}</if>
             <if test="deviceType != null "> and device_type = #{deviceType}</if>
             <if test="dealStatus != null  and dealStatus != ''"> and deal_status = #{dealStatus}</if>
+            <if test="isHiddenDanger != null  and isHiddenDanger != ''"> and is_hidden_danger = #{isHiddenDanger}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
     </select>
@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">plan_id,</if>
             <if test="deviceCode != null">device_code,</if>
             <if test="deviceType != null">device_type,</if>
+            <if test="isHiddenDanger != null">is_hidden_danger,</if>
             <if test="dealStatus != null">deal_status,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">#{planId},</if>
             <if test="deviceCode != null">#{deviceCode},</if>
             <if test="deviceType != null">#{deviceType},</if>
+            <if test="isHiddenDanger != null">#{isHiddenDanger},</if>
             <if test="dealStatus != null">#{dealStatus},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -76,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">plan_id = #{planId},</if>
             <if test="deviceCode != null">device_code = #{deviceCode},</if>
             <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="isHiddenDanger != null">is_hidden_danger = #{isHiddenDanger},</if>
             <if test="dealStatus != null">deal_status = #{dealStatus},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

gassafety-system/src/main/resources/mapper/system/TOrderFeedbackMapper.xml

@@ -15,11 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pictureUrl1"    column="picture_url_1"    />
         <result property="pictureUrl2"    column="picture_url_2"    />
         <result property="pictureUrl3"    column="picture_url_3"    />
-        <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectTOrderFeedbackVo">
-        select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3, remarks from t_order_feedback
+        select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
     </sql>
 
     <select id="selectTOrderFeedbackList" parameterType="TOrderFeedback" resultMap="TOrderFeedbackResult">
@@ -34,7 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null  and pictureUrl1 != ''"> and picture_url_1 = #{pictureUrl1}</if>
             <if test="pictureUrl2 != null  and pictureUrl2 != ''"> and picture_url_2 = #{pictureUrl2}</if>
             <if test="pictureUrl3 != null  and pictureUrl3 != ''"> and picture_url_3 = #{pictureUrl3}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
     </select>
     
@@ -61,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null">picture_url_1,</if>
             <if test="pictureUrl2 != null">picture_url_2,</if>
             <if test="pictureUrl3 != null">picture_url_3,</if>
-            <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
@@ -73,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null">#{pictureUrl1},</if>
             <if test="pictureUrl2 != null">#{pictureUrl2},</if>
             <if test="pictureUrl3 != null">#{pictureUrl3},</if>
-            <if test="remarks != null">#{remarks},</if>
          </trim>
     </insert>
 
@@ -89,7 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null">picture_url_1 = #{pictureUrl1},</if>
             <if test="pictureUrl2 != null">picture_url_2 = #{pictureUrl2},</if>
             <if test="pictureUrl3 != null">picture_url_3 = #{pictureUrl3},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
         </trim>
         where feedback_id = #{feedbackId}
     </update>

gassafety-web/src/api/deviceInspection/inspectionData.js

@@ -9,6 +9,15 @@ export function listInspectionData(query) {
   })
 }
 
+// 查询所有巡检记录不分页
+export function getAllTInspectionInfo(query) {
+  return request({
+    url: '/deviceInspection/inspectionData/getAllTInspectionInfo',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询巡检记录详细
 export function getInspectionData(dataId) {
   return request({

gassafety-web/src/views/workOrder/basicsInfo/detail.vue

@@ -143,12 +143,15 @@
               <el-timeline-item v-for="(activity, index) in form.feedbackList" :key="index" :timestamp="activity.feedbackTime">
                 <el-card>
                   <div style="float: left;margin-left: 50px;">
-                    <p v-if="form.deviceType == 0">设备类型：管道</p>
-                    <p v-if="form.deviceType == 1">设备类型：调压阀</p>
-                    <p v-if="form.deviceType == 2">设备类型：阀门井</p>
-                    <p v-if="form.deviceType == 3">设备类型：流量计</p>
-                    <p v-if="form.deviceType == 4">设备类型：压力表</p>
-                    <p>设备名称：{{form.deviceName}}</p>
+                    <p>设备类型：
+                      <span v-if="activity.deviceType == 0">管道</span>
+                      <span v-if="activity.deviceType == 1">调压箱</span>
+                      <span v-if="activity.deviceType == 2">阀门井</span>
+                      <span v-if="activity.deviceType == 3">流量计</span>
+                      <span v-if="activity.deviceType == 4">压力表</span>
+                    </p>
+
+                    <p>设备名称：{{activity.deviceName}}</p>
                     <p>反馈信息：{{activity.contents}}</p>
                   </div>
                   <div style="float: left;margin-left: 50px;">
@@ -166,15 +169,15 @@
                     <div class="feedbackTime">
                       <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"  v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 70px;"></el-image>
                     </div>
-                    
-                    
+
+
                   </div>
-                 
+
                 </el-card>
               </el-timeline-item>
             </el-timeline>
           </div>
-          
+
             <!-- <el-timeline-item timestamp="2018/4/3" placement="top">
               <el-card>
                 <p>反馈时间：{{contents}}</p>
@@ -185,7 +188,7 @@
                 <p>是否解决：{{contents}}</p>
               </el-card>
             </el-timeline-item> -->
-          
+
           <!-- <div style="width: 95%;float: left;">
             <div style="float: left;margin-left: 50px;" >
               <el-image :src="form.pictureUrl1" fit="cover" v-if="form.pictureUrl1 != null && form.pictureUrl1 != ''" style="width: 100px;height: 100px;">
@@ -208,9 +211,9 @@
               </el-form-item>
             </el-form>
           </div>-->
-        </div> 
+        </div>
 <!-- 返回按钮 -->
-        
+
 
 
       </div>

gassafety-web/src/views/workOrder/feedback/index.vue

@@ -122,7 +122,7 @@
     />
 
     <!-- 工单反馈对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="工单名称" prop="orderName">
           <font>{{form.orderName}}</font>
@@ -154,17 +154,12 @@
           />
         </el-form-item>
         <el-form-item label="是否存在隐患" prop="isHiddenDanger">
-          <!--<el-radio-group v-model="form.isHiddenDanger">
-            <el-radio :label="1">是</el-radio>
-            <el-radio :label="2">否</el-radio>
-          </el-radio-group>-->
           <el-switch
             v-model="isHiddenDanger"
             active-text="是"
             inactive-text="否">
           </el-switch>
         </el-form-item>
-<!--        <el-form-item label="处理结果" prop="dealStatus">-->
         <el-form-item label="处理结果" prop="dealStatus" v-if="isHiddenDanger == true">
           <el-radio-group v-model="form.dealStatus">
             <el-radio :label="2">已处理完成</el-radio>
@@ -286,12 +281,14 @@
         this.form.pictureUrl2 = "";
         this.form.pictureUrl3 = "";
         this.fileList = [];
+        this.fileIndex = 0;
       },
       // 取消按钮
       cancel() {
         this.open = false;
         this.reset();
         this.fileList = [];
+        this.fileIndex = 0;
       },
       // 表单重置
       reset() {
@@ -345,11 +342,6 @@
         const orderId = row.orderId || this.ids
         getBasicsInfo(orderId).then(response => {
           this.form = response.data;
-          this.form.pictureUrl1 = null;
-          this.form.pictureUrl2 = null;
-          this.form.pictureUrl3 = null;
-          this.form.contents = null;
-          this.form.remarks = null;
           this.open = true;
           this.title = "工单反馈";
         });