From efa51429f963cd865dc1cfa5f6a0e4de1dad817f Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 26 Jul 2022 16:33:10 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/supermap/createMarkerPopup.js     | 41 ++++++++++++---------
 front/src/views/home/infrastructurePage.vue | 17 +++++++--
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/front/src/supermap/createMarkerPopup.js b/front/src/supermap/createMarkerPopup.js
index a899ef73..343620aa 100644
--- a/front/src/supermap/createMarkerPopup.js
+++ b/front/src/supermap/createMarkerPopup.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:43:31
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-26 15:19:38
+ * @Description: 告诉大家这是什么
+ */
 /**
  * @Author: tiansiyuan
  * @Date: 2021/2/20 13:12:56
@@ -18,23 +25,23 @@ import { selectByChannelCode } from '@/api/videoSurveillance'
  */
 function createCameraDetailsPop(feature) {
   // if(feature.type !== 'cameraTree'){
-  selectByChannelCode({ channelCode: feature.data.channelCode }).then((res) => {
-    feature.data = res.data.data[0]
-  })
-  // }
-  const popupDom = new Dom({
-    template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>',
-    data() {
-      return {
-        feature: feature,
-      }
-    },
-    created() {},
-    components: {
-      CameraDetailsPop,
-    },
-  })
-  return popupDom.initDom()
+  // selectByChannelCode({ channelCode: feature.data.channelCode }).then((res) => {
+  //   feature.data = res.data.data[0]
+  // })
+  // // }
+  // const popupDom = new Dom({
+  //   template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>',
+  //   data() {
+  //     return {
+  //       feature: feature,
+  //     }
+  //   },
+  //   created() {},
+  //   components: {
+  //     CameraDetailsPop,
+  //   },
+  // })
+  // return popupDom.initDom()
 }
 function createSearchAddressTitlePop(feature) {
   const popupDom = new Dom({
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index c8aebfe2..eec677d2 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -5,7 +5,13 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
+        <el-button
+          @click="nullClick"
+          v-if="item.title == '视频标签'"
+          type="small"
+        >
+          清空
+        </el-button>
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
@@ -95,7 +101,11 @@
           <template v-if="column.dataIndex === 'operation'">
             <a
               @click="
-                openVideo(record.channelCode ||record.channelId || record.channelCode.channelId)
+                openVideo(
+                  record.channelCode ||
+                    record.channelId ||
+                    record.channelCode.channelId
+                )
               "
             >
               预览
@@ -588,7 +598,8 @@
         padding: 0 0.08rem;
       }
       .leftType {
-        margin: 0.1rem 0;
+        margin: 0.2rem 0;
+        margin-right: 0.06rem;
       }
       .down {
         background: #0087ff;