diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index 693a175..ef5938c 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -1,15 +1,21 @@
-
+
@@ -26,8 +32,9 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
+import { eventBus } from "../../../../main";
export default {
name: 'Jt',
@@ -47,19 +54,19 @@
},
caseTotal: 0,
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: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -81,10 +88,10 @@
name: '基础设施',
value: 'place'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
place: [
@@ -98,11 +105,23 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.place = response.data.value
}
})
this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: true });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
@@ -125,16 +144,16 @@
// 设备图层控制
layer(item) {
// clearUpMap()
- 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()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-place', item,
null)
})
@@ -145,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
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)
}
})
@@ -169,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -177,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickHw)
})
@@ -187,7 +206,7 @@
// 智慧工地-工地近1月综合得分
score() {
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
response.data.value.forEach(item => {
console.log(item.areaboundary)
// todo : 画范围
@@ -199,7 +218,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,
@@ -235,13 +254,13 @@
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
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -250,7 +269,7 @@
},
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/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index 693a175..ef5938c 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -1,15 +1,21 @@
-
+
@@ -26,8 +32,9 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
+import { eventBus } from "../../../../main";
export default {
name: 'Jt',
@@ -47,19 +54,19 @@
},
caseTotal: 0,
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: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -81,10 +88,10 @@
name: '基础设施',
value: 'place'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
place: [
@@ -98,11 +105,23 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.place = response.data.value
}
})
this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: true });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
@@ -125,16 +144,16 @@
// 设备图层控制
layer(item) {
// clearUpMap()
- 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()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-place', item,
null)
})
@@ -145,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
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)
}
})
@@ -169,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -177,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickHw)
})
@@ -187,7 +206,7 @@
// 智慧工地-工地近1月综合得分
score() {
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
response.data.value.forEach(item => {
console.log(item.areaboundary)
// todo : 画范围
@@ -199,7 +218,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,
@@ -235,13 +254,13 @@
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
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -250,7 +269,7 @@
},
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/jxh/index.vue b/src/pages/ywts/cszl/jxh/index.vue
index 8697cb6..0f23aaa 100644
--- a/src/pages/ywts/cszl/jxh/index.vue
+++ b/src/pages/ywts/cszl/jxh/index.vue
@@ -1,26 +1,24 @@
-
-
+
+
@@ -44,14 +42,15 @@
getAll,
getCaseInfo, getBoard
} from "../../../../api/ywts/cszl/jxh";
-import {AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
-import {getGridInfo, getGridToken} from "../../../../api/common";
+import { getGridInfo, getGridToken } from "../../../../api/common";
import JxhPop from "./jxhPop";
+import { eventBus } from "../../../../main";
export default {
name: 'Jxh',
- components: {JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
+ components: { JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
data() {
return {
preCase: null,
@@ -132,6 +131,18 @@
this.isListPage = false
this.isShow = false
})
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 全部事件
getAll({
// urgent: '0',
@@ -139,8 +150,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -158,7 +169,7 @@
caseMarker(res) {
res.data.value.forEach(item => {
// console.log(item.status)
- if(item.total === '1') {
+ if (item.total === '1') {
AddLabelPoint(
item.id,
'',
@@ -184,24 +195,24 @@
switch (e.bigtype) {
case 'source':
query.sourceId = e.type
- getSourceList(query).then( res => {
- if(res.code === 200) {
+ getSourceList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'project':
query.projectId = e.type
- getProjectList(query).then( res => {
- if(res.code === 200) {
+ getProjectList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'grid':
query.gridType = e.type
- getGridList(query).then( res => {
- if(res.code === 200) {
+ getGridList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -212,7 +223,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,
@@ -222,7 +233,7 @@
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -233,7 +244,7 @@
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.caseList = []
this.isListPage = true
this.hasUrge = false
@@ -267,13 +278,13 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
// 事件看板
- this.caseTotal = 1000 // todo
+ this.caseTotal = 1000 // todo
this.caseList = []
this.isListPage = true
this.hasUrge = true
@@ -296,8 +307,8 @@
high: '1',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -310,8 +321,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -321,7 +332,7 @@
break
case "caseHeatBtn":
getHeat(this.time).then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value) // 热力图
}
})
@@ -330,29 +341,29 @@
},
gridDraw(token, areaCode) {
const colors = [
- [0,234,255,0.47],
- [255,185,0,0.47],
- [255,234,0,0.47],
- [209,0,255,0.47],
- [255,0,38,0.47],
+ [0, 234, 255, 0.47],
+ [255, 185, 0, 0.47],
+ [255, 234, 0, 0.47],
+ [209, 0, 255, 0.47],
+ [255, 0, 38, 0.47],
]
getGridInfo({
paramCodeList: 'KJ5001',
areaCode,
token
- }).then( res => {
+ }).then(res => {
console.log(res)
res.data.chirdAreaInfo.forEach((item, index) => {
item._source.areainfo.coordinates.forEach(area => {
let positions = []
- let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0]: area
+ let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0] : area
arr.forEach(pos => {
- positions.push(Freedo.Cartesian3.fromDegrees( pos[0], pos[1],0))
+ positions.push(Freedo.Cartesian3.fromDegrees(pos[0], pos[1], 0))
})
- AddPolygon(positions,colors[index % 5], this.gridClick,item._id)
+ AddPolygon(positions, colors[index % 5], this.gridClick, item._id)
AddOnlyLabel(
'',
- item._source.areaname , //+ this.menus.grid
+ item._source.areaname, //+ this.menus.grid
[item._source.lon, item._source.lat, 0],
'', null, null)
})
@@ -368,7 +379,7 @@
secret: CryptoJS.MD5(timestamp + 'geostar999').toString()
}
- getGridToken(param).then( res => {
+ getGridToken(param).then(res => {
clearUpMap()
this.gridDraw(res.data.token, '360783001')
this.gridDraw(res.data.token, '360783002')
@@ -378,32 +389,32 @@
},
// 三个概况统计
layerSeach() {
- getSource(this.time).then( res => {
- if(res.code === 200) {
+ getSource(this.time).then(res => {
+ if (res.code === 200) {
this.menus.source = res.data.value.map(item => {
item.bigtype = 'source'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getProject(this.time).then( res => {
- if(res.code === 200) {
+ getProject(this.time).then(res => {
+ if (res.code === 200) {
this.menus.project = res.data.value.map(item => {
item.bigtype = 'project'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getGrid(this.time).then( res => {
- if(res.code === 200) {
+ getGrid(this.time).then(res => {
+ if (res.code === 200) {
this.menus.grid = res.data.value.map(item => {
item.bigtype = 'grid'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
@@ -414,7 +425,7 @@
if (val && val.page) {
this.caseListQuery.pageNo = val.page
}
- if(this.hasUrge) {
+ if (this.hasUrge) {
this.searchBoard()
} else {
this.searchCaseMarkerList()
@@ -423,20 +434,20 @@
// 事件看板查询
searchBoard() {
getBoard(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
}
})
},
// 事件详情分页
searchCaseMarkerList() {
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
}
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index 693a175..ef5938c 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -1,15 +1,21 @@
-
+
@@ -26,8 +32,9 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
+import { eventBus } from "../../../../main";
export default {
name: 'Jt',
@@ -47,19 +54,19 @@
},
caseTotal: 0,
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: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -81,10 +88,10 @@
name: '基础设施',
value: 'place'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
place: [
@@ -98,11 +105,23 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.place = response.data.value
}
})
this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: true });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
@@ -125,16 +144,16 @@
// 设备图层控制
layer(item) {
// clearUpMap()
- 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()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-place', item,
null)
})
@@ -145,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
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)
}
})
@@ -169,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -177,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickHw)
})
@@ -187,7 +206,7 @@
// 智慧工地-工地近1月综合得分
score() {
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
response.data.value.forEach(item => {
console.log(item.areaboundary)
// todo : 画范围
@@ -199,7 +218,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,
@@ -235,13 +254,13 @@
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
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -250,7 +269,7 @@
},
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/jxh/index.vue b/src/pages/ywts/cszl/jxh/index.vue
index 8697cb6..0f23aaa 100644
--- a/src/pages/ywts/cszl/jxh/index.vue
+++ b/src/pages/ywts/cszl/jxh/index.vue
@@ -1,26 +1,24 @@
-
-
+
+
@@ -44,14 +42,15 @@
getAll,
getCaseInfo, getBoard
} from "../../../../api/ywts/cszl/jxh";
-import {AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
-import {getGridInfo, getGridToken} from "../../../../api/common";
+import { getGridInfo, getGridToken } from "../../../../api/common";
import JxhPop from "./jxhPop";
+import { eventBus } from "../../../../main";
export default {
name: 'Jxh',
- components: {JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
+ components: { JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
data() {
return {
preCase: null,
@@ -132,6 +131,18 @@
this.isListPage = false
this.isShow = false
})
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 全部事件
getAll({
// urgent: '0',
@@ -139,8 +150,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -158,7 +169,7 @@
caseMarker(res) {
res.data.value.forEach(item => {
// console.log(item.status)
- if(item.total === '1') {
+ if (item.total === '1') {
AddLabelPoint(
item.id,
'',
@@ -184,24 +195,24 @@
switch (e.bigtype) {
case 'source':
query.sourceId = e.type
- getSourceList(query).then( res => {
- if(res.code === 200) {
+ getSourceList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'project':
query.projectId = e.type
- getProjectList(query).then( res => {
- if(res.code === 200) {
+ getProjectList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'grid':
query.gridType = e.type
- getGridList(query).then( res => {
- if(res.code === 200) {
+ getGridList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -212,7 +223,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,
@@ -222,7 +233,7 @@
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -233,7 +244,7 @@
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.caseList = []
this.isListPage = true
this.hasUrge = false
@@ -267,13 +278,13 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
// 事件看板
- this.caseTotal = 1000 // todo
+ this.caseTotal = 1000 // todo
this.caseList = []
this.isListPage = true
this.hasUrge = true
@@ -296,8 +307,8 @@
high: '1',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -310,8 +321,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -321,7 +332,7 @@
break
case "caseHeatBtn":
getHeat(this.time).then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value) // 热力图
}
})
@@ -330,29 +341,29 @@
},
gridDraw(token, areaCode) {
const colors = [
- [0,234,255,0.47],
- [255,185,0,0.47],
- [255,234,0,0.47],
- [209,0,255,0.47],
- [255,0,38,0.47],
+ [0, 234, 255, 0.47],
+ [255, 185, 0, 0.47],
+ [255, 234, 0, 0.47],
+ [209, 0, 255, 0.47],
+ [255, 0, 38, 0.47],
]
getGridInfo({
paramCodeList: 'KJ5001',
areaCode,
token
- }).then( res => {
+ }).then(res => {
console.log(res)
res.data.chirdAreaInfo.forEach((item, index) => {
item._source.areainfo.coordinates.forEach(area => {
let positions = []
- let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0]: area
+ let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0] : area
arr.forEach(pos => {
- positions.push(Freedo.Cartesian3.fromDegrees( pos[0], pos[1],0))
+ positions.push(Freedo.Cartesian3.fromDegrees(pos[0], pos[1], 0))
})
- AddPolygon(positions,colors[index % 5], this.gridClick,item._id)
+ AddPolygon(positions, colors[index % 5], this.gridClick, item._id)
AddOnlyLabel(
'',
- item._source.areaname , //+ this.menus.grid
+ item._source.areaname, //+ this.menus.grid
[item._source.lon, item._source.lat, 0],
'', null, null)
})
@@ -368,7 +379,7 @@
secret: CryptoJS.MD5(timestamp + 'geostar999').toString()
}
- getGridToken(param).then( res => {
+ getGridToken(param).then(res => {
clearUpMap()
this.gridDraw(res.data.token, '360783001')
this.gridDraw(res.data.token, '360783002')
@@ -378,32 +389,32 @@
},
// 三个概况统计
layerSeach() {
- getSource(this.time).then( res => {
- if(res.code === 200) {
+ getSource(this.time).then(res => {
+ if (res.code === 200) {
this.menus.source = res.data.value.map(item => {
item.bigtype = 'source'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getProject(this.time).then( res => {
- if(res.code === 200) {
+ getProject(this.time).then(res => {
+ if (res.code === 200) {
this.menus.project = res.data.value.map(item => {
item.bigtype = 'project'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getGrid(this.time).then( res => {
- if(res.code === 200) {
+ getGrid(this.time).then(res => {
+ if (res.code === 200) {
this.menus.grid = res.data.value.map(item => {
item.bigtype = 'grid'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
@@ -414,7 +425,7 @@
if (val && val.page) {
this.caseListQuery.pageNo = val.page
}
- if(this.hasUrge) {
+ if (this.hasUrge) {
this.searchBoard()
} else {
this.searchCaseMarkerList()
@@ -423,20 +434,20 @@
// 事件看板查询
searchBoard() {
getBoard(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
}
})
},
// 事件详情分页
searchCaseMarkerList() {
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
}
})
},
diff --git a/src/pages/ywts/cszl/yj/index.vue b/src/pages/ywts/cszl/yj/index.vue
index f6e1abe..d74dfe9 100644
--- a/src/pages/ywts/cszl/yj/index.vue
+++ b/src/pages/ywts/cszl/yj/index.vue
@@ -45,7 +45,7 @@
import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import { iconFilter, deviceList, caseList } from './data'
import ListPage from "@/components/ListPage";
-
+import { eventBus } from "../../../../main";
export default {
name: 'Yj',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -118,12 +118,18 @@
}
},
mounted() {
- // getStatistics().then(response => {
- // if(response.code === 200) {
- // this.menus.place = response.data.value
- // }
- // })
- // this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
clearResetMap()
this.searchPlace({})
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index 693a175..ef5938c 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -1,15 +1,21 @@
-
+
@@ -26,8 +32,9 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
+import { eventBus } from "../../../../main";
export default {
name: 'Jt',
@@ -47,19 +54,19 @@
},
caseTotal: 0,
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: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -81,10 +88,10 @@
name: '基础设施',
value: 'place'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
place: [
@@ -98,11 +105,23 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.place = response.data.value
}
})
this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: true });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
@@ -125,16 +144,16 @@
// 设备图层控制
layer(item) {
// clearUpMap()
- 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()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-place', item,
null)
})
@@ -145,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
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)
}
})
@@ -169,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -177,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickHw)
})
@@ -187,7 +206,7 @@
// 智慧工地-工地近1月综合得分
score() {
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
response.data.value.forEach(item => {
console.log(item.areaboundary)
// todo : 画范围
@@ -199,7 +218,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,
@@ -235,13 +254,13 @@
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
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -250,7 +269,7 @@
},
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/jxh/index.vue b/src/pages/ywts/cszl/jxh/index.vue
index 8697cb6..0f23aaa 100644
--- a/src/pages/ywts/cszl/jxh/index.vue
+++ b/src/pages/ywts/cszl/jxh/index.vue
@@ -1,26 +1,24 @@
-
-
+
+
@@ -44,14 +42,15 @@
getAll,
getCaseInfo, getBoard
} from "../../../../api/ywts/cszl/jxh";
-import {AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
-import {getGridInfo, getGridToken} from "../../../../api/common";
+import { getGridInfo, getGridToken } from "../../../../api/common";
import JxhPop from "./jxhPop";
+import { eventBus } from "../../../../main";
export default {
name: 'Jxh',
- components: {JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
+ components: { JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
data() {
return {
preCase: null,
@@ -132,6 +131,18 @@
this.isListPage = false
this.isShow = false
})
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 全部事件
getAll({
// urgent: '0',
@@ -139,8 +150,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -158,7 +169,7 @@
caseMarker(res) {
res.data.value.forEach(item => {
// console.log(item.status)
- if(item.total === '1') {
+ if (item.total === '1') {
AddLabelPoint(
item.id,
'',
@@ -184,24 +195,24 @@
switch (e.bigtype) {
case 'source':
query.sourceId = e.type
- getSourceList(query).then( res => {
- if(res.code === 200) {
+ getSourceList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'project':
query.projectId = e.type
- getProjectList(query).then( res => {
- if(res.code === 200) {
+ getProjectList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'grid':
query.gridType = e.type
- getGridList(query).then( res => {
- if(res.code === 200) {
+ getGridList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -212,7 +223,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,
@@ -222,7 +233,7 @@
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -233,7 +244,7 @@
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.caseList = []
this.isListPage = true
this.hasUrge = false
@@ -267,13 +278,13 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
// 事件看板
- this.caseTotal = 1000 // todo
+ this.caseTotal = 1000 // todo
this.caseList = []
this.isListPage = true
this.hasUrge = true
@@ -296,8 +307,8 @@
high: '1',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -310,8 +321,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -321,7 +332,7 @@
break
case "caseHeatBtn":
getHeat(this.time).then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value) // 热力图
}
})
@@ -330,29 +341,29 @@
},
gridDraw(token, areaCode) {
const colors = [
- [0,234,255,0.47],
- [255,185,0,0.47],
- [255,234,0,0.47],
- [209,0,255,0.47],
- [255,0,38,0.47],
+ [0, 234, 255, 0.47],
+ [255, 185, 0, 0.47],
+ [255, 234, 0, 0.47],
+ [209, 0, 255, 0.47],
+ [255, 0, 38, 0.47],
]
getGridInfo({
paramCodeList: 'KJ5001',
areaCode,
token
- }).then( res => {
+ }).then(res => {
console.log(res)
res.data.chirdAreaInfo.forEach((item, index) => {
item._source.areainfo.coordinates.forEach(area => {
let positions = []
- let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0]: area
+ let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0] : area
arr.forEach(pos => {
- positions.push(Freedo.Cartesian3.fromDegrees( pos[0], pos[1],0))
+ positions.push(Freedo.Cartesian3.fromDegrees(pos[0], pos[1], 0))
})
- AddPolygon(positions,colors[index % 5], this.gridClick,item._id)
+ AddPolygon(positions, colors[index % 5], this.gridClick, item._id)
AddOnlyLabel(
'',
- item._source.areaname , //+ this.menus.grid
+ item._source.areaname, //+ this.menus.grid
[item._source.lon, item._source.lat, 0],
'', null, null)
})
@@ -368,7 +379,7 @@
secret: CryptoJS.MD5(timestamp + 'geostar999').toString()
}
- getGridToken(param).then( res => {
+ getGridToken(param).then(res => {
clearUpMap()
this.gridDraw(res.data.token, '360783001')
this.gridDraw(res.data.token, '360783002')
@@ -378,32 +389,32 @@
},
// 三个概况统计
layerSeach() {
- getSource(this.time).then( res => {
- if(res.code === 200) {
+ getSource(this.time).then(res => {
+ if (res.code === 200) {
this.menus.source = res.data.value.map(item => {
item.bigtype = 'source'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getProject(this.time).then( res => {
- if(res.code === 200) {
+ getProject(this.time).then(res => {
+ if (res.code === 200) {
this.menus.project = res.data.value.map(item => {
item.bigtype = 'project'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getGrid(this.time).then( res => {
- if(res.code === 200) {
+ getGrid(this.time).then(res => {
+ if (res.code === 200) {
this.menus.grid = res.data.value.map(item => {
item.bigtype = 'grid'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
@@ -414,7 +425,7 @@
if (val && val.page) {
this.caseListQuery.pageNo = val.page
}
- if(this.hasUrge) {
+ if (this.hasUrge) {
this.searchBoard()
} else {
this.searchCaseMarkerList()
@@ -423,20 +434,20 @@
// 事件看板查询
searchBoard() {
getBoard(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
}
})
},
// 事件详情分页
searchCaseMarkerList() {
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
}
})
},
diff --git a/src/pages/ywts/cszl/yj/index.vue b/src/pages/ywts/cszl/yj/index.vue
index f6e1abe..d74dfe9 100644
--- a/src/pages/ywts/cszl/yj/index.vue
+++ b/src/pages/ywts/cszl/yj/index.vue
@@ -45,7 +45,7 @@
import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import { iconFilter, deviceList, caseList } from './data'
import ListPage from "@/components/ListPage";
-
+import { eventBus } from "../../../../main";
export default {
name: 'Yj',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -118,12 +118,18 @@
}
},
mounted() {
- // getStatistics().then(response => {
- // if(response.code === 200) {
- // this.menus.place = response.data.value
- // }
- // })
- // this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
clearResetMap()
this.searchPlace({})
diff --git a/src/pages/ywts/shms/jy/index.vue b/src/pages/ywts/shms/jy/index.vue
index 8acda86..f377985 100644
--- a/src/pages/ywts/shms/jy/index.vue
+++ b/src/pages/ywts/shms/jy/index.vue
@@ -79,55 +79,18 @@
name: 'jy',
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: 41, checked: true });
- eventBus.$emit('change-layer', { id: 21, checked: true });
- eventBus.$emit('change-layer', { id: 12, checked: true });
- // // 教育模型
- // window.pmtsManager.add({
- // id: "智慧教育-手工模型",
- // url: mapJson.CIM4["智慧教育-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // // CIM2 楼
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false
- // })
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false,
- // alpha: 0.5,
- // color: '#002d7a'
- // })
- // for(let key in modelJson) {
- // window.pmtsManager.add({
- // id: key,
- // // url: mapJson.CIM4["智慧教育-手工模型"],
- // url: modelJson[key],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // }
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: true }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
@@ -306,7 +269,7 @@
})
})
},
- menuClick(e) {
+ menuClick(e) {
clearResetMap()
this.markerList = this.markerBakList.filter(item => item.type === e.type)
this.markerList.forEach((item) => {
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index 693a175..ef5938c 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -1,15 +1,21 @@
-
+
@@ -26,8 +32,9 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
+import { eventBus } from "../../../../main";
export default {
name: 'Jt',
@@ -47,19 +54,19 @@
},
caseTotal: 0,
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: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -81,10 +88,10 @@
name: '基础设施',
value: 'place'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
place: [
@@ -98,11 +105,23 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.place = response.data.value
}
})
this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: true });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
@@ -125,16 +144,16 @@
// 设备图层控制
layer(item) {
// clearUpMap()
- 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()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-place', item,
null)
})
@@ -145,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
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)
}
})
@@ -169,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -177,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickHw)
})
@@ -187,7 +206,7 @@
// 智慧工地-工地近1月综合得分
score() {
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
response.data.value.forEach(item => {
console.log(item.areaboundary)
// todo : 画范围
@@ -199,7 +218,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,
@@ -235,13 +254,13 @@
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
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -250,7 +269,7 @@
},
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/jxh/index.vue b/src/pages/ywts/cszl/jxh/index.vue
index 8697cb6..0f23aaa 100644
--- a/src/pages/ywts/cszl/jxh/index.vue
+++ b/src/pages/ywts/cszl/jxh/index.vue
@@ -1,26 +1,24 @@
-
-
+
+
@@ -44,14 +42,15 @@
getAll,
getCaseInfo, getBoard
} from "../../../../api/ywts/cszl/jxh";
-import {AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
-import {getGridInfo, getGridToken} from "../../../../api/common";
+import { getGridInfo, getGridToken } from "../../../../api/common";
import JxhPop from "./jxhPop";
+import { eventBus } from "../../../../main";
export default {
name: 'Jxh',
- components: {JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
+ components: { JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
data() {
return {
preCase: null,
@@ -132,6 +131,18 @@
this.isListPage = false
this.isShow = false
})
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 全部事件
getAll({
// urgent: '0',
@@ -139,8 +150,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -158,7 +169,7 @@
caseMarker(res) {
res.data.value.forEach(item => {
// console.log(item.status)
- if(item.total === '1') {
+ if (item.total === '1') {
AddLabelPoint(
item.id,
'',
@@ -184,24 +195,24 @@
switch (e.bigtype) {
case 'source':
query.sourceId = e.type
- getSourceList(query).then( res => {
- if(res.code === 200) {
+ getSourceList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'project':
query.projectId = e.type
- getProjectList(query).then( res => {
- if(res.code === 200) {
+ getProjectList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'grid':
query.gridType = e.type
- getGridList(query).then( res => {
- if(res.code === 200) {
+ getGridList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -212,7 +223,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,
@@ -222,7 +233,7 @@
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -233,7 +244,7 @@
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.caseList = []
this.isListPage = true
this.hasUrge = false
@@ -267,13 +278,13 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
// 事件看板
- this.caseTotal = 1000 // todo
+ this.caseTotal = 1000 // todo
this.caseList = []
this.isListPage = true
this.hasUrge = true
@@ -296,8 +307,8 @@
high: '1',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -310,8 +321,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -321,7 +332,7 @@
break
case "caseHeatBtn":
getHeat(this.time).then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value) // 热力图
}
})
@@ -330,29 +341,29 @@
},
gridDraw(token, areaCode) {
const colors = [
- [0,234,255,0.47],
- [255,185,0,0.47],
- [255,234,0,0.47],
- [209,0,255,0.47],
- [255,0,38,0.47],
+ [0, 234, 255, 0.47],
+ [255, 185, 0, 0.47],
+ [255, 234, 0, 0.47],
+ [209, 0, 255, 0.47],
+ [255, 0, 38, 0.47],
]
getGridInfo({
paramCodeList: 'KJ5001',
areaCode,
token
- }).then( res => {
+ }).then(res => {
console.log(res)
res.data.chirdAreaInfo.forEach((item, index) => {
item._source.areainfo.coordinates.forEach(area => {
let positions = []
- let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0]: area
+ let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0] : area
arr.forEach(pos => {
- positions.push(Freedo.Cartesian3.fromDegrees( pos[0], pos[1],0))
+ positions.push(Freedo.Cartesian3.fromDegrees(pos[0], pos[1], 0))
})
- AddPolygon(positions,colors[index % 5], this.gridClick,item._id)
+ AddPolygon(positions, colors[index % 5], this.gridClick, item._id)
AddOnlyLabel(
'',
- item._source.areaname , //+ this.menus.grid
+ item._source.areaname, //+ this.menus.grid
[item._source.lon, item._source.lat, 0],
'', null, null)
})
@@ -368,7 +379,7 @@
secret: CryptoJS.MD5(timestamp + 'geostar999').toString()
}
- getGridToken(param).then( res => {
+ getGridToken(param).then(res => {
clearUpMap()
this.gridDraw(res.data.token, '360783001')
this.gridDraw(res.data.token, '360783002')
@@ -378,32 +389,32 @@
},
// 三个概况统计
layerSeach() {
- getSource(this.time).then( res => {
- if(res.code === 200) {
+ getSource(this.time).then(res => {
+ if (res.code === 200) {
this.menus.source = res.data.value.map(item => {
item.bigtype = 'source'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getProject(this.time).then( res => {
- if(res.code === 200) {
+ getProject(this.time).then(res => {
+ if (res.code === 200) {
this.menus.project = res.data.value.map(item => {
item.bigtype = 'project'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getGrid(this.time).then( res => {
- if(res.code === 200) {
+ getGrid(this.time).then(res => {
+ if (res.code === 200) {
this.menus.grid = res.data.value.map(item => {
item.bigtype = 'grid'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
@@ -414,7 +425,7 @@
if (val && val.page) {
this.caseListQuery.pageNo = val.page
}
- if(this.hasUrge) {
+ if (this.hasUrge) {
this.searchBoard()
} else {
this.searchCaseMarkerList()
@@ -423,20 +434,20 @@
// 事件看板查询
searchBoard() {
getBoard(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
}
})
},
// 事件详情分页
searchCaseMarkerList() {
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
}
})
},
diff --git a/src/pages/ywts/cszl/yj/index.vue b/src/pages/ywts/cszl/yj/index.vue
index f6e1abe..d74dfe9 100644
--- a/src/pages/ywts/cszl/yj/index.vue
+++ b/src/pages/ywts/cszl/yj/index.vue
@@ -45,7 +45,7 @@
import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import { iconFilter, deviceList, caseList } from './data'
import ListPage from "@/components/ListPage";
-
+import { eventBus } from "../../../../main";
export default {
name: 'Yj',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -118,12 +118,18 @@
}
},
mounted() {
- // getStatistics().then(response => {
- // if(response.code === 200) {
- // this.menus.place = response.data.value
- // }
- // })
- // this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
clearResetMap()
this.searchPlace({})
diff --git a/src/pages/ywts/shms/jy/index.vue b/src/pages/ywts/shms/jy/index.vue
index 8acda86..f377985 100644
--- a/src/pages/ywts/shms/jy/index.vue
+++ b/src/pages/ywts/shms/jy/index.vue
@@ -79,55 +79,18 @@
name: 'jy',
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: 41, checked: true });
- eventBus.$emit('change-layer', { id: 21, checked: true });
- eventBus.$emit('change-layer', { id: 12, checked: true });
- // // 教育模型
- // window.pmtsManager.add({
- // id: "智慧教育-手工模型",
- // url: mapJson.CIM4["智慧教育-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // // CIM2 楼
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false
- // })
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false,
- // alpha: 0.5,
- // color: '#002d7a'
- // })
- // for(let key in modelJson) {
- // window.pmtsManager.add({
- // id: key,
- // // url: mapJson.CIM4["智慧教育-手工模型"],
- // url: modelJson[key],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // }
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: true }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
@@ -306,7 +269,7 @@
})
})
},
- menuClick(e) {
+ menuClick(e) {
clearResetMap()
this.markerList = this.markerBakList.filter(item => item.type === e.type)
this.markerList.forEach((item) => {
diff --git a/src/pages/ywts/shms/sq/index.vue b/src/pages/ywts/shms/sq/index.vue
index bbbdd94..6aa8714 100644
--- a/src/pages/ywts/shms/sq/index.vue
+++ b/src/pages/ywts/shms/sq/index.vue
@@ -119,14 +119,18 @@
name: 'jy',
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: 43, checked: true });
- eventBus.$emit('change-layer', { id: 21, checked: true });
- eventBus.$emit('change-layer', { id: 12, checked: true });
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: true });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isShow = false
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index 693a175..ef5938c 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -1,15 +1,21 @@
-
+
@@ -26,8 +32,9 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
+import { eventBus } from "../../../../main";
export default {
name: 'Jt',
@@ -47,19 +54,19 @@
},
caseTotal: 0,
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: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -81,10 +88,10 @@
name: '基础设施',
value: 'place'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
place: [
@@ -98,11 +105,23 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.place = response.data.value
}
})
this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: true });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
@@ -125,16 +144,16 @@
// 设备图层控制
layer(item) {
// clearUpMap()
- 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()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-place', item,
null)
})
@@ -145,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
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)
}
})
@@ -169,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -177,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickHw)
})
@@ -187,7 +206,7 @@
// 智慧工地-工地近1月综合得分
score() {
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
response.data.value.forEach(item => {
console.log(item.areaboundary)
// todo : 画范围
@@ -199,7 +218,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,
@@ -235,13 +254,13 @@
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
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -250,7 +269,7 @@
},
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/jxh/index.vue b/src/pages/ywts/cszl/jxh/index.vue
index 8697cb6..0f23aaa 100644
--- a/src/pages/ywts/cszl/jxh/index.vue
+++ b/src/pages/ywts/cszl/jxh/index.vue
@@ -1,26 +1,24 @@
-
-
+
+
@@ -44,14 +42,15 @@
getAll,
getCaseInfo, getBoard
} from "../../../../api/ywts/cszl/jxh";
-import {AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
-import {getGridInfo, getGridToken} from "../../../../api/common";
+import { getGridInfo, getGridToken } from "../../../../api/common";
import JxhPop from "./jxhPop";
+import { eventBus } from "../../../../main";
export default {
name: 'Jxh',
- components: {JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
+ components: { JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
data() {
return {
preCase: null,
@@ -132,6 +131,18 @@
this.isListPage = false
this.isShow = false
})
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 全部事件
getAll({
// urgent: '0',
@@ -139,8 +150,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -158,7 +169,7 @@
caseMarker(res) {
res.data.value.forEach(item => {
// console.log(item.status)
- if(item.total === '1') {
+ if (item.total === '1') {
AddLabelPoint(
item.id,
'',
@@ -184,24 +195,24 @@
switch (e.bigtype) {
case 'source':
query.sourceId = e.type
- getSourceList(query).then( res => {
- if(res.code === 200) {
+ getSourceList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'project':
query.projectId = e.type
- getProjectList(query).then( res => {
- if(res.code === 200) {
+ getProjectList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'grid':
query.gridType = e.type
- getGridList(query).then( res => {
- if(res.code === 200) {
+ getGridList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -212,7 +223,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,
@@ -222,7 +233,7 @@
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -233,7 +244,7 @@
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.caseList = []
this.isListPage = true
this.hasUrge = false
@@ -267,13 +278,13 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
// 事件看板
- this.caseTotal = 1000 // todo
+ this.caseTotal = 1000 // todo
this.caseList = []
this.isListPage = true
this.hasUrge = true
@@ -296,8 +307,8 @@
high: '1',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -310,8 +321,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -321,7 +332,7 @@
break
case "caseHeatBtn":
getHeat(this.time).then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value) // 热力图
}
})
@@ -330,29 +341,29 @@
},
gridDraw(token, areaCode) {
const colors = [
- [0,234,255,0.47],
- [255,185,0,0.47],
- [255,234,0,0.47],
- [209,0,255,0.47],
- [255,0,38,0.47],
+ [0, 234, 255, 0.47],
+ [255, 185, 0, 0.47],
+ [255, 234, 0, 0.47],
+ [209, 0, 255, 0.47],
+ [255, 0, 38, 0.47],
]
getGridInfo({
paramCodeList: 'KJ5001',
areaCode,
token
- }).then( res => {
+ }).then(res => {
console.log(res)
res.data.chirdAreaInfo.forEach((item, index) => {
item._source.areainfo.coordinates.forEach(area => {
let positions = []
- let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0]: area
+ let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0] : area
arr.forEach(pos => {
- positions.push(Freedo.Cartesian3.fromDegrees( pos[0], pos[1],0))
+ positions.push(Freedo.Cartesian3.fromDegrees(pos[0], pos[1], 0))
})
- AddPolygon(positions,colors[index % 5], this.gridClick,item._id)
+ AddPolygon(positions, colors[index % 5], this.gridClick, item._id)
AddOnlyLabel(
'',
- item._source.areaname , //+ this.menus.grid
+ item._source.areaname, //+ this.menus.grid
[item._source.lon, item._source.lat, 0],
'', null, null)
})
@@ -368,7 +379,7 @@
secret: CryptoJS.MD5(timestamp + 'geostar999').toString()
}
- getGridToken(param).then( res => {
+ getGridToken(param).then(res => {
clearUpMap()
this.gridDraw(res.data.token, '360783001')
this.gridDraw(res.data.token, '360783002')
@@ -378,32 +389,32 @@
},
// 三个概况统计
layerSeach() {
- getSource(this.time).then( res => {
- if(res.code === 200) {
+ getSource(this.time).then(res => {
+ if (res.code === 200) {
this.menus.source = res.data.value.map(item => {
item.bigtype = 'source'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getProject(this.time).then( res => {
- if(res.code === 200) {
+ getProject(this.time).then(res => {
+ if (res.code === 200) {
this.menus.project = res.data.value.map(item => {
item.bigtype = 'project'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getGrid(this.time).then( res => {
- if(res.code === 200) {
+ getGrid(this.time).then(res => {
+ if (res.code === 200) {
this.menus.grid = res.data.value.map(item => {
item.bigtype = 'grid'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
@@ -414,7 +425,7 @@
if (val && val.page) {
this.caseListQuery.pageNo = val.page
}
- if(this.hasUrge) {
+ if (this.hasUrge) {
this.searchBoard()
} else {
this.searchCaseMarkerList()
@@ -423,20 +434,20 @@
// 事件看板查询
searchBoard() {
getBoard(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
}
})
},
// 事件详情分页
searchCaseMarkerList() {
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
}
})
},
diff --git a/src/pages/ywts/cszl/yj/index.vue b/src/pages/ywts/cszl/yj/index.vue
index f6e1abe..d74dfe9 100644
--- a/src/pages/ywts/cszl/yj/index.vue
+++ b/src/pages/ywts/cszl/yj/index.vue
@@ -45,7 +45,7 @@
import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import { iconFilter, deviceList, caseList } from './data'
import ListPage from "@/components/ListPage";
-
+import { eventBus } from "../../../../main";
export default {
name: 'Yj',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -118,12 +118,18 @@
}
},
mounted() {
- // getStatistics().then(response => {
- // if(response.code === 200) {
- // this.menus.place = response.data.value
- // }
- // })
- // this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
clearResetMap()
this.searchPlace({})
diff --git a/src/pages/ywts/shms/jy/index.vue b/src/pages/ywts/shms/jy/index.vue
index 8acda86..f377985 100644
--- a/src/pages/ywts/shms/jy/index.vue
+++ b/src/pages/ywts/shms/jy/index.vue
@@ -79,55 +79,18 @@
name: 'jy',
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: 41, checked: true });
- eventBus.$emit('change-layer', { id: 21, checked: true });
- eventBus.$emit('change-layer', { id: 12, checked: true });
- // // 教育模型
- // window.pmtsManager.add({
- // id: "智慧教育-手工模型",
- // url: mapJson.CIM4["智慧教育-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // // CIM2 楼
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false
- // })
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false,
- // alpha: 0.5,
- // color: '#002d7a'
- // })
- // for(let key in modelJson) {
- // window.pmtsManager.add({
- // id: key,
- // // url: mapJson.CIM4["智慧教育-手工模型"],
- // url: modelJson[key],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // }
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: true }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
@@ -306,7 +269,7 @@
})
})
},
- menuClick(e) {
+ menuClick(e) {
clearResetMap()
this.markerList = this.markerBakList.filter(item => item.type === e.type)
this.markerList.forEach((item) => {
diff --git a/src/pages/ywts/shms/sq/index.vue b/src/pages/ywts/shms/sq/index.vue
index bbbdd94..6aa8714 100644
--- a/src/pages/ywts/shms/sq/index.vue
+++ b/src/pages/ywts/shms/sq/index.vue
@@ -119,14 +119,18 @@
name: 'jy',
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: 43, checked: true });
- eventBus.$emit('change-layer', { id: 21, checked: true });
- eventBus.$emit('change-layer', { id: 12, checked: true });
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: true });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isShow = false
diff --git a/src/pages/ywts/zyhj/hb/index.vue b/src/pages/ywts/zyhj/hb/index.vue
index 2b4fe8d..2425eb3 100644
--- a/src/pages/ywts/zyhj/hb/index.vue
+++ b/src/pages/ywts/zyhj/hb/index.vue
@@ -32,6 +32,7 @@
import pointPop from './ponitPop.vue'
import alarmPop from './alarmPop.vue'
import casePop from './casePop.vue'
+import { eventBus } from "../../../../main";
export default {
name: 'Hb',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, pointPop, alarmPop, casePop },
@@ -107,6 +108,19 @@
this.showAlarm = false
this.showCase = false
})
+
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 946ee45..35ee8d7 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -8,10 +8,10 @@
height="5" text-hover="人员热力" @click="btnClick" />
-
-
+
+
@@ -128,32 +128,24 @@
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: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: true });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
this.isShow = false
})
- // window.pmtsManager.add({
- // id: "智慧工地-手工模型",
- // url: mapJson.CIM4["智慧工地-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // window.terrainManager.visible = true
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/cszl/hw/index.vue b/src/pages/ywts/cszl/hw/index.vue
index 6b78aed..ed28bc6 100644
--- a/src/pages/ywts/cszl/hw/index.vue
+++ b/src/pages/ywts/cszl/hw/index.vue
@@ -31,6 +31,7 @@
import ListPage from "@/components/ListPage";
import { getPlacePointList, getOverviewStatistics, getPersonList, getCarList, getCaseList, getCaseInfo } from '@/api/ywts/cszl/hw'
import { iconFilter, iconPerson, personList, carList, iconCar } from './data'
+import { eventBus } from "../../../../main";
export default {
name: 'Hw',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -96,7 +97,18 @@
clearResetMap()
this.selectInde = 'deviceBtn'
this.fetchPoint()
-
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
diff --git a/src/pages/ywts/cszl/jt/index.vue b/src/pages/ywts/cszl/jt/index.vue
index 693a175..ef5938c 100644
--- a/src/pages/ywts/cszl/jt/index.vue
+++ b/src/pages/ywts/cszl/jt/index.vue
@@ -1,15 +1,21 @@
-
+
@@ -26,8 +32,9 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
+import { eventBus } from "../../../../main";
export default {
name: 'Jt',
@@ -47,19 +54,19 @@
},
caseTotal: 0,
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: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -81,10 +88,10 @@
name: '基础设施',
value: 'place'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
place: [
@@ -98,11 +105,23 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.place = response.data.value
}
})
this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: true });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isListPage = false
@@ -125,16 +144,16 @@
// 设备图层控制
layer(item) {
// clearUpMap()
- 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()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'gd-place', item,
null)
})
@@ -145,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
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)
}
})
@@ -169,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -177,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'gd', item,
this.clickHw)
})
@@ -187,7 +206,7 @@
// 智慧工地-工地近1月综合得分
score() {
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
response.data.value.forEach(item => {
console.log(item.areaboundary)
// todo : 画范围
@@ -199,7 +218,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,
@@ -235,13 +254,13 @@
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
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -250,7 +269,7 @@
},
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/jxh/index.vue b/src/pages/ywts/cszl/jxh/index.vue
index 8697cb6..0f23aaa 100644
--- a/src/pages/ywts/cszl/jxh/index.vue
+++ b/src/pages/ywts/cszl/jxh/index.vue
@@ -1,26 +1,24 @@
-
-
+
+
@@ -44,14 +42,15 @@
getAll,
getCaseInfo, getBoard
} from "../../../../api/ywts/cszl/jxh";
-import {AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon} from "../../../../utils/freedo";
+import { AddDivPointCase, AddDivPointHighlight, AddOnlyLabel, AddPolygon } from "../../../../utils/freedo";
import ListPage from "@/components/ListPage";
-import {getGridInfo, getGridToken} from "../../../../api/common";
+import { getGridInfo, getGridToken } from "../../../../api/common";
import JxhPop from "./jxhPop";
+import { eventBus } from "../../../../main";
export default {
name: 'Jxh',
- components: {JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
+ components: { JxhPop, LayerManager, TimeManager, KeywordManager, CommonBtn, ListPage },
data() {
return {
preCase: null,
@@ -132,6 +131,18 @@
this.isListPage = false
this.isShow = false
})
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 全部事件
getAll({
// urgent: '0',
@@ -139,8 +150,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -158,7 +169,7 @@
caseMarker(res) {
res.data.value.forEach(item => {
// console.log(item.status)
- if(item.total === '1') {
+ if (item.total === '1') {
AddLabelPoint(
item.id,
'',
@@ -184,24 +195,24 @@
switch (e.bigtype) {
case 'source':
query.sourceId = e.type
- getSourceList(query).then( res => {
- if(res.code === 200) {
+ getSourceList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'project':
query.projectId = e.type
- getProjectList(query).then( res => {
- if(res.code === 200) {
+ getProjectList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
break
case 'grid':
query.gridType = e.type
- getGridList(query).then( res => {
- if(res.code === 200) {
+ getGridList(query).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -212,7 +223,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,
@@ -222,7 +233,7 @@
this.clickCase)
}
- if(item.total === '1') {
+ if (item.total === '1') {
// 保存当前marker
this.preCase = item
// 高亮当前marker
@@ -233,7 +244,7 @@
}
// 查询事件详情
- this.caseTotal = Number(item.total)
+ this.caseTotal = Number(item.total)
this.caseList = []
this.isListPage = true
this.hasUrge = false
@@ -267,13 +278,13 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
// 事件看板
- this.caseTotal = 1000 // todo
+ this.caseTotal = 1000 // todo
this.caseList = []
this.isListPage = true
this.hasUrge = true
@@ -296,8 +307,8 @@
high: '1',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -310,8 +321,8 @@
// high: '0',
startTime: this.time.startTime,
endTime: this.time.endTime,
- }).then( res => {
- if(res.code === 200) {
+ }).then(res => {
+ if (res.code === 200) {
this.caseMarker(res)
}
})
@@ -321,7 +332,7 @@
break
case "caseHeatBtn":
getHeat(this.time).then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value) // 热力图
}
})
@@ -330,29 +341,29 @@
},
gridDraw(token, areaCode) {
const colors = [
- [0,234,255,0.47],
- [255,185,0,0.47],
- [255,234,0,0.47],
- [209,0,255,0.47],
- [255,0,38,0.47],
+ [0, 234, 255, 0.47],
+ [255, 185, 0, 0.47],
+ [255, 234, 0, 0.47],
+ [209, 0, 255, 0.47],
+ [255, 0, 38, 0.47],
]
getGridInfo({
paramCodeList: 'KJ5001',
areaCode,
token
- }).then( res => {
+ }).then(res => {
console.log(res)
res.data.chirdAreaInfo.forEach((item, index) => {
item._source.areainfo.coordinates.forEach(area => {
let positions = []
- let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0]: area
+ let arr = item._source.areainfo.type === 'MultiPolygon' ? area[0] : area
arr.forEach(pos => {
- positions.push(Freedo.Cartesian3.fromDegrees( pos[0], pos[1],0))
+ positions.push(Freedo.Cartesian3.fromDegrees(pos[0], pos[1], 0))
})
- AddPolygon(positions,colors[index % 5], this.gridClick,item._id)
+ AddPolygon(positions, colors[index % 5], this.gridClick, item._id)
AddOnlyLabel(
'',
- item._source.areaname , //+ this.menus.grid
+ item._source.areaname, //+ this.menus.grid
[item._source.lon, item._source.lat, 0],
'', null, null)
})
@@ -368,7 +379,7 @@
secret: CryptoJS.MD5(timestamp + 'geostar999').toString()
}
- getGridToken(param).then( res => {
+ getGridToken(param).then(res => {
clearUpMap()
this.gridDraw(res.data.token, '360783001')
this.gridDraw(res.data.token, '360783002')
@@ -378,32 +389,32 @@
},
// 三个概况统计
layerSeach() {
- getSource(this.time).then( res => {
- if(res.code === 200) {
+ getSource(this.time).then(res => {
+ if (res.code === 200) {
this.menus.source = res.data.value.map(item => {
item.bigtype = 'source'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getProject(this.time).then( res => {
- if(res.code === 200) {
+ getProject(this.time).then(res => {
+ if (res.code === 200) {
this.menus.project = res.data.value.map(item => {
item.bigtype = 'project'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
})
- getGrid(this.time).then( res => {
- if(res.code === 200) {
+ getGrid(this.time).then(res => {
+ if (res.code === 200) {
this.menus.grid = res.data.value.map(item => {
item.bigtype = 'grid'
- item.type = item.id.replace(/ /g,'')
- item.typename = item.name.replace(/ /g,'')
+ item.type = item.id.replace(/ /g, '')
+ item.typename = item.name.replace(/ /g, '')
return item
})
}
@@ -414,7 +425,7 @@
if (val && val.page) {
this.caseListQuery.pageNo = val.page
}
- if(this.hasUrge) {
+ if (this.hasUrge) {
this.searchBoard()
} else {
this.searchCaseMarkerList()
@@ -423,20 +434,20 @@
// 事件看板查询
searchBoard() {
getBoard(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
}
})
},
// 事件详情分页
searchCaseMarkerList() {
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
}
})
},
diff --git a/src/pages/ywts/cszl/yj/index.vue b/src/pages/ywts/cszl/yj/index.vue
index f6e1abe..d74dfe9 100644
--- a/src/pages/ywts/cszl/yj/index.vue
+++ b/src/pages/ywts/cszl/yj/index.vue
@@ -45,7 +45,7 @@
import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
import { iconFilter, deviceList, caseList } from './data'
import ListPage from "@/components/ListPage";
-
+import { eventBus } from "../../../../main";
export default {
name: 'Yj',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop },
@@ -118,12 +118,18 @@
}
},
mounted() {
- // getStatistics().then(response => {
- // if(response.code === 200) {
- // this.menus.place = response.data.value
- // }
- // })
- // this.search()
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
clearResetMap()
this.searchPlace({})
diff --git a/src/pages/ywts/shms/jy/index.vue b/src/pages/ywts/shms/jy/index.vue
index 8acda86..f377985 100644
--- a/src/pages/ywts/shms/jy/index.vue
+++ b/src/pages/ywts/shms/jy/index.vue
@@ -79,55 +79,18 @@
name: 'jy',
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: 41, checked: true });
- eventBus.$emit('change-layer', { id: 21, checked: true });
- eventBus.$emit('change-layer', { id: 12, checked: true });
- // // 教育模型
- // window.pmtsManager.add({
- // id: "智慧教育-手工模型",
- // url: mapJson.CIM4["智慧教育-手工模型"],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // // CIM2 楼
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false
- // })
- // window.pmtsManager.add({
- // url: mapJson['CIM2']['CIM2建筑(带纹理)'],
- // show: true,
- // name: 'CIM2建筑(带纹理)',
- // autoFlyto: false,
- // alpha: 0.5,
- // color: '#002d7a'
- // })
- // for(let key in modelJson) {
- // window.pmtsManager.add({
- // id: key,
- // // url: mapJson.CIM4["智慧教育-手工模型"],
- // url: modelJson[key],
- // show: true,
- // maximumScreenSpaceError: 32,
- // maximumMemoryUsage: 64,
- // maximumAbsoluteMemoryUsage: 8192,
- // autoFlyto: true
- // },
- // undefined
- // )
- // }
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: true }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
@@ -306,7 +269,7 @@
})
})
},
- menuClick(e) {
+ menuClick(e) {
clearResetMap()
this.markerList = this.markerBakList.filter(item => item.type === e.type)
this.markerList.forEach((item) => {
diff --git a/src/pages/ywts/shms/sq/index.vue b/src/pages/ywts/shms/sq/index.vue
index bbbdd94..6aa8714 100644
--- a/src/pages/ywts/shms/sq/index.vue
+++ b/src/pages/ywts/shms/sq/index.vue
@@ -119,14 +119,18 @@
name: 'jy',
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: 43, checked: true });
- eventBus.$emit('change-layer', { id: 21, checked: true });
- eventBus.$emit('change-layer', { id: 12, checked: true });
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: true });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
// 清除弹窗展示
this.$bus.$on('clear', () => {
this.isShow = false
diff --git a/src/pages/ywts/zyhj/hb/index.vue b/src/pages/ywts/zyhj/hb/index.vue
index 2b4fe8d..2425eb3 100644
--- a/src/pages/ywts/zyhj/hb/index.vue
+++ b/src/pages/ywts/zyhj/hb/index.vue
@@ -32,6 +32,7 @@
import pointPop from './ponitPop.vue'
import alarmPop from './alarmPop.vue'
import casePop from './casePop.vue'
+import { eventBus } from "../../../../main";
export default {
name: 'Hb',
components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, pointPop, alarmPop, casePop },
@@ -107,6 +108,19 @@
this.showAlarm = false
this.showCase = false
})
+
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: false });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: false }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
},
methods: {
async btnClick(e) {
diff --git a/src/pages/ywts/zyhj/yl/index.vue b/src/pages/ywts/zyhj/yl/index.vue
index 6eaba1e..e65a360 100644
--- a/src/pages/ywts/zyhj/yl/index.vue
+++ b/src/pages/ywts/zyhj/yl/index.vue
@@ -40,7 +40,7 @@
import { getDevice, getCaseList, getCaseInfo, getseedlingList } from '@/api/ywts/zyhj/yl'
import { iconFilter } from './data'
import ListPage from "@/components/ListPage";
-
+import { eventBus } from "../../../../main";
export default {
name: 'Yl',
components: { YlPop, TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop, mmPop },
@@ -127,6 +127,18 @@
this.isListPage = false
this.isShow = false
})
+ // 设置默认选中图层
+ eventBus.$emit('change-layer', { id: 41, checked: false }); // 智慧教育-手工模型
+ eventBus.$emit('change-layer', { id: 42, checked: false });// 智慧停车云-手工模型
+ eventBus.$emit('change-layer', { id: 43, checked: false });//智慧社区-手工模型
+ eventBus.$emit('change-layer', { id: 44, checked: false });// 智慧工地-手工模型
+ eventBus.$emit('change-layer', { id: 45, checked: false });// 智慧交通-手工模型
+ eventBus.$emit('change-layer', { id: 46, checked: true });// 智慧园林-手工模型
+ eventBus.$emit('change-layer', { id: 31, checked: false }); // 倾斜
+ eventBus.$emit('change-layer', { id: 21, checked: true }); //CIM2建筑(带纹理)
+ eventBus.$emit('change-layer', { id: 22, checked: false }); //CIM2建筑(纯白色)
+ eventBus.$emit('change-layer', { id: 12, checked: true }); // 蓉江新区正射影像
+ eventBus.$emit('change-layer', { id: 13, checked: true }); // 蓉江新区边界
},
methods: {
async btnClick(e) {