From be7a30013f3e6bf80a79ad7ec228c85481c0ad21 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 26 二月 2021 14:56:58 +0800
Subject: [PATCH] 事件标签弹窗弹性盒高修正

---
 src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue |   70 ++++++++++++++++++++++++++--------
 1 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 67cc64b..7aa45ce 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -112,6 +112,7 @@
                   :key="ind"
                   :index="index + '-' + ind"
                   @click="checkOption(config, option)"
+                  class="highlevel-option"
                 >{{ option.name }}</el-menu-item>
               </el-submenu>
             </el-menu>
@@ -205,7 +206,7 @@
                 </div>
               </div>
               <div class="star" @click="toggleFollow(data)">
-                <i :class="[data.IsFollow ? 'follow' : '', 'el-icon-star-off']"></i>
+                <i class="iconfont" :class="[data.IsFollow ? 'follow' : '', 'iconguanzhu']"></i>
               </div>
             </div>
           </el-col>
@@ -274,9 +275,9 @@
       >
         <div class="title" slot="title">
           <i class="el-icon-connection"></i>
-          <span>shoubi瑙嗛</span>
+          <span>{{curEvName}}瑙嗛</span>
         </div>
-        <event-videos :eventDetail="curEventDetail"></event-videos>
+        <event-videos :eventVideoArr="eventVideoArr"></event-videos>
       </el-dialog>
     </div>
   </div>
@@ -291,6 +292,7 @@
   getLabelMap,
   delLabel,
   editLabel,
+  getEventVideo
 } from "@/api/shuohuang";
 import VideoAnalyze from "./videoAnalyze";
 import EventVideos from "./eventVideos";
@@ -413,7 +415,8 @@
       labelDialogVisible: false,
       selectedVideo: {},
       eventDialogVisible: false,
-      curEventDetail: {}
+      curEvName: '',
+      eventVideoArr: []
     };
   },
   watch: {
@@ -431,6 +434,11 @@
     checkEventVideo (label) {
       this.eventDialogVisible = true;
       this.curEventDetail = label;
+      let _this = this;
+      getEventVideo({Event:label.Event,LkgID:label.ParentID}).then(res=>{
+        _this.eventVideoArr = res.data;
+        _this.curEvName = label.Event;
+      })
     },
     handleTabSizeChange (size) {
       this.tabPageSize = size;
@@ -527,7 +535,6 @@
         } else {
           _this.tabTotal = res.total;
           _this.tabData = res.data;
-          // debugger
           _this.tabData = _this.tabData.map(function (item) {
             const set = new Set()
             item.LableLst.forEach(function (label) {
@@ -683,7 +690,9 @@
 
 <style lang="scss">
 .search-for-video-analyze {
-  padding: 20px 30px;
+  //padding: 20px 30px;
+  //鍑烘í鍚戞粴鍔ㄦ潯
+  padding: 20px 40px;
   .flex-box {
     display: flex;
   }
@@ -746,6 +755,8 @@
           width: 100px;
           text-align: left;
           background: #f3f3f3;
+          color: rgb(133, 133, 133);
+          background: #ecf0fc;
         }
         .options-wrap {
           flex: 1;
@@ -777,23 +788,25 @@
           justify-content: flex-end;
           .more {
             margin-top: 6px;
-            padding: 0px 12px;
+            padding: 0px 6px;
             border: 1px solid #ccc;
             margin-right: 10px;
-            width: 48px;
+            width: 44px;
             height: 26px;
             line-height: 26px;
+            border-radius: 2px;
             &:hover {
               color: #6486e7;
             }
           }
           .multCheck {
             margin-top: 6px;
-            width: 48px;
+            width: 44px;
             height: 26px;
             line-height: 26px;
-            padding: 0px 12px;
+            padding: 0px 6px;
             border: 1px solid #ccc;
+            border-radius: 2px;
             &:hover {
               color: #7695ec;
               border-color: #7695ec;
@@ -820,6 +833,8 @@
             height: 40px;
             line-height: 40px;
             border: none;
+            color: #2c3e50;
+            font-size: 12px;
           }
           .el-menu--popup {
             display: flex;
@@ -827,6 +842,13 @@
             li.el-menu-item {
               display: inline-block;
               min-width: auto;
+            }
+          }
+          .highlevel-option {
+            font-size: 12px;
+            color: #2c3e50;
+            &:hover {
+              color: #6486e7;
             }
           }
         }
@@ -839,8 +861,7 @@
   .data-list {
     margin-top: 20px;
     .header-bar {
-      padding-bottom: 5px;
-      border-bottom: 1px solid #ddd;
+      padding-bottom: 10px;
       .left {
         float: left;
         display: flex;
@@ -873,11 +894,20 @@
       }
     }
     .content {
-      padding-top: 14px;
+      //padding-top: 14px;
+      background: #f5f5f5;
+      background: #fff;
+      margin: 0 -30px;
+      margin-bottom: -30px;
+      padding: 0;
       // .el-row {
       //   display: flex;
       //   flex-wrap: wrap;
       // }
+      .el-row {
+        padding-top: 20px;
+        background: #f5f5f5;
+      }
       .el-col {
         margin-bottom: 10px;
       }
@@ -885,9 +915,13 @@
         cursor: pointer;
         position: relative;
         text-align: left;
-        border: 1px solid #dedede;
+        background: #fff;
         border-radius: 5px;
-        height: 420px;
+        height: 360px;
+        margin-bottom: 10px;
+        &:hover {
+          box-shadow: 3px 2px 5px 1px rgba(0, 0, 0, 0.3);
+        }
         .video-wrap {
           border-radius: 3px;
           width: 100%;
@@ -909,7 +943,7 @@
           padding: 10px;
           .base-info {
             > div {
-              margin-bottom: 5px;
+              margin-bottom: 1px;
             }
             label {
               color: #999;
@@ -963,7 +997,9 @@
       }
       .pagination-center {
         text-align: center;
-        margin: 10px auto;
+        margin: 0 -10px;
+        padding: 10px 0 20px;
+        background: #f5f5f5;
       }
     }
     .dialog-video {

--
Gitblit v1.8.0