Skip to content

G
gassafety-progress
Commit 357e616d authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

Merge branch 'master' into develop_jzl

parents 6c32d1f9 f65a97f3
Show whitespace changes
Inline Side-by-side
Showing with 360 additions and 55 deletions
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEmergencyDevice.java
View file @ 357e616d
......@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
* 应急设备对象 t_emergency_device
*
* @author zehong
* @date 2022-03-17
* @date 2022-03-21
*/
public class TEmergencyDevice extends BaseEntity
{
......@@ -34,11 +34,24 @@ public class TEmergencyDevice extends BaseEntity
@Excel(name = "纬度")
private String latitude;
/** 联系人 */
@Excel(name = "联系人")
private String contacts;
/** 联系电话 */
@Excel(name = "联系电话")
private String phone;
/** 详细地址 */
@Excel(name = "详细地址")
private String address;
/** 简介 */
@Excel(name = "简介")
private String introduce;
/** 0未删除 1已删除 */
@Excel(name = "0未删除 1已删除")
private Integer isDel;
public void setId(String id)
......@@ -86,6 +99,24 @@ public class TEmergencyDevice extends BaseEntity
{
return latitude;
}
public void setContacts(String contacts)
{
this.contacts = contacts;
}
public String getContacts()
{
return contacts;
}
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
{
return phone;
}
public void setAddress(String address)
{
this.address = address;
......@@ -95,6 +126,15 @@ public class TEmergencyDevice extends BaseEntity
{
return address;
}
public void setIntroduce(String introduce)
{
this.introduce = introduce;
}
public String getIntroduce()
{
return introduce;
}
public void setIsDel(Integer isDel)
{
this.isDel = isDel;
......@@ -113,7 +153,10 @@ public class TEmergencyDevice extends BaseEntity
.append("deviceName", getDeviceName())
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("contacts", getContacts())
.append("phone", getPhone())
.append("address", getAddress())
.append("introduce", getIntroduce())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
......
gassafetyprogress-system/src/main/resources/mapper/system/TEmergencyDeviceMapper.xml
View file @ 357e616d
......@@ -10,14 +10,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deviceName" column="device_name" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="contacts" column="contacts" />
<result property="phone" column="phone" />
<result property="address" column="address" />
<result property="introduce" column="introduce" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="isDel" column="is_del" />
</resultMap>
<sql id="selectTEmergencyDeviceVo">
select id, device_type, device_name, longitude, latitude, address, create_time, update_time, is_del from t_emergency_device
select id, device_type, device_name, longitude, latitude, contacts, phone, address, introduce, create_time, update_time, is_del from t_emergency_device
</sql>
<select id="selectTEmergencyDeviceList" parameterType="TEmergencyDevice" resultMap="TEmergencyDeviceResult">
......@@ -44,7 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceName != null">device_name,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="contacts != null">contacts,</if>
<if test="phone != null">phone,</if>
<if test="address != null">address,</if>
<if test="introduce != null">introduce,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="isDel != null">is_del,</if>
......@@ -55,7 +61,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceName != null">#{deviceName},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="contacts != null">#{contacts},</if>
<if test="phone != null">#{phone},</if>
<if test="address != null">#{address},</if>
<if test="introduce != null">#{introduce},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="isDel != null">#{isDel},</if>
......@@ -69,7 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceName != null">device_name = #{deviceName},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="contacts != null">contacts = #{contacts},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="address != null">address = #{address},</if>
<if test="introduce != null">introduce = #{introduce},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
......
gassafetyprogress-web/src/assets/styles/all.scss
View file @ 357e616d
......@@ -633,6 +633,40 @@
overflow-y: hidden !important;
}
}
// 后台系统右上角消息图标
.el-badge {
position: relative;
vertical-align: middle;
display: inline-block;
margin-bottom: 25px;
margin-right: 10px;
}
[class^=el-icon-], [class*=" el-icon-"] {
font-family: "element-icons" !important;
speak: none;
font-style: normal;
font-weight: 900 !important;
font-variant: normal;
text-transform: none;
vertical-align: text-bottom;
vertical-align: baseline;
display: inline-block;
-webkit-font-smoothing: antialiased;
display: inline-block;
padding: 0 8px;
height: 100% !important;
font-size: 22px;
color: #5a5e66;
-moz-osx-font-smoothing: grayscale;
}
.el-badge__content.is-fixed {
top: 15px !important;
right: 20px !important;
}
.el-badge__content {
padding: 0 2px !important;
}
//去除高德logo
.amap-logo{
display: none;
......
gassafetyprogress-web/src/components/bigWindow/leftBar.vue
View file @ 357e616d
......@@ -205,11 +205,12 @@
// 绘制图表
pieone.setOption({
title: {
text: '巡检任务完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
text: '巡检任务数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
left: 'center',
top :20,
textStyle:{
color: "#00ffff"
color: "#00ffff",
fontSize: "16"
}
},
grid: {
......@@ -281,11 +282,12 @@
});
pietwo.setOption({
title: {
text: '隐患整治完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
text: '隐患整治数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
left: 'center',
top :20,
textStyle:{
color: "#00ffff"
color: "#00ffff",
fontSize: "16"
}
},
grid: {
......
gassafetyprogress-web/src/components/bigWindow/rightBar.vue
View file @ 357e616d
......@@ -51,7 +51,7 @@
<div class="" style="padding: 0px 10px;">
<div class="yujingleft yujing" style="width: 33%;height: 90px;float: left;">
<div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
<img src="@/assets/mapinages/group786.png" alt="" style="width: 60px;height: 60px;" />
<img src="@/assets/mapinages/group786.png" alt="" style="width: 50px;height: 50px;" />
</div>
<div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
<p>设备预警</p>
......@@ -60,7 +60,7 @@
</div>
<div class="yujingcenter yujing" style="width: 33%;height: 90px;float: left;">
<div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
<img src="@/assets/mapinages/group787.png" alt="" style="width: 60px;height: 60px;" />
<img src="@/assets/mapinages/group787.png" alt="" style="width: 50px;height: 50px;" />
</div>
<div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
<p>事件情况</p>
......@@ -69,7 +69,7 @@
</div>
<div class="yujingright yujing" style="width: 33%;height: 90px;float: left;">
<div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
<img src="@/assets/mapinages/group788.png" alt="" style="width: 60px;height: 60px;" />
<img src="@/assets/mapinages/group788.png" alt="" style="width: 50px;height: 50px;" />
</div>
<div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
<p>隐患数量</p>
......
gassafetyprogress-web/src/components/emergency/deviceMaterial.vue 0 → 100644
View file @ 357e616d
<!--
* @Author: your name
* @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-08 16:16:39
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/components/deviceA.vue
-->
<template>
<div class="devicea-wrapper">
<div class="title">
{{deviceData.deviceName}}
</div>
<div class="close" @click="close">
<img src="@/assets/mapImages/closeBtn.png" alt="" />
</div>
<div class="top flex">
</div>
<div class="middle">
<div class="left">
<div>联系人：</div>
</div>
<div v-unValue title="123" class="right">
{{ deviceData.contacts }}
</div>
</div>
<div class="middle">
<div class="left">
<div>联系电话：</div>
</div>
<div v-unValue title="123" class="right">
{{ deviceData.phone }}
</div>
</div>
<div class="middle">
<div class="left">
<div>设施地址：</div>
</div>
<div v-unValue title="123" class="right">
{{ deviceData.address }}
</div>
</div>
<div class="middle">
<div class="left">
<div>简介：</div>
</div>
<div v-unValue title="123" class="right">
{{ deviceData.introduce }}
</div>
</div>
</div>
</template>
<script>
import { companyType, deviceType } from "@/utils/mapClass/config.js";
export default {
data() {
return {
companyType,
deviceType,
profile: "暂无备注",
};
},
computed: {
prodTest() {
return this.vueRoot.$store.state.user.systemSetting.prod_test;
},
company() {
return this.vueRoot.$store.state.bigWindowCompany.company;
},
},
mounted() {
// 如果不是测试，而是真数据，就要用帧数据的东西
if (this.prodTest != "test") {
this.companyType = {};
this.company.forEach((item) => {
this.companyType[item.conpanyId] = item.companyName;
});
}
console.log(this.deviceData);
},
methods: {
close() {
this.mapClass.infowindowClose();
},
btnClick() {
// this.vueRoot.centerDataFunc(this.deviceData.pressureFlows);
},
},
};
</script>
<style lang="scss" scoped>
.devicea-wrapper {
background-color: rgba(9, 18, 32, 0.6);
padding: 10px;
position: relative;
width: 500px;
.title {
// padding-top: 10px;
// padding-left: 10px;
font-size: 14px;
line-height: 14px;
color: #ffffff;
}
.close {
position: absolute;
right: 10px;
top: 5px;
cursor: pointer;
}
.top {
margin-top: 10px;
// margin-bottom: 10px;
border: 1px solid #cccccc;
box-sizing: border-box;
.group {
height: 30px;
flex: 1;
display: flex;
justify-content: space-between;
box-sizing: border-box;
div {
flex: 1;
box-sizing: border-box;
border-right: 1px solid #cccccc;
text-align: center;
font-size: 14px;
color: #ffffff;
line-height: 30px;
padding: 0 5px;
&.last {
border-right: none;
}
}
.left {
text-align: right;
background-color: rgba(255, 255, 255, 0.1);
}
}
}
.middle {
display: flex;
border: 1px solid #cccccc;
border-top: none;
& > div {
box-sizing: border-box;
border-right: 1px solid #cccccc;
text-align: center;
font-size: 14px;
color: #ffffff;
line-height: 30px;
padding: 0 5px;
&.left {
width: 113px;
display: flex;
align-items: center;
background-color: rgba(255, 255, 255, 0.1);
div {
text-align: right;
flex: 1;
}
}
&.right {
border: none;
flex: 1;
text-align: left;
text-indent: 2em;
line-height: normal;
padding: 5px;
}
}
}
.foot {
width: 100%;
padding: 5px;
border: 1px solid #ffffff;
box-sizing: border-box;
font-size: 14px;
color: #ffffff;
text-indent: 2em;
margin-bottom: 10px;
}
.flex {
display: flex;
justify-content: space-between;
}
}
</style>
gassafetyprogress-web/src/layout/components/Navbar.vue
View file @ 357e616d
......@@ -7,13 +7,17 @@
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<!-- <search id="header-search" class="right-menu-item" /> -->
          <el-badge :value="200" :max="99" class="item">
            <i class="el-icon-chat-dot-round"></i>
          </el-badge>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="布局大小" effect="dark" placement="bottom">
<!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>
</el-tooltip> -->
</template>
......
gassafetyprogress-web/src/utils/mapClass/map.js
View file @ 357e616d
......@@ -311,7 +311,6 @@ export class EditorMap {
this.allDevice[iconType] = [];
}
this.allDevice[iconType].push(device);
this.deviceEvent(device, compontent);
// 设备的事件函数
this.deviceEvent(device, compontent);
}
......
gassafetyprogress-web/src/views/emergency/index.vue
View file @ 357e616d
......@@ -238,6 +238,7 @@ import Company from "@/components/bigWindow/Company.vue";
import PipeColor from "@/components/emergency/PipeColor.vue";
import GetPos from '@/components/GetPos';
import rightBar from "@/components/emergency/rightBar.vue";
import deviceMaterial from "@/components/emergency/deviceMaterial.vue";
export default {
name: "Home",
components: {
......@@ -247,6 +248,8 @@ export default {
UserCenter,
OtherCenter,
PipeColor,
deviceMaterial,
},
data() {
return {
......@@ -489,7 +492,7 @@ export default {
});
this.deviceList = response.rows;
//console.log(this.deviceList)
this.addDevice({"data":this.deviceList},null)
this.addDevice({"data":this.deviceList},deviceMaterial)
this.arr2.forEach((item) => (item.ischeck = true));
});
},
......@@ -594,7 +597,7 @@ export default {
},
// 设备上图
addDevice(data, component) {
console.log(data,data)
//console.log(data,data)
for (let comp in data) {
data[comp].forEach((pipe) => {
this.map.addDevice(pipe, component);
......
gassafetyprogress-web/src/views/operationMonitor/gassVehicle/index.vue
View file @ 357e616d
......@@ -33,7 +33,7 @@
<!--<el-table-column label="车辆检测信息" align="center" prop="vehicleInspect" />-->
<el-table-column label="所属企业" align="center" prop="beyondEnterpriseId" />
<el-table-column label="责任人" align="center" prop="personLiable" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="联系电话" align="center" prop="phone" width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope">
<el-button
......@@ -67,7 +67,7 @@
<!-- 查询车辆信息 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" label-width="80px">
<el-form ref="form" :model="form" label-width="100px">
<el-row>
<el-col :span="11">
<el-form-item label="车牌号" prop="carNum">
......@@ -144,10 +144,19 @@
<!--值班人员轨迹回放-->
<el-dialog
title="值班人员轨迹回放"
title="车辆轨迹回放"
:visible.sync="backOpen"
>
<el-form :model="backForm" ref="backForm" :rules="rules">
<el-form :model="backForm" ref="backForm" :rules="rules" label-width="120px">
<el-row>
<el-col :span="10">
<el-form-item label="车牌号" prop="carNum">
<!--<span>{{ backForm.carNum }}</span>-->
<el-input v-model="backForm.carNum" :disabled="true"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="请选择时间段" prop="changeTime">
......@@ -358,10 +367,10 @@ export default {
.format("YYYY-MM-DD HH:mm:ss");
this.backForm.endTime = moment().format("YYYY-MM-DD HH:mm:ss");
} else if (e == 2) {
this.backForm.beginTime = moment().format("YYYY-MM-DD HH:mm:ss");
this.backForm.endTime = moment()
.add(1, "d")
this.backForm.beginTime = moment()
.subtract(1, "d")
.format("YYYY-MM-DD HH:mm:ss");
this.backForm.endTime = moment().format("YYYY-MM-DD HH:mm:ss");
} else {
this.backForm.beginTime = "";
this.backForm.endTime = "";
......@@ -370,8 +379,8 @@ export default {
getCar(carNum){
this.backOpen=true;
this.backForm.carNum =carNum;
this.backForm.beginTime = moment().format("YYYY-MM-DD HH:mm:ss");
this.backForm.endTime = moment().add(2, "h").format("YYYY-MM-DD HH:mm:ss");
this.backForm.beginTime = moment().subtract(2, "h").format("YYYY-MM-DD HH:mm:ss");
this.backForm.endTime = moment().format("YYYY-MM-DD HH:mm:ss");
},
handleCurrentChangvale(val){
this.queryParams.pageNum = val;
......@@ -415,6 +424,7 @@ export default {
}
getVehicleLocations(this.backForm).then(res =>{
let paths = [];
let times = [];
if(res.data.length == 1){
this.$message({
message: '抱歉当前车辆只能查看位置信息，无法形成轨迹！',
......@@ -428,8 +438,9 @@ export default {
}else{
res.data.forEach(item => {
paths.push([item.longitude,item.latitude]);
times.push(item.reportTime)
})
this.map.backTrack(this.backForm.vehicleId,paths);
this.map.backTrack(this.backForm.vehicleId,paths,times);
this.backOpen = false;
}
......
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