Skip to content

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

Merge branch 'develop_jzl'

parents 7365846e aa8ec83e
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 86 deletions
gassafetyprogress-web/src/components/bigWindow/Cz.vue
View file @ 34114d97
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2022-01-26 20:07:52 * @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-10 10:33:35 * @LastEditTime: 2022-03-16 17:32:38
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<img src="@/assets/mapImages/closeBtn.png" alt="" /> <img src="@/assets/mapImages/closeBtn.png" alt="" />
</div> </div>
<div class="top flex"> <!-- <div class="top flex">
<div class="group"> <div class="group">
<div class="left">所属公司：</div> <div class="left">所属公司：</div>
<div class="right zzz">{{ companyType[deviceData.companyType] }}</div> <div class="right zzz">{{ companyType[deviceData.companyType] }}</div>
...@@ -47,6 +47,50 @@ ...@@ -47,6 +47,50 @@
</div> </div>
<div v-else>-</div> <div v-else>-</div>
</div> </div>
</div> -->
<div class="top flex">
<div class="top-left">
<div class="group">
<div class="left">所属公司：</div>
<div class="right zzz">{{ companyType[deviceData.companyType] }}</div>
</div>
<div class="group">
<div class="left">设备类型：</div>
<div class="right zzz">
{{ deviceType[deviceData.iconType] }}
</div>
</div>
<div class="group">
<div class="left last">设备地址：</div>
<div
v-if="deviceData.deviceAddr"
:title="deviceData.deviceAddr"
class="right last zzz"
>
{{ deviceData.deviceAddr || "-" }}
</div>
<div
v-else-if="deviceData.stationAddr"
:title="deviceData.stationAddr"
class="right last zzz"
>
{{ deviceData.stationAddr || "-" }}
</div>
<div v-else>-</div>
</div>
</div>
<div class="top-right">
<el-image
v-if="deviceData.pictureAddress"
style="width: 100px; height: 100px"
:src="deviceData.pictureAddress"
:preview-src-list="[deviceData.pictureAddress ]"
z-index=99999
>
</el-image>
<div class="imgtext" v-else>暂无图片</div>
</div>
</div> </div>
<div class="middle">{{ profile }}</div> <div class="middle">{{ profile }}</div>
...@@ -57,8 +101,8 @@ ...@@ -57,8 +101,8 @@
<div>设备数量</div> <div>设备数量</div>
<div>在线设备</div> <div>在线设备</div>
<div>离线设备</div> <div>离线设备</div>
<div>历史报警</div> <!-- <div>历史报警</div>
<div>已处理报警</div> <div>已处理报警</div> -->
<div class="last">报警中</div> <div class="last">报警中</div>
</div> </div>
<template v-if="list.length > 0"> <template v-if="list.length > 0">
...@@ -77,12 +121,12 @@ ...@@ -77,12 +121,12 @@
<div v-unValue class=""> <div v-unValue class="">
{{ deviceData.offlineEquipment }} {{ deviceData.offlineEquipment }}
</div> </div>
<div v-unValue class=""> <!-- <div v-unValue class="">
{{ deviceData.historicalAlarm }} {{ deviceData.historicalAlarm }}
</div> </div>
<div v-unValue class=""> <div v-unValue class="">
{{ deviceData.alarmProcessed }} {{ deviceData.alarmProcessed }}
</div> </div> -->
<div v-unValue class="last"> <div v-unValue class="last">
{{ deviceData.inAlarm }} {{ deviceData.inAlarm }}
</div> </div>
...@@ -160,6 +204,8 @@ export default { ...@@ -160,6 +204,8 @@ export default {
}); });
} }
this.myHttp() this.myHttp()
console.log(this.deviceData);
}, },
methods: { methods: {
...@@ -191,7 +237,7 @@ export default { ...@@ -191,7 +237,7 @@ export default {
background-color: rgba(9, 18, 32, 0.6); background-color: rgba(9, 18, 32, 0.6);
padding: 10px; padding: 10px;
position: relative; position: relative;
width: 700px; width: 600px;
.title { .title {
// padding-top: 10px; // padding-top: 10px;
// padding-left: 10px; // padding-left: 10px;
...@@ -211,28 +257,42 @@ export default { ...@@ -211,28 +257,42 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
border: 1px solid #cccccc; border: 1px solid #cccccc;
box-sizing: border-box; box-sizing: border-box;
.group { .top-left {
height: 30px;
flex: 1; flex: 1;
display: flex; .group {
justify-content: space-between; height: 40px;
box-sizing: border-box;
div {
flex: 1; flex: 1;
display: flex;
justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
border-right: 1px solid #cccccc; div {
text-align: center; flex: 1;
font-size: 14px; box-sizing: border-box;
color: #ffffff; border-right: 1px solid #cccccc;
line-height: 30px; border-bottom: 1px solid #cccccc;
padding: 0 5px; text-align: center;
&.last { font-size: 14px;
border-right: none; color: #ffffff;
line-height: 40px;
padding: 0 5px;
&.last {
border-bottom: none;
}
}
.left {
text-align: right;
background-color: rgba(255, 255, 255, 0.1);
} }
} }
.left { }
text-align: right; .top-right {
background-color: rgba(255, 255, 255, 0.1); flex: 1;
display: flex;
justify-content: center;
align-items: center;
.imgtext {
color: #ffffff;
font-size: 30px;
} }
} }
} }
......
gassafetyprogress-web/src/components/bigWindow/Device.vue
View file @ 34114d97
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2022-01-26 20:07:52 * @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-10 10:33:28 * @LastEditTime: 2022-03-16 17:29:11
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
...@@ -19,33 +19,47 @@ ...@@ -19,33 +19,47 @@
</div> </div>
<div class="top flex"> <div class="top flex">
<div class="group"> <div class="top-left">
<div class="left">所属公司：</div> <div class="group">
<div class="right zzz">{{ companyType[deviceData.companyType] }}</div> <div class="left">所属公司：</div>
</div> <div class="right zzz">{{ companyType[deviceData.companyType] }}</div>
<div class="group">
<div class="left">设备类型：</div>
<div class="right zzz">
{{ deviceType[deviceData.iconType] }}
</div> </div>
</div> <div class="group">
<div class="group"> <div class="left">设备类型：</div>
<div class="left">设备地址：</div> <div class="right zzz">
<div {{ deviceType[deviceData.iconType] }}
v-if="deviceData.deviceAddr" </div>
:title="deviceData.deviceAddr"
class="right last zzz"
>
{{ deviceData.deviceAddr || "-" }}
</div> </div>
<div <div class="group">
v-else-if="deviceData.stationAddr" <div class="left last">设备地址：</div>
:title="deviceData.stationAddr" <div
class="right last zzz" v-if="deviceData.deviceAddr"
> :title="deviceData.deviceAddr"
{{ deviceData.stationAddr || "-" }} class="right last zzz"
>
{{ deviceData.deviceAddr || "-" }}
</div>
<div
v-else-if="deviceData.stationAddr"
:title="deviceData.stationAddr"
class="right last zzz"
>
{{ deviceData.stationAddr || "-" }}
</div>
<div v-else>-</div>
</div> </div>
<div v-else>-</div> </div>
<div class="top-right">
<el-image
v-if="deviceData.iconUrl"
style="width: 100px; height: 100px"
:src="deviceData.iconUrl"
:preview-src-list="[deviceData.iconUrl ]"
z-index=99999
>
</el-image>
<div class="imgtext" v-else>暂无图片</div>
</div> </div>
</div> </div>
...@@ -57,8 +71,8 @@ ...@@ -57,8 +71,8 @@
<div>设备数量</div> <div>设备数量</div>
<div>在线设备</div> <div>在线设备</div>
<div>离线设备</div> <div>离线设备</div>
<div>历史报警</div> <!-- <div>历史报警</div>
<div>已处理报警</div> <div>已处理报警</div> -->
<div class="last">报警中</div> <div class="last">报警中</div>
</div> </div>
<template v-if="list.length > 0"> <template v-if="list.length > 0">
...@@ -77,12 +91,12 @@ ...@@ -77,12 +91,12 @@
<div v-unValue class=""> <div v-unValue class="">
{{ deviceData.offlineEquipment }} {{ deviceData.offlineEquipment }}
</div> </div>
<div v-unValue class=""> <!-- <div v-unValue class="">
{{ deviceData.historicalAlarm }} {{ deviceData.historicalAlarm }}
</div> </div>
<div v-unValue class=""> <div v-unValue class="">
{{ deviceData.alarmProcessed }} {{ deviceData.alarmProcessed }}
</div> </div> -->
<div v-unValue class="last"> <div v-unValue class="last">
{{ deviceData.inAlarm }} {{ deviceData.inAlarm }}
</div> </div>
...@@ -90,7 +104,7 @@ ...@@ -90,7 +104,7 @@
</template> </template>
</div> </div>
<div class="btn" v-if="list.length>0"> <div class="btn" v-if="list.length > 0">
<div @click="btnClick">感知设备</div> <div @click="btnClick">感知设备</div>
</div> </div>
</div> </div>
...@@ -160,7 +174,7 @@ export default { ...@@ -160,7 +174,7 @@ export default {
} }
// 当点开infowindow的时候，重新调接口 // 当点开infowindow的时候，重新调接口
this.myHttp(); this.myHttp();
// console.log(this.deviceData); console.log(this.deviceData);
}, },
methods: { methods: {
close() { close() {
...@@ -206,7 +220,7 @@ export default { ...@@ -206,7 +220,7 @@ export default {
background-color: rgba(9, 18, 32, 0.6); background-color: rgba(9, 18, 32, 0.6);
padding: 10px; padding: 10px;
position: relative; position: relative;
width: 700px; width: 600px;
.title { .title {
// padding-top: 10px; // padding-top: 10px;
// padding-left: 10px; // padding-left: 10px;
...@@ -226,28 +240,42 @@ export default { ...@@ -226,28 +240,42 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
border: 1px solid #cccccc; border: 1px solid #cccccc;
box-sizing: border-box; box-sizing: border-box;
.group { .top-left {
height: 30px;
flex: 1; flex: 1;
display: flex; .group {
justify-content: space-between; height: 40px;
box-sizing: border-box;
div {
flex: 1; flex: 1;
display: flex;
justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
border-right: 1px solid #cccccc; div {
text-align: center; flex: 1;
font-size: 14px; box-sizing: border-box;
color: #ffffff; border-right: 1px solid #cccccc;
line-height: 30px; border-bottom: 1px solid #cccccc;
padding: 0 5px; text-align: center;
&.last { font-size: 14px;
border-right: none; color: #ffffff;
line-height: 40px;
padding: 0 5px;
&.last {
border-bottom: none;
}
}
.left {
text-align: right;
background-color: rgba(255, 255, 255, 0.1);
} }
} }
.left { }
text-align: right; .top-right {
background-color: rgba(255, 255, 255, 0.1); flex: 1;
display: flex;
justify-content: center;
align-items: center;
.imgtext {
color: #ffffff;
font-size: 30px;
} }
} }
} }
......
gassafetyprogress-web/src/components/bigWindow/User.vue
View file @ 34114d97
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2022-01-26 20:07:52 * @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-07 14:02:43 * @LastEditTime: 2022-03-16 15:35:48
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
...@@ -35,6 +35,15 @@ ...@@ -35,6 +35,15 @@
</div> </div>
</div> </div>
<div class="top flex top-bottom">
<div class="group">
<div class="left">联系地址：</div>
<div :title="deviceData.address" class="right last zzz">
{{ deviceData.address || "-" }}
</div>
</div>
</div>
<template v-if="deviceData.detectorCountList"> <template v-if="deviceData.detectorCountList">
<div class="foot"> <div class="foot">
<div class="thead flex"> <div class="thead flex">
...@@ -42,8 +51,8 @@ ...@@ -42,8 +51,8 @@
<div>设备数量</div> <div>设备数量</div>
<div>在线设备</div> <div>在线设备</div>
<div>离线设备</div> <div>离线设备</div>
<div>历史报警</div> <!-- <div>历史报警</div>
<div>已处理报警</div> <div>已处理报警</div> -->
<div class="last">报警中</div> <div class="last">报警中</div>
</div> </div>
<div <div
...@@ -59,12 +68,12 @@ ...@@ -59,12 +68,12 @@
<div v-unValue class=""> <div v-unValue class="">
{{ data.offLineNum }} {{ data.offLineNum }}
</div> </div>
<div v-unValue class=""> <!-- <div v-unValue class="">
{{ data.historyAlarmNum }} {{ data.historyAlarmNum }}
</div> </div>
<div v-unValue class=""> <div v-unValue class="">
{{ data.cancelAlarmNum }} {{ data.cancelAlarmNum }}
</div> </div> -->
<div v-unValue class="last zzz"> <div v-unValue class="last zzz">
{{ data.processingAlarmNum }} {{ data.processingAlarmNum }}
</div> </div>
...@@ -140,7 +149,7 @@ export default { ...@@ -140,7 +149,7 @@ export default {
background-color: rgba(9, 18, 32, 0.6); background-color: rgba(9, 18, 32, 0.6);
padding: 10px; padding: 10px;
position: relative; position: relative;
width: 700px; width: 600px;
.title { .title {
// padding-top: 10px; // padding-top: 10px;
// padding-left: 10px; // padding-left: 10px;
...@@ -184,6 +193,15 @@ export default { ...@@ -184,6 +193,15 @@ export default {
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
} }
} }
&.top-bottom {
.left {
flex:none;
width: 192px !important;
}
.right {
flex: 1;
}
}
} }
.middle { .middle {
width: 100%; width: 100%;
......
gassafetyprogress-web/src/utils/mapClass/map.js
View file @ 34114d97
/* /*
* @Author: your name * @Author: your name
* @Date: 2022-01-11 13:45:12 * @Date: 2022-01-11 13:45:12
* @LastEditTime: 2022-03-15 13:50:27 * @LastEditTime: 2022-03-16 15:06:43
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/mapClass.js * @FilePath: /test/hello-world/src/utils/mapClass.js
...@@ -79,17 +79,25 @@ export class EditorMap { ...@@ -79,17 +79,25 @@ export class EditorMap {
// 获取朝阳区的边界信息 // 获取朝阳区的边界信息
var bounds = result.districtList[0].boundaries; var bounds = result.districtList[0].boundaries;
var polygons = []; var polygons = [];
console.log("boundsboundsboundsboundsbounds",bounds)
if (bounds) { if (bounds) {
for (var i = 0, l = bounds.length; i < l; i++) { for (var i = 0, l = bounds.length; i < l; i++) {
//生成行政区划polygon //生成行政区划polygon
new AMap.Polygon({ // new AMap.Polygon({
// map: this.map,
// strokeWeight: 2,
// path: bounds[i],
// fillOpacity: 1,
// fillColor: "transparent",
// strokeColor: "#09f",
// });
new AMap.Polyline({
map: this.map, map: this.map,
strokeWeight: 2, strokeWeight: 4,
path: bounds[i],
fillOpacity: 1,
fillColor: "transparent",
strokeColor: "#09f", strokeColor: "#09f",
}); path: bounds[i],
})
// polygons.push(polygon); // polygons.push(polygon);
} }
} }
......
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