Skip to content

G
gassafety-progress
Commit 5d31c50c authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

parents 16ea099e 6ac94b3a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2221 additions and 470 deletions
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java 0 → 100644
View file @ 5d31c50c
package com.zehong.web.controller.complainDeal;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TComplainDeal;
import com.zehong.system.service.ITComplainDealService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 投诉处置Controller
*
* @author zehong
* @date 2022-02-15
*/
@RestController
@RequestMapping("/complainDeal")
public class TComplainDealController extends BaseController
{
@Autowired
private ITComplainDealService tComplainDealService;
/**
* 查询投诉处置列表
*/
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:list')")
@GetMapping("/list")
public TableDataInfo list(TComplainDeal tComplainDeal)
{
startPage();
List<TComplainDeal> list = tComplainDealService.selectTComplainDealList(tComplainDeal);
return getDataTable(list);
}
/**
* 导出投诉处置列表
*/
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:export')")
@Log(title = "投诉处置", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TComplainDeal tComplainDeal)
{
List<TComplainDeal> list = tComplainDealService.selectTComplainDealList(tComplainDeal);
ExcelUtil<TComplainDeal> util = new ExcelUtil<TComplainDeal>(TComplainDeal.class);
return util.exportExcel(list, "投诉处置数据");
}
/**
* 获取投诉处置详细信息
*/
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:query')")
@GetMapping(value = "/{complainDealId}")
public AjaxResult getInfo(@PathVariable("complainDealId") Long complainDealId)
{
return AjaxResult.success(tComplainDealService.selectTComplainDealById(complainDealId));
}
/**
* 新增投诉处置
*/
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:add')")
@Log(title = "投诉处置", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TComplainDeal tComplainDeal)
{
return toAjax(tComplainDealService.insertTComplainDeal(tComplainDeal));
}
/**
* 修改投诉处置
*/
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:edit')")
@Log(title = "投诉处置", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TComplainDeal tComplainDeal)
{
return toAjax(tComplainDealService.updateTComplainDeal(tComplainDeal));
}
/**
* 删除投诉处置
*/
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:remove')")
@Log(title = "投诉处置", businessType = BusinessType.DELETE)
@DeleteMapping("/{complainDealIds}")
public AjaxResult remove(@PathVariable Long[] complainDealIds)
{
return toAjax(tComplainDealService.deleteTComplainDealByIds(complainDealIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java
View file @ 5d31c50c
......@@ -78,10 +78,14 @@ public class TDeviceInfoController extends BaseController
{
//添加设备信息表数据 并且返回新增id
tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
// TDeviceInfo tDeviceInfo = new TDeviceInfo();
// //根据企业id查询企业名称
// String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tDeviceInfo.getBeyondEnterpriseId());
// tDeviceInfo.setBeyondEnterpriseName(EnterpriseName);
if (!"null".equals(listaw.gettDeviceInfoS())){
//将关联设备信息与设备进行绑定
tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId());
}
TDeviceInfo tDeviceInfo = new TDeviceInfo();
//根据企业id查询企业名称
String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tDeviceInfo.getBeyondEnterpriseId());
tDeviceInfo.setBeyondEnterpriseName(EnterpriseName);
}
/**
......@@ -141,13 +145,22 @@ public class TDeviceInfoController extends BaseController
}
/**
* 关联设备批量数据删除接口
* 关联设备数据删除接口
*/
@RequestMapping("/deleteDetailInfo")
public void deleteDetailInfo(@RequestBody int deviceId){
tDeviceInfoService.deleteDetailinfOS(deviceId);
}
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
@RequestMapping("/deleteDeviceDetailInfo")
public void deleteDeviceDetailInfo(@RequestBody int deviceId){
tDeviceInfoService.deleteDeviceDetailInfo(deviceId);
}
/**
* 关联设备批量数据删除接口
* @param deviceId
......@@ -156,4 +169,29 @@ public class TDeviceInfoController extends BaseController
public void deleteeListDetailInfo(@RequestBody Long[] deviceId){
tDeviceInfoService.deleteDetailInfo(deviceId);
}
/**
* 查询设备已经关联的关联设备接口
* @param id
* @return
*/
@RequestMapping("/selectDetailInfoList")
public TableDataInfo selectDetailInfoList(@RequestBody int id){
List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoService.selectDetailInfoList(id);
return getDataTable(tDeviceInfoS);
}
/**
* 关联设备绑定接口
* @param listaw
*/
@RequestMapping("/updateDetailInfoList")
public void updateDetailInfoList(@RequestBody Listaw listaw){
if (!"null".equals(listaw.gettDeviceInfoS())){
//将关联设备信息与设备进行绑定
tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId());
}
}
}
gassafetyprogress-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java
View file @ 5d31c50c
......@@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
// 过滤请求
.authorizeRequests()
// 对于登录login 验证码captchaImage 允许匿名访问
.antMatchers("/login", "/captchaImage","/common/upload").anonymous()
.antMatchers("/login", "/captchaImage").anonymous()
.antMatchers(
HttpMethod.GET,
"/*.html",
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TComplainDeal.java 0 → 100644
View file @ 5d31c50c
package com.zehong.system.domain;
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;
/**
* 投诉处置对象 t_complain_deal
*
* @author zehong
* @date 2022-02-15
*/
public class TComplainDeal extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 投诉处置id */
private Long complainDealId;
/** 投诉人姓名 */
@Excel(name = "投诉人姓名")
private String complainName;
/** 投诉人电话 */
@Excel(name = "投诉人电话")
private String complainPhone;
/** 投诉事项 */
@Excel(name = "投诉事项")
private String complainMatter;
/** 转办记录 */
@Excel(name = "转办记录")
private String transferRecord;
/** 办理情况 */
@Excel(name = "办理情况")
private String dealCondition;
/** 指派单位名称 */
@Excel(name = "指派单位名称")
private String complainAssignEnterproseName;
/** 指派单位id */
@Excel(name = "指派单位id")
private Long complainAssignEnterproseId;
/** 指派人 */
@Excel(name = "指派人")
private String complainAssignManId;
/** 指派人id */
@Excel(name = "指派人id")
private Long complainAssignMan;
/** 任务状态：1.派发中 2.反馈 3.归档 */
@Excel(name = "任务状态：1.派发中 2.反馈 3.归档")
private String complainStatus;
/** 是否删除(0正常，1删除) */
@Excel(name = "是否删除(0正常，1删除)")
private String isDel;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setComplainDealId(Long complainDealId)
{
this.complainDealId = complainDealId;
}
public Long getComplainDealId()
{
return complainDealId;
}
public void setComplainName(String complainName)
{
this.complainName = complainName;
}
public String getComplainName()
{
return complainName;
}
public void setComplainPhone(String complainPhone)
{
this.complainPhone = complainPhone;
}
public String getComplainPhone()
{
return complainPhone;
}
public void setComplainMatter(String complainMatter)
{
this.complainMatter = complainMatter;
}
public String getComplainMatter()
{
return complainMatter;
}
public void setTransferRecord(String transferRecord)
{
this.transferRecord = transferRecord;
}
public String getTransferRecord()
{
return transferRecord;
}
public void setDealCondition(String dealCondition)
{
this.dealCondition = dealCondition;
}
public String getDealCondition()
{
return dealCondition;
}
public void setComplainAssignEnterproseName(String complainAssignEnterproseName)
{
this.complainAssignEnterproseName = complainAssignEnterproseName;
}
public String getComplainAssignEnterproseName()
{
return complainAssignEnterproseName;
}
public void setComplainAssignEnterproseId(Long complainAssignEnterproseId)
{
this.complainAssignEnterproseId = complainAssignEnterproseId;
}
public Long getComplainAssignEnterproseId()
{
return complainAssignEnterproseId;
}
public void setComplainAssignManId(String complainAssignManId)
{
this.complainAssignManId = complainAssignManId;
}
public String getComplainAssignManId()
{
return complainAssignManId;
}
public void setComplainAssignMan(Long complainAssignMan)
{
this.complainAssignMan = complainAssignMan;
}
public Long getComplainAssignMan()
{
return complainAssignMan;
}
public void setComplainStatus(String complainStatus)
{
this.complainStatus = complainStatus;
}
public String getComplainStatus()
{
return complainStatus;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("complainDealId", getComplainDealId())
.append("complainName", getComplainName())
.append("complainPhone", getComplainPhone())
.append("complainMatter", getComplainMatter())
.append("transferRecord", getTransferRecord())
.append("dealCondition", getDealCondition())
.append("complainAssignEnterproseName", getComplainAssignEnterproseName())
.append("complainAssignEnterproseId", getComplainAssignEnterproseId())
.append("complainAssignManId", getComplainAssignManId())
.append("complainAssignMan", getComplainAssignMan())
.append("complainStatus", getComplainStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("remarks", getRemarks())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java
View file @ 5d31c50c
......@@ -10,7 +10,7 @@ import com.zehong.common.core.domain.BaseEntity;
/**
* 设备信息对象 t_device_info
*
*
* @author zehong
* @date 2022-01-27
*/
......@@ -38,7 +38,7 @@ public class TDeviceInfo extends BaseEntity
private String deviceModel;
/** 设备类型：1.阀井 2.调压箱 3.巡检员 4.视频 */
@Excel(name = "设备类型：1.阀井 2.调压箱 3.巡检员 4.视频")
@Excel(name = "设备类型")
private String deviceType;
/** 权属单位 */
......@@ -49,18 +49,22 @@ public class TDeviceInfo extends BaseEntity
private String beyondEnterpriseName;
/** 经度 */
private BigDecimal longitude;
@Excel(name = "经度")
private String longitude;
/** 纬度 */
private BigDecimal latitude;
@Excel(name = "纬度")
private String latitude;
/** 设备图片路径 */
private String iconUrl;
/** 联系人 */
@Excel(name = "联系人")
private String linkman;
/** 电话 */
@Excel(name = "电话")
private String phone;
/** 安装时间 */
......@@ -77,156 +81,159 @@ public class TDeviceInfo extends BaseEntity
/** 备注 */
private String remarks;
public void setDeviceId(Long deviceId)
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public Long getDeviceId()
{
return deviceId;
}
public void setDeviceName(String deviceName)
public void setDeviceName(String deviceName)
{
this.deviceName = deviceName;
}
public String getDeviceName()
public String getDeviceName()
{
return deviceName;
}
public void setDeviceCode(String deviceCode)
public void setDeviceCode(String deviceCode)
{
this.deviceCode = deviceCode;
}
public String getDeviceCode()
public String getDeviceCode()
{
return deviceCode;
}
public void setDeviceAddr(String deviceAddr)
public void setDeviceAddr(String deviceAddr)
{
this.deviceAddr = deviceAddr;
}
public String getDeviceAddr()
public String getDeviceAddr()
{
return deviceAddr;
}
public void setDeviceModel(String deviceModel)
public void setDeviceModel(String deviceModel)
{
this.deviceModel = deviceModel;
}
public String getDeviceModel()
public String getDeviceModel()
{
return deviceModel;
}
public void setDeviceType(String deviceType)
public void setDeviceType(String deviceType)
{
this.deviceType = deviceType;
}
public String getDeviceType()
public String getDeviceType()
{
return deviceType;
}
public void setBeyondEnterpriseId(Long beyondEnterpriseId)
public void setBeyondEnterpriseId(Long beyondEnterpriseId)
{
this.beyondEnterpriseId = beyondEnterpriseId;
}
public Long getBeyondEnterpriseId()
public Long getBeyondEnterpriseId()
{
return beyondEnterpriseId;
}
public void setBeyondEnterpriseName(String beyondEnterpriseName)
public void setBeyondEnterpriseName(String beyondEnterpriseName)
{
this.beyondEnterpriseName = beyondEnterpriseName;
}
public String getBeyondEnterpriseName()
public String getBeyondEnterpriseName()
{
return beyondEnterpriseName;
}
public void setLongitude(BigDecimal longitude)
{
this.longitude = longitude;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public BigDecimal getLongitude()
{
public String getLongitude() {
return longitude;
}
public void setLatitude(BigDecimal latitude)
{
this.latitude = latitude;
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public BigDecimal getLatitude()
{
public String getLatitude() {
return latitude;
}
public void setIconUrl(String iconUrl)
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public void setIconUrl(String iconUrl)
{
this.iconUrl = iconUrl;
}
public String getIconUrl()
public String getIconUrl()
{
return iconUrl;
}
public void setLinkman(String linkman)
public void setLinkman(String linkman)
{
this.linkman = linkman;
}
public String getLinkman()
public String getLinkman()
{
return linkman;
}
public void setPhone(String phone)
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
public String getPhone()
{
return phone;
}
public void setInstallationTime(Date installationTime)
public void setInstallationTime(Date installationTime)
{
this.installationTime = installationTime;
}
public Date getInstallationTime()
public Date getInstallationTime()
{
return installationTime;
}
public void setInspectionTime(Date inspectionTime)
public void setInspectionTime(Date inspectionTime)
{
this.inspectionTime = inspectionTime;
}
public Date getInspectionTime()
public Date getInspectionTime()
{
return inspectionTime;
}
public void setIsDel(String isDel)
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
public String getRemarks()
{
return remarks;
}
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventInfo.java
View file @ 5d31c50c
......@@ -37,8 +37,8 @@ public class TEventInfo extends BaseEntity
private String eventLocation;
/** 报案时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reportTime;
/** 报案人 */
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTroubleStandingBook.java
View file @ 5d31c50c
......@@ -47,6 +47,18 @@ public class TTroubleStandingBook extends BaseEntity
@Excel(name = "事故原因")
private String troubleReason;
/** 是否人员伤亡 */
@Excel(name = "是否人员伤亡")
private String isCasualties;
/** 受伤人数 */
@Excel(name = "受伤人数")
private int injuryNum;
/** 死亡人数 */
@Excel(name = "死亡人数")
private int deathNum;
/** 责任单位 */
@Excel(name = "责任单位")
private String responsibleUnit;
......@@ -148,7 +160,32 @@ public class TTroubleStandingBook extends BaseEntity
{
return troubleReason;
}
public void setResponsibleUnit(String responsibleUnit)
public String getIsCasualties() {
return isCasualties;
}
public void setIsCasualties(String isCasualties) {
this.isCasualties = isCasualties;
}
public int getInjuryNum() {
return injuryNum;
}
public void setInjuryNum(int injuryNum) {
this.injuryNum = injuryNum;
}
public int getDeathNum() {
return deathNum;
}
public void setDeathNum(int deathNum) {
this.deathNum = deathNum;
}
public void setResponsibleUnit(String responsibleUnit)
{
this.responsibleUnit = responsibleUnit;
}
......
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TComplainDealMapper.java 0 → 100644
View file @ 5d31c50c
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TComplainDeal;
/**
* 投诉处置Mapper接口
*
* @author zehong
* @date 2022-02-15
*/
public interface TComplainDealMapper
{
/**
* 查询投诉处置
*
* @param complainDealId 投诉处置ID
* @return 投诉处置
*/
public TComplainDeal selectTComplainDealById(Long complainDealId);
/**
* 查询投诉处置列表
*
* @param tComplainDeal 投诉处置
* @return 投诉处置集合
*/
public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal);
/**
* 新增投诉处置
*
* @param tComplainDeal 投诉处置
* @return 结果
*/
public int insertTComplainDeal(TComplainDeal tComplainDeal);
/**
* 修改投诉处置
*
* @param tComplainDeal 投诉处置
* @return 结果
*/
public int updateTComplainDeal(TComplainDeal tComplainDeal);
/**
* 删除投诉处置
*
* @param complainDealId 投诉处置ID
* @return 结果
*/
public int deleteTComplainDealById(Long complainDealId);
/**
* 批量删除投诉处置
*
* @param complainDealIds 需要删除的数据ID
* @return 结果
*/
public int deleteTComplainDealByIds(Long[] complainDealIds);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDeviceInfoMapper.java
View file @ 5d31c50c
......@@ -3,6 +3,7 @@ package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TDeviceInfoS;
import org.apache.ibatis.annotations.Param;
/**
* 设备信息Mapper接口
......@@ -90,4 +91,23 @@ public interface TDeviceInfoMapper
* @param deviceId
*/
void deleteDetailinfOS(int deviceId);
/**
* 将关联设备信息与设备进行绑定
* @param gettDeviceInfoS
*/
void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
/**
* 查询设备已经关联的关联设备
* @param id
* @return
*/
List<TDeviceInfoS> selectDetailInfoList(int id);
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
void deleteDeviceDetailInfo(int deviceId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITComplainDealService.java 0 → 100644
View file @ 5d31c50c
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TComplainDeal;
/**
* 投诉处置Service接口
*
* @author zehong
* @date 2022-02-15
*/
public interface ITComplainDealService
{
/**
* 查询投诉处置
*
* @param complainDealId 投诉处置ID
* @return 投诉处置
*/
public TComplainDeal selectTComplainDealById(Long complainDealId);
/**
* 查询投诉处置列表
*
* @param tComplainDeal 投诉处置
* @return 投诉处置集合
*/
public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal);
/**
* 新增投诉处置
*
* @param tComplainDeal 投诉处置
* @return 结果
*/
public int insertTComplainDeal(TComplainDeal tComplainDeal);
/**
* 修改投诉处置
*
* @param tComplainDeal 投诉处置
* @return 结果
*/
public int updateTComplainDeal(TComplainDeal tComplainDeal);
/**
* 批量删除投诉处置
*
* @param complainDealIds 需要删除的投诉处置ID
* @return 结果
*/
public int deleteTComplainDealByIds(Long[] complainDealIds);
/**
* 删除投诉处置信息
*
* @param complainDealId 投诉处置ID
* @return 结果
*/
public int deleteTComplainDealById(Long complainDealId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDeviceInfoService.java
View file @ 5d31c50c
......@@ -3,6 +3,7 @@ package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TDeviceInfoS;
import org.apache.ibatis.annotations.Param;
/**
* 设备信息Service接口
......@@ -90,4 +91,23 @@ public interface ITDeviceInfoService
* @param deviceId
*/
void deleteDetailinfOS(int deviceId);
/**
* 将关联设备信息与设备进行绑定
* @param gettDeviceInfoS
*/
void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
/**
* 查询设备已经关联的关联设备
* @param id
* @return
*/
List<TDeviceInfoS> selectDetailInfoList(int id);
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
void deleteDeviceDetailInfo(int deviceId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TComplainDealServiceImpl.java 0 → 100644
View file @ 5d31c50c
package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TComplainDealMapper;
import com.zehong.system.domain.TComplainDeal;
import com.zehong.system.service.ITComplainDealService;
/**
* 投诉处置Service业务层处理
*
* @author zehong
* @date 2022-02-15
*/
@Service
public class TComplainDealServiceImpl implements ITComplainDealService
{
@Autowired
private TComplainDealMapper tComplainDealMapper;
/**
* 查询投诉处置
*
* @param complainDealId 投诉处置ID
* @return 投诉处置
*/
@Override
public TComplainDeal selectTComplainDealById(Long complainDealId)
{
return tComplainDealMapper.selectTComplainDealById(complainDealId);
}
/**
* 查询投诉处置列表
*
* @param tComplainDeal 投诉处置
* @return 投诉处置
*/
@Override
public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal)
{
return tComplainDealMapper.selectTComplainDealList(tComplainDeal);
}
/**
* 新增投诉处置
*
* @param tComplainDeal 投诉处置
* @return 结果
*/
@Override
public int insertTComplainDeal(TComplainDeal tComplainDeal)
{
tComplainDeal.setCreateTime(DateUtils.getNowDate());
return tComplainDealMapper.insertTComplainDeal(tComplainDeal);
}
/**
* 修改投诉处置
*
* @param tComplainDeal 投诉处置
* @return 结果
*/
@Override
public int updateTComplainDeal(TComplainDeal tComplainDeal)
{
tComplainDeal.setUpdateTime(DateUtils.getNowDate());
return tComplainDealMapper.updateTComplainDeal(tComplainDeal);
}
/**
* 批量删除投诉处置
*
* @param complainDealIds 需要删除的投诉处置ID
* @return 结果
*/
@Override
public int deleteTComplainDealByIds(Long[] complainDealIds)
{
return tComplainDealMapper.deleteTComplainDealByIds(complainDealIds);
}
/**
* 删除投诉处置信息
*
* @param complainDealId 投诉处置ID
* @return 结果
*/
@Override
public int deleteTComplainDealById(Long complainDealId)
{
return tComplainDealMapper.deleteTComplainDealById(complainDealId);
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java
View file @ 5d31c50c
......@@ -3,6 +3,7 @@ package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.TDeviceInfoS;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TDeviceInfoMapper;
......@@ -142,4 +143,33 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
public void deleteDetailinfOS(int deviceId) {
tDeviceInfoMapper.deleteDetailinfOS(deviceId);
}
/**
* 将关联设备信息与设备进行绑定
* @param gettDeviceInfoS
*/
@Override
public void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id) {
tDeviceInfoMapper.updatetRelationDeviceDetailInfo(gettDeviceInfoS,id);
}
/**
* 查询设备已经关联的关联设备
* @param id
* @return
*/
@Override
public List<TDeviceInfoS> selectDetailInfoList(int id) {
List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoMapper.selectDetailInfoList(id);
return tDeviceInfoS;
}
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
@Override
public void deleteDeviceDetailInfo(int deviceId) {
tDeviceInfoMapper.deleteDeviceDetailInfo(deviceId);
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TTroubleStandingBookServiceImpl.java
View file @ 5d31c50c
......@@ -67,6 +67,11 @@ public class TTroubleStandingBookServiceImpl implements ITTroubleStandingBookSer
@Override
public int updateTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook)
{
// 是否人员伤亡：2否，受伤人数和死亡人数改为0
if(tTroubleStandingBook.getIsCasualties().equals("2")){
tTroubleStandingBook.setInjuryNum(0);
tTroubleStandingBook.setDeathNum(0);
}
tTroubleStandingBook.setUpdateTime(DateUtils.getNowDate());
return tTroubleStandingBookMapper.updateTTroubleStandingBook(tTroubleStandingBook);
}
......
gassafetyprogress-system/src/main/resources/mapper/system/TComplainDealMapper.xml 0 → 100644
View file @ 5d31c50c
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TComplainDealMapper">
<resultMap type="TComplainDeal" id="TComplainDealResult">
<result property="complainDealId" column="complain_deal_id" />
<result property="complainName" column="complain_name" />
<result property="complainPhone" column="complain_phone" />
<result property="complainMatter" column="complain_matter" />
<result property="transferRecord" column="transfer_record" />
<result property="dealCondition" column="deal_condition" />
<result property="complainAssignEnterproseName" column="complain_assign_enterprose_name" />
<result property="complainAssignEnterproseId" column="complain_assign_enterprose_id" />
<result property="complainAssignManId" column="complain_assign_man_id" />
<result property="complainAssignMan" column="complain_assign_man" />
<result property="complainStatus" column="complain_status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="isDel" column="is_del" />
<result property="remarks" column="remarks" />
</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
</sql>
<select id="selectTComplainDealList" parameterType="TComplainDeal" resultMap="TComplainDealResult">
<include refid="selectTComplainDealVo"/>
<where>
<if test="complainName != null and complainName != ''"> and complain_name like concat('%', #{complainName}, '%')</if>
<if test="complainPhone != null and complainPhone != ''"> and complain_phone = #{complainPhone}</if>
<if test="complainMatter != null and complainMatter != ''"> and complain_matter = #{complainMatter}</if>
<if test="transferRecord != null and transferRecord != ''"> and transfer_record = #{transferRecord}</if>
<if test="dealCondition != null and dealCondition != ''"> and deal_condition = #{dealCondition}</if>
<if test="complainAssignEnterproseName != null and complainAssignEnterproseName != ''"> and complain_assign_enterprose_name like concat('%', #{complainAssignEnterproseName}, '%')</if>
<if test="complainAssignEnterproseId != null "> and complain_assign_enterprose_id = #{complainAssignEnterproseId}</if>
<if test="complainAssignManId != null and complainAssignManId != ''"> and complain_assign_man_id = #{complainAssignManId}</if>
<if test="complainAssignMan != null "> and complain_assign_man = #{complainAssignMan}</if>
<if test="complainStatus != null and complainStatus != ''"> and complain_status = #{complainStatus}</if>
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
<select id="selectTComplainDealById" parameterType="Long" resultMap="TComplainDealResult">
<include refid="selectTComplainDealVo"/>
where complain_deal_id = #{complainDealId}
</select>
<insert id="insertTComplainDeal" parameterType="TComplainDeal" useGeneratedKeys="true" keyProperty="complainDealId">
insert into t_complain_deal
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="complainName != null">complain_name,</if>
<if test="complainPhone != null">complain_phone,</if>
<if test="complainMatter != null">complain_matter,</if>
<if test="transferRecord != null">transfer_record,</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>
<if test="complainAssignManId != null">complain_assign_man_id,</if>
<if test="complainAssignMan != null">complain_assign_man,</if>
<if test="complainStatus != null">complain_status,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="isDel != null">is_del,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="complainName != null">#{complainName},</if>
<if test="complainPhone != null">#{complainPhone},</if>
<if test="complainMatter != null">#{complainMatter},</if>
<if test="transferRecord != null">#{transferRecord},</if>
<if test="dealCondition != null">#{dealCondition},</if>
<if test="complainAssignEnterproseName != null">#{complainAssignEnterproseName},</if>
<if test="complainAssignEnterproseId != null">#{complainAssignEnterproseId},</if>
<if test="complainAssignManId != null">#{complainAssignManId},</if>
<if test="complainAssignMan != null">#{complainAssignMan},</if>
<if test="complainStatus != null">#{complainStatus},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
<update id="updateTComplainDeal" parameterType="TComplainDeal">
update t_complain_deal
<trim prefix="SET" suffixOverrides=",">
<if test="complainName != null">complain_name = #{complainName},</if>
<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="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>
<if test="complainAssignManId != null">complain_assign_man_id = #{complainAssignManId},</if>
<if test="complainAssignMan != null">complain_assign_man = #{complainAssignMan},</if>
<if test="complainStatus != null">complain_status = #{complainStatus},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where complain_deal_id = #{complainDealId}
</update>
<delete id="deleteTComplainDealById" parameterType="Long">
delete from t_complain_deal where complain_deal_id = #{complainDealId}
</delete>
<delete id="deleteTComplainDealByIds" parameterType="String">
delete from t_complain_deal where complain_deal_id in
<foreach item="complainDealId" collection="array" open="(" separator="," close=")">
#{complainDealId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
gassafetyprogress-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml
View file @ 5d31c50c
......@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
<if test="deviceAddr != null and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
</where>
group by a.device_id desc
</select>
<select id="selectTDeviceInfoById" parameterType="Long" resultMap="TDeviceInfoResult">
......@@ -149,14 +150,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</update>
<!--添加关联设备信息表数据-->
<!-- <insert id="insertDeviceDetailInfo" parameterType="java.util.List">-->
<!-- INSERT INTO t_relation_device_detail_info (relation_device_id,device_name,device_model,device_type,iot_no)-->
<!-- VALUES-->
<!-- <foreach collection="list" item="item" index="key" separator=",">-->
<!-- (#{item.relationDeviceId},#{item.deviceName},#{item.deviceModel},#{item.deviceType},#{item.iotNo})-->
<!-- </foreach>-->
<!-- </insert>-->
<insert id="insertDeviceDetailInfo">
INSERT INTO t_relation_device_detail_info (relation_device_id,device_name,device_model,device_type,iot_no,remarks)
......@@ -180,6 +173,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by relation_device_detail_id desc
</select>
<!--查询设备已经关联的关联设备-->
<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}
</select>
<!--关联设备数据删除接口-->
<update id="deleteDetailInfo">
update t_relation_device_detail_info set is_del='1' where relation_device_detail_id in
......@@ -193,4 +192,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_relation_device_detail_info set is_del='1' where relation_device_detail_id = #{deviceId}
</update>
<!--将关联设备信息与设备进行绑定-->
<update id="updatetRelationDeviceDetailInfo" parameterType="java.util.List">
update t_relation_device_detail_info set relation_device_id = #{id}
where
relation_device_detail_id in
<foreach collection="gettDeviceInfoS" item="items" index="key" open="(" separator="," close=")">
#{items.relationDeviceDetailId}
</foreach>
</update>
<!--解绑 设备与关联设备关系-->
<update id="deleteDeviceDetailInfo">
update t_relation_device_detail_info set relation_device_id='0' where relation_device_detail_id=#{deviceId}
</update>
</mapper>
gassafetyprogress-system/src/main/resources/mapper/system/TEventInfoMapper.xml
View file @ 5d31c50c
......@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="reportPerson != null and reportPerson != ''"> and report_person like concat('%', #{reportPerson}, '%')</if>
<if test="beyondEnterpriseId != null and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
</where>
order by report_time
</select>
<select id="selectTEventInfoById" parameterType="Long" resultMap="TEventInfoResult">
......
gassafetyprogress-system/src/main/resources/mapper/system/TPlanInfoMapper.xml
View file @ 5d31c50c
......@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planLevel != null and planLevel != ''"> and plan_level = #{planLevel}</if>
<if test="beyondEnterpriseId != null and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
</where>
order by create_time desc
</select>
<select id="selectTPlanInfoById" parameterType="Long" resultMap="TPlanInfoResult">
......
gassafetyprogress-system/src/main/resources/mapper/system/TTroubleStandingBookMapper.xml
View file @ 5d31c50c
......@@ -13,6 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="troubleType" column="trouble_type" />
<result property="briefProcess" column="brief_process" />
<result property="troubleReason" column="trouble_reason" />
<result property="isCasualties" column="is_casualties" />
<result property="injuryNum" column="injury_num" />
<result property="deathNum" column="death_num" />
<result property="responsibleUnit" column="responsible_unit" />
<result property="responsiblePeople" column="responsible_people" />
<result property="isDeal" column="is_deal" />
......@@ -27,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTTroubleStandingBookVo">
select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, responsible_unit, responsible_people, is_deal,happen_date, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, is_casualties, injury_num, death_num, responsible_unit, responsible_people, is_deal,happen_date, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
</sql>
<select id="selectTTroubleStandingBookList" parameterType="TTroubleStandingBookForm" resultMap="TTroubleStandingBookResult">
......@@ -58,6 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="troubleType != null">trouble_type,</if>
<if test="briefProcess != null">brief_process,</if>
<if test="troubleReason != null">trouble_reason,</if>
<if test="isCasualties != null">is_casualties,</if>
<if test="injuryNum != null">injury_num,</if>
<if test="deathNum != null">death_num,</if>
<if test="responsibleUnit != null">responsible_unit,</if>
<if test="responsiblePeople != null">responsible_people,</if>
<if test="isDeal != null">is_deal,</if>
......@@ -78,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="troubleType != null">#{troubleType},</if>
<if test="briefProcess != null">#{briefProcess},</if>
<if test="troubleReason != null">#{troubleReason},</if>
<if test="isCasualties != null">#{isCasualties},</if>
<if test="injuryNum != null">#{injuryNum},</if>
<if test="deathNum != null">#{deathNum},</if>
<if test="responsibleUnit != null">#{responsibleUnit},</if>
<if test="responsiblePeople != null">#{responsiblePeople},</if>
<if test="isDeal != null">#{isDeal},</if>
......@@ -102,6 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="troubleType != null">trouble_type = #{troubleType},</if>
<if test="briefProcess != null">brief_process = #{briefProcess},</if>
<if test="troubleReason != null">trouble_reason = #{troubleReason},</if>
<if test="isCasualties != null">is_casualties = #{isCasualties},</if>
<if test="injuryNum != null">injury_num = #{injuryNum},</if>
<if test="deathNum != null">death_num = #{deathNum},</if>
<if test="responsibleUnit != null">responsible_unit = #{responsibleUnit},</if>
<if test="responsiblePeople != null">responsible_people = #{responsiblePeople},</if>
<if test="isDeal != null">is_deal = #{isDeal},</if>
......
gassafetyprogress-web/src/api/complainDeal/complainDeal.js 0 → 100644
View file @ 5d31c50c
import request from '@/utils/request'
// 查询投诉处置列表
export function listComplainDeal(query) {
return request({
url: '/complainDeal/list',
method: 'get',
params: query
})
}
// 查询投诉处置详细
export function getComplainDeal(complainDealId) {
return request({
url: '/complainDeal/' + complainDealId,
method: 'get'
})
}
// 新增投诉处置
export function addComplainDeal(data) {
return request({
url: '/complainDeal',
method: 'post',
data: data
})
}
// 修改投诉处置
export function updateComplainDeal(data) {
return request({
url: '/complainDeal',
method: 'put',
data: data
})
}
// 删除投诉处置
export function delComplainDeal(complainDealId) {
return request({
url: '/complainDeal/' + complainDealId,
method: 'delete'
})
}
// 导出投诉处置
export function exportComplainDeal(query) {
return request({
url: '/complainDeal/complainDeal/export',
method: 'get',
params: query
})
}
gassafetyprogress-web/src/api/regulation/device.js
View file @ 5d31c50c
......@@ -87,6 +87,17 @@ export function addDetailInfos(data) {
})
}
// 解除 设备与关联设备信息
export function deleteDeviceDetailInfo(deviceId) {
return request({
url: '/device/device/deleteDeviceDetailInfo',
method: 'delete',
data:deviceId
})
}
// 删除关联设备信息
export function deleteeListDetailInfo(deviceId) {
return request({
......@@ -96,4 +107,20 @@ export function deleteeListDetailInfo(deviceId) {
})
}
//查询已经关联的关联设备信息
export function selectDetailInfoList(data){
return request({
url: '/device/device/selectDetailInfoList',
method: 'post',
data: data
})
}
// 新增设备信息
export function updateDetailInfoLists(data) {
return request({
url: '/device/device/updateDetailInfoList',
method: 'post',
data: data
})
}
gassafetyprogress-web/src/assets/mapImages/coordinate.svg 0 → 100644
View file @ 5d31c50c
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1644901265903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7343" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M527.053 96.924c-169.131 0.322-306.127 137.496-306.127 306.7 0 157.986 128.978 324.17 278.121 502.935 7.838 9.418 17.977 14.485 28.006 15.061 10.029-0.576 20.168-5.643 28.002-15.061 149.144-178.765 278.123-344.948 278.123-502.935 0-169.205-136.997-306.378-306.126-306.7zM527.053 500.967c-66.070-0.358-119.562-53.956-119.562-120.099s53.492-119.74 119.562-120.099c66.069 0.358 119.557 53.956 119.557 120.099s-53.487 119.74-119.557 120.099z" p-id="7344" fill="#1296db"></path></svg>
\ No newline at end of file
gassafetyprogress-web/src/assets/mapImages/yalibiao.svg deleted 100644 → 0
View file @ 16ea099e
<svg id="组_2449" data-name="组 2449" xmlns="http://www.w3.org/2000/svg" width="23" height="33.9" viewBox="0 0 23 33.9">
<g id="路径_186" data-name="路径 186" fill="none">
<path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
<path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85127067565918 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
</g>
<path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.804) rotate(180)" fill="#7bf8f4"/>
<path id="路径_966" data-name="路径 966" d="M99.476,156.616a6.028,6.028,0,0,1-1.622,2.267.9.9,0,0,1-.583.252.8.8,0,0,1-.567-.236.765.765,0,0,1-.236-.535.705.705,0,0,1,.236-.535,6.035,6.035,0,0,0,1.748-4.377A5.726,5.726,0,0,0,96.7,149.2a6.645,6.645,0,0,0-9.085.016,5.836,5.836,0,0,0-1.763,4.283,6.134,6.134,0,0,0,1.952,4.346.765.765,0,0,1,.236.535.705.705,0,0,1-.236.535.748.748,0,0,1-.567.236.8.8,0,0,1-.567-.236,7.414,7.414,0,0,1-2.047-2.724,7.528,7.528,0,0,1,1.748-8.266,7.836,7.836,0,0,1,2.629-1.685,9.392,9.392,0,0,1,6.361-.063,6.113,6.113,0,0,1,2.141,1.26c2.866,2.425,3.023,5.9,2.047,8.943Zm-7.337-7.684a4.366,4.366,0,0,0-4.377,4.267.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,5.254,5.254,0,0,1,1.575-3.684,5.533,5.533,0,0,1,7.7,0,5.208,5.208,0,0,1,1.606,3.732.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,4.382,4.382,0,0,0-4.424-4.314Zm.913,5.4a1.113,1.113,0,0,1-1.559-.047,1.054,1.054,0,0,1-.268-1.149l-1.212-1.2a.418.418,0,0,1,0-.6.479.479,0,0,1,.63,0l1.228,1.2a1.162,1.162,0,0,1,1.2.268,1.024,1.024,0,0,1,.331.771A1.093,1.093,0,0,1,93.052,154.333Zm.016-.016" transform="translate(-80.582 -142.727)" fill="#7bf8f4"/>
</svg>
gassafetyprogress-web/src/components/GetPos/index.vue
View file @ 5d31c50c
<!--
* @Author: your name
* @Date: 2022-02-12 11:07:10
* @LastEditTime: 2022-02-12 15:13:41
* @LastEditTime: 2022-02-15 10:33:20
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
......@@ -14,32 +14,33 @@
width="60%"
:before-close="handleClose"
>
<div class="search-wrapper pos">
<el-input
v-model="searchinput"
class="searchinput"
placeholder="请输入内容"
size="mini"
style="width: 150px"
ref="input"
></el-input>
</div>
<div @click="pos" class="positionBtn pos">
<el-button type="primary" size="mini" icon="el-icon-position"
>定位</el-button
>
</div>
<template v-if="inputVisible">
<div class="search-wrapper pos">
<el-input
v-model="searchinput"
class="searchinput"
placeholder="请输入内容"
size="mini"
style="width: 150px"
ref="input"
></el-input>
</div>
<div @click="pos" class="positionBtn pos">
<el-button type="primary" size="mini" icon="el-icon-position"
>定位</el-button
>
</div>
</template>
<div id="getposmap"></div>
</el-dialog>
</template>
<script>
import { EditorMap } from "./untils/getPath.js";
import { EditorMap } from "@/utils/mapClass/getPath.js";
export default {
props: {
//管道路径，二维数组
//管道路径，二维数组s
pipePath: {
type: Array,
default: () => [],
......@@ -55,10 +56,15 @@ export default {
default: "",
},
// 显示隐藏
dialogVisible:{
type:Boolean,
default:false,
}
dialogVisible: {
type: Boolean,
default: false,
},
// input跟定位按钮是否展示
inputVisible: {
type: Boolean,
default: true,
},
},
data() {
return {
......@@ -80,8 +86,7 @@ export default {
});
},
},
mounted() {
},
mounted() {},
methods: {
init() {
this.$nextTick(() => {
......@@ -90,13 +95,13 @@ export default {
if (this.device == "") {
// 如果传了路径就创建一个marker，如果没传就直接激活手动创建
if (this.devicePos.length > 0) {
this.map.addDevice({path:this.devicePos});
this.map.addDevice({ path: this.devicePos });
} else {
this.map.mouseAddMarker();
}
} else {
if (this.pipePath.length > 0) {
this.map.addPipeLine({path:this.pipePath});
this.map.addPipeLine({ path: this.pipePath });
} else {
this.mouseAddPipeline();
}
......@@ -104,7 +109,7 @@ export default {
});
},
handleClose() {
this.$emit("close")
this.$emit("close");
},
open() {
this.dialogVisible = true;
......@@ -113,7 +118,7 @@ export default {
pos() {
this.path = this.map.getPath();
this.$emit("getPath", this.path);
console.log(this.path)
console.log(this.path);
if (this.path?.length > 0) {
this.$emit("update:dialogVisible", false);
}
......
gassafetyprogress-web/src/components/GetPos/untils/getPath.js → gassafetyprogress-web/src/utils/mapClass/getPath.js
View file @ 5d31c50c
......@@ -248,7 +248,7 @@ export class EditorMap {
let device = this.createMarker({
map: this.map,
anchor: "bottom-center",
icon: require("@/assets/mapImages/yalibiao.svg"),
icon: require("@/assets/mapImages/coordinate.svg"),
position: path,
extData: deviceData,
});
......
gassafetyprogress-web/src/views/complainDeal/index.vue 0 → 100644
View file @ 5d31c50c
This diff is collapsed.
gassafetyprogress-web/src/views/regulation/gasuser/index.vue
View file @ 5d31c50c
......@@ -115,7 +115,7 @@
<!-- 添加或修改燃气用户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="用户账号" prop="username">
<el-input v-model="form.username" placeholder="请输入用户账号" />
</el-form-item>
......
gassafetyprogress-web/src/views/standingBook/equipment/index.vue
View file @ 5d31c50c
......@@ -74,13 +74,13 @@
</el-row>
<el-table v-loading="loading" :data="equipmentList" >
<el-table-column label="用户名称" align="center" prop="userName" width="220px"/>
<el-table-column label="身份证号" align="center" prop="idCard"/>
<el-table-column label="用户名称" align="center" prop="userName" width="200px"/>
<el-table-column label="身份证号" align="center" prop="idCard" width="180px"/>
<el-table-column label="联系电话" align="center" prop="linkMobile"/>
<el-table-column label="详细地址" align="center" prop="userAddress" width="380px"/>
<el-table-column label="安装时间" align="center" prop="installTime"/>
<el-table-column label="品牌名称" align="center" prop="brandName" width="130px"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="品牌名称" align="center" prop="brandName"/>
<el-table-column label="操作" align="center" width="180px">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -385,13 +385,13 @@ export default {
if (this.form.safeEquipmentId != null) {
updateEquipment(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.open1 = false;
this.getList();
});
} else {
addEquipment(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.open1 = false;
this.getList();
});
}
......
gassafetyprogress-web/src/views/standingBook/hidden/index.vue
View file @ 5d31c50c
......@@ -67,7 +67,7 @@
<el-table v-loading="loading" :data="hiddenList" >
<el-table-column label="隐患名称" align="center" prop="hiddenTitle" width="200px"/>
<el-table-column label="隐患等级" align="center" prop="hiddenType" width="150px">
<el-table-column label="隐患等级" align="center" prop="hiddenType">
<template slot-scope="scope">
<span v-if="scope.row.hiddenType == '1'">一级隐患</span>
<span v-if="scope.row.hiddenType == '2'">二级隐患</span>
......@@ -75,9 +75,9 @@
</template>
</el-table-column>
<el-table-column label="隐患位置" align="center" prop="hiddenLocation" width="300px"/>
<el-table-column label="隐患发现人员" align="center" prop="hiddenFindPeople" width="150px"/>
<el-table-column label="隐患发现人员" align="center" prop="hiddenFindPeople"/>
<el-table-column label="发现时间" align="center" prop="hiddenFindDate" width="150px"/>
<el-table-column label="处理方案" align="center" prop="dealPlanUrl" width="150px">
<el-table-column label="处理方案" align="center" prop="dealPlanUrl">
<template slot-scope="scope">
<span
class="dbtn"
......@@ -89,13 +89,13 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="整治情况" align="center" prop="remediation" width="180px">
<el-table-column label="整治情况" align="center" prop="remediation">
<template slot-scope="scope">
<span v-if="scope.row.remediation != '' && scope.row.remediation != null">{{ scope.row.remediation }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" width="180px">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -233,60 +233,66 @@
</div>
</el-dialog>
<el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @cancel="cancel2">
<el-form ref="detailForm" :model="detailForm" label-width="120px">
<el-row>
<el-col :span="11">
<el-form-item label="隐患名称:">
<font>{{detailForm.hiddenTitle}}</font>
</el-form-item>
<el-form-item label="隐患发现人员:">
<font>{{detailForm.hiddenFindPeople}}</font>
</el-form-item>
<el-form-item label="隐患位置:">
<font>{{detailForm.hiddenLocation}}</font>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患等级:">
<font v-if="detailForm.hiddenType == '1'">一级隐患</font>
<font v-if="detailForm.hiddenType == '2'">二级隐患</font>
<font v-if="detailForm.hiddenType == '3'">三级隐患</font>
</el-form-item>
<el-form-item label="发现时间:">
<font>{{detailForm.hiddenFindDate}}</font>
</el-form-item>
<el-form-item label="处理方案:">
<span
class="dbtn"
@click="checkFile(detailForm.dealPlanUrl)"
v-if="detailForm.dealPlan != ''"
>
<i class="el-icon el-icon-view"></i>查看/下载
</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="隐患内容:">
<font>{{detailForm.hiddenContent}}</font>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="整治情况:">
<font v-if="detailForm.remediation != '' && detailForm.remediation != null">{{detailForm.remediation}}</font>
<font v-else> - </font>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
</el-row>
</el-form>
</el-dialog>
<el-dialog :title="title2" :visible.sync="open2" width="1200px" append-to-body @cancel="cancel2" @close="cancel2">
<el-row>
<el-col :span="14">
<el-form ref="detailForm" :model="detailForm" label-width="120px">
<el-row>
<el-col :span="10">
<el-form-item label="隐患名称:">
<font>{{detailForm.hiddenTitle}}</font>
</el-form-item>
<el-form-item label="隐患发现人员:">
<font>{{detailForm.hiddenFindPeople}}</font>
</el-form-item>
<el-form-item label="发现时间:">
<font>{{detailForm.hiddenFindDate}}</font>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="隐患等级:">
<font v-if="detailForm.hiddenType == '1'">一级隐患</font>
<font v-if="detailForm.hiddenType == '2'">二级隐患</font>
<font v-if="detailForm.hiddenType == '3'">三级隐患</font>
</el-form-item>
<el-form-item label="隐患位置:">
<font>{{detailForm.hiddenLocation}}</font>
</el-form-item>
<el-form-item label="处理方案:">
<span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
<i class="el-icon el-icon-view"></i>查看/下载
</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="隐患内容:">
<font>{{detailForm.hiddenContent}}</font>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="整治情况:">
<font v-if="detailForm.remediation != '' && detailForm.remediation != null">{{detailForm.remediation}}</font>
<font v-else> - </font>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
</el-row>
</el-form>
</el-col>
<el-col :span="9">
<div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 100%" id="hiddenContainer"></div>
</div>
</el-col>
</el-row>
</el-dialog>
<GetPos
:dialogVisible.sync="dialogTableVisible"
......@@ -301,15 +307,14 @@
<script>
import { listHidden, getHidden, delHidden, addHidden, updateHidden, exportHidden } from "@/api/standingBook/hidden";
import Editor from '@/components/Editor';
import FileUpload from '@/components/FileUpload';
import GetPos from '@/components/GetPos';
import { EditorMap } from "@/utils/mapClass/getPath.js";
let uploadfile = require("@/assets/uploadfile.png");
export default {
name: "Hidden",
components: {
Editor,
FileUpload,
GetPos
},
......@@ -344,6 +349,7 @@ export default {
// 地图
dialogTableVisible: false,
devicePos: [],
map: null,
// 查询参数
queryParams: {
pageNum: 1,
......@@ -406,11 +412,11 @@ export default {
this.open1 = false;
this.reset1();
this.fileList = [];
this.devicePos = [];
},
cancel2() {
this.open2 = false;
this.reset2();
this.map.destroy();
},
// 表单重置
reset1() {
......@@ -458,6 +464,7 @@ export default {
remarks: null
};
this.resetForm("detailForm");
this.devicePos = [];
},
/** 搜索按钮操作 */
handleQuery() {
......@@ -546,8 +553,16 @@ export default {
this.reset2();
getHidden(row.hiddenId).then(response => {
this.detailForm = response.data;
this.devicePos = [this.detailForm.longitude, this.detailForm.latitude];
this.open2 = true;
this.title2 = "隐患整治台账详情";
this.$nextTick(() => {
this.map = new EditorMap("hiddenContainer", {}, this);
this.map.addDevice({ path: this.devicePos });
this.map.nowMouseTarget = null;
this.map.mousetoolClose(false);
});
});
},
checkFile(url) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment