解决冲突

gassafety-admin/src/main/java/com/zehong/web/controller/common/CommonController.java

@@ -77,8 +77,7 @@ public class CommonController
 //            String fileName = FileUploadUtils.upload(filePath, file);
 //            String url = serverConfig.getUrl() + fileName;
             String fileName = file.getOriginalFilename();
-            String fileServer = serverConfig.getUrl().contains("127") && serverConfig.getUrl().contains("8093") && !filePath.contains("/data")? serverConfig.getUrl() : serverConfig.getUrl().replace("127.0.0.1:8903","36.148.23.59:8901");
-            String url = fileServer + FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + FileUploadUtils.upload(filePath, file);
             AjaxResult ajax = AjaxResult.success();
             ajax.put("fileName", fileName);
             ajax.put("url", url);

gassafety-admin/src/main/java/com/zehong/web/controller/device/TDeviceInfoController.java

@@ -3,6 +3,7 @@ package com.zehong.web.controller.device;
 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.domain.entity.SysDept;
 import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.poi.ExcelUtil;
@@ -50,6 +51,15 @@ public class TDeviceInfoController extends BaseController
         return AjaxResult.success(tDeviceInfoService.selectTDeviceInfoList(tDeviceInfo));
     }
 
+    /**
+     * 获取设备下拉树列表
+     */
+    @PutMapping("/deviceTree")
+    public AjaxResult deviceTree(@RequestBody List<TDeviceInfo> deviceInfoList)
+    {
+        return AjaxResult.success(tDeviceInfoService.buildDeviceTreeSelect(deviceInfoList));
+    }
+
     /**
      * 导出设备信息列表
      */

gassafety-admin/src/main/java/com/zehong/web/controller/system/SysUserController.java

 package com.zehong.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -65,6 +67,17 @@ public class SysUserController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取巡检员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:inspectorList')")
+    @GetMapping("/inspectorList")
+    public AjaxResult inspectorList()
+    {
+        List<SysUser> list = userService.selectInspectorList();
+        return AjaxResult.success(list);
+    }
+
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @GetMapping("/export")

gassafety-admin/src/main/java/com/zehong/web/controller/workOrder/TWorkOrderController.java

@@ -2,7 +2,9 @@ package com.zehong.web.controller.workOrder;
 
 import java.util.List;
 
+import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.form.TWorkOrderForm;
 import com.zehong.system.domain.vo.WorkOrderVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,12 +43,12 @@ public class TWorkOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('workOrder:basicsInfo:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TWorkOrder tWorkOrder) throws Exception
+    public TableDataInfo list(TWorkOrderForm tWorkOrderForm) throws Exception
     {
         startPage();
         List<WorkOrderVo> list = null;
         try {
-            list = tWorkOrderService.selectTWorkOrderList(tWorkOrder);
+            list = tWorkOrderService.selectTWorkOrderList(tWorkOrderForm);
         } catch (Exception e) {
             e.printStackTrace();
             throw new Exception(StringUtils.format("查询工单基础信息列表失败"));
@@ -60,11 +62,11 @@ public class TWorkOrderController extends BaseController
     @PreAuthorize("@ss.hasPermi('workOrder:basicsInfo:export')")
     @Log(title = "工单基础信息", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TWorkOrder tWorkOrder) throws Exception
+    public AjaxResult export(TWorkOrderForm tWorkOrderForm) throws Exception
     {
         List<WorkOrderVo> list = null;
         try {
-            list = tWorkOrderService.selectTWorkOrderList(tWorkOrder);
+            list = tWorkOrderService.selectTWorkOrderList(tWorkOrderForm);
         } catch (Exception e) {
             e.printStackTrace();
             throw new Exception(StringUtils.format("导出工单基础信息列表失败"));
@@ -116,8 +118,8 @@ public class TWorkOrderController extends BaseController
     public AjaxResult edit(@RequestBody TWorkOrder tWorkOrder) throws Exception
     {
         String orderStatus = tWorkOrder.getOrderStatus();
-        // 工单状态只有是0未下发或1已下发,才允许修改
-        if(!"0".equals(orderStatus) && !"1".equals(orderStatus)){
+        // 工单状态只有是0未接收才允许修改
+        if(!"0".equals(orderStatus)){
             throw new Exception(StringUtils.format("工单({})当前状态不允许修改", tWorkOrder.getOrderId()));
         }
 
@@ -139,7 +141,14 @@ public class TWorkOrderController extends BaseController
     public AjaxResult editStatus(@RequestBody TWorkOrder tWorkOrder) throws Exception
     {
         String orderStatus = tWorkOrder.getOrderStatus();
-        if("5".equals(orderStatus)) {
+        if("0".equals(orderStatus)){
+            tWorkOrder.setOrderStatus("1");
+            tWorkOrder.setActualTime(DateUtils.getNowDate());
+        } else if("1".equals(orderStatus)) {
+            tWorkOrder.setOrderStatus("2");
+        } else if("2".equals(orderStatus)) {
+            tWorkOrder.setOrderStatus("3");
+        } else if("3".equals(orderStatus)) {
             throw new Exception(StringUtils.format("工单({})已归档，不允许更改状态", tWorkOrder.getOrderId()));
         }
 

gassafety-system/src/main/java/com/zehong/system/domain/form/TWorkOrderForm.java

+package com.zehong.system.domain.form;
+
+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_work_order
+ * 
+ * @author zehong
+ * @date 2021-07-19
+ */
+public class TWorkOrderForm extends BaseEntity
+{
+
+    /** 工单id */
+    private String orderId;
+
+    /** 工单类型（1巡检信息，2隐患信息，3报警信息） */
+    private String orderType;
+
+    /** 工单名称 */
+    private String orderName;
+
+    /** 工单状态（0未接收，1已接收，2进行中，3已反馈，4已归档） */
+    private String orderStatus;
+
+    /** 指定执行人员（巡检员id） */
+    private Long appointInspector;
+
+    /** 开始下发时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startAllotTime;
+
+    /** 结束下发时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endAllotTime;
+
+    /** 实际接收人员（巡检员id） */
+    @Excel(name = "实际接收人员", readConverterExp = "巡检员id")
+    private Long actualInspector;
+
+    /** 实际接收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "实际接收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date actualTime;
+
+    /** 用户名 */
+    private String userName;
+
+    public void setOrderId(String orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() 
+    {
+        return orderId;
+    }
+
+    public void setOrderType(String orderType) 
+    {
+        this.orderType = orderType;
+    }
+
+    public String getOrderType() 
+    {
+        return orderType;
+    }
+
+    public void setOrderName(String orderName)
+    {
+        this.orderName = orderName;
+    }
+
+    public String getOrderName() 
+    {
+        return orderName;
+    }
+
+    public void setOrderStatus(String orderStatus) 
+    {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getOrderStatus() 
+    {
+        return orderStatus;
+    }
+
+    public void setAppointInspector(Long appointInspector)
+    {
+        this.appointInspector = appointInspector;
+    }
+
+    public Long getAppointInspector()
+    {
+        return appointInspector;
+    }
+
+    public Date getStartAllotTime() {
+        return startAllotTime;
+    }
+
+    public void setStartAllotTime(Date startAllotTime) {
+        this.startAllotTime = startAllotTime;
+    }
+
+    public Date getEndAllotTime() {
+        return endAllotTime;
+    }
+
+    public void setEndAllotTime(Date endAllotTime) {
+        this.endAllotTime = endAllotTime;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Long getActualInspector() {
+        return actualInspector;
+    }
+
+    public void setActualInspector(Long actualInspector) {
+        this.actualInspector = actualInspector;
+    }
+
+    public Date getActualTime() {
+        return actualTime;
+    }
+
+    public void setActualTime(Date actualTime) {
+        this.actualTime = actualTime;
+    }
+}

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

@@ -36,6 +36,9 @@ public class WorkOrderVo extends BaseEntity
     /** 设备编号 */
     private String deviceCodes;
 
+    /** 设备名称 */
+    private String deviceName;
+
     /** 设备列表 */
     private List<TDeviceInfo> deviceInfoList;
 
@@ -150,6 +153,14 @@ public class WorkOrderVo extends BaseEntity
         this.deviceCodes = deviceCodes;
     }
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public List<TDeviceInfo> getDeviceInfoList() {
         return deviceInfoList;
     }

gassafety-system/src/main/java/com/zehong/system/mapper/SysUserMapper.java

@@ -19,6 +19,14 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    /**
+     * 查询巡检员列表
+     *
+     * @param
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectInspectorList();
+
     /**
      * 通过用户名查询用户
      * 

gassafety-system/src/main/java/com/zehong/system/mapper/TWorkOrderMapper.java

@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
 
 import java.util.List;
 import com.zehong.system.domain.TWorkOrder;
+import com.zehong.system.domain.form.TWorkOrderForm;
 
 /**
  * 工单基础信息Mapper接口
@@ -32,7 +33,7 @@ public interface TWorkOrderMapper
      * @param tWorkOrder 工单基础信息
      * @return 工单基础信息集合
      */
-    public List<TWorkOrder> selectTWorkOrderList(TWorkOrder tWorkOrder);
+    public List<TWorkOrder> selectTWorkOrderList(TWorkOrderForm tWorkOrderForm);
 
     /**
      * 新增工单基础信息

gassafety-system/src/main/java/com/zehong/system/service/ISysUserService.java

@@ -18,6 +18,14 @@ public interface ISysUserService
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    /**
+     * 查询巡检员列表
+     *
+     * @param
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectInspectorList();
+
     /**
      * 通过用户名查询用户
      * 

gassafety-system/src/main/java/com/zehong/system/service/ITDeviceInfoService.java

@@ -3,6 +3,8 @@ package com.zehong.system.service;
 import java.util.List;
 import java.util.Map;
 
+import com.zehong.common.core.domain.TreeSelect;
+import com.zehong.common.core.domain.entity.SysDept;
 import com.zehong.system.domain.TDeviceInfo;
 
 /**
@@ -29,6 +31,14 @@ public interface ITDeviceInfoService
      */
     public List<TDeviceInfo> selectTDeviceInfoList(TDeviceInfo tDeviceInfo);
 
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param deviceInfoList 设备列表
+     * @return 下拉树结构列表
+     */
+    public List<Map<Object, Object>> buildDeviceTreeSelect(List<TDeviceInfo> deviceInfoList);
+
     /**
      * 统计各设备类型的设备总数
      * @return

gassafety-system/src/main/java/com/zehong/system/service/ITWorkOrderService.java

@@ -2,6 +2,7 @@ package com.zehong.system.service;
 
 import java.util.List;
 import com.zehong.system.domain.TWorkOrder;
+import com.zehong.system.domain.form.TWorkOrderForm;
 import com.zehong.system.domain.vo.WorkOrderVo;
 
 /**
@@ -24,10 +25,10 @@ public interface ITWorkOrderService
     /**
      * 查询工单基础信息列表
      * 
-     * @param tWorkOrder 工单基础信息
+     * @param tWorkOrderForm 工单基础信息表单
      * @return 工单基础信息集合
      */
-    public List<WorkOrderVo> selectTWorkOrderList(TWorkOrder tWorkOrder) throws Exception;
+    public List<WorkOrderVo> selectTWorkOrderList(TWorkOrderForm tWorkOrderForm) throws Exception;
 
     /**
      * 新增工单基础信息

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

@@ -66,6 +66,18 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    /**
+     * 查询巡检员列表
+     *
+     * @param
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<SysUser> selectInspectorList()
+    {
+        return userMapper.selectInspectorList();
+    }
+
     /**
      * 通过用户名查询用户
      * 

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

 package com.zehong.system.service.impl;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import com.zehong.common.core.domain.TreeSelect;
+import com.zehong.common.core.domain.entity.SysDept;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TDeviceInfoMapper;
 import com.zehong.system.domain.TDeviceInfo;
 import com.zehong.system.service.ITDeviceInfoService;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 设备信息Service业务层处理
@@ -45,6 +48,28 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
         return tDeviceInfoMapper.selectTDeviceInfoList(tDeviceInfo);
     }
 
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param deviceInfoList 部门列表
+     * @return 下拉树结构列表
+     */
+    @Override
+    public List<Map<Object, Object>> buildDeviceTreeSelect(List<TDeviceInfo> deviceInfoList)
+    {
+        List<Map<Object, Object>> list = new ArrayList<>();
+
+        for (TDeviceInfo deviceInfo : deviceInfoList) {
+            Map<Object, Object> map = new HashMap<>();
+            map.put("id", deviceInfo.getDeviceId());
+            map.put("label", deviceInfo.getDeviceName());
+
+            list.add(map);
+        }
+
+        return list;
+    }
+
     /**
      * 统计各设备类型的设备总数
      * @return

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

@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
 
 import java.util.List;
 
+import com.zehong.common.utils.DateUtils;
 import com.zehong.system.domain.*;
 import com.zehong.system.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,18 +79,18 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
             trouble.setDealStatus(dealStatus);
             tHiddenTroubleMapper.updateTHiddenTrouble(trouble);
 
-        } else {
+        } else if("3".equals(orderType)) {
             TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(order.getResourceId());
             alarm.setDealStatus(dealStatus);
             tDeviceAlarmMapper.updateTDeviceAlarm(alarm);
         }
 
-        // 如果工单状态是进行中，修改状态为已反馈
-        if("2".equals(order.getOrderStatus())){
-            order.setOrderStatus("3");
+        // 如果工单状态是已接收，修改状态为已反馈
+        if("1".equals(order.getOrderStatus())){
+            order.setOrderStatus("2");
             tWorkOrderMapper.updateTWorkOrder(order);
         }
-
+        tOrderFeedback.setFeedbackTime(DateUtils.getNowDate());
         return tOrderFeedbackMapper.insertTOrderFeedback(tOrderFeedback);
     }
 

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

@@ -6,6 +6,7 @@ import java.util.List;
 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.WorkOrderVo;
 import com.zehong.system.mapper.*;
 import org.springframework.beans.BeanUtils;
@@ -107,6 +108,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             String deviceCode = trouble.getDeviceCode();
             TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
             if(device != null){
+                workOrderVo.setDeviceName(device.getDeviceName());
                 deviceInfoList.add(device);
             }
 
@@ -128,6 +130,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
                     workOrderVo.setLongitude(device.getLongitude());
                     workOrderVo.setLatitude(device.getLatitude());
                     workOrderVo.setDeviceType(device.getDeviceType());
+                    workOrderVo.setDeviceName(device.getDeviceName());
                     workOrderVo.setAddress(device.getDeviceAddr());
                     deviceInfoList.add(device);
                 }
@@ -152,14 +155,14 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     /**
      * 查询工单基础信息列表
      * 
-     * @param tWorkOrder 工单基础信息
+     * @param tWorkOrderForm 工单基础信息
      * @return 工单基础信息
      */
     @Override
-    public List<WorkOrderVo> selectTWorkOrderList(TWorkOrder tWorkOrder) throws Exception
+    public List<WorkOrderVo> selectTWorkOrderList(TWorkOrderForm tWorkOrderForm) throws Exception
     {
         List<WorkOrderVo> workOrderVoList = new ArrayList<WorkOrderVo>();
-        List<TWorkOrder> workOrderList = tWorkOrderMapper.selectTWorkOrderList(tWorkOrder);
+        List<TWorkOrder> workOrderList = tWorkOrderMapper.selectTWorkOrderList(tWorkOrderForm);
 
         if(workOrderList.size() != 0){
 
@@ -172,7 +175,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
                 workOrderVo.setAppointInspectorName(appointInspector.getNickName());
 
                 if(workOrder.getActualInspector() != workOrder.getAppointInspector() && workOrder.getActualInspector() != null){
-                    SysUser actualInspector = sysUserMapper.selectUserById(tWorkOrder.getActualInspector());
+                    SysUser actualInspector = sysUserMapper.selectUserById(workOrder.getActualInspector());
                     workOrderVo.setActualInspectorName(actualInspector.getNickName());
                 } else {
                     workOrderVo.setActualInspectorName(appointInspector.getNickName());
@@ -237,8 +240,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     {
         if("1".equals(tWorkOrder.getOrderStatus())){
 
-            TWorkOrder order = tWorkOrderMapper.selectTWorkOrderById(tWorkOrder.getOrderId());
-            int planId = order.getResourceId();
+            int planId = tWorkOrder.getResourceId();
             // 修改巡检计划状态为进行中
             TInspectionPlan plan = new TInspectionPlan();
             plan.setPlanId(planId);
@@ -246,10 +248,11 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             plan.setUpdateTime(DateUtils.getNowDate());
             tInspectionPlanMapper.updateTInspectionPlan(plan);
 
-        } else if ("4".equals(tWorkOrder.getOrderStatus())){
+            tWorkOrder.setActualTime(DateUtils.getNowDate());
+
+        } else if ("3".equals(tWorkOrder.getOrderStatus())){
 
-            TWorkOrder order = tWorkOrderMapper.selectTWorkOrderById(tWorkOrder.getOrderId());
-            int planId = order.getResourceId();
+            int planId = tWorkOrder.getResourceId();
             // 修改巡检计划状态为已完成
             TInspectionPlan plan = new TInspectionPlan();
             plan.setPlanId(planId);
@@ -257,8 +260,9 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             plan.setUpdateTime(DateUtils.getNowDate());
             tInspectionPlanMapper.updateTInspectionPlan(plan);
 
+        } else if ("0".equals(tWorkOrder.getOrderStatus())){
+            tWorkOrder.setUpdateTime(DateUtils.getNowDate());
         }
-        tWorkOrder.setUpdateTime(DateUtils.getNowDate());
         return tWorkOrderMapper.updateTWorkOrder(tWorkOrder);
     }
 

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

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -90,6 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
+
+	<select id="selectInspectorList" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.del_flag = '0' and r.role_id = 102
+	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">
 		select count(1) from sys_user where user_name = #{userName} limit 1

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

@@ -52,7 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTOrderFeedback" parameterType="TOrderFeedback">
         insert into t_order_feedback
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="feedbackId != null">feedback_id,</if>
             <if test="orderId != null">order_id,</if>
             <if test="deviceCode != null">device_code,</if>
             <if test="contents != null">contents,</if>
@@ -65,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="feedbackId != null">#{feedbackId},</if>
             <if test="orderId != null">#{orderId},</if>
             <if test="deviceCode != null">#{deviceCode},</if>
             <if test="contents != null">#{contents},</if>

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

@@ -23,26 +23,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="selectTWorkOrderVo">
-        select order_id, order_type, resource_id, order_name, order_status, update_time, appoint_inspector, allot_time, actual_inspector, actual_time, remarks from t_work_order
+        select t.order_id, t.order_type, t.resource_id, t.order_name, t.order_status, t.update_time, t.appoint_inspector, t.allot_time, t.actual_inspector, t.actual_time, t.remarks
+        from t_work_order t
+        left join sys_user s on t.appoint_inspector = s.user_id
     </sql>
 
-    <select id="selectTWorkOrderList" parameterType="TWorkOrder" resultMap="TWorkOrderResult">
+    <select id="selectTWorkOrderList" parameterType="TWorkOrderForm" resultMap="TWorkOrderResult">
         <include refid="selectTWorkOrderVo"/>
-        <where>  
-            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="orderName != null  and orderName != ''"> and order_name like concat('%', #{orderName}, '%')</if>
-            <if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
-            <if test="appointInspector != null "> and appoint_inspector = #{appointInspector}</if>
-            <if test="allotTime != null "> and allot_time = #{allotTime}</if>
-            <if test="actualInspector != null "> and actual_inspector = #{actualInspector}</if>
-            <if test="actualTime != null "> and actual_time = #{actualTime}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        <where>
+            <if test="orderId != null  and orderId != ''"> and t.order_id like concat('%',#{orderId},'%')</if>
+            <if test="orderType != null  and orderType != ''"> and t.order_type = #{orderType}</if>
+            <if test="orderName != null  and orderName != ''"> and t.order_name like concat('%', #{orderName}, '%')</if>
+            <if test="orderStatus != null  and orderStatus != ''"> and t.order_status = #{orderStatus}</if>
+            <if test="appointInspector != null "> and t.appoint_inspector = #{appointInspector}</if>
+            <if test="startAllotTime != null "> and t.allot_time &gt;= #{startAllotTime}</if>
+            <if test="endAllotTime != null "> and t.allot_time &lt;= #{endAllotTime}</if>
+            <if test="userName != null  and userName != ''"> and s.user_name = #{userName}</if>
         </where>
     </select>
     
     <select id="selectTWorkOrderById" parameterType="String" resultMap="TWorkOrderResult">
         <include refid="selectTWorkOrderVo"/>
-        where order_id = #{orderId}
+        where t.order_id = #{orderId}
     </select>
         
     <insert id="insertTWorkOrder" parameterType="TWorkOrder">

gassafety-web/src/api/device/deviceInfo.js

@@ -62,9 +62,19 @@ export function exportDeviceInfo(query) {
 }
 
 // 统计各设备类型的设备总数
-export function countDeviceByType(){
+export function countDeviceByType() {
   return request({
     url: '/device/deviceInfo/countDeviceByType',
     method: 'get'
   })
 }
+
+// 查询设备下拉树结构
+export function deviceTree(data) {
+  return request({
+    url: '/device/deviceInfo/deviceTree',
+    method: 'put',
+    data: data
+  })
+}
+

gassafety-web/src/api/system/user.js

@@ -10,6 +10,15 @@ export function listUser(query) {
   })
 }
 
+// 查询巡检员列表
+export function inspectorList(query) {
+  return request({
+    url: '/system/user/inspectorList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询用户详细
 export function getUser(userId) {
   return request({

gassafety-web/src/components/PopWindow/flowMeter.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,9 +69,8 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
-
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
   export default {
@@ -84,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -117,7 +124,7 @@
                   this.map.remove(this.obj);
                   this.form.deviceId = response.data;
                   this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                  this.gaoMap.placeSearch.clear();
+                  //this.gaoMap.placeSearch.clear();
                   this.gaoMap.closeAddMarker();
                   this.msgSuccess("新增成功");
                 }else{
@@ -135,6 +142,11 @@
         this.form.url = "";
         this.fileArr = [];
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

gassafety-web/src/components/PopWindow/lineInfoWindow.vue

@@ -2,72 +2,93 @@
   <div class="wrapper">
     <div class="top display-default">
       <div class="left text">{{ obj.pipeName }}</div>
-      <div v-if="!obj.editorPage" class="right text">
-        <img src="../../assets/images/closeBtn.png" alt="" />
+      <div class="right text">
+        <img @click="close" src="../../assets/images/closeBtn.png" alt="" />
       </div>
     </div>
+
     <!-- 设备信息 -->
-    <div class="eq-content display-default">
-      <div class="text-wrapper">
-        <div :title="obj.pipeName" class="eq-text">
+    <div class="content">
+      <div class="eq-content display-default">
+        <div class="text-wrapper">
+          <!-- <div :title="obj.pipeName" class="eq-text">
           <span>管道名称：</span>
           <span>{{ obj.pipeName }}</span>
+        </div> -->
+          <div class="eq-text">
+            <span>管道编号：</span>
+            <span>{{ obj.pipeCode }} </span>
+          </div>
+          <div class="eq-text">
+            <span>管道长度：</span>
+            <span>{{ `${obj.pipeLength ? obj.pipeLength + "米" : ""}` }}</span>
+          </div>
+          <div class="eq-text">
+            <span>管道类型：</span>
+            <span>{{ ["地埋管线", "地表管线"][obj.pipeType - 1] }}</span>
+          </div>
+          <div class="eq-text">
+            <span>管道压力：</span>
+            <span>{{
+              ["低押", "中压", "次高压", "高压"][obj.pipePressure - 1]
+            }}</span>
+          </div>
         </div>
-        <div class="eq-text">
-          <span>管道编号：</span>
-          <span>{{ obj.pipeCode }}</span>
+
+        <div class="pic">
+          <img :src="obj.iconUrl" alt="" />
         </div>
-        <div class="eq-text">
-          <span>管道长度：</span>
-          <span>{{ `${obj.pipeLength ?obj.pipeLength+'米':""}` }}</span>
+      </div>
+
+      <div class="maintain-content">
+        <div>
+          <span>管道所在地址：</span>
+          <span>{{ obj.pipeAddr }}</span>
         </div>
-        <div class="eq-text">
-          <span>管道类型：</span>
-          <span>{{ ["地埋管线", "地表管线"][obj.pipeType] }}</span>
+        <div>
+          <span>安装日期：</span>
+          <span>{{ moment(obj.installationTime).format("YYYY-MM-DD") }}</span>
         </div>
-        <div class="eq-text">
-          <span>管道压力：</span>
-          <span>{{
-            ["低押", "中压", "次高压", "高压"][obj.pipePressure]
-          }}</span>
+        <div>
+          <span>最后巡检日期：</span>
+          <span>{{ obj.inspectionTime }}</span>
+        </div>
+        <div>
+          <span>备注信息；</span>
+          <span>{{ obj.remarks }} </span>
         </div>
       </div>
-
-      <div class="pic">
-        <img :src="obj.url" alt="" />
-      </div>
+      <template v-if="!obj.editorPage">
+        <div class="warn-content">
+          <div>报警状态 <span>报警</span></div>
+          <div>详细信息：<span>管线两端设备压差较大，管线可能泄漏</span></div>
+        </div>
+        <div class="btn">
+          <el-button class="elbtn" type="primary">生成工单</el-button>
+        </div>
+      </template>
     </div>
 
-    <div class="maintain-content">
-      <div>
-        安装日期：<span>{{ obj.installationTime }}</span>
-      </div>
-      <div>
-        最后巡检日期：<span>{{ obj.inspectionTime }}</span>
-      </div>
-      <div>
-        备注信息；<span>{{ obj.remarks }}</span>
-      </div>
-    </div>
-    <template v-if="!obj.editorPage">
-      <div class="warn-content">
-        <div>报警状态 <span>报警</span></div>
-        <div>详细信息：<span>管线两端设备压差较大，管线可能泄漏</span></div>
-      </div>
-      <div class="btn">
-        <el-button class="elbtn" type="primary">生成工单</el-button>
-      </div>
-    </template>
     <!-- 报警状态 -->
   </div>
 </template>
 
 <script>
 //line移入时的的infowindow
+import moment from "moment";
 export default {
   props: {
     obj: { typs: Object },
   },
+  created() {
+    console.log("created", this.obj);
+  },
+  methods: {
+    moment,
+    close() {
+      this.obj.polyline.infoWindow.close();
+    },
+  },
 };
 </script>
 
@@ -78,7 +99,7 @@ export default {
   background: #fff;
   border-radius: 4px;
   box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
-  overflow: hidden;
+  // overflow: hidden;
   .top {
     width: 100%;
     height: 51px;
@@ -93,57 +114,73 @@ export default {
       padding-left: 22px;
     }
     .right {
-      padding-right: 16px;
+      padding-right: 22px;
+      img{
+        cursor: pointer;
+      }
     }
   }
-
-  .eq-content {
-    min-height: 156px;
-    box-sizing: border-box;
-    padding: 13px 16px 13px 22px;
-    border-bottom: 1px solid #e2e2e2;
-    .text-wrapper {
-      padding-top: 1px;
-      & > div {
-        margin-bottom: 6px;
-      }
-      .eq-text {
-        font-size: 14px;
-        font-weight: 400;
-        color: #1d1d1d;
-        opacity: 1;
-
-        & > span {
-          display: inline-block;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          word-break: break-all;
-          max-width: 100px;
+  .content {
+    max-height: 400px;
+    overflow: hidden;
+    overflow-y: auto;
+    .eq-content {
+      min-height: 156px;
+      box-sizing: border-box;
+      padding: 13px 22px 0px 22px;
+      // border-bottom: 1px solid #e2e2e2;
+      .text-wrapper {
+        padding-top: 1px;
+        & > div {
+          margin-bottom: 6px;
+        }
+        .eq-text {
+          font-size: 14px;
+          font-weight: 400;
+          color: #1d1d1d;
+          opacity: 1;
+          & > span {
+            vertical-align: top;
+            display: inline-block;
+            // white-space: nowrap;
+            // text-overflow: ellipsis;
+            // overflow: hidden;
+            word-break: break-all;
+            max-width: 100px;
+          }
         }
       }
-    }
-    .pic {
-      width: 177px;
-      height: 129px;
-      background-color: black;
-      img {
-        width: 100%;
+      .pic {
+        width: 177px;
+        height: 129px;
+        // background-color: black;
+        img {
+          width: 100%;
+          height: 100%;
+        }
       }
     }
   }
 
   .maintain-content {
     width: 100%;
-    height: 109px;
+    height: 119px;
     padding-left: 22px;
-    padding-top: 16px;
+    padding-right: 22px;
+    padding-bottom: 10px;
+    // padding-top: 16px;
     box-sizing: border-box;
-    border-bottom: 1px solid #e2e2e2;
+    // border-bottom: 1px solid #e2e2e2;
     & > div {
       margin-bottom: 8px;
       font-size: 14px;
       font-weight: 400;
+      span {
+        vertical-align: top;
+        display: inline-block;
+        word-break: break-all;
+        max-width: 280px;
+      }
     }
   }
 

gassafety-web/src/components/PopWindow/pipelineView.vue

@@ -4,7 +4,7 @@
     :visible.sync="dialogVisible"
     :before-close="handleClose"
   >
-    <el-row >
+    <el-row>
       <el-form
         :rules="rules"
         ref="editForm"
@@ -25,6 +25,7 @@
         <el-col>
           <el-form-item v-show="false" label="企业id" prop="enterpriseId">
             <el-input disabled v-model="editForm.enterpriseId"></el-input>
+            
           </el-form-item>
         </el-col>
 
@@ -40,7 +41,7 @@
         </el-col>
         <el-col :span="11">
           <el-form-item label="管道长度" prop="pipeLength">
-            <el-input v-model="editForm.pipeLength">
+            <el-input type="number" min=0 v-model="editForm.pipeLength">
               <i
                 slot="suffix"
                 style="color: #000; font-style: normal; margin-right: 10px"
@@ -99,7 +100,11 @@
               @remove="listRemove"
               :fileArr="fileArr"
             />
-            <el-input v-show="false" disabled v-model="editForm.iconUrl"></el-input>
+            <el-input
+              v-show="false"
+              disabled
+              v-model="editForm.iconUrl"
+            ></el-input>
           </el-form-item>
           <!-- <el-form-item v-show="false" label="设备图片路径" prop="iconUrl"> -->
           <!-- </el-form-item> -->
@@ -111,7 +116,7 @@
           <el-form-item label="安装日期" prop="installationTime">
             <el-col :span="11">
               <el-date-picker
-                type="datetime"
+                type="date"
                 placeholder="选择日期"
                 style="width: 100%"
                 v-model="editForm.installationTime"
@@ -141,7 +146,9 @@
 
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="ok">确 定</el-button>
+      <el-button :loading="okLoading" type="primary" @click="ok"
+        >确 定</el-button
+      >
     </span>
   </el-dialog>
 </template>
@@ -177,9 +184,10 @@ export default {
   data() {
     return {
       // isShow: false,
+      okLoading: false,
       fileArr: [],
       editForm: {
-        pipeName:"",
+        pipeName: "",
         pipeType: "1",
         pipePressure: "1",
         iconUrl: "",
@@ -205,7 +213,7 @@ export default {
         pipePressure: [
           { required: true, message: "请选择管道压力", trigger: "blur" },
         ],
-        iconUrl: [{ required: true, message: "请上传骨片", trigger: "change" }],
+        iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
         installationTime: [
           {
             // type: "date",
@@ -227,28 +235,46 @@ export default {
     this.fileArr = this.lineData.pipeId ? [{ url: this.editForm.iconUrl }] : [];
   },
   methods: {
-    mouseup(){
-      console.log('组件mouseup')
+    mouseup() {
+      console.log("组件mouseup");
     },
     ok() {
-      this.$refs.editForm.validate((valid)=>{
-        if(valid){
+      this.$refs.editForm.validate((valid) => {
+        if (valid) {
+          this.okLoading = true;
           const data = { ...this.editForm };
-        data.installationTime = moment(this.editForm.installationTime).format(
-          "YYYY-MM-DD HH:mm:ss"
-        );
-        console.log("data", data);
-        console.log(this.editForm.pipeId);
-        this.requeset(this.editForm.pipeId, data).then((res) => {
-          // 改变this指向，传回去target ，传回去data
-          if (res.code == 200) {
-            this.dialogVisible = false;
-           data.pipeId =data.pipeId ?data.pipeId: res.data;
-            this.lineOkCallBack.call(this.gaodeMap, this.target, data);
-          }
-        });
+          data.installationTime = moment(this.editForm.installationTime).format(
+            "YYYY-MM-DD HH:mm:ss"
+          );
+          console.log("data", data);
+          console.log(this.editForm.pipeId);
+          this.requeset(this.editForm.pipeId, data)
+            .then((res) => {
+              // 改变this指向，传回去target ，传回去data
+              if (res.code == 200) {
+                this.dialogVisible = false;
+                data.pipeId = data.pipeId ? data.pipeId : res.data;
+                this.lineOkCallBack.call(this.gaodeMap, this.target, data);
+                if (!this.editForm.pipeId) {
+                  this.gaodeMap.newLineObj = null;
+                  this.gaodeMap.createNewLine();
+                }
+
+                this.$message({
+                  type: "success",
+                  offset: 100,
+                  // center:true,
+                  message: `${
+                    this.editForm.pipeId ? "修改管道成功" : "添加管道成功"
+                  }`,
+                });
+              }
+            })
+            .catch(() => {
+              this.okLoading = false;
+            });
         }
-      })
+      });
       // console.log(this.gaodeMap,this.target)
     },
     async requeset(id, data) {
@@ -270,13 +296,13 @@ export default {
       this.$confirm("确认关闭？")
         .then((_) => {
           done();
-          
         })
         .catch((_) => {});
     },
     // 图片上传成功
     fileFinshed(e) {
       this.editForm.iconUrl = e.url;
+      console.log(this.editForm.iconUrl);
     },
     // 图片列表移除
     listRemove(e) {

gassafety-web/src/components/PopWindow/pressureGage.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,9 +69,8 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
-
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
   export default {
@@ -84,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -117,7 +124,7 @@
                   this.map.remove(this.obj);
                   this.form.deviceId = response.data;
                   this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                  this.gaoMap.placeSearch.clear();
+                  //this.gaoMap.placeSearch.clear();
                   this.gaoMap.closeAddMarker();
                   this.msgSuccess("新增成功");
                 }else{
@@ -135,6 +142,11 @@
         this.form.url = "";
         this.fileArr = [];
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

gassafety-web/src/components/PopWindow/regulatorBox.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,6 +69,7 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
@@ -82,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -91,6 +100,7 @@
     methods: {
       show () {
         this.dialogVisible = true;
+        //this.getPipeInfo();
       },
       hide () {
         this.remove()
@@ -116,7 +126,7 @@
                   this.form.deviceId = response.data;
                   console.log(this.gaoMap,"addgaoMap")
                   this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                  this.gaoMap.placeSearch.clear();
+                  //this.gaoMap.placeSearch.clear();
                   this.gaoMap.closeAddMarker();
                   this.msgSuccess("新增成功");
                 }else{
@@ -134,6 +144,11 @@
       handleClose(done) {
         done();
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

gassafety-web/src/components/PopWindow/valveWell.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,9 +69,8 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
-
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
   export default {
@@ -84,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -117,7 +124,7 @@
                   this.map.remove(this.obj);
                   this.form.deviceId = response.data;
                   this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                  this.gaoMap.placeSearch.clear();
+                  //this.gaoMap.placeSearch.clear();
                   this.gaoMap.closeAddMarker();
                   this.msgSuccess("新增成功");
                 }else{
@@ -135,6 +142,11 @@
         this.form.url = "";
         this.fileArr = [];
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

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

@@ -7,13 +7,12 @@
           <el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 20px">
               <el-step title="未接收" ></el-step>
               <el-step title="已接收" ></el-step>
-              <el-step title="进行中" ></el-step>
+<!--              <el-step title="进行中" ></el-step>-->
               <el-step title="已反馈" ></el-step>
               <el-step title="已归档" ></el-step>
           </el-steps>
         </div>
-        
-        
+
         <div style="width: 100%;height: 280px;">
           <el-divider></el-divider>
           <div style="color: #31EAEA;width: 30%;height: 40px;">
@@ -34,9 +33,8 @@
               <el-form-item label="工单状态:" prop="orderStatus">
                 <font v-if="form.orderStatus == 0">未接收</font>
                 <font v-if="form.orderStatus == 1">已接收</font>
-                <font v-if="form.orderStatus == 2">进行中</font>
-                <font v-if="form.orderStatus == 3">已反馈</font>
-                <font v-if="form.orderStatus == 4">已归档</font>
+                <font v-if="form.orderStatus == 2">已反馈</font>
+                <font v-if="form.orderStatus == 3">已归档</font>
               </el-form-item>
               <el-form-item label="指定执行人员:" prop="appointInspectorName">
                 <font>{{form.appointInspectorName}}</font>
@@ -53,8 +51,16 @@
                 <font v-if="form.deviceType == 3">流量计</font>
                 <font v-if="form.deviceType == 4">压力表</font>
               </el-form-item>
-              <el-form-item label="设备编号:" prop="deviceCodes">
-                <font>{{form.deviceCodes}}</font>
+              <el-form-item label="设备名称:" prop="deviceName">
+                <font v-if="form.orderType != 1">{{form.deviceName}}</font>
+                <el-tree
+                  :data="deviceOptions"
+                  :props="defaultProps"
+                  :expand-on-click-node="false"
+                  ref="tree"
+                  @node-click="handleNodeClick"
+                  v-if="form.orderType == 1"
+                />
               </el-form-item>
               <el-form-item label="设备位置:" v-if="form.orderType != 1">
                 <font>{{form.address}}</font>
@@ -73,9 +79,8 @@
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
         </div>
-    <!-- 接单信息 -->
-        
-        <div v-if="form.actualInspectorName != null && form.actualTime != null">
+        <!-- 接单信息 -->
+        <div v-if="form.actualTime != '' && form.actualTime != null">
           <el-divider></el-divider>
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>接单信息</li></ul>
@@ -90,65 +95,31 @@
           </el-form>
         </div>
         <!-- 反馈信息 -->
-        <div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.contents != null && form.feedbackTime != null && form.dealStatus != null">
+        <div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.dealStatus != '' && form.dealStatus != null">
           <el-divider></el-divider>
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>反馈信息</li></ul>
           </div>
           <div style="width: 95%;float: left;">
-            <!-- <el-upload style="float: left;"
-              action="#"
-              list-type="picture-card"
-              :auto-upload="false">
-                <i slot="default" class="el-icon-plus"></i>
-                <div slot="file" slot-scope="{file}">
-                  <img
-                    class="el-upload-list__item-thumbnail"
-                    :src="file.url" alt=""
-                  >
-                  <span class="el-upload-list__item-actions">
-                    <span
-                      class="el-upload-list__item-preview"
-                      @click="handlePictureCardPreview(file)"
-                    >
-                      <i class="el-icon-zoom-in"></i>
-                    </span>
-                    <span
-                      v-if="!disabled"
-                      class="el-upload-list__item-delete"
-                      @click="handleDownload(file)"
-                    >
-                      <i class="el-icon-download"></i>
-                    </span>
-                    <span
-                      v-if="!disabled"
-                      class="el-upload-list__item-delete"
-                      @click="handleRemove(file)"
-                    >
-                      <i class="el-icon-delete"></i>
-                    </span>
-                  </span>
-                </div>
-            </el-upload> -->
-              <div style="float: left;margin-left: 50px;" >
-                <el-image :src="form.pictureUrl1" :preview-src-list="srcList" fit="cover"   v-if="form.pictureUrl1 != null"   style="width: 100px;height: 100px;margin-left: 15px;">
-                </el-image>
-                <el-image :src="form.pictureUrl2" :preview-src-list="srcList" fit="cover"  v-if="form.pictureUrl2 != null"   style="width: 100px;height: 100px;margin-left: 15px;">
-                </el-image>
-                <el-image :src="form.pictureUrl3" :preview-src-list="srcList" fit="cover"  v-if="form.pictureUrl3 != null"   style="width: 100px;height: 100px;margin-left: 15px;">
-                </el-image>
-              </div>
+            <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;">
+              </el-image>
+              <el-image :src="form.pictureUrl2" fit="cover" v-if="form.pictureUrl2 != null && form.pictureUrl2 != ''" style="width: 100px;height: 100px;">
+              </el-image>
+              <el-image :src="form.pictureUrl3" fit="cover" v-if="form.pictureUrl3 != null && form.pictureUrl3 != ''" style="width: 100px;height: 100px;">
+              </el-image>
+            </div>
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;" >
-                <el-form-item label="反馈信息:" prop="contents">
-                  <font>{{form.contents}}</font>
-                </el-form-item>
-                <el-form-item label="反馈时间:" prop="feedbackTime">
-                  <font>{{form.feedbackTime}}</font>
-                </el-form-item>
-                <el-form-item label="是否解决:" prop="dealStatus">
-                  <font v-if="form.dealStatus == 3">未解决</font>
-                  <font v-if="form.dealStatus != 3 && form.dealStatus != null">已解决</font>
-                </el-form-item>
+              <el-form-item label="反馈信息:" prop="contents">
+                <font>{{form.contents}}</font>
+              </el-form-item>
+              <el-form-item label="反馈时间:" prop="feedbackTime">
+                <font>{{form.feedbackTime}}</font>
+              </el-form-item>
+              <el-form-item label="是否解决:" prop="dealStatus">
+                <font v-if="form.dealStatus == 3">未解决</font>
+                <font v-if="form.dealStatus != 3 && form.dealStatus != null">已解决</font>
+              </el-form-item>
             </el-form>
           </div>
         </div>
@@ -170,8 +141,10 @@
   <script>
 
   import { listBasicsInfo, getBasicsInfo, delBasicsInfo, addBasicsInfo, updateBasicsInfo, exportBasicsInfo } from "@/api/workOrder/basicsInfo";
-  import gaodeMap from "utils/gaodeMap.js"
-  import {map, DEVICE_TYPE} from "utils/gaodeMap.js"
+  import { deviceTree } from "@/api/device/deviceInfo";
+  import gaodeMap from "utils/gaodeMap.js";
+  import {map, DEVICE_TYPE} from "utils/gaodeMap.js";
+
 export default {
     name: "BasicsInfo",
     components: {
@@ -207,6 +180,17 @@ export default {
         pickerOptions:[],
         // 工单类型字典
         ordertypeOptions: [],
+        // 设备树选项
+        deviceOptions: [
+          {
+            label: "设备列表",
+            childList: []
+          }
+        ],
+        defaultProps: {
+          children: "childList",
+          label: "label"
+        },
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -233,7 +217,6 @@ export default {
       // 如果是跳转来的，则接受初始化参数
       // this.user_id = this.$route.query.id; //详细信息页接收参数
       this.orderId = this.$route.query.orderId;
-
       this.getList();
       this.getDicts("t_order_status").then(response => {
         this.typeOptions = response.data;
@@ -278,9 +261,25 @@ export default {
           for(var i = 0; i < this.form.deviceInfoList.length; i++){
             let obj = this.form.deviceInfoList[i];
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
-           
+          }
+
+          if(this.form.orderType == '1') {
+            // 获取设备列表树
+            let data = this.form.deviceInfoList;
+            console.log(data, "====");
+            deviceTree(data).then(response => {
+              this.deviceOptions[0].childList = response.data;
+            });
           }
         });
+      },
+      // 筛选节点
+      // filterNode(value, data) {
+      //   if (!value) return true;
+      //   return data.label.indexOf(value) !== -1;
+      // },
+      // 节点单击事件
+      handleNodeClick(data) {
 
       },
       // 取消按钮