From 242563b76577c8dfa44ceecf1f47d11230fc6bf5 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 04 Apr 2023 15:15:14 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs
---
src/views/video/list.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/views/video/list.vue b/src/views/video/list.vue
index 90ce625..8fa9104 100644
--- a/src/views/video/list.vue
+++ b/src/views/video/list.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 16:18:17
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-04-02 10:33:36
+ * @LastEditTime: 2023-04-04 11:02:46
* @FilePath: \srs-police-affairs\src\views\video\list.vue
* @Description: 辖区管理
*
@@ -31,7 +31,7 @@
<div class="down-tree">
<el-scrollbar>
<el-tree v-show="searchLazyFlag" :props="props" :load="loadNode" lazy node-key="id"
- @node-click="treeClick" :default-expanded-keys="defaultExpandedKeys">
+ @node-click="treeClick" :default-expanded-keys="defaultExpandedKeys" :empty-text="''">
<span class="custom-tree-node" slot-scope="node">
<i v-show="node.data.leaf" class="status-box"
:class="{ online: Number(node.data.status) === 1 }"></i>
@@ -55,7 +55,7 @@
</el-tree>
<el-tree v-show="searchLazyFlag == false" :data="searchTreeData" :props="defaultProps"
- :default-expand-all="true" @node-click="treeClick">
+ :default-expand-all="true" @node-click="treeClick" :empty-text="''">
<span class="custom-tree-node" slot-scope="node">
<i class="status-box" :class="{ online: Number(node.data.status) === 1 }"></i>
@@ -298,6 +298,7 @@
searchChange (e) {
this.$store.commit('SET_VIDEOLISTPOPUP', false)
+ this.$store.commit('SET_VIDEOROWCLICKPOPUP', false)
this.inputpopup = false
plot.stop()
@@ -341,8 +342,8 @@
disableDepthTestDistance: Number.POSITIVE_INFINITY
},
incident: this.siteClick,
- // mouseOverIncident: this.pointMouseOver,
- // mouseOutIncident: this.pointMouseOut,
+ mouseOverIncident: this.pointMouseOver,
+ mouseOutIncident: this.pointMouseOut,
})
})
@@ -392,6 +393,7 @@
removeDrawLayer () {
this.$store.commit('SET_VIDEOLISTPOPUP', false)
+ this.$store.commit('SET_VIDEOROWCLICKPOPUP', false)
this.inputpopup = false
plot.stop()
@@ -412,6 +414,7 @@
searchDraw () {
this.$store.commit('SET_VIDEOLISTPOPUP', false)
+ this.$store.commit('SET_VIDEOROWCLICKPOPUP', false)
this.searchLazyFlag = false
@@ -499,8 +502,8 @@
disableDepthTestDistance: Number.POSITIVE_INFINITY
},
incident: this.siteClick,
- // mouseOverIncident: this.pointMouseOver,
- // mouseOutIncident: this.pointMouseOut,
+ mouseOverIncident: this.pointMouseOver,
+ mouseOutIncident: this.pointMouseOut,
})
})
@@ -575,14 +578,14 @@
siteGd: 600,
})
- this.$store.commit('SET_VIDEOLISTPOPUP', true)
+ this.$store.commit('SET_VIDEOROWCLICKPOPUP', true)
- this.$store.commit('SET_VIDEOLISTPOPUPDATA', {
+ this.$store.commit('SET_VIDEOROWCLICKPOPUPDATA', {
...node
})
var popup = new global.DC.DivForms(global.viewer, {
- domId: 'videoListPopup',
+ domId: 'videoRowClickPopup',
position: [
global.DC.Transform.transformWGS84ToCartesian(
new global.DC.Position(
@@ -665,8 +668,8 @@
disableDepthTestDistance: Number.POSITIVE_INFINITY
},
incident: this.siteClick,
- // mouseOverIncident: this.pointMouseOver,
- // mouseOutIncident: this.pointMouseOut,
+ mouseOverIncident: this.pointMouseOver,
+ mouseOutIncident: this.pointMouseOut,
})
}
})
@@ -699,6 +702,9 @@
loading && loading.close()
this.$store.commit('SET_VIDEOLISTPOPUP', false)
+
+ this.$store.commit('SET_VIDEOROWCLICKPOPUP', false)
+
this.$EventBus.$emit('mapRemoveLayer', {
layerName: 'treeValAllLayer',
type: 'VectorLayer'
--
Gitblit v1.9.3