Skip to content

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

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

# Conflicts:
#	gassafety-web/src/assets/styles/gassafety.scss
parents 7521d86a c2269b3d
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 100 deletions
gassafety-admin/src/main/java/com/zehong/web/controller/inspectorLocation/TUserLocationController.java
View file @ f18f10ed
...@@ -116,7 +116,7 @@ public class TUserLocationController extends BaseController ...@@ -116,7 +116,7 @@ public class TUserLocationController extends BaseController
/** /**
* 新增巡检员定位 * 新增巡检员定位
*/ */
@PreAuthorize("@ss.hasPermi('system:location:add')") //@PreAuthorize("@ss.hasPermi('system:location:add')")
@Log(title = "巡检员定位", businessType = BusinessType.INSERT) @Log(title = "巡检员定位", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TUserLocation tUserLocation) public AjaxResult add(@RequestBody TUserLocation tUserLocation)
......
gassafety-system/src/main/java/com/zehong/system/domain/TUserLocation.java
View file @ f18f10ed
...@@ -35,6 +35,16 @@ public class TUserLocation extends BaseEntity ...@@ -35,6 +35,16 @@ public class TUserLocation extends BaseEntity
private String phonenumber; private String phonenumber;
private String nickName;
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getUserName() { public String getUserName() {
return userName; return userName;
} }
......
gassafety-system/src/main/resources/mapper/system/TUserLocationMapper.xml
View file @ f18f10ed
...@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTUserLocationVo"> <sql id="selectTUserLocationVo">
select location.location_id, location.user_id, location.longitude, location.latitude, location.create_time,(SELECT sysU.user_name FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS userName,(SELECT sysU.phonenumber FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS phonenumber from t_user_location location select location.location_id, location.user_id, location.longitude, location.latitude, location.create_time,(SELECT sysU.user_name FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS userName,(SELECT sysU.phonenumber FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS phonenumber,(SELECT sysU.nick_name FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS nickName from t_user_location location
</sql> </sql>
<select id="selectTUserLocationList" parameterType="TUserLocation" resultMap="TUserLocationResult"> <select id="selectTUserLocationList" parameterType="TUserLocation" resultMap="TUserLocationResult">
......
gassafety-web/src/assets/images/llj.gif
View replaced file @ 7521d86a View file @ f18f10ed
gassafety-web/src/assets/images/llj.gif

2.05 KB | W: | H:

gassafety-web/src/assets/images/llj.gif

1.98 KB | W: | H:

gassafety-web/src/assets/images/llj.gif
gassafety-web/src/assets/images/llj.gif
gassafety-web/src/assets/images/llj.gif
gassafety-web/src/assets/images/llj.gif
  • 2-up
  • Swipe
  • Onion skin
gassafety-web/src/assets/images/ylb.gif
View replaced file @ 7521d86a View file @ f18f10ed
gassafety-web/src/assets/images/ylb.gif

1.93 KB | W: | H:

gassafety-web/src/assets/images/ylb.gif

1.83 KB | W: | H:

gassafety-web/src/assets/images/ylb.gif
gassafety-web/src/assets/images/ylb.gif
gassafety-web/src/assets/images/ylb.gif
gassafety-web/src/assets/images/ylb.gif
  • 2-up
  • Swipe
  • Onion skin
gassafety-web/src/assets/styles/gassafety.scss
View file @ f18f10ed
...@@ -436,4 +436,9 @@ ...@@ -436,4 +436,9 @@
} }
} }
} }
} }
\ No newline at end of file .ddd {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
gassafety-web/src/components/PopWindowGis/lineInfoWindow.vue
View file @ f18f10ed
<template> <template>
<div class="wrapper"> <div class="wrapper">
<div class="top display-default"> <div class="top display-default">
<div class="left text">{{ obj.pipeName }}</div> <div class="left text ddd" :title="obj.pipeName">{{ obj.pipeName }}</div>
<div class="right text"> <div class="right text">
<img @click="close" src="../../assets/images/closeBtn.png" alt="" /> <img @click="close" src="../../assets/images/closeBtn.png" alt="" />
</div> </div>
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
}}</span> }}</span>
</div> </div>
</div> </div>
<div class="pic"> <div class="pic">
<img @mousedown.stop="mousedown" :src="obj.iconUrl" alt="" /> <img @mousedown.stop="mousedown" :src="obj.iconUrl" alt="" />
<el-image <el-image
...@@ -129,7 +128,8 @@ export default { ...@@ -129,7 +128,8 @@ export default {
close() { close() {
this.obj.polyline.infoWindow.close(); this.obj.polyline.infoWindow.close();
// window底部的数据拦 // window底部的数据拦
this.obj.polyline.getExtData().class.view.bottomDataShow = true; this.obj.polyline.getExtData().class.view.domAllShow();
}, },
deviceMore() { deviceMore() {
console.log(this.obj.polyline.getExtData().lineData); console.log(this.obj.polyline.getExtData().lineData);
...@@ -151,27 +151,32 @@ export default { ...@@ -151,27 +151,32 @@ export default {
.wrapper { .wrapper {
width: 406px; width: 406px;
max-height: 430px; max-height: 430px;
background: #fff; background: rgba(7, 29, 51, 0.9);
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
color: #fff;
// overflow: hidden; // overflow: hidden;
.top { .top {
width: 100%; width: 100%;
height: 51px; height: 51px;
background-color: #053b6a; // background-color: #053b6a;
background-image: url(../../assets/images/blueTopBg.png);
background-size: 100% 100%;
background-position: center;
// border-radius: 4px 4px 0px 0px;
// border: 1px solid #fff;
box-sizing: border-box;
position: relative; position: relative;
&:before { &:before {
content: ""; content: "";
position: absolute; position: absolute;
left: -20px; left: -20px;
top: 5px; top: 5px;
width: 0px; z-index: -1;
height: 0px; width: 33px;
/* border: 20px solid red; */ height: 33px;
border-top: 15px solid transparent; background-image: url(../../assets/images/blueLeftTriangle.png);
border-bottom: 15px solid transparent;
/* border-left: 50px solid greenyellow; */
border-right: 30px solid #053b6a;
} }
.text { .text {
font-weight: 600; font-weight: 600;
...@@ -209,7 +214,8 @@ export default { ...@@ -209,7 +214,8 @@ export default {
.eq-text { .eq-text {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #1d1d1d; // color: #1d1d1d;
color: #fff;
opacity: 1; opacity: 1;
& > span { & > span {
vertical-align: top; vertical-align: top;
......
gassafety-web/src/components/PopWindowGis/lineInfoWindowWarn.vue
View file @ f18f10ed
<template> <template>
<div class="wrapper"> <div class="wrapper">
<div class="top display-default"> <div class="top display-default">
<div class="left text">{{ obj.pipeName }}</div> <div class="left text ddd" :title="obj.pipeName">{{ obj.pipeName }}</div>
<div class="right text"> <div class="right text">
<img @click="close" src="../../assets/images/closeBtn.png" alt="" /> <img @click="close" src="../../assets/images/closeBtn.png" alt="" />
</div> </div>
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
}, },
close() { close() {
this.obj.polyline.infoWindow.close(); this.obj.polyline.infoWindow.close();
this.obj.polyline.getExtData().class.view.bottomDataShow = true; this.obj.polyline.getExtData().class.view.domAllShow()
}, },
}, },
}; };
...@@ -210,26 +210,29 @@ export default { ...@@ -210,26 +210,29 @@ export default {
.wrapper { .wrapper {
width: 406px; width: 406px;
max-height: 500px; max-height: 500px;
background: #fff; // background: #fff;
background: rgba(7, 29, 51, 0.9);
color: #fff;
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
// overflow: hidden; // overflow: hidden;
.top { .top {
width: 100%; width: 100%;
height: 51px; height: 51px;
background-color: #ff5a67; // background-color: #ff5a67;
background-image: url(../../assets/images/redTopBg.png);
background-size: 100% 100%;
background-position: center;
&:before { &:before {
content: ""; content: "";
position: absolute; position: absolute;
left: -20px; left: -20px;
top: 5px; top: 5px;
width: 0px; z-index: -1;
height: 0px; width: 33px;
/* border: 20px solid red; */ height: 33px;
border-top: 15px solid transparent; background-image: url(../../assets/images/redLeftTriangle.png);
border-bottom: 15px solid transparent;
/* border-left: 50px solid greenyellow; */
border-right: 30px solid #ff5a67;
} }
.text { .text {
font-weight: 600; font-weight: 600;
...@@ -239,6 +242,8 @@ export default { ...@@ -239,6 +242,8 @@ export default {
} }
.left { .left {
padding-left: 22px; padding-left: 22px;
width:100%;
overflow: hidden;
} }
.right { .right {
padding-right: 22px; padding-right: 22px;
...@@ -267,7 +272,7 @@ export default { ...@@ -267,7 +272,7 @@ export default {
.eq-text { .eq-text {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #1d1d1d; color: #fff;
opacity: 1; opacity: 1;
& > span { & > span {
vertical-align: top; vertical-align: top;
...@@ -300,6 +305,7 @@ export default { ...@@ -300,6 +305,7 @@ export default {
// padding-right: 22px; // padding-right: 22px;
// padding-bottom: 10px; // padding-bottom: 10px;
// padding-top: 16px; // padding-top: 16px;
box-sizing: border-box; box-sizing: border-box;
// border-bottom: 1px solid #e2e2e2; // border-bottom: 1px solid #e2e2e2;
& > div { & > div {
...@@ -337,7 +343,7 @@ export default { ...@@ -337,7 +343,7 @@ export default {
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
width: 95px; width: 95px;
height: 33px; height: 33px;
border: none; // border: none;
} }
} }
} }
......
gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue
View file @ f18f10ed
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="wrapper"> <div class="wrapper">
<span class="dot-left"></span> <span class="dot-left"></span>
<div class="top display-default"> <div class="top display-default">
<div class="left text">{{ data.deviceName }}</div> <div class="left text ddd" :title="data.deviceName">{{ data.deviceName }}</div>
<div class="right text"> <div class="right text">
<img src="../../assets/images/closeBtn.png" alt="" @click="close" /> <img src="../../assets/images/closeBtn.png" alt="" @click="close" />
</div> </div>
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
}, },
close() { close() {
this.map.clearInfoWindow(); this.map.clearInfoWindow();
this.data.class.view.bottomDataShow = true; this.data.class.view.domAllShow()
}, },
}, },
}; };
...@@ -107,26 +107,38 @@ export default { ...@@ -107,26 +107,38 @@ export default {
.wrapper { .wrapper {
width: 406px; width: 406px;
max-height: 430px; max-height: 430px;
background: #fff; // background: #fff;
border-radius: 4px; border-radius: 4px;
background: rgba(7, 29, 51, 0.9);
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
color: #fff;
// overflow: hidden; // overflow: hidden;
.top { .top {
width: 100%; width: 100%;
height: 51px; height: 51px;
background-color: #053b6a; // background-color: #053b6a;
background-image: url(../../assets/images/blueTopBg.png);
background-size: 100% 100%;
background-position: center;
&:before { &:before {
// content: "";
// position: absolute;
// left: -20px;
// top: 5px;
// width: 0px;
// height: 0px;
// z-index:-1;
// border-top: 15px solid transparent;
// border-bottom: 15px solid transparent;
// border-right: 30px solid #053b6a;
content: ""; content: "";
position: absolute; position: absolute;
left: -20px; left: -20px;
top: 5px; top: 5px;
width: 0px; z-index: -1;
height: 0px; width: 33px;
/* border: 20px solid red; */ height: 33px;
border-top: 15px solid transparent; background-image: url(../../assets/images/blueLeftTriangle.png);
border-bottom: 15px solid transparent;
/* border-left: 50px solid greenyellow; */
border-right: 30px solid #053b6a;
} }
.text { .text {
font-weight: 600; font-weight: 600;
...@@ -164,7 +176,8 @@ export default { ...@@ -164,7 +176,8 @@ export default {
.eq-text { .eq-text {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #1d1d1d; // color: #1d1d1d;
color: #fff;
opacity: 1; opacity: 1;
& > span { & > span {
vertical-align: top; vertical-align: top;
......
gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue
View file @ f18f10ed
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
<div class="wrapper"> <div class="wrapper">
<span class="dot-left"></span> <span class="dot-left"></span>
<div class="top display-default"> <div class="top display-default">
<div class="left text">{{ data.deviceName }}</div> <div class="left text ddd" :title="data.deviceName">
{{ data.deviceName }}
</div>
<div class="right text"> <div class="right text">
<img <img src="../../assets/images/closeBtn.png" alt="" @click="close" />
src="../../assets/images/closeBtn.png"
alt=""
@click="close"
/>
</div> </div>
</div> </div>
<!-- 设备信息 --> <!-- 设备信息 -->
...@@ -137,9 +135,9 @@ export default { ...@@ -137,9 +135,9 @@ export default {
type: "device", type: "device",
}); });
}, },
close(){ close() {
this.map.clearInfoWindow(); this.map.clearInfoWindow();
this.data.class.view.bottomDataShow = true; this.data.class.view.domAllShow();
}, },
// CreateWorkCallBack(e) { // CreateWorkCallBack(e) {
// // console.log("生成工单后传过来的参数", e); // // console.log("生成工单后传过来的参数", e);
...@@ -177,31 +175,32 @@ export default { ...@@ -177,31 +175,32 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper { .wrapper {
width: 406px; width: 406px;
max-height: 500px; max-height: 500px;
background: #fff; // background: #fff;
background: rgba(7, 29, 51, 0.9);
color: #fff;
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
// overflow: hidden; // overflow: hidden;
.top { .top {
width: 100%; width: 100%;
height: 51px; height: 51px;
background-color: #ff5a67; // background-color: #ff5a67;
&:before { background-image: url(../../assets/images/redTopBg.png);
background-size: 100% 100%;
background-position: center;
&:before {
content: ""; content: "";
position: absolute; position: absolute;
left: -20px; left: -20px;
top: 5px; top: 5px;
width: 0px; z-index: -1;
height: 0px; width: 33px;
/* border: 20px solid red; */ height: 33px;
border-top: 15px solid transparent; background-image: url(../../assets/images/redLeftTriangle.png);
border-bottom: 15px solid transparent;
/* border-left: 50px solid greenyellow; */
border-right: 30px solid #ff5a67;
} }
.text { .text {
font-weight: 600; font-weight: 600;
...@@ -239,7 +238,7 @@ export default { ...@@ -239,7 +238,7 @@ export default {
.eq-text { .eq-text {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #1d1d1d; color: #fff;
opacity: 1; opacity: 1;
& > span { & > span {
vertical-align: top; vertical-align: top;
...@@ -309,7 +308,7 @@ export default { ...@@ -309,7 +308,7 @@ export default {
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
width: 95px; width: 95px;
height: 33px; height: 33px;
border: none; // border: none;
} }
} }
} }
......
gassafety-web/src/components/PopWindowGis/troubleInfoWindowWarn.vue
View file @ f18f10ed
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<div class="wrapper"> <div class="wrapper">
<span class="dot-left"></span> <span class="dot-left"></span>
<div class="top display-default"> <div class="top display-default">
<div class="left text">{{ data.troubleName }}</div> <div class="left text ddd" :title="data.troubleName">
{{ data.troubleName }}
</div>
<div class="right text"> <div class="right text">
<img src="../../assets/images/closeBtn.png" alt="" @click="close" /> <img src="../../assets/images/closeBtn.png" alt="" @click="close" />
</div> </div>
...@@ -154,7 +156,7 @@ export default { ...@@ -154,7 +156,7 @@ export default {
// }, // },
close() { close() {
this.map.clearInfoWindow(); this.map.clearInfoWindow();
this.data.class.view.bottomDataShow = true; this.data.class.view.domAllShow();
}, },
deviceMore() { deviceMore() {
this.data.class.view.$router.push({ this.data.class.view.$router.push({
...@@ -185,26 +187,29 @@ export default { ...@@ -185,26 +187,29 @@ export default {
.wrapper { .wrapper {
width: 406px; width: 406px;
max-height: 500px; max-height: 500px;
background: #fff; // background: #fff;
background: rgba(7, 29, 51, 0.9);
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
// overflow: hidden; // overflow: hidden;
.top { .top {
width: 100%; width: 100%;
height: 51px; height: 51px;
background-color: #e6a23c; // background-color: #e6a23c;
background-image: url(../../assets/images/yellowTopBg.png);
background-size: 100% 100%;
background-position: center;
color: #fff;
&:before { &:before {
content: ""; content: "";
position: absolute; position: absolute;
left: -20px; left: -20px;
top: 5px; top: 5px;
width: 0px; z-index: -1;
height: 0px; width: 33px;
/* border: 20px solid red; */ height: 33px;
border-top: 15px solid transparent; background-image: url(../../assets/images/yellowLeftTriangle.png);
border-bottom: 15px solid transparent;
/* border-left: 50px solid greenyellow; */
border-right: 30px solid #e6a23c;
} }
.text { .text {
font-weight: 600; font-weight: 600;
...@@ -242,7 +247,7 @@ export default { ...@@ -242,7 +247,7 @@ export default {
.eq-text { .eq-text {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #1d1d1d; color: #fff;
opacity: 1; opacity: 1;
& > span { & > span {
vertical-align: top; vertical-align: top;
...@@ -272,6 +277,7 @@ export default { ...@@ -272,6 +277,7 @@ export default {
width: 100%; width: 100%;
max-height: 119px; max-height: 119px;
padding-left: 22px; padding-left: 22px;
color: #fff;
// padding-right: 22px; // padding-right: 22px;
// padding-bottom: 10px; // padding-bottom: 10px;
// padding-top: 16px; // padding-top: 16px;
...@@ -312,7 +318,7 @@ export default { ...@@ -312,7 +318,7 @@ export default {
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
width: 95px; width: 95px;
height: 33px; height: 33px;
border: none; // border: none;
} }
} }
} }
......
gassafety-web/src/components/PopWindowGis/workerManInfowindow.vue
View file @ f18f10ed
<template> <template>
<div class="wrapper"> <div class="wrapper">
<div class="content"> <div class="content">
<span class="left">姓名: {{ data.userName }}</span> <span class="left">姓名: {{ data.nickName }}</span>
<span class="right">时间: {{ data.createTime }}</span> <span class="right">时间: {{ data.createTime }}</span>
</div> </div>
...@@ -26,7 +26,9 @@ export default { ...@@ -26,7 +26,9 @@ export default {
.wrapper { .wrapper {
// width: 166px; // width: 166px;
height: 54px; height: 54px;
background: #0d4f88; // background: #0d4f88;
background: rgba(7, 29, 51, 0.9);
font-size: 14px; font-size: 14px;
color: #fff; color: #fff;
box-sizing: border-box; box-sizing: border-box;
...@@ -45,7 +47,9 @@ export default { ...@@ -45,7 +47,9 @@ export default {
border-top: 15px solid transparent; border-top: 15px solid transparent;
border-bottom: 15px solid transparent; border-bottom: 15px solid transparent;
/* border-left: 50px solid greenyellow; */ /* border-left: 50px solid greenyellow; */
border-right: 30px solid #0d4f88; border-right: 30px solid rgba(7, 29, 51, 0.9);
box-shadow: 0 0 20px -5px #0d4f88;
z-index: -1; z-index: -1;
} }
.content { .content {
......
gassafety-web/src/components/PopWindowGis/workerManView.vue
View file @ f18f10ed
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
created() { created() {
this.formData.userId = this.userId; this.formData.userId = this.userId;
this.workerManArr = this.gaodeMap.workerManArr.map((item) => ({ this.workerManArr = this.gaodeMap.workerManArr.map((item) => ({
label: item.userName, label: item.nickName,
value: item.userId, value: item.userId,
})); }));
}, },
......
gassafety-web/src/utils/gaodeMapView.js
View file @ f18f10ed
...@@ -80,7 +80,7 @@ class gaodeMap { ...@@ -80,7 +80,7 @@ class gaodeMap {
this.closeInfoWindow(); this.closeInfoWindow();
this.polyLinesColorClear(); this.polyLinesColorClear();
this.view.bottomDataShow = true; this.domAllShow();
if (this.lineType != 1 || this.lineFlag) return; if (this.lineType != 1 || this.lineFlag) return;
// 除了这里，还要利用vue页面的window事件辅助，当组件出来的时候，就得利用window事件 // 除了这里，还要利用vue页面的window事件辅助，当组件出来的时候，就得利用window事件
if (this.newLineObj) { if (this.newLineObj) {
...@@ -139,13 +139,13 @@ class gaodeMap { ...@@ -139,13 +139,13 @@ class gaodeMap {
// 卫星图 // 卫星图
if (!bool) { if (!bool) {
if(this.satellite) return; if (this.satellite) return;
this.satellite = new AMap.TileLayer.Satellite() this.satellite = new AMap.TileLayer.Satellite();
this.myMap.addLayer(this.satellite); this.myMap.addLayer(this.satellite);
} else { } else {
if(this.satellite){ if (this.satellite) {
this.myMap.removeLayer(this.satellite); this.myMap.removeLayer(this.satellite);
this.satellite=null; this.satellite = null;
} }
} }
} }
...@@ -284,6 +284,7 @@ class gaodeMap { ...@@ -284,6 +284,7 @@ class gaodeMap {
marker.on("mouseover", this.wokerManOpen); marker.on("mouseover", this.wokerManOpen);
marker.on("mouseout", e => { marker.on("mouseout", e => {
e.target.infoWindow.close(); e.target.infoWindow.close();
this.domAllShow()
}); });
marker.on("mousedown", e => { marker.on("mousedown", e => {
...@@ -719,7 +720,7 @@ class gaodeMap { ...@@ -719,7 +720,7 @@ class gaodeMap {
map: map, map: map,
path: lineArr, path: lineArr,
showDir: true, showDir: true,
strokeColor: "#28F", //线颜色 strokeColor: "#2EE7E7", //线颜色
// strokeOpacity: 1, //线透明度 // strokeOpacity: 1, //线透明度
strokeWeight: 6 //线宽 strokeWeight: 6 //线宽
// strokeStyle: "solid" //线样式 // strokeStyle: "solid" //线样式
...@@ -969,8 +970,15 @@ class gaodeMap { ...@@ -969,8 +970,15 @@ class gaodeMap {
boxCollision(infowindowDom) { boxCollision(infowindowDom) {
// gis地图页面的bottomdata组件 // gis地图页面的bottomdata组件
const { const {
Bottom: { $el: pageDom } Bottom: { $el: pageDomBottom },
Right: { $el: pageDomRight }
} = this.view.$refs; } = this.view.$refs;
this.mathWho(infowindowDom, pageDomBottom, "bottomDataShow", "bottom");
this.mathWho(infowindowDom, pageDomRight, "rightDataShow", "right");
}
// domAttr view里的属性
//attr 存储在类里的值
mathWho(infowindowDom, pageDom, domAttr, attr) {
let { let {
offsetTop: ay, offsetTop: ay,
offsetLeft: ax, offsetLeft: ax,
...@@ -985,20 +993,34 @@ class gaodeMap { ...@@ -985,20 +993,34 @@ class gaodeMap {
} = infowindowDom.getBoundingClientRect(); } = infowindowDom.getBoundingClientRect();
// 如果组件消失了ay回变成0，所以要记录一下，当它为0的时候取记录的值 // 如果组件消失了ay回变成0，所以要记录一下，当它为0的时候取记录的值
if (ay != 0) { if (ay != 0) {
this.ay = ay; // this.ay = ay;
this[attr + "y"] = ay;
} else {
// ay = this.ay;
ay = this[attr + "y"];
}
if (ax != 0) {
// this.ax = ax;
this[attr + "x"] = ax;
} else { } else {
ay = this.ay; // ax = this.ax;
ax = this[attr + "x"];
} }
console.log("ay", ay); console.log("ay", ay);
if (by + bh >= ay) { if (by + bh >= ay && bx + bw >= ax) {
console.log("隐藏"); console.log("隐藏");
this.view.bottomDataShow = false; this.view[domAttr] = false;
} else { } else {
console.log("显示"); console.log("显示");
this.view.bottomDataShow = true; this.view[domAttr] = true;
} }
// if((by+bh) -ay <0)
} }
domAllShow() {
this.view.bottomDataShow = true;
this.view.rightDataShow = true;
}
// 把map里的in佛window转化成vue里的dom // 把map里的in佛window转化成vue里的dom
addCloneDome(target, infoWindow) { addCloneDome(target, infoWindow) {
target.cloneDom = infoWindow.dom.cloneNode(true); target.cloneDom = infoWindow.dom.cloneNode(true);
......
gassafety-web/src/views/enterprise/mapView/components/Right.vue
View file @ f18f10ed
...@@ -66,11 +66,12 @@ export default { ...@@ -66,11 +66,12 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper { .wrapper {
width: 300px; width: 270px;
height: 800px; height: 700px;
position: absolute; position: absolute;
top: 40px; top: 40px;
right: 0; right: 0;
bottom:0;
overflow-x: hidden; overflow-x: hidden;
// right: 10px; // right: 10px;
// top: 131px; // top: 131px;
...@@ -102,6 +103,9 @@ export default { ...@@ -102,6 +103,9 @@ export default {
background-image: url(../../../../assets/images/listBg.png); background-image: url(../../../../assets/images/listBg.png);
margin-right: 10px; margin-right: 10px;
display: flex; display: flex;
&:last-child{
margin-bottom:0px !important;
}
&.three { &.three {
margin-right: 0px; margin-right: 0px;
} }
......
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ f18f10ed
...@@ -73,7 +73,10 @@ ...@@ -73,7 +73,10 @@
/> />
<Bottom <Bottom
v-show="bottomDataShow" v-show="bottomDataShow"
:class="{ classShow: !bottomDataShow }" :class="{
classShow: !bottomDataShow,
bottomMarginRight: bottomMarginRight,
}"
ref="Bottom" ref="Bottom"
:list="rightBototmData" :list="rightBototmData"
/> />
...@@ -265,7 +268,7 @@ ...@@ -265,7 +268,7 @@
</template> </template>
<!-- 无数据 --> <!-- 无数据 -->
<template v-else> <template v-else>
<div style="padding-left: 5px;color:#fff;">暂无数据</div> <div style="padding-left: 5px; color: #fff">暂无数据</div>
</template> </template>
</div> </div>
</el-collapse-transition> </el-collapse-transition>
...@@ -389,6 +392,8 @@ export default { ...@@ -389,6 +392,8 @@ export default {
rightBototmData: [], rightBototmData: [],
bottomDataShow: true, bottomDataShow: true,
rightDataShow: true, rightDataShow: true,
// 如果右边与下面重叠了，bottom要往左移
bottomMarginRight: false,
// 是否显示生成工单弹框 // 是否显示生成工单弹框
createWorkOpen: false, createWorkOpen: false,
//隐患工单 //隐患工单
...@@ -419,6 +424,7 @@ export default { ...@@ -419,6 +424,7 @@ export default {
window.removeEventListener("resize", this.onResize); window.removeEventListener("resize", this.onResize);
window.addEventListener("resize", this.onResize); window.addEventListener("resize", this.onResize);
this.initMap(); this.initMap();
// }); // });
}, },
watch: { watch: {
...@@ -433,7 +439,22 @@ export default { ...@@ -433,7 +439,22 @@ export default {
this.boxHeight = document.body.clientHeight - 80; this.boxHeight = document.body.clientHeight - 80;
this.boxWidth = document.body.clientWidth; this.boxWidth = document.body.clientWidth;
console.log("挂在"); console.log("挂在");
const {
Bottom: { $el: pageDomBottom },
Right: { $el: pageDomRight },
} = this.$refs;
// 右边的底
const RightBottom = pageDomRight.offsetTop + pageDomRight.offsetHeight;
// 下边的上边
const bottomTop = pageDomBottom.offsetTop;
if(RightBottom>bottomTop){
// 重叠了，bottom右移动
this.bottomMarginRight=true;
}
}, },
initMap() { initMap() {
let gaoMap = new gaodeMap("石家庄"); let gaoMap = new gaodeMap("石家庄");
this.gaoMap = gaoMap; this.gaoMap = gaoMap;
...@@ -792,6 +813,8 @@ export default { ...@@ -792,6 +813,8 @@ export default {
leftBarChange(item) { leftBarChange(item) {
// this.leftBarNum= this.leftBarNum != item.value ? item.value:0; // this.leftBarNum= this.leftBarNum != item.value ? item.value:0;
this.gaoMap.closeInfoWindow(); this.gaoMap.closeInfoWindow();
this.domAllShow();
this.gaoMap.polyLinesColorClear(); this.gaoMap.polyLinesColorClear();
const index = this.leftBarNum.indexOf(item.value); const index = this.leftBarNum.indexOf(item.value);
if (index >= 0) { if (index >= 0) {
...@@ -875,6 +898,7 @@ export default { ...@@ -875,6 +898,7 @@ export default {
} }
}, },
panToo(iten, item) { panToo(iten, item) {
this.domAllShow();
// 如果没打对勾，就啥也不干 // 如果没打对勾，就啥也不干
if (!this.leftBarNum.includes(item.value)) return; if (!this.leftBarNum.includes(item.value)) return;
// 点击的时候允许infowindow消失 // 点击的时候允许infowindow消失
...@@ -1029,6 +1053,7 @@ export default { ...@@ -1029,6 +1053,7 @@ export default {
} else { } else {
this.arrowRightNum.push(item.value); this.arrowRightNum.push(item.value);
} }
this.domAllShow();
}, },
// 管道储存 // 管道储存
...@@ -1147,7 +1172,7 @@ export default { ...@@ -1147,7 +1172,7 @@ export default {
path: [item.longitude, item.latitude], path: [item.longitude, item.latitude],
no: index, no: index,
userId: item.userId, userId: item.userId,
userName: item.userName, userName: item.nickName,
userPhone: item.phonenumber, userPhone: item.phonenumber,
}; };
}); });
...@@ -1381,6 +1406,10 @@ export default { ...@@ -1381,6 +1406,10 @@ export default {
this.gaoMap.lineFlag = false; this.gaoMap.lineFlag = false;
// this.gaoMap.createNewLine(); // this.gaoMap.createNewLine();
}, },
domAllShow() {
this.bottomDataShow = true;
this.rightDataShow = true;
},
refreshMap() { refreshMap() {
// this.changeBtnDataClear(); // this.changeBtnDataClear();
this.keyWord = ""; this.keyWord = "";
...@@ -1452,8 +1481,8 @@ export default { ...@@ -1452,8 +1481,8 @@ export default {
drawerClick() { drawerClick() {
console.log("drawerClick"); console.log("drawerClick");
this.gaoMap.polyLinesColorClear(); this.gaoMap.polyLinesColorClear();
this.gaoMap.closeInfoWindow(); this.gaoMap.closeInfoWindow();
this.domAllShow();
}, },
}, },
...@@ -1482,6 +1511,10 @@ export default { ...@@ -1482,6 +1511,10 @@ export default {
bottom: 0; bottom: 0;
width: 100%; width: 100%;
} }
// 如果right与bottom 重叠，则bottom左移动
.bottomMarginRight{
right: 280px;
}
// .btn-wrapper { // .btn-wrapper {
// position: fixed; // position: fixed;
// right: 32px; // right: 32px;
......
gassafety-web/yarn.lock
View file @ f18f10ed
...@@ -903,6 +903,11 @@ ...@@ -903,6 +903,11 @@
"@babel/helper-validator-identifier" "^7.14.5" "@babel/helper-validator-identifier" "^7.14.5"
to-fast-properties "^2.0.0" to-fast-properties "^2.0.0"
"@easydarwin/easywasmplayer@^4.0.13":
version "4.0.13"
resolved "https://registry.nlark.com/@easydarwin/easywasmplayer/download/@easydarwin/easywasmplayer-4.0.13.tgz#83dc92d880e9b0528e5d4cfc9c669a1a1e420c08"
integrity sha1-g9yS2IDpsFKOXUz8nGaaGh5CDAg=
"@eslint/eslintrc@^0.2.2": "@eslint/eslintrc@^0.2.2":
version "0.2.2" version "0.2.2"
resolved "https://registry.nlark.com/@eslint/eslintrc/download/@eslint/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76" resolved "https://registry.nlark.com/@eslint/eslintrc/download/@eslint/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
...@@ -3378,9 +3383,9 @@ ecc-jsbn@~0.1.1: ...@@ -3378,9 +3383,9 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0" jsbn "~0.1.0"
safer-buffer "^2.1.0" safer-buffer "^2.1.0"
echarts@4.9.0: echarts@^4.9.0:
version "4.9.0" version "4.9.0"
resolved "https://registry.nlark.com/echarts/download/echarts-4.9.0.tgz#a9b9baa03f03a2a731e6340c55befb57a9e1347d" resolved "https://registry.nlark.com/echarts/download/echarts-4.9.0.tgz?cache=0&sync_timestamp=1630472362764&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fecharts%2Fdownload%2Fecharts-4.9.0.tgz#a9b9baa03f03a2a731e6340c55befb57a9e1347d"
integrity sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0= integrity sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=
dependencies: dependencies:
zrender "4.3.2" zrender "4.3.2"
......
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