From a8db0542d7ee32f3e0ecc38f97a59b73f682a028 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 24 Mar 2022 17:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianping/AppVisitToVerify/components/List.vue  |  7 -------
 .../monitor/AppMonitorManage/AppMonitorManage.vue  | 14 +++++++++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/jianping/AppVisitToVerify/components/List.vue b/packages/jianping/AppVisitToVerify/components/List.vue
index 8228518a..730db179 100644
--- a/packages/jianping/AppVisitToVerify/components/List.vue
+++ b/packages/jianping/AppVisitToVerify/components/List.vue
@@ -44,13 +44,6 @@
         :size.sync="search.size"
         @selection-change="(v) => (ids = v.map((e) => e.id))"
         @getList="getList">
-        <el-table-column slot="tags" label="标签">
-          <template slot-scope="{ row }">
-            <div class="table-tags">
-              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
-            </div>
-          </template>
-        </el-table-column>
         <el-table-column slot="options" width="90px" fixed="right" label="操作" align="center">
           <div class="table-options" slot-scope="{ row }">
             <el-button type="text" @click="toDetail(row.id)">详情</el-button>
diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
index ec8d49ce..57f508a6 100644
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
+++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
@@ -4,7 +4,7 @@
                    :render-item="renderTreeItem" ref="DeviceSlider"/>
     <div class="monitorPane">
       <div class="headerBar">
-        <el-select default-first-option size="small" v-model="splitScreen">
+        <el-select default-first-option size="small" v-model="splitScreen" @change="onChange">
           <i slot="prefix" class="iconfont iconjdq_led_Led1"/>
           <el-option v-for="(op,i) in splitOps" :key="i" v-bind="op"/>
         </el-select>
@@ -14,11 +14,11 @@
         <div
           class="videoBox"
           v-for="(m,i) in monitors"
-          :key="i"
+          :key="m.id"
           @mouseenter.stop="m.isShowPlayBtn = true"
           @mouseleave.stop="m.isShowPlayBtn = false"
           :style="currentSplitStyle">
-          <AiMonitor :src="m.url" type="slw"></AiMonitor>
+            <AiMonitor :src="m.url" type="slw"></AiMonitor>
           <span>{{ m.name }}</span>
           <i class="el-icon-circle-close" v-if="m.isShowPlayBtn" title="关闭" @click="removeMonitor(i)"></i>
         </div>
@@ -98,6 +98,8 @@
         this.$fullscreen(this.fullscreen)
       },
       handleSelectMonitor(monitor) {
+        if (monitor.type !== '1') return
+
         let {id} = monitor,
             index = this.monitors.findIndex(e => e.id == id)
         if (index > -1) {
@@ -109,6 +111,12 @@
         }
       },
 
+      onChange (e) {
+        if (e === 1 && this.monitors.length) {
+          this.monitors = [this.monitors[0]]
+        }
+      },
+
       removeMonitor (i) {
         this.monitors.splice(i, 1)
       },