Skip to content

G
gassafety
Commit dc0dee11 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

parents ce41e2a5 dbaa9ea0
Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 74 deletions
gassafety-system/src/main/java/com/zehong/system/domain/TDeviceAlarm.java
View file @ dc0dee11
......@@ -53,10 +53,6 @@ public class TDeviceAlarm extends BaseEntity
@Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
private String dealStatus;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setAlarmId(Integer alarmId)
{
this.alarmId = alarmId;
......@@ -138,15 +134,6 @@ public class TDeviceAlarm extends BaseEntity
{
return dealStatus;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
......@@ -162,7 +149,6 @@ public class TDeviceAlarm extends BaseEntity
.append("dealStatus", getDealStatus())
.append("updateTime", getUpdateTime())
.append("createTime", getCreateTime())
.append("remarks", getRemarks())
.toString();
}
}
gassafety-system/src/main/java/com/zehong/system/domain/vo/DeviceAlarmVo.java 0 → 100644
View file @ dc0dee11
package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.core.domain.BaseEntity;
import com.zehong.system.domain.TDeviceInfo;
import java.util.Date;
/**
* 报警信息对象 t_device_alarm
*
* @author zehong
* @date 2021-07-21
*/
public class DeviceAlarmVo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Integer alarmId;
/** 设备id */
private Integer deviceId;
/** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
private String deviceType;
/** 设备 */
private TDeviceInfo deviceInfo;
/** 工单id */
private String orderId;
/** 报警类型 */
private String alarmType;
/** 报警值（报警信息） */
private String alarmValue;
/** 报警开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 报警结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
private String dealStatus;
public void setAlarmId(Integer alarmId)
{
this.alarmId = alarmId;
}
public Integer getAlarmId()
{
return alarmId;
}
public void setDeviceId(Integer deviceId)
{
this.deviceId = deviceId;
}
public Integer getDeviceId()
{
return deviceId;
}
public String getDeviceType() {
return deviceType;
}
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public TDeviceInfo getDeviceInfo() {
return deviceInfo;
}
public void setDeviceInfo(TDeviceInfo deviceInfo) {
this.deviceInfo = deviceInfo;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getOrderId()
{
return orderId;
}
public void setAlarmType(String alarmType)
{
this.alarmType = alarmType;
}
public String getAlarmType()
{
return alarmType;
}
public void setAlarmValue(String alarmValue)
{
this.alarmValue = alarmValue;
}
public String getAlarmValue()
{
return alarmValue;
}
public void setStartTime(Date startTime)
{
this.startTime = startTime;
}
public Date getStartTime()
{
return startTime;
}
public void setEndTime(Date endTime)
{
this.endTime = endTime;
}
public Date getEndTime()
{
return endTime;
}
public void setDealStatus(String dealStatus)
{
this.dealStatus = dealStatus;
}
public String getDealStatus()
{
return dealStatus;
}
}
gassafety-system/src/main/java/com/zehong/system/domain/vo/InspectionPlanVo.java
View file @ dc0dee11
......@@ -3,11 +3,11 @@ package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.core.domain.BaseEntity;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TInspectionData;
import com.zehong.system.domain.TPipe;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 巡检计划对象 t_inspection_plan
......@@ -28,8 +28,14 @@ public class InspectionPlanVo extends BaseEntity
/** 设备id */
private String deviceIds;
/** 设备树列表 */
private Map<Object, List> deviceList;
/** 设备列表 */
private List<TInspectionData> inspectionDataList;
/** 设备列表 */
private List<TDeviceInfo> deviceList;
/** 管道列表 */
private List<TPipe> pipeList;
/** 工单id */
private String orderId;
......@@ -82,14 +88,30 @@ public class InspectionPlanVo extends BaseEntity
this.deviceIds = deviceIds;
}
public Map<Object, List> getDeviceList() {
public List<TInspectionData> getInspectionDataList() {
return inspectionDataList;
}
public void setInspectionDataList(List<TInspectionData> inspectionDataList) {
this.inspectionDataList = inspectionDataList;
}
public List<TDeviceInfo> getDeviceList() {
return deviceList;
}
public void setDeviceList(Map<Object, List> deviceList) {
public void setDeviceList( List<TDeviceInfo> deviceList) {
this.deviceList = deviceList;
}
public List<TPipe> getPipeList() {
return pipeList;
}
public void setPipeList(List<TPipe> pipeList) {
this.pipeList = pipeList;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
......
gassafety-system/src/main/resources/mapper/system/TDeviceAlarmMapper.xml
View file @ dc0dee11
......@@ -16,11 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dealStatus" column="deal_status" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTDeviceAlarmVo">
select alarm_id, device_id, device_type, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time, remarks from t_device_alarm
select alarm_id, device_id, device_type, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time from t_device_alarm
</sql>
<select id="selectTDeviceAlarmList" parameterType="TDeviceAlarm" resultMap="TDeviceAlarmResult">
......@@ -34,7 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="dealStatus != null and dealStatus != ''"> and deal_status = #{dealStatus}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
......@@ -56,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dealStatus != null">deal_status,</if>
<if test="updateTime != null">update_time,</if>
<if test="createTime != null">create_time,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deviceId != null">#{deviceId},</if>
......@@ -69,7 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dealStatus != null">#{dealStatus},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
......@@ -86,7 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dealStatus != null">deal_status = #{dealStatus},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where alarm_id = #{alarmId}
</update>
......
gassafety-web/src/assets/styles/gassafety.scss
View file @ dc0dee11
......@@ -103,6 +103,61 @@
}
}
// gis地图中底部table样式
.right-bottom-data-left {
.el-table {
.el-table__header-wrapper,
.el-table__fixed-header-wrapper {
th {
word-break: break-word;
background-color: #fff;
color: #525252;
height: 30px;
font-size: 13px;
padding: 0;
}
}
.el-table__body-wrapper {
.el-table__row:nth-child(2n + 1) {
background-color: #e6e6e6;
// &:hover {
// td {
// background-color: #f4f4f4;
// }
// }
td {
.cell {
color: #525252;
}
}
}
.el-table__row:nth-child(2n) {
background-color: #f4f4f4;
// &:hover {
// td {
// background-color: #e6e6e6;
// }
// }
td {
.cell {
color: #053b6a;
}
}
}
}
.el-table__body-wrapper {
.el-button [class*="el-icon-"] + span {
margin-left: 1px;
}
}
}
}
/** 表单布局 **/
.form-header {
font-size: 15px;
......@@ -273,24 +328,21 @@
}
}
// 所有的提示框标题
.el-dialog__header{
padding-bottom:0;
padding:0px;
.el-dialog__header {
padding-bottom: 0;
padding: 0px;
height: 51px;
line-height: 50px;
background-color: #053b6a;
.el-dialog__title{
.el-dialog__title {
display: inline-block;
margin-left:22px;
color:#fff;
margin-left: 22px;
color: #fff;
}
.el-dialog__headerbtn{
i{
.el-dialog__headerbtn {
i {
color: #fff;
}
}
// background-color: ;
}
// 图片预览
gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue
View file @ dc0dee11
......@@ -104,7 +104,7 @@
@click="handleIssue(scope.row)"
v-hasPermi="['workOrder:basicsInfo:add']"
v-if="scope.row.planStatus == 0"
>下发
>下发工单
</el-button>
<el-button
size="normal"
......@@ -251,9 +251,6 @@
typeOptions: [],
// 设备级联
options: [],
planId: null,
planName: null,
remarks: null,
props: {
multiple: true,
value: "id",
......@@ -280,11 +277,7 @@
remarks: null
},
// 表单参数
form: {
planId: null,
planName: null,
remarks: null
},
form: { },
// 表单校验
rules: {
planName: [
......@@ -447,7 +440,7 @@
this.form.resourceId = this.form.planId;
this.form.orderType = "1";
addBasicsInfo(this.form).then(response => {
this.form = response.data;
this.msgSuccess("下发成功");
this.open = false;
this.getList();
});
......
gassafety-web/src/views/enterprise/mapView/components/RightBototmData.vue
View file @ dc0dee11
......@@ -3,17 +3,43 @@
<div class="left">
<div class="top">设备报警最新记录</div>
<div class="bottom">
<div class="one">设备编号:<span>1123123123</span></div>
<div class="two">报警时间:<span>34523452345</span></div>
<div class="bottom right-bottom-data-left">
<!-- <div class="table-top">
<div>编号</div>
<div>名称</div>
<div>类型</div>
<div>内容</div>
<div>事件</div>
</div> -->
<!-- <div class="one">设备编号:<span>1123123123</span></div>
<div class="two">报警时间:<span>34523452345</span></div> -->
<el-table size="mini" :data="tableData" style="width: 100%" height="170">
<el-table-column prop="date" label="编号" width="150">
</el-table-column>
<el-table-column prop="name" label="名称" width="120">
</el-table-column>
<el-table-column prop="province" label="类型" width="80">
</el-table-column>
<el-table-column prop="city" label="时间" width="120">
</el-table-column>
<el-table-column prop="address" label="内容" width="">
</el-table-column>
</el-table>
</div>
</div>
<div class="right">
<template v-for="item in list">
<div class="right-content" :key="item.type">
<template v-for="(item, index) in list">
<div
class="right-content"
:class="{ three: index == 2 }"
:key="item.type"
>
<div class="text-icon">
<i class="iconfont" :class="[iconClass(item),{iconFontSize: item.type==4 }]"></i>
<i
class="iconfont"
:class="[iconClass(item), { iconFontSize: item.type == 4 }]"
></i>
</div>
<div class="text">
<div class="top">{{ typeName[item.type] }}</div>
......@@ -50,6 +76,57 @@ export default {
4: "icon-ylbgs",
99: "icon-gdcd",
},
tableData: [
{
date: "2016-05-03",
name: "王小虎",
province: "上海",
city: "普陀区",
address: "上海市普陀区金沙江路",
},
{
date: "2016-05-02",
name: "王小虎",
province: "上海",
city: "普陀区",
address: "上海市普陀区金沙江路 1518 弄",
},
{
date: "2016-05-04",
name: "王小虎",
province: "上海",
city: "普陀区",
address: "上海市普陀区金沙江路 1518 弄",
},
{
date: "2016-05-01",
name: "王小虎",
province: "上海",
city: "普陀区",
address: "上海市普陀区金沙江路 1518 弄",
},
{
date: "2016-05-08",
name: "王小虎",
province: "上海",
city: "普陀区",
address: "上海市普陀区金沙江路 1518 弄",
},
{
date: "2016-05-06",
name: "王小虎",
province: "上海",
city: "普陀区",
address: "上海市普陀区金沙江路 1518 弄",
},
{
date: "2016-05-07",
name: "王小虎",
province: "上海",
city: "普陀区",
address: "上海市普陀区金沙江路 1518 弄",
},
],
};
},
created() {
......@@ -57,7 +134,7 @@ export default {
},
methods: {
iconClass(item) {
return this.iconList[item.type]
return this.iconList[item.type];
},
},
};
......@@ -65,58 +142,62 @@ export default {
<style lang="scss" scoped>
.wrapper {
width: 778px;
height: 304px;
// width: 978px;
height: 200px;
position: fixed;
right: 32px;
bottom: 22px;
right: 10px;
bottom: 10px;
overflow:hidden;
// background-color: #fff;
display: flex;
justify-content: space-between;
& > div {
}
.left {
width: 278px;
width: 778px;
margin-right: 12px;
box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
background-color: #fff;
color: #fff;
// background-color: #fff;
// color: #fff;
font-size: 14px;
font-weight: 400;
.top {
height: 32px;
background-color: #053b6a;
color: #fff;
line-height: 32px;
padding-left: 12px;
}
.bottom {
& > div {
height: 20px;
padding-left: 32px;
padding-bottom: 2px;
&.one {
background-color: #f0f0f0;
color: #2788ea;
}
&.two {
color: #676767;
}
.table-top {
// background-color: red;
// display: flex;
// justify-content: space-between;
// div {
// width: 100%;
// text-align: center;
// }
}
}
}
.right {
width: 500px;
width: 740px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
// justify-content: space-between;
align-content: flex-start;
margin-top:7px;
& > .right-content {
background-color: #fff;
width: 238px;
height: 82px;
margin-bottom: 29px;
box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
margin-right: 10px;
display: flex;
&.three {
margin-right: 0px;
}
// align-items: center;
.text-icon {
line-height: 82px;
......@@ -142,7 +223,7 @@ export default {
}
}
// 单独调整下最后一个icon的大小
.iconFontSize{
.iconFontSize {
font-size: 50px !important;
}
}
......
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