Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java

 package com.zehong.web.controller.complainDeal;
 
+import java.util.Date;
 import java.util.List;
+
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +24,8 @@ import com.zehong.system.service.ITComplainDealService;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.common.core.page.TableDataInfo;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 投诉处置Controller
  * 
@@ -32,14 +38,20 @@ public class TComplainDealController extends BaseController
 {
     @Autowired
     private ITComplainDealService tComplainDealService;
+    @Autowired
+    private TokenService tokenService;
 
     /**
      * 查询投诉处置列表
      */
     @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TComplainDeal tComplainDeal)
+    public TableDataInfo list(TComplainDeal tComplainDeal, HttpServletRequest request)
     {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if(loginUser.getUser().getDeptId()!=-2){
+            tComplainDeal.setComplainAssignEnterproseId(loginUser.getUser().getDeptId());
+        }
         startPage();
         List<TComplainDeal> list = tComplainDealService.selectTComplainDealList(tComplainDeal);
         return getDataTable(list);
@@ -87,6 +99,9 @@ public class TComplainDealController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TComplainDeal tComplainDeal)
     {
+        if(tComplainDeal.getComplainStatus().equals("2")){
+            tComplainDeal.setDealTime(new Date());
+        }
         return toAjax(tComplainDealService.updateTComplainDeal(tComplainDeal));
     }
 
@@ -100,4 +115,12 @@ public class TComplainDealController extends BaseController
     {
         return toAjax(tComplainDealService.deleteTComplainDealByIds(complainDealIds));
     }
+
+
+    @GetMapping("/getuserList/{enterproseId}")
+    public AjaxResult selectUserByenterproseId(@PathVariable("enterproseId") String enterproseId)
+    {
+        return AjaxResult.success(tComplainDealService.selectUserByenterproseId(enterproseId));
+    }
+
 }

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java

@@ -3,6 +3,7 @@ package com.zehong.web.controller.supervise;
 import java.util.List;
 
 import com.zehong.system.domain.Listaw;
+import com.zehong.system.domain.TDetailInfoList;
 import com.zehong.system.domain.TDeviceInfoS;
 import com.zehong.system.service.ITEmployedPeopleInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -80,7 +81,7 @@ public class TDeviceInfoController extends BaseController
         tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
         if (!"null".equals(listaw.gettDeviceInfoS())){
             //将关联设备信息与设备进行绑定
-            tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId());
+            tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId(),listaw.gettDeviceInfo().getRelationDeviceType());
         }
         TDeviceInfo tDeviceInfo = new TDeviceInfo();
         //根据企业id查询企业名称
@@ -173,12 +174,12 @@ public class TDeviceInfoController extends BaseController
 
     /**
      * 查询设备已经关联的关联设备接口
-     * @param id
+     * @param tDetailInfoList
      * @return
      */
     @RequestMapping("/selectDetailInfoList")
-    public TableDataInfo selectDetailInfoList(@RequestBody  int id){
-        List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoService.selectDetailInfoList(id);
+    public TableDataInfo selectDetailInfoList(@RequestBody TDetailInfoList tDetailInfoList){
+        List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoService.selectDetailInfoList(tDetailInfoList.getId(),tDetailInfoList.getRelationDeviceType());
         return getDataTable(tDeviceInfoS);
     }
 
@@ -188,9 +189,15 @@ public class TDeviceInfoController extends BaseController
      */
     @RequestMapping("/updateDetailInfoList")
     public void updateDetailInfoList(@RequestBody Listaw listaw){
+        Long id;
+        if (null!=listaw.gettDeviceInfo().getDeviceId()){
+            id=listaw.gettDeviceInfo().getDeviceId();
+        }else {
+            id=listaw.gettDeviceInfo().getSiteStationId();
+        }
         if (!"null".equals(listaw.gettDeviceInfoS())){
             //将关联设备信息与设备进行绑定
-            tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId());
+            tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),id,listaw.gettDeviceInfo().getRelationDeviceType());
         }
     }
 

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TSiteStationInfoController.java

 package com.zehong.web.controller.supervise;
 import java.util.List;
+
+import com.zehong.system.domain.TTSiteStationInfoList;
+import com.zehong.system.service.ITDeviceInfoService;
 import com.zehong.system.service.ITEmployedPeopleInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +38,9 @@ public class TSiteStationInfoController extends BaseController {
     @Autowired
     private ITEmployedPeopleInfoService tEmployedPeopleInfoService;
 
+    @Autowired
+    private ITDeviceInfoService tDeviceInfoService;
+
     /**
      * 查询场站信息列表
      */
@@ -76,12 +82,16 @@ public class TSiteStationInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('supervise:station:add')")
     @Log(title = "场站信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TSiteStationInfo tSiteStationInfo)
+    public void add(@RequestBody TTSiteStationInfoList tSiteStationInfos)
     {
         //根据企业id查询企业名称
-        String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tSiteStationInfo.getBeyondEnterpriseId());
-        tSiteStationInfo.setBeyondEnterpriseName(EnterpriseName);
-        return toAjax(tSiteStationInfoService.insertTSiteStationInfo(tSiteStationInfo));
+        String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tSiteStationInfos.gettDeviceInfo().getBeyondEnterpriseId());
+        tSiteStationInfos.gettDeviceInfo().setBeyondEnterpriseName(EnterpriseName);
+        tSiteStationInfoService.insertTSiteStationInfo(tSiteStationInfos.gettDeviceInfo());
+        if (!"null".equals(tSiteStationInfos.gettDeviceInfoS())){
+            //将关联设备信息与设备进行绑定
+            tDeviceInfoService.updatetRelationDeviceDetailInfo(tSiteStationInfos.gettDeviceInfoS(),tSiteStationInfos.gettDeviceInfo().getSiteStationId(),tSiteStationInfos.gettDeviceInfo().getRelationDeviceType());
+        }
     }
 
     /**

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

 package com.zehong.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 投诉处置对象 t_complain_deal
  * 
@@ -34,8 +37,11 @@ public class TComplainDeal extends BaseEntity
     @Excel(name = "转办记录")
     private String transferRecord;
 
+    @Excel(name = "反馈事件")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dealTime;
     /** 办理情况 */
-    @Excel(name = "办理情况")
+    @Excel(name = "办理反馈情况")
     private String dealCondition;
 
     /** 指派单位名称 */
@@ -47,12 +53,12 @@ public class TComplainDeal extends BaseEntity
     private Long complainAssignEnterproseId;
 
     /** 指派人 */
-    @Excel(name = "指派人")
-    private String complainAssignManId;
+    @Excel(name = "指派人id")
+    private Long complainAssignManId;
 
     /** 指派人id */
-    @Excel(name = "指派人id")
-    private Long complainAssignMan;
+    @Excel(name = "指派人")
+    private String complainAssignMan;
 
     /** 任务状态：1.派发中 2.反馈 3.归档 */
     @Excel(name = "任务状态：1.派发中 2.反馈 3.归档")
@@ -138,21 +144,21 @@ public class TComplainDeal extends BaseEntity
     {
         return complainAssignEnterproseId;
     }
-    public void setComplainAssignManId(String complainAssignManId) 
+    public void setComplainAssignManId(Long complainAssignManId)
     {
         this.complainAssignManId = complainAssignManId;
     }
 
-    public String getComplainAssignManId() 
+    public Long getComplainAssignManId()
     {
         return complainAssignManId;
     }
-    public void setComplainAssignMan(Long complainAssignMan) 
+    public void setComplainAssignMan(String complainAssignMan)
     {
         this.complainAssignMan = complainAssignMan;
     }
 
-    public Long getComplainAssignMan() 
+    public String getComplainAssignMan()
     {
         return complainAssignMan;
     }
@@ -184,6 +190,14 @@ public class TComplainDeal extends BaseEntity
         return remarks;
     }
 
+    public Date getDealTime() {
+        return dealTime;
+    }
+
+    public void setDealTime(Date dealTime) {
+        this.dealTime = dealTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDetailInfoList.java

+package com.zehong.system.domain;
+
+public class TDetailInfoList {
+
+    private int id;
+
+    private String relationDeviceType;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getRelationDeviceType() {
+        return relationDeviceType;
+    }
+
+    public void setRelationDeviceType(String relationDeviceType) {
+        this.relationDeviceType = relationDeviceType;
+    }
+
+    @Override
+    public String toString() {
+        return "TDetailInfoList{" +
+                "id=" + id +
+                ", relationDeviceType='" + relationDeviceType + '\'' +
+                '}';
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java

@@ -21,6 +21,9 @@ public class TDeviceInfo extends BaseEntity
     /** 设备id */
     private Long deviceId;
 
+    /** 场站id*/
+    private Long siteStationId;
+
     /** 设备名称 */
     @Excel(name = "设备名称")
     private String deviceName;
@@ -81,6 +84,26 @@ public class TDeviceInfo extends BaseEntity
     /** 备注 */
     private String remarks;
 
+    /** 关联设备类型  1设备  2场站*/
+    private String relationDeviceType;
+
+
+    public Long getSiteStationId() {
+        return siteStationId;
+    }
+
+    public void setSiteStationId(Long siteStationId) {
+        this.siteStationId = siteStationId;
+    }
+
+    public String getRelationDeviceType() {
+        return relationDeviceType;
+    }
+
+    public void setRelationDeviceType(String relationDeviceType) {
+        this.relationDeviceType = relationDeviceType;
+    }
+
     public void setDeviceId(Long deviceId)
     {
         this.deviceId = deviceId;
@@ -240,28 +263,26 @@ public class TDeviceInfo extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deviceId", getDeviceId())
-            .append("deviceName", getDeviceName())
-            .append("deviceCode", getDeviceCode())
-            .append("deviceAddr", getDeviceAddr())
-            .append("deviceModel", getDeviceModel())
-            .append("deviceType", getDeviceType())
-            .append("beyondEnterpriseId", getBeyondEnterpriseId())
-            .append("beyondEnterpriseName", getBeyondEnterpriseName())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .append("iconUrl", getIconUrl())
-            .append("linkman", getLinkman())
-            .append("phone", getPhone())
-            .append("installationTime", getInstallationTime())
-            .append("inspectionTime", getInspectionTime())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isDel", getIsDel())
-            .append("remarks", getRemarks())
-            .toString();
+        return "TDeviceInfo{" +
+                "deviceId=" + deviceId +
+                ", siteStationId=" + siteStationId +
+                ", deviceName='" + deviceName + '\'' +
+                ", deviceCode='" + deviceCode + '\'' +
+                ", deviceAddr='" + deviceAddr + '\'' +
+                ", deviceModel='" + deviceModel + '\'' +
+                ", deviceType='" + deviceType + '\'' +
+                ", beyondEnterpriseId=" + beyondEnterpriseId +
+                ", beyondEnterpriseName='" + beyondEnterpriseName + '\'' +
+                ", longitude='" + longitude + '\'' +
+                ", latitude='" + latitude + '\'' +
+                ", iconUrl='" + iconUrl + '\'' +
+                ", linkman='" + linkman + '\'' +
+                ", phone='" + phone + '\'' +
+                ", installationTime=" + installationTime +
+                ", inspectionTime=" + inspectionTime +
+                ", isDel='" + isDel + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", relationDeviceType='" + relationDeviceType + '\'' +
+                '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSiteStationInfo.java

@@ -57,6 +57,21 @@ public class TSiteStationInfo extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 关联设备类型  1设备  2场站*/
+    private String relationDeviceType;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getRelationDeviceType() {
+        return relationDeviceType;
+    }
+
+    public void setRelationDeviceType(String relationDeviceType) {
+        this.relationDeviceType = relationDeviceType;
+    }
+
     public void setSiteStationId(Long siteStationId)
     {
         this.siteStationId = siteStationId;
@@ -159,22 +174,19 @@ public class TSiteStationInfo extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("siteStationId", getSiteStationId())
-            .append("siteStationType", getSiteStationType())
-            .append("siteStationName", getSiteStationName())
-            .append("buildDate", getBuildDate())
-            .append("buildUnit", getBuildUnit())
-            .append("beyondEnterpriseId", getBeyondEnterpriseId())
-            .append("beyondEnterpriseName", getBeyondEnterpriseName())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isDel", getIsDel())
-            .append("remarks", getRemarks())
-            .toString();
+        return "TSiteStationInfo{" +
+                "siteStationId=" + siteStationId +
+                ", siteStationType='" + siteStationType + '\'' +
+                ", siteStationName='" + siteStationName + '\'' +
+                ", buildDate='" + buildDate + '\'' +
+                ", buildUnit='" + buildUnit + '\'' +
+                ", beyondEnterpriseId=" + beyondEnterpriseId +
+                ", beyondEnterpriseName='" + beyondEnterpriseName + '\'' +
+                ", longitude=" + longitude +
+                ", latitude=" + latitude +
+                ", isDel='" + isDel + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", relationDeviceType='" + relationDeviceType + '\'' +
+                '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTSiteStationInfoList.java

+package com.zehong.system.domain;
+
+import java.util.List;
+
+public class TTSiteStationInfoList {
+
+    private TSiteStationInfo tDeviceInfo;
+
+    private List<TDeviceInfoS> tDeviceInfoS;
+
+    public TSiteStationInfo gettDeviceInfo() {
+        return tDeviceInfo;
+    }
+
+    public void settDeviceInfo(TSiteStationInfo tDeviceInfo) {
+        this.tDeviceInfo = tDeviceInfo;
+    }
+
+    public List<TDeviceInfoS> gettDeviceInfoS() {
+        return tDeviceInfoS;
+    }
+
+    public void settDeviceInfoS(List<TDeviceInfoS> tDeviceInfoS) {
+        this.tDeviceInfoS = tDeviceInfoS;
+    }
+
+    @Override
+    public String toString() {
+        return "TTSiteStationInfoList{" +
+                "tDeviceInfo=" + tDeviceInfo +
+                ", tDeviceInfoS=" + tDeviceInfoS +
+                '}';
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TComplainDealMapper.java

 package com.zehong.system.mapper;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 import com.zehong.system.domain.TComplainDeal;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 投诉处置Mapper接口
@@ -58,4 +62,11 @@ public interface TComplainDealMapper
      * @return 结果
      */
     public int deleteTComplainDealByIds(Long[] complainDealIds);
+
+    /**
+     * 查询公司下用户
+     * @param enterproseId
+     * @return
+     */
+    public List<Map<String,Object>> selectUserByenterproseId(@Param("enterproseId")String enterproseId);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDeviceInfoMapper.java

@@ -96,14 +96,14 @@ public interface TDeviceInfoMapper
      * 将关联设备信息与设备进行绑定
      * @param gettDeviceInfoS
      */
-    void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
+    void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id,@Param("relationDevicetype") String relationDevicetype);
 
     /**
      * 查询设备已经关联的关联设备
      * @param id
      * @return
      */
-    List<TDeviceInfoS> selectDetailInfoList(int id);
+    List<TDeviceInfoS> selectDetailInfoList(@Param("id")int id,@Param("relationDeviceType")String relationDeviceType);
 
     /**
      * 解绑 设备与关联设备关系

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITComplainDealService.java

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TComplainDeal;
 
 /**
@@ -58,4 +60,6 @@ public interface ITComplainDealService
      * @return 结果
      */
     public int deleteTComplainDealById(Long complainDealId);
+
+    public List<Map<String,Object>> selectUserByenterproseId(String enterproseId);
 }

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

@@ -96,14 +96,14 @@ public interface ITDeviceInfoService
      * 将关联设备信息与设备进行绑定
      * @param gettDeviceInfoS
      */
-    void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
+    void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id,@Param("relationDevicetype") String relationDevicetype);
 
     /**
      * 查询设备已经关联的关联设备
      * @param id
      * @return
      */
-    List<TDeviceInfoS> selectDetailInfoList(int id);
+    List<TDeviceInfoS> selectDetailInfoList(@Param("id") int id,@Param("relationDeviceType")String relationDeviceType);
 
     /**
      * 解绑 设备与关联设备关系

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TComplainDealServiceImpl.java

 package com.zehong.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -93,4 +95,8 @@ public class TComplainDealServiceImpl implements ITComplainDealService
     {
         return tComplainDealMapper.deleteTComplainDealById(complainDealId);
     }
+    @Override
+    public  List<Map<String,Object>> selectUserByenterproseId(String enterproseId){
+        return tComplainDealMapper.selectUserByenterproseId(enterproseId);
+    }
 }

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

@@ -149,8 +149,8 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
      * @param gettDeviceInfoS
      */
     @Override
-    public void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id) {
-        tDeviceInfoMapper.updatetRelationDeviceDetailInfo(gettDeviceInfoS,id);
+    public void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id,@Param("relationDevicetype") String relationDevicetype) {
+        tDeviceInfoMapper.updatetRelationDeviceDetailInfo(gettDeviceInfoS,id,relationDevicetype);
     }
 
     /**
@@ -159,8 +159,8 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
      * @return
      */
     @Override
-    public List<TDeviceInfoS> selectDetailInfoList(int id) {
-        List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoMapper.selectDetailInfoList(id);
+    public List<TDeviceInfoS> selectDetailInfoList(@Param("id") int id,@Param("relationDeviceType")String relationDeviceType) {
+        List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoMapper.selectDetailInfoList(id,relationDeviceType);
         return tDeviceInfoS;
     }
 

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

 package com.zehong.system.service.impl;
 
-import java.util.List;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.TWorkOrderMapper;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.TEnterpriseInfo;
 import com.zehong.system.domain.TWorkOrder;
+import com.zehong.system.mapper.TEnterpriseInfoMapper;
+import com.zehong.system.mapper.TWorkOrderMapper;
 import com.zehong.system.service.ITWorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 燃气任务Service业务层处理
@@ -21,6 +25,9 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     @Autowired
     private TWorkOrderMapper tWorkOrderMapper;
 
+    @Autowired
+    private TEnterpriseInfoMapper tEnterpriseInfoMapper;
+
     /**
      * 查询燃气任务
      * 
@@ -56,6 +63,21 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     {
         tWorkOrder.setCreateTime(DateUtils.getNowDate());
         tWorkOrder.setCreateBy(SecurityUtils.getUsername());
+        Long enterpriseId = SecurityUtils.getLoginUser().getUser().getDeptId();
+        if(null != enterpriseId){
+            if("-2".equals(enterpriseId.toString())){
+                tWorkOrder.setWorkCreateEnterpriseId("-2");
+                tWorkOrder.setWorkCreateEnterpriseName("政府部门");
+            }else{
+
+                TEnterpriseInfo enterpriseInfo = tEnterpriseInfoMapper.selectTEnterpriseInfoById(enterpriseId);
+                if(null != enterpriseInfo && StringUtils.isNotEmpty(enterpriseInfo.getEnterpriseName())){
+                    tWorkOrder.setWorkCreateEnterpriseId(enterpriseId.toString());
+                    tWorkOrder.setWorkCreateEnterpriseName(enterpriseInfo.getEnterpriseName());
+                }
+
+            }
+        }
         return tWorkOrderMapper.insertTWorkOrder(tWorkOrder);
     }
 
@@ -70,6 +92,9 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     {
         tWorkOrder.setUpdateTime(DateUtils.getNowDate());
         tWorkOrder.setUpdateBy(SecurityUtils.getUsername());
+        /*if(StringUtils.isNotEmpty(tWorkOrder.getIconUrl()) || StringUtils.isNotEmpty(tWorkOrder.getRectificationResult())){
+            tWorkOrder.setWorkStatus("2");
+        }*/
         return tWorkOrderMapper.updateTWorkOrder(tWorkOrder);
     }
 

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="complainPhone"    column="complain_phone"    />
         <result property="complainMatter"    column="complain_matter"    />
         <result property="transferRecord"    column="transfer_record"    />
+        <result property="dealTime"    column="deal_time"    />
         <result property="dealCondition"    column="deal_condition"    />
         <result property="complainAssignEnterproseName"    column="complain_assign_enterprose_name"    />
         <result property="complainAssignEnterproseId"    column="complain_assign_enterprose_id"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTComplainDealVo">
-        select complain_deal_id, complain_name, complain_phone, complain_matter, transfer_record, deal_condition, complain_assign_enterprose_name, complain_assign_enterprose_id, complain_assign_man_id, complain_assign_man, complain_status, create_by, create_time, update_by, update_time, is_del, remarks from t_complain_deal
+        select complain_deal_id, complain_name, complain_phone, complain_matter, transfer_record, deal_time,deal_condition, complain_assign_enterprose_name, complain_assign_enterprose_id, complain_assign_man_id, complain_assign_man, complain_status, create_by, create_time, update_by, update_time, is_del, remarks from t_complain_deal
     </sql>
 
     <select id="selectTComplainDealList" parameterType="TComplainDeal" resultMap="TComplainDealResult">
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainPhone != null">complain_phone,</if>
             <if test="complainMatter != null">complain_matter,</if>
             <if test="transferRecord != null">transfer_record,</if>
+            <if test="dealTime !=null">deal_time,</if>
             <if test="dealCondition != null">deal_condition,</if>
             <if test="complainAssignEnterproseName != null">complain_assign_enterprose_name,</if>
             <if test="complainAssignEnterproseId != null">complain_assign_enterprose_id,</if>
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainPhone != null">#{complainPhone},</if>
             <if test="complainMatter != null">#{complainMatter},</if>
             <if test="transferRecord != null">#{transferRecord},</if>
+            <if test="dealTime != null">#{dealTime},</if>
             <if test="dealCondition != null">#{dealCondition},</if>
             <if test="complainAssignEnterproseName != null">#{complainAssignEnterproseName},</if>
             <if test="complainAssignEnterproseId != null">#{complainAssignEnterproseId},</if>
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainPhone != null">complain_phone = #{complainPhone},</if>
             <if test="complainMatter != null">complain_matter = #{complainMatter},</if>
             <if test="transferRecord != null">transfer_record = #{transferRecord},</if>
+            <if test="dealTime != null">deal_time = #{dealTime},</if>
             <if test="dealCondition != null">deal_condition = #{dealCondition},</if>
             <if test="complainAssignEnterproseName != null">complain_assign_enterprose_name = #{complainAssignEnterproseName},</if>
             <if test="complainAssignEnterproseId != null">complain_assign_enterprose_id = #{complainAssignEnterproseId},</if>
@@ -124,4 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{complainDealId}
         </foreach>
     </delete>
+    <select id="selectUserByenterproseId" resultType="java.util.HashMap">
+        SELECT user_id as id ,nick_name as nickName FROM sys_user
+        WHERE del_flag!=2 and  dept_id = #{enterproseId}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--查询设备已经关联的关联设备-->
     <select id="selectDetailInfoList" resultMap="TDeviceInfoResultS">
         select relation_device_detail_id,relation_device_id,device_name,device_model,iot_no,remarks, (CASE  device_type WHEN '1' THEN '压力表' WHEN '2' THEN '流量计' end) as  device_type
-        from t_relation_device_detail_info  where relation_device_id=#{id}
+        from t_relation_device_detail_info  where relation_device_id=#{id} and relation_device_type=#{relationDeviceType}
     </select>
 
     <!--关联设备数据删除接口-->
@@ -195,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!--将关联设备信息与设备进行绑定-->
     <update id="updatetRelationDeviceDetailInfo" parameterType="java.util.List">
-        update t_relation_device_detail_info set relation_device_id = #{id}
+        update t_relation_device_detail_info set relation_device_id = #{id} ,relation_device_type =#{relationDevicetype}
         where
         relation_device_detail_id in
         <foreach collection="gettDeviceInfoS" item="items" index="key" open="(" separator="," close=")">
@@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!--解绑 设备与关联设备关系-->
     <update id="deleteDeviceDetailInfo">
-        update t_relation_device_detail_info set relation_device_id='0' where relation_device_detail_id=#{deviceId}
+        update t_relation_device_detail_info set relation_device_id=NULL where relation_device_detail_id=#{deviceId}
     </update>
 
 </mapper>

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

@@ -34,39 +34,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTWorkOrderVo">
-        select work_id, work_title, work_type, work_content, work_create_enterprise_name, work_create_enterprise_id, work_assign_enterprose_name, work_assign_enterprose_id, work_assign_man_id, work_assign_man, work_status, inspection_date, inspection_route, problem_description, icon_url, rectification_plan, rectification_result, responsible_unit, responsible_person, expiry_date, create_by, create_time, update_by, update_time, is_del, remarks from t_work_order
+        SELECT
+            workOrder.work_id,
+            workOrder.work_title,
+            workOrder.work_type,
+            workOrder.work_content,
+            workOrder.work_create_enterprise_name,
+            workOrder.work_create_enterprise_id,
+            info.enterprise_name AS work_assign_enterprose_name,
+            workOrder.work_assign_enterprose_id,
+            workOrder.work_assign_man_id,
+            usr.user_name AS work_assign_man,
+            workOrder.work_status,
+            workOrder.inspection_date,
+            workOrder.inspection_route,
+            workOrder.problem_description,
+            workOrder.icon_url,
+            workOrder.rectification_plan,
+            workOrder.rectification_result,
+            workOrder.responsible_unit,
+            workOrder.responsible_person,
+            workOrder.expiry_date,
+            workOrder.create_by,
+            workOrder.create_time,
+            workOrder.update_by,
+            workOrder.update_time,
+            workOrder.is_del,
+            workOrder.remarks
+        FROM
+            t_work_order workOrder
+        LEFT JOIN sys_user usr ON usr.user_id = workOrder.work_assign_man_id
+        LEFT JOIN t_enterprise_info info ON info.enterprise_id = workOrder.work_assign_enterprose_id
+
     </sql>
 
     <select id="selectTWorkOrderList" parameterType="TWorkOrder" resultMap="TWorkOrderResult">
         <include refid="selectTWorkOrderVo"/>
         <where>  
-            <if test="workTitle != null  and workTitle != ''"> and work_title like concat('%', #{workTitle}, '%')</if>
-            <if test="workType != null  and workType != ''"> and work_type = #{workType}</if>
-            <if test="workContent != null  and workContent != ''"> and work_content = #{workContent}</if>
-            <if test="workCreateEnterpriseName != null  and workCreateEnterpriseName != ''"> and work_create_enterprise_name like concat('%', #{workCreateEnterpriseName}, '%')</if>
-            <if test="workCreateEnterpriseId != null  and workCreateEnterpriseId != ''"> and work_create_enterprise_id = #{workCreateEnterpriseId}</if>
-            <if test="workAssignEnterproseName != null  and workAssignEnterproseName != ''"> and work_assign_enterprose_name like concat('%', #{workAssignEnterproseName}, '%')</if>
-            <if test="workAssignEnterproseId != null "> and work_assign_enterprose_id = #{workAssignEnterproseId}</if>
-            <if test="workAssignManId != null "> and work_assign_man_id = #{workAssignManId}</if>
-            <if test="workAssignMan != null  and workAssignMan != ''"> and work_assign_man = #{workAssignMan}</if>
-            <if test="workStatus != null  and workStatus != ''"> and work_status = #{workStatus}</if>
-            <if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
-            <if test="inspectionRoute != null  and inspectionRoute != ''"> and inspection_route = #{inspectionRoute}</if>
-            <if test="problemDescription != null  and problemDescription != ''"> and problem_description = #{problemDescription}</if>
-            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
-            <if test="rectificationPlan != null  and rectificationPlan != ''"> and rectification_plan = #{rectificationPlan}</if>
-            <if test="rectificationResult != null  and rectificationResult != ''"> and rectification_result = #{rectificationResult}</if>
-            <if test="responsibleUnit != null  and responsibleUnit != ''"> and responsible_unit = #{responsibleUnit}</if>
-            <if test="responsiblePerson != null  and responsiblePerson != ''"> and responsible_person = #{responsiblePerson}</if>
-            <if test="expiryDate != null "> and expiry_date = #{expiryDate}</if>
-            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="workTitle != null  and workTitle != ''"> and workOrder.work_title like concat('%', #{workTitle}, '%')</if>
+            <if test="workType != null  and workType != ''"> and workOrder.work_type = #{workType}</if>
+            <if test="workContent != null  and workContent != ''"> and workOrder.work_content = #{workContent}</if>
+            <if test="workCreateEnterpriseName != null  and workCreateEnterpriseName != ''"> and workOrder.work_create_enterprise_name like concat('%', #{workCreateEnterpriseName}, '%')</if>
+            <if test="workCreateEnterpriseId != null  and workCreateEnterpriseId != ''"> and workOrder.work_create_enterprise_id = #{workCreateEnterpriseId}</if>
+            <if test="workAssignEnterproseName != null  and workAssignEnterproseName != ''"> and info.work_assign_enterprose_name like concat('%', #{workAssignEnterproseName}, '%')</if>
+            <if test="workAssignEnterproseId != null "> and workOrder.work_assign_enterprose_id = #{workAssignEnterproseId}</if>
+            <if test="workAssignManId != null "> and workOrder.work_assign_man_id = #{workAssignManId}</if>
+            <if test="workAssignMan != null  and workAssignMan != ''"> and user.work_assign_man = #{workAssignMan}</if>
+            <if test="workStatus != null  and workStatus != ''"> and workOrder.work_status = #{workStatus}</if>
+            <if test="inspectionDate != null "> and workOrder.inspection_date = #{inspectionDate}</if>
+            <if test="inspectionRoute != null  and inspectionRoute != ''"> and workOrder.inspection_route = #{inspectionRoute}</if>
+            <if test="problemDescription != null  and problemDescription != ''"> and workOrder.problem_description = #{problemDescription}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and workOrder.icon_url = #{iconUrl}</if>
+            <if test="rectificationPlan != null  and rectificationPlan != ''"> and workOrder.rectification_plan = #{rectificationPlan}</if>
+            <if test="rectificationResult != null  and rectificationResult != ''"> and workOrder.rectification_result = #{rectificationResult}</if>
+            <if test="responsibleUnit != null  and responsibleUnit != ''"> and workOrder.responsible_unit = #{responsibleUnit}</if>
+            <if test="responsiblePerson != null  and responsiblePerson != ''"> and workOrder.responsible_person = #{responsiblePerson}</if>
+            <if test="expiryDate != null "> and workOrder.expiry_date = #{expiryDate}</if>
+            <if test="isDel != null  and isDel != ''"> and workOrder.is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and workOrder.remarks = #{remarks}</if>
         </where>
+        ORDER BY workOrder.create_time DESC
     </select>
     
     <select id="selectTWorkOrderById" parameterType="Long" resultMap="TWorkOrderResult">
         <include refid="selectTWorkOrderVo"/>
-        where work_id = #{workId}
+        where workOrder.work_id = #{workId}
     </select>
         
     <insert id="insertTWorkOrder" parameterType="TWorkOrder" useGeneratedKeys="true" keyProperty="workId">
@@ -137,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workCreateEnterpriseId != null">work_create_enterprise_id = #{workCreateEnterpriseId},</if>
             <if test="workAssignEnterproseName != null">work_assign_enterprose_name = #{workAssignEnterproseName},</if>
             <if test="workAssignEnterproseId != null">work_assign_enterprose_id = #{workAssignEnterproseId},</if>
+            <if test="workAssignManId == null and workAssignMan == ''">work_assign_man_id = null,</if>
             <if test="workAssignManId != null">work_assign_man_id = #{workAssignManId},</if>
             <if test="workAssignMan != null">work_assign_man = #{workAssignMan},</if>
             <if test="workStatus != null">work_status = #{workStatus},</if>

gassafetyprogress-web/package.json

 {
   "name": "zehong",
   "version": "3.5.0",
-  "description": "泽宏管理系统",
+  "description": "智慧管网管理系统",
   "author": "泽宏",
   "license": "MIT",
   "scripts": {

gassafetyprogress-web/src/api/complainDeal/complainDeal.js

@@ -51,3 +51,10 @@ export function exportComplainDeal(query) {
     params: query
   })
 }
+
+export function getUserList(cId) {
+  return request({
+    url: '/complainDeal/getuserList/' + cId,
+    method: 'get'
+  })
+}

gassafetyprogress-web/src/assets/styles/all.scss

@@ -56,6 +56,9 @@
 .el-dialog:not(.is-fullscreen) {
   margin-top: 6vh !important;
 }
+.el-dialog__header{
+  border-bottom:1px solid #cccccc;
+}
 .bigwindow {
   // 全局表格样式
   .el-table {

gassafetyprogress-web/src/components/GetPos/index.vue

@@ -28,7 +28,7 @@
 
       <div @click="pos" class="positionBtn pos">
         <el-button type="primary" size="mini" icon="el-icon-position"
-          >定位</el-button
+          > 确定 </el-button
         >
       </div>
     </template>
@@ -78,6 +78,7 @@ export default {
       if (newValue) {
         this.init();
       } else {
+
         this.map.destroy();
         this.searchinput="";
       }
@@ -101,10 +102,11 @@ export default {
             this.map.mouseAddMarker();
           }
         } else {
+          console.log(this.pipePath.length)
           if (this.pipePath.length > 0) {
             this.map.addPipeLine({ path: this.pipePath });
           } else {
-            this.mouseAddPipeline();
+            this.map.mouseAddPipeline();
           }
         }
       });
@@ -119,7 +121,6 @@ export default {
     pos() {
       this.path = this.map.getPath();
       this.$emit("getPath", this.path);
-      console.log(this.path);
       if (this.path?.length > 0) {
         this.$emit("update:dialogVisible", false);
       }

gassafetyprogress-web/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '泽宏管理系统',
+      title: '智慧管网管理系统',
       logo: logoImg
     }
   }

gassafetyprogress-web/src/main.js

 /*
  * @Author: your name
  * @Date: 2022-01-07 11:29:13
- * @LastEditTime: 2022-02-17 11:35:38
+ * @LastEditTime: 2022-02-18 17:29:27
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/main.js
  */
-import Vue from 'vue'
+import Vue from "vue";
 
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
 
-import Element from 'element-ui'
-import './assets/styles/element-variables.scss'
+import Element from "element-ui";
+import "./assets/styles/element-variables.scss";
 
-import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/zehong.scss' // zehong css
-import './assets/css/font.css'
-import './assets/styles/all.scss'
+import "@/assets/styles/index.scss"; // global css
+import "@/assets/styles/zehong.scss"; // zehong css
+import "./assets/css/font.css";
+import "./assets/styles/all.scss";
 
-import App from './App'
-import store from './store'
-import router from './router'
-import permission from './directive/permission'
-import * as echarts from 'echarts'
-import './assets/icons' // icon
-import './permission' // permission control
+import App from "./App";
+import store from "./store";
+import router from "./router";
+import permission from "./directive/permission";
+import * as echarts from "echarts";
+import "./assets/icons"; // icon
+import "./permission"; // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/zehong";
+import {
+  parseTime,
+  resetForm,
+  addDateRange,
+  selectDictLabel,
+  selectDictLabels,
+  download,
+  handleTree,
+} from "@/utils/zehong";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
-import RightToolbar from "@/components/RightToolbar"
-
+import RightToolbar from "@/components/RightToolbar";
 
 // 全局方法挂载
-Vue.prototype.$echarts = echarts
+Vue.prototype.$echarts = echarts;
 Vue.prototype.$Vue = Vue;
-Vue.prototype.getDicts = getDicts
-Vue.prototype.getConfigKey = getConfigKey
-Vue.prototype.parseTime = parseTime
-Vue.prototype.resetForm = resetForm
-Vue.prototype.addDateRange = addDateRange
-Vue.prototype.selectDictLabel = selectDictLabel
-Vue.prototype.selectDictLabels = selectDictLabels
-Vue.prototype.download = download
-Vue.prototype.handleTree = handleTree
+Vue.prototype.getDicts = getDicts;
+Vue.prototype.getConfigKey = getConfigKey;
+Vue.prototype.parseTime = parseTime;
+Vue.prototype.resetForm = resetForm;
+Vue.prototype.addDateRange = addDateRange;
+Vue.prototype.selectDictLabel = selectDictLabel;
+Vue.prototype.selectDictLabels = selectDictLabels;
+Vue.prototype.download = download;
+Vue.prototype.handleTree = handleTree;
 
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
-}
+};
 
 Vue.prototype.msgError = function (msg) {
   this.$message({ showClose: true, message: msg, type: "error" });
-}
+};
 
 Vue.prototype.msgInfo = function (msg) {
   this.$message.info(msg);
-}
+};
 
 // 全局组件挂载
-Vue.component('Pagination', Pagination)
-Vue.component('RightToolbar', RightToolbar)
+Vue.component("Pagination", Pagination);
+Vue.component("RightToolbar", RightToolbar);
 
-Vue.use(permission)
+Vue.use(permission);
 
 /**
  * If you don't want to use mock-server
@@ -72,16 +79,19 @@ Vue.use(permission)
  * Currently MockJs will be used in the production environment,
  * please remove it before going online! ! !
  */
-
+// dialog只允许点关闭或者取消按钮关闭
+Element.Dialog.props.closeOnClickModal = false;
+Element.Dialog.props.closeOnPressEscape = false;
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
-})
+  size: Cookies.get("size") || "medium", // set element-ui default size
+});
+console.log(Element);
 
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
 
 new Vue({
-  el: '#app',
+  el: "#app",
   router,
   store,
-  render: h => h(App)
-})
+  render: (h) => h(App),
+});

gassafetyprogress-web/src/settings.js

 module.exports = {
-  title: '泽宏管理系统',
+  title: '智慧管网管理系统',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

gassafetyprogress-web/src/views/regulation/device/index.vue

@@ -19,15 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="所在地址" prop="deviceAddr">
-        <el-input
-          v-model="queryParams.deviceAddr"
-          placeholder="请输入所在地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="所在地址" prop="deviceAddr">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deviceAddr"-->
+<!--          placeholder="请输入所在地址"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -124,7 +124,7 @@
     />
 
     <!--选择关联设备弹出框-->
-   <el-dialog title="选择关联设备"  :visible.sync="dialogTableVisible"   formLabelWidth="160px">
+   <el-dialog title="选择关联设备"  width="1100px"  :visible.sync="dialogTableVisible"   formLabelWidth="160px">
     <template>
       <el-form :model="dateQueryParams" ref="queryForm" :inline="true" v-show="showSearch" >
         <el-form-item label="设备名称" prop="deviceName">
@@ -282,7 +282,6 @@
     </el-dialog>
 
 
-
     <!-- 添加或修改设备信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -334,20 +333,37 @@
           </el-col>
         </el-row>
 
+<!--        <el-row>-->
+<!--        <el-col :span="11">-->
+<!--        <el-form-item label="经度" prop="longitude">-->
+<!--          <el-input  v-model="form.longitude" placeholder="请输入经度" />-->
+<!--        </el-form-item>-->
+<!--        </el-col>-->
+
+<!--        <el-col :span="11">-->
+<!--        <el-form-item label="纬度" prop="latitude">-->
+<!--          <el-input  v-model="form.latitude" placeholder="请输入纬度" />-->
+<!--        </el-form-item>-->
+<!--        </el-col>-->
+<!--        </el-row>-->
+
         <el-row>
-        <el-col :span="11">
-        <el-form-item label="经度" prop="longitude">
+          <el-col :span="23">
+            <el-form-item label="经纬度坐标" prop="longitude">
+              <el-col :span="9">
                 <el-input v-model="form.longitude" placeholder="请输入经度" />
-        </el-form-item>
               </el-col>
-
-        <el-col :span="11">
-        <el-form-item label="纬度" prop="latitude">
-          <el-input  v-model="form.latitude" placeholder="请输入纬度" />
+              <el-col :span="9" style="margin-left: 10px">
+                <el-input v-model="form.latitude" placeholder="请输入纬度"/>
+              </el-col>
+              <el-col :span="3" style="margin-left: 30px">
+                <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
+              </el-col>
             </el-form-item>
           </el-col>
         </el-row>
 
+
         <el-row>
         <el-col :span="22">
         <el-form-item label="设备图片路径" prop="iconUrl">
@@ -428,16 +444,25 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <GetPos
+      :dialogVisible.sync="dialogTableVisibles"
+      device=""
+      :devicePos="devicePos"
+      @close="dialogcancelFun"
+      @getPath="getPath"
+    />
   </div>
 </template>
 
 
 <script>
 import { listDevice, getDevice, delDevice, addDevice, updateDevice, exportDevice, selectTEnterprise,getDdeviceDetailInfo,addDetailInfos,deleteDetailInfo,deleteeListDetailInfo,selectDetailInfoList,deleteDeviceDetailInfo,updateDetailInfoLists} from "@/api/regulation/device";
-
+import GetPos from '@/components/GetPos';
+import { EditorMap } from "@/utils/mapClass/getPath.js";
 export default {
   name: "Device",
   components: {
+    GetPos
   },
   data() {
     return {
@@ -451,6 +476,10 @@ export default {
       multipleSelection: [],
       dialogTableVisible: false,
       dialogFormVisible: false,
+      /**--------------地图使用数据---------------*/
+      dialogTableVisibles: false,
+      devicePos: [],
+      /**--------------地图使用数据---------------*/
       form: {
         name: '',
         region: '',
@@ -459,7 +488,7 @@ export default {
         delivery: false,
         type: [],
         resource: '',
-        desc: ''
+        desc: '',
       },
       formLabelWidth: '120px',
       /*添加关联设备*/
@@ -566,9 +595,6 @@ export default {
         iotNo:[
           { required: true, message: "请输入联网编号", trigger: "blur" },
         ],
-        remarksn:[
-          { required: true, message: "请输入备注", trigger: "blur" },
-        ],
       },
     };
   },
@@ -627,7 +653,8 @@ export default {
         updateBy: null,
         updateTime: null,
         isDel: null,
-        remarks: null
+        remarks: null,
+        relationDeviceType:'1',
       };
       this.resetForm("form");
     },
@@ -695,9 +722,12 @@ export default {
         this.test = response.data;
       });
       const deviceId = row.deviceId || this.ids
-
+      var tDeviceInfon={
+        id:deviceId,
+        relationDeviceType:'1'
+      }
       //查询关联设备信息数据
-      selectDetailInfoList(deviceId).then(response => {
+      selectDetailInfoList(JSON.stringify(tDeviceInfon)).then(response => {
         this.DetailInfoList = response.rows;
         this.loadings = false;
       });
@@ -768,6 +798,7 @@ export default {
                 this.getList();
               });
               if ( this.datalist !=null){
+                this.form.relationDeviceType='1';
                 var tDeviceInfon={
                   tDeviceInfo:this.form,
                   tDeviceInfoS:this.datalist
@@ -779,11 +810,12 @@ export default {
                 });
               }
             } else {
-              alert("走的新增")
+
                 if (valid) {
                   //获取已经选中的下级设备id
                   const deviceIds =  this.ids;
                   // alert(deviceIds)
+                  this.form.relationDeviceType='1';
                   var tDeviceInfon={
                     tDeviceInfo:this.form,
                     tDeviceInfoS:this.datalist
@@ -878,13 +910,6 @@ export default {
       //获取已经选中的下级设备id
       const deviceIds =  this.ids;
       const li=this.datalist;
-      this.$confirm('是否确认添加关联设备信息?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-
-      }).then(() => {
         if (this.form.deviceId != null) {
           //修改
           this.DetailInfoList=this.DetailInfoList.concat(this.datalist)
@@ -905,7 +930,6 @@ export default {
           this.dialogTableVisible=false
           this.msgSuccess("添加成功");
         }
-      }).catch(() => {});
     },
     /**
      * 选择关联设备查询方法
@@ -920,6 +944,32 @@ export default {
         //打开选择关联设备弹出框
         this.dialogTableVisible = true
       });
+    },
+
+    /**
+     * 经纬度坐标方法
+     */
+    MapdialogFun() {
+      this.dialogTableVisibles = true;
+    },
+
+    /**
+     * 地图关闭方法
+     */
+    dialogcancelFun() {
+      this.dialogTableVisibles = false;
+    },
+
+    /**
+     * 经纬度 选择
+     * @param res
+     */
+    getPath(res){
+      console.log("res", res);
+      console.log(this.form.longitude, this.form.latitude);
+      //确认选择经纬度
+      this.form.longitude = res[0];
+      this.form.latitude = res[1];
     }
   }
 };

gassafetyprogress-web/src/views/regulation/gasuser/index.vue

@@ -148,16 +148,32 @@
           </el-col>
         </el-row>
 
+<!--        <el-row>-->
+<!--          <el-col :span="11">-->
+<!--        <el-form-item label="经度" prop="longitude">-->
+<!--          <el-input  v-model="form.longitude" placeholder="请输入经度" />-->
+<!--        </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="11">-->
+<!--        <el-form-item label="纬度" prop="latitude">-->
+<!--          <el-input  v-model="form.latitude" placeholder="请输入纬度" />-->
+<!--        </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
         <el-row>
-          <el-col :span="11">
-        <el-form-item label="经度" prop="longitude">
+          <el-col :span="23">
+            <el-form-item label="经纬度坐标" prop="longitude">
+              <el-col :span="9">
                 <el-input v-model="form.longitude" placeholder="请输入经度" />
-        </el-form-item>
               </el-col>
-
-          <el-col :span="11">
-        <el-form-item label="纬度" prop="latitude">
-          <el-input  v-model="form.latitude" placeholder="请输入纬度" />
+              <el-col :span="9" style="margin-left: 10px">
+                <el-input v-model="form.latitude" placeholder="请输入纬度"/>
+              </el-col>
+              <el-col :span="3" style="margin-left: 30px">
+                <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
+              </el-col>
             </el-form-item>
           </el-col>
         </el-row>
@@ -198,18 +214,31 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <GetPos
+      :dialogVisible.sync="dialogTableVisibles"
+      device=""
+      :devicePos="devicePos"
+      @close="dialogcancelFun"
+      @getPath="getPath"
+    />
   </div>
 </template>
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, exportUser } from "@/api/regulation/user";
-
+import GetPos from '@/components/GetPos';
 export default {
   name: "User",
   components: {
+    GetPos
   },
   data() {
     return {
+      /**--------------地图使用数据---------------*/
+      dialogTableVisibles: false,
+      devicePos: [],
+      /**--------------地图使用数据---------------*/
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -372,6 +401,27 @@ export default {
           this.download(response.msg);
           this.exportLoading = false;
         }).catch(() => {});
+    },
+    /**
+     * 经纬度坐标方法
+     */
+    MapdialogFun() {
+      this.dialogTableVisibles = true;
+    },
+    /**
+     * 地图关闭方法
+     */
+    dialogcancelFun() {
+      this.dialogTableVisibles = false;
+    },
+    /**
+     * 经纬度 选择
+     * @param res
+     */
+    getPath(res){
+      //确认选择经纬度
+      this.form.longitude = res[0];
+      this.form.latitude = res[1];
     }
   }
 };

gassafetyprogress-web/src/views/regulation/pipe/index.vue

 <template>
   <div class="app-container">
+    <GetPos
+      :dialogVisible.sync="dialogVisible"
+      device="pipe"
+      @close="dialogVisible=false"
+      @getPath="getPath"
+      :pipePath="this.coordinateslist"
+    />
+
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="管道长度" prop="pipeLength">
         <el-input
@@ -19,15 +27,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="压力" prop="pipePressure">
-        <el-input
-          v-model="queryParams.pipePressure"
-          placeholder="请输入压力"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="压力" prop="pipePressure">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.pipePressure"-->
+<!--          placeholder="请输入压力"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -92,7 +100,7 @@
       <el-table-column label="建设年代" align="center" prop="buildDate" />
       <el-table-column label="建设单位" align="center" prop="buildUnit" />
       <el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" />
-      <el-table-column label="坐标" align="center" prop="coordinates" />
+<!--      <el-table-column label="坐标" align="center" prop="coordinates" />-->
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -210,12 +218,18 @@
 
 
         <el-row>
-          <el-col :span="22">
+          <el-col :span="18">
         <el-form-item label="坐标" prop="coordinates">
           <el-input v-model="form.coordinates"   type="textarea" placeholder="请输入坐标" />
         </el-form-item>
           </el-col>
+          <el-col :span="3" style="margin-left: 30px">
+            <el-button type="primary" plain @click="MapdialogFun">选择坐标</el-button>
+          </el-col>
         </el-row>
+
+
+
         <el-row>
           <el-col :span="22">
         <el-form-item label="备注" prop="remarks">
@@ -236,13 +250,17 @@
 
 <script>
 import { listPipe, getPipe, delPipe, addPipe, updatePipe, exportPipe, selectTEnterprise} from "@/api/regulation/pipe";
-
+import GetPos from '@/components/GetPos';
 export default {
   name: "Pipe",
   components: {
+    GetPos
   },
   data() {
     return {
+      dialogVisible:false,
+      //地图管径回显数据
+      coordinateslist:null,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -283,6 +301,7 @@ export default {
         coordinates: null,
         isDel: null,
         remarks: null
+
       },
       // 表单参数
       form: {},
@@ -376,6 +395,7 @@ export default {
       selectTEnterprise().then(response => {
         this.test = response.data;
       });
+      this.coordinateslist+=JSON.parse(null);
       this.reset();
       this.open = true;
       this.title = "添加管道信息";
@@ -390,6 +410,10 @@ export default {
       const pipeId = row.pipeId || this.ids
       getPipe(pipeId).then(response => {
         this.form = response.data;
+        const text=this.form.coordinates
+        console.log(text)
+        this.coordinateslist=JSON.parse(text);
+
         this.open = true;
         this.title = "修改管道信息";
       });
@@ -442,6 +466,27 @@ export default {
           this.download(response.msg);
           this.exportLoading = false;
         }).catch(() => {});
+    },
+    /**管道信息 选择管道提交数据方法*/
+    getPath(e){
+      // for (let i=0;i<e.length;i++){
+      //   console.log(e[i])
+      //   coordinates.push(e[i])
+      // }
+      var a = '['
+      for (var i in e) {
+        if (i == e.length - 1) {
+          a += '[' + e[i].toString()+']'
+        } else {
+          a += '[' + e[i].toString()+'],'
+        }
+      }
+      a += ']'
+     this.form.coordinates=a;
+    },
+    /** 管道打开方法*/
+    MapdialogFun(){
+      this.dialogVisible=true;
     }
   }
 };

gassafetyprogress-web/src/views/regulation/supervise/index.vue

@@ -19,15 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="备注" prop="remarks">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remarks"-->
+<!--          placeholder="请输入备注"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

gassafetyprogress-web/src/views/system/eventInfo/index.vue

@@ -66,28 +66,6 @@
           v-hasPermi="['system:eventInfo:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:eventInfo:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:eventInfo:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -103,7 +81,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="eventInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!--<el-table-column type="selection" width="55" align="center" />-->
       <!--<el-table-column label="事件id" align="center" prop="eventId" />-->
       <el-table-column label="事件名称" align="center" prop="eventTitle" />
       <el-table-column label="所属企业" align="center" prop="beyondEnterpriseName" />
@@ -116,9 +94,21 @@
         </template>
       </el-table-column>
       <el-table-column label="报案人" align="center" prop="reportPerson" />
-      <el-table-column label="事件处置信息" align="center" prop="eventDeal" />
-      <el-table-column label="事件评估信息" align="center" prop="eventAssessment" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="附件" align="center" prop="iconUrl" width="150px">
+        <template slot-scope="scope">
+          <span
+            class="dbtn"
+            @click="checkFile(scope.row.iconUrl)"
+            v-if="scope.row.iconUrl != null && scope.row.iconUrl!=''"
+          >
+            <i class="el-icon el-icon-view"></i>查看/下载
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="事件处置信息" align="center" prop="eventDeal" />-->
+      <!--<el-table-column label="事件评估信息" align="center" prop="eventAssessment" />-->
+      <!--<el-table-column label="备注" align="center" prop="remarks" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -134,7 +124,6 @@
             icon="el-icon-document-copy"
             @click="handleDtail(scope.row)"
           >详情</el-button>
-          <el-button
           <el-button
             size="mini"
             type="text"
@@ -216,10 +205,10 @@
               </el-form-item>
             </div>
           </div>
-          <el-form-item label="事件处置信息" prop="eventDeal" style="width: 60%">
+          <el-form-item label="事件处置信息" prop="eventDeal" style="width: 95%">
             <el-input v-model="form.eventDeal" type="textarea" placeholder="请输入事件处置信息" :disabled="readonly"/>
           </el-form-item>
-          <el-form-item label="事件评估信息" prop="eventAssessment" style="width: 60%">
+          <el-form-item label="事件评估信息" prop="eventAssessment" style="width: 95%">
             <el-input v-model="form.eventAssessment" type="textarea" placeholder="请输入事件评估信息" :disabled="readonly"/>
           </el-form-item>
           <el-form-item label="事件附件" prop="iconUrl" :style="display" >
@@ -237,7 +226,7 @@
               <span
                 class="dbtn"
                 @click="checkFile(form.iconUrl)"
-              v-if="form.iconUrl != ''"
+                v-if="form.iconUrl!=null && form.iconUrl != ''"
               >
                 <i class="el-icon el-icon-view"></i>查看/下载
               </span>
@@ -382,7 +371,7 @@ export default {
       let obj = {};
       obj = this.enterpriseList.find((item)=>{
         return item.enterpriseId === value;
-    });
+    ``});
       this.form.beyondEnterpriseName = obj.enterpriseName;
       this.form.beyondEnterpriseId = value;
     },

gassafetyprogress-web/src/views/system/planInfo/index.vue

@@ -57,28 +57,28 @@
           v-hasPermi="['system:planInfo:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:planInfo:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:planInfo:remove']"
-        >删除</el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="success"-->
+          <!--plain-->
+          <!--icon="el-icon-edit"-->
+          <!--size="mini"-->
+          <!--:disabled="single"-->
+          <!--@click="handleUpdate"-->
+          <!--v-hasPermi="['system:planInfo:edit']"-->
+        <!--&gt;修改</el-button>-->
+      <!--</el-col>-->
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="danger"-->
+          <!--plain-->
+          <!--icon="el-icon-delete"-->
+          <!--size="mini"-->
+          <!--:disabled="multiple"-->
+          <!--@click="handleDelete"-->
+          <!--v-hasPermi="['system:planInfo:remove']"-->
+        <!--&gt;删除</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -94,7 +94,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="planInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!--<el-table-column type="selection" width="25" align="center" />-->
       <!--<el-table-column label="预案id" align="center" prop="planId" />-->
       <el-table-column label="预案标题" align="center" prop="planTitle" />
       <el-table-column label="所属企业名称" align="center" prop="beyondEnterpriseName" />
@@ -102,12 +102,12 @@
       <el-table-column label="预案等级" align="center" prop="planLevel"  :formatter="planLevelFormat"/>
       <!--<el-table-column label="应急方案" align="center" prop="planContents" />-->
       <el-table-column label="应急设备及车辆" align="center" prop="planEquipment" />
-      <el-table-column label="方案附件" align="center" prop="dealPlanUrl" width="150px">
+      <el-table-column label="方案附件" align="center" prop="iconUrl" width="150px">
         <template slot-scope="scope">
           <span
             class="dbtn"
             @click="checkFile(scope.row.iconUrl)"
-            v-if="scope.row.iconUrl != ''"
+            v-if="scope.row.iconUrl != null && scope.row.iconUrl!=''"
           >
             <i class="el-icon el-icon-view"></i>查看/下载
           </span>
@@ -216,7 +216,7 @@
               <span
                 class="dbtn"
                 @click="checkFile(form.iconUrl)"
-                v-if="form.iconUrl != ''"
+                v-if="form.iconUrl!=null && form.iconUrl != ''"
               >
                 <i class="el-icon el-icon-view"></i>查看/下载
               </span>
@@ -346,7 +346,6 @@ export default {
       });
     },
     qiyechang(value){
-      console.log(value)
       let obj = {};
        obj = this.enterpriseList.find((item)=>{
              return item.enterpriseId === value;
@@ -475,11 +474,8 @@ export default {
         this.title = "修改应急预案";
         if(this.form.iconUrl!=null||this.form.iconUrl==""){
           this.fileList = [{name: 'file', url:uploadfile}];
-          this.$nextTick(()=>{
-            document.getElementsByClassName("el-upload--picture-card")[0].style.display="none"
-          document.getElementById("yesbutton").style.display="" ;
-        })
         }
+        document.getElementById("yesbutton").style.display="" ;
         document.getElementById("fujian").style.display=""
         document.getElementById("fujianxia").style.display="none"
       });

gassafetyprogress-web/vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '泽宏管理系统' // 标题
+const name = defaultSettings.title || '智慧管网管理系统' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://222.223.203.154:8092/gassafety`,
+        target: `http://localhost:8903/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''