diff --git a/src/components/CommonFunction/index.vue b/src/components/CommonFunction/index.vue
index 1a10acb..c2eba44 100644
--- a/src/components/CommonFunction/index.vue
+++ b/src/components/CommonFunction/index.vue
@@ -5,8 +5,8 @@
@click="btnClick" />
-
+
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/components/CommonFunction/index.vue b/src/components/CommonFunction/index.vue
index 1a10acb..c2eba44 100644
--- a/src/components/CommonFunction/index.vue
+++ b/src/components/CommonFunction/index.vue
@@ -5,8 +5,8 @@
@click="btnClick" />
-
+
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/components/CommonFunction/index.vue b/src/components/CommonFunction/index.vue
index 1a10acb..c2eba44 100644
--- a/src/components/CommonFunction/index.vue
+++ b/src/components/CommonFunction/index.vue
@@ -5,8 +5,8 @@
@click="btnClick" />
-
+
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/components/CommonFunction/index.vue b/src/components/CommonFunction/index.vue
index 1a10acb..c2eba44 100644
--- a/src/components/CommonFunction/index.vue
+++ b/src/components/CommonFunction/index.vue
@@ -5,8 +5,8 @@
@click="btnClick" />
-
+
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/components/CommonFunction/index.vue b/src/components/CommonFunction/index.vue
index 1a10acb..c2eba44 100644
--- a/src/components/CommonFunction/index.vue
+++ b/src/components/CommonFunction/index.vue
@@ -5,8 +5,8 @@
@click="btnClick" />
-
+
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/components/CommonFunction/index.vue b/src/components/CommonFunction/index.vue
index 1a10acb..c2eba44 100644
--- a/src/components/CommonFunction/index.vue
+++ b/src/components/CommonFunction/index.vue
@@ -5,8 +5,8 @@
@click="btnClick" />
-
+
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/components/CommonFunction/index.vue b/src/components/CommonFunction/index.vue
index 1a10acb..c2eba44 100644
--- a/src/components/CommonFunction/index.vue
+++ b/src/components/CommonFunction/index.vue
@@ -5,8 +5,8 @@
@click="btnClick" />
-
+
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index fb1ce91..693a175 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -3,7 +3,7 @@
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index fb1ce91..693a175 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -3,7 +3,7 @@
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index fb1ce91..693a175 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -3,7 +3,7 @@
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index fb1ce91..693a175 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -3,7 +3,7 @@
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index fb1ce91..693a175 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -3,7 +3,7 @@
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index fb1ce91..693a175 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -3,7 +3,7 @@
@@ -21,7 +21,7 @@
import CommonBtn from "../CommonBtn";
import { clearUpMap } from '@/utils/freedo/index'
-import { initPosition, initPage } from "../../utils/freedo";
+import { initPosition, initPage } from "../../utils/freedo";
import mapJson from "@/assets/mapJson/map.json";
import { eventBus } from "../../main";
@@ -59,11 +59,11 @@
disabled: true,
"children": [
{ "id": 41, "label": "智慧教育-手工模型", disabled: true },
- { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
- { "id": 43, "label": "智慧社区-手工模型", disabled: true },
- { "id": 44, "label": "智慧工地-手工模型", disabled: true },
- { "id": 45, "label": "智慧交通-手工模型", disabled: true },
- { "id": 46, "label": "智慧园林-手工模型", disabled: true }
+ { "id": 42, "label": "智慧停车云-手工模型", disabled: true },
+ { "id": 43, "label": "智慧社区-手工模型", disabled: true },
+ { "id": 44, "label": "智慧工地-手工模型", disabled: true },
+ { "id": 45, "label": "智慧交通-手工模型", disabled: true },
+ { "id": 46, "label": "智慧园林-手工模型", disabled: true }
]
}, {
"id": 5,
@@ -95,8 +95,8 @@
setTimeout(() => {
this.tree.forEach((item) => {
item.disabled = false
- if(item.children) {
- item.children = item.children.map((item) => ({ ...item,disabled: false}))
+ if (item.children) {
+ item.children = item.children.map((item) => ({ ...item, disabled: false }))
}
})
}, 5000)
@@ -125,7 +125,7 @@
handler(data, checked, indeterminate)
}
else {
- if(data.id.toString() === '5' && checked) {
+ if (data.id.toString() === '5' && checked) {
window.terrainManager.visible = true
return
}
@@ -143,14 +143,18 @@
},
btnClick(e) {
this.showLayerTree = false
+ this.clearDialog()
if (e.target.id === 'initBtn') {
initPosition()
} else if (e.target.id === 'clearBtn') {
clearUpMap()
} else if (e.target.id === 'layerBtn') {
- // clearUpMap()
this.showLayerTree = true
}
+ },
+ // 清空地图弹窗
+ clearDialog() {
+ this.$bus.$emit('clear')
}
}
}
@@ -178,7 +182,7 @@
right: 20px;
top: 1rem;
display: flex;
- width: 20rem;
+ width: 15rem;
height: 5rem;
z-index: 1111111111;
}
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index 63b60ea..8aefaea 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -259,8 +259,8 @@
localPoint(e) {
// this.childrenClick(e)
this.clickIcon({
- _data:{
- data:e
+ _data: {
+ data: e
}
})
},
@@ -280,6 +280,11 @@
},
mounted() {
this.search()
+ this.$bus.$on('clear', () => {
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ this.isShowPop = false
+ })
// getStatistics().then(res => {
// if (res.code === 200 && res.data.value.length) {
// console.log(res.data, '')
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 48721f7..32573d2 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -112,6 +112,7 @@
btnClick(e) {
clearResetMap()
this.selectIndex = e.target.id
+ this.isShowPop = false
if (this.selectIndex === 'publicBtn') {
// 绘制热力图
heat([
@@ -870,6 +871,10 @@
getStatistics({}).then(res => {
console.log(res.data, '一卡通')
})
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ })
}
}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index 4b8d110..81530d5 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -695,6 +695,11 @@
},
mounted() {
this.drawSence()
+ this.$bus.$on('clear', () => {
+ this.isShowPop = false
+ this.isShowEvent = false
+ this.isShowEventPop = false
+ })
}
}
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index e9be7b0..946ee45 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -1,30 +1,23 @@
-
-
+
+
@@ -34,7 +27,7 @@
import TimeManager from "@/components/TimeManager";
import GdPop from "./gdPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, clearResetMap ,AddLabelPoint, initPosition } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint, initPosition } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -43,17 +36,17 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddLabel, focusPoint } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
import KeywordManager from "../../../../components/KeywordManager";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Gd',
- components: {KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { KeywordManager, GdPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -73,19 +66,19 @@
caseTotal: 0,
layerManager: null,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff88',
- 2: '#fdeb5688',
- 3: '#85c8ff88',
- 4: '#ffba7488',
- 5: '#87f6b388',
- },
+ 1: '#ffffff88',
+ 2: '#fdeb5688',
+ 3: '#85c8ff88',
+ 4: '#ffba7488',
+ 5: '#87f6b388',
+ },
time: {
startTime: '',
endTime: '',
@@ -105,10 +98,10 @@
name: '工地设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
@@ -122,7 +115,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -135,16 +128,20 @@
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:44, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 44, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
-
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.isShow = false
+ })
// window.pmtsManager.add({
// id: "智慧工地-手工模型",
// url: mapJson.CIM4["智慧工地-手工模型"],
@@ -179,7 +176,7 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
console.log(res.data, '热力')
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
// arr.splice(0,1) // todo: 测试第一个错误数据
@@ -192,17 +189,17 @@
// 设备图层控制
layer(item) {
// clearUpMap(true)
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-dev', item,
null)
})
@@ -216,23 +213,23 @@
// keywords: this.keyword
}
getCasePointList(param).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap(true)
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
this.keywordList = data
data.forEach(item => {
// if(item.total === '1') {
- AddLabelPoint(
- item.id,
- '',
- this.caseIcon[item.eventstatus],
- [item.lon, item.lat, 0], 'gd-case', item,
- this.clickCase)
+ AddLabelPoint(
+ item.id,
+ '',
+ this.caseIcon[item.eventstatus],
+ [item.lon, item.lat, 0], 'gd-case', item,
+ this.clickCase)
// } else {
// AddDivPointCase(item, this.caseColor[item.status], item.total, this.clickCase)
// }
@@ -244,8 +241,8 @@
search() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
clearUpMap(true)
this.keywordList = response.data.value
response.data.value.forEach(item => {
@@ -254,7 +251,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickGd)
})
@@ -265,8 +262,8 @@
score() {
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
- getArea({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getArea({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
// console.log(item,'321123')
@@ -280,8 +277,8 @@
})
}
})
- getMonthGdScore({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getMonthGdScore({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
response.data.value.filter(item => item.lng !== "" && item.lng !== null).forEach(item => {
AddLabel(
item.id,
@@ -304,7 +301,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -313,7 +310,7 @@
[this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -323,7 +320,7 @@
this.preCase = null
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.isListPage = true
this.$refs.caseListPage.initDialog()
this.caseListQuery = {
@@ -345,16 +342,16 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
}
})
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 87e65b1..6b78aed 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -96,6 +96,12 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
+
+ // 清除弹窗展示
+ this.$bus.$on('clear', () => {
+ this.isListPage = false
+ this.showPop = false
+ })
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index fb1ce91..693a175 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -3,7 +3,7 @@