From f001bfbd33dff2b400601e1daf8d4cad17d2eb4a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 08 Nov 2022 14:26:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

---
 src/views/activity/index.vue |   29 +++++++++--------------------
 1 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index 5e3765c..9a097b9 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/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-11-07 17:20:06
+ * @LastEditTime: 2022-11-08 14:26:29
  * @FilePath: \srs-police-affairs\src\views\activity\index.vue
  * @Description: 安保活动
  * 
@@ -110,16 +110,13 @@
         </div>
 
         <div class="second-container">
-            <el-tree :data="treeData" show-checkbox node-key="id" @check="treeCheckClick" @node-click="treeNodeClick">
-            </el-tree>
+            <el-tree :data="treeData" show-checkbox node-key="id" @check="treeCheckClick"></el-tree>
         </div>
 
         <div v-show="dialogVisible" class="activity-details-box">
             <div class="title">
                 活动详情
-                <div class="close" @click="closeActivityDetails">
-                    <i class="el-icon-close"></i>
-                </div>
+                <div class="close" @click="closeActivityDetails"></div>
             </div>
 
             <div class="row-box">
@@ -172,7 +169,7 @@
                         placeholder="请输入范围"
                     ></el-input>
                 </div>
-            </div> -->
+            </div>-->
         </div>
 
         <div class="btn-box">
@@ -507,19 +504,6 @@
                     }
                 })
             }
-        },
-
-        treeNodeClick () {
-            let color = global.DC.Namespace.Cesium.Color.fromBytes(
-                102, 176, 255,
-                100
-            )
-            this.$EventBus.$emit('layerPolylineAdd', {
-                layerName: 'polylineLayer1',
-                positions: '116.025000, 28.686000, 116.025000, 28.678000,116.020000, 28.678000',
-                material: color,
-                width: 2
-            })
         },
 
         goAbDetail (item, index) {
@@ -908,6 +892,11 @@
                 transform: translate(0, -50%);
                 cursor: pointer;
             }
+
+            .close::before {
+                content: '\e6db';
+                font-family: element-icons;
+            }
         }
 
         .row-box {

--
Gitblit v1.9.3