From d057c8fdb1ed9db6cfcebacb146cd0ffbc1ad7fe Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 20 Sep 2022 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/views/home/index.vue | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 0e99c7f..aaeaa8a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 16:18:17
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-09-17 10:40:49
+ * @LastEditTime: 2022-09-19 18:29:26
* @FilePath: \srs-police-affairs\src\views\home\index.vue
* @Description: 小区-栋-层-房屋
*
@@ -114,7 +114,7 @@
<div class="center-container">
<div class="layers-control-btn">
- <el-checkbox v-model="houseLayerShow">小区</el-checkbox>
+ <el-checkbox v-model="houseLayerShow" @change="houseChange">小区</el-checkbox>
</div>
<div class="layers-control-btn">
<el-checkbox v-model="carLayerShow">警车</el-checkbox>
@@ -146,6 +146,11 @@
}
},
created () {
+
+
+
+
+
},
mounted () {
this.initPersonEcharts()
@@ -153,6 +158,35 @@
this.initEquipmentEcharts()
this.initEventChangeEcharts()
this.initEventCountEcharts()
+
+ this.$nextTick(() => {
+ let position = [
+ [
+ [115.935114, 28.627012, 100],
+ [115.930150, 28.733535, 100],
+ [115.986738, 28.683523, 100],
+ [116.015526, 28.647454, 100],
+ ]
+ ]
+
+ position.forEach((item) => {
+ let str = ''
+ item.forEach(it => {
+ str = str + `${it[0]},${it[1]},${it[2]};`
+ })
+
+ this.$EventBus.$emit('layerPolygonAdd', {
+ layerName: 'polygonLayer',
+ positions: str,
+ material: global.DC.Namespace.Cesium.Color.fromBytes(
+ 3,
+ 255,
+ 13,
+ 10
+ ),
+ })
+ })
+ })
},
updated () {
},
@@ -465,6 +499,29 @@
option && myChart.setOption(option)
},
+<<<<<<< HEAD
+ tableRowClassName () {
+ // if ((rowIndex + 1) % 2 === 0) {
+ return "aa"
+ // } else {
+ // return "background:rgba(0,8,1,0.1)"
+ // }
+ },
+
+ houseChange (e) {
+ if (e == true) {
+ this.$EventBus.$emit('addMxTileset', {
+ titlesetName: 'sdTilesetLayer',
+ titlesetUrl: "/sd/tileset.json"
+ })
+ } else {
+ this.$EventBus.$emit('removeMxTileset', {
+ titlesetName: 'sdTilesetLayer'
+ })
+ }
+ }
+=======
+>>>>>>> 0296d220b566f61bbedd8f422bbf3f03b5641a47
}
}
</script>
--
Gitblit v1.9.3