From 675f53b52844d1d368d71d966620ba698f24bcde Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 09 三月 2021 09:34:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/panel/RightSearchPanel.vue |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index f8c5efd..587073a 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="right-panel" >
+  <div id="right-panel">
     <div class="panel-tab">
       <div v-for="item in topicMenu" :key="item.id" :title="item.name" class="tab-item" @click="handleGd" :class="{'B-TMT-tab-waybill-isActive': isWaybillHover}">
         <img :src="item.icon" style="width: 24px;height: 24px;"></div>
@@ -44,7 +44,7 @@
       topicList: TopicList,
       topicCheckedList: [],
       isPanelVisible: false,
-      gcComp: SewersSearch,
+      gcComp: 'sewersSearch',
 
       gdVisible: true,
       hbVisible: false,
@@ -56,21 +56,10 @@
       isCollapse: false
     }
   },
-  computed: {},
-  watch: {
-    '$store.state.map.topic.topicCheckedList': function (newVal, oldVal) {
-      console.log(oldVal)
-      console.log(newVal)
-      this.topicCheckedList = newVal
-      this.topicMenu = []
-      this.topicList.forEach((item) => {
-        this.topicCheckedList.forEach((itm) => {
-          if (item.name === itm) {
-            // item.checked = tr
-            this.topicMenu.push(item)
-          }
-        })
-      })
+  computed: {
+    topicMenu () {
+      console.log(this.$store.state.map.topic.topicCheckedList)
+      return this.$store.state.map.topic.topicCheckedList
     }
   },
   methods: {
@@ -85,7 +74,6 @@
     },
     toggleMonitorPanel () {
       this.isCollapse = !this.isCollapse
-      console.log(11)
       // const el = $('.btn-stretch')
       // const el2 = $('.panel-fold-btn')
       // const el = document.getElementsByClassName('.btn-stretch')

--
Gitblit v1.8.0