From 9c2ba2659c261dfe1b3923ffbd175cf56296c298 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 22 Apr 2021 19:36:55 +0800
Subject: [PATCH] 部分样式修改,及页面显示调整

---
 src/views/policeTracking/policeTracking.vue |   19 ++++++++++++-------
 src/views/supervisoryConsole/card.vue       |    8 +++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 719f502..ee81226 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -435,7 +435,9 @@
                   :key="index"
                   :src="item"
                   :preview-src-list="srcList"
+                  v-show="imgSrc.length > 0"
                 ></el-image>
+                <span v-show="imgSrc.length == 0">暂无现场图片</span>
               </el-card>
             </div>
             <div class="block">
@@ -462,7 +464,9 @@
                   :src="feedbackVideo"
                   style="width: 100%; height: 100%; object-fit: fill"
                   controls
+                  v-show="feedbackVideo != ''"
                 ></video>
+                <span v-show="feedbackVideo == ''">暂无现场视频</span>
               </div>
             </div>
           </div>
@@ -498,6 +502,7 @@
         :visible.sync="oldVideoSatart"
         :close-on-press-escape="false"
         :close-on-click-modal="false"
+        @opened="oldOpenVideo"
         @close="vaddress = ''"
         append-to-body
       >
@@ -509,7 +514,9 @@
           id="old_video"
           style="width: 100%; height: 100%; object-fit: fill"
           controls
+          v-show="vaddress != ''"
         ></video>
+        <span v-show="vaddress == ''">暂无历史视频</span>
       </el-dialog>
     </el-col>
   </el-row>
@@ -600,7 +607,6 @@
     this.getList();
     this.getAudios();
     this.getImgAndVideo();
-    this.getVideo();
     this.$refs.mapDiv.onload = () => {
       window.frames[0].init("AlertSecurity", {
         x: this.form.jd,
@@ -862,15 +868,14 @@
       });
     },
 
-    getVideo() {
+    oldOpenVideo() {
       getclient(this.form.id).then((res) => {
-        if (res.data.data.vaddress == "") {
-          this.getVideo();
-        } else {
-          this.vaddress = res.data.data.vaddress;
+        if (res.data.data.vaddress != "") {
+           this.vaddress = res.data.data.vaddress;
         }
       });
-    },
+    }
+
   },
 };
 </script>
diff --git a/src/views/supervisoryConsole/card.vue b/src/views/supervisoryConsole/card.vue
index 178a768..d914590 100644
--- a/src/views/supervisoryConsole/card.vue
+++ b/src/views/supervisoryConsole/card.vue
@@ -29,8 +29,7 @@
       style="
         margin-top: 10px;
         display: flex;
-        justify-content: center;
-        align-items: center;
+        justify-content: left;
         flex-wrap: wrap;
       "
     >
@@ -53,7 +52,7 @@
             "
           >
             <div>{{ item.deviceName }}</div>
-            <div>{{ item.street }}</div>
+            <div style="width: 80%;">{{ item.street }}</div>
 
             <div class="cet">
               {{
@@ -284,8 +283,7 @@
   height: 172px !important;
   box-sizing: border-box;
   margin-bottom: 20px !important;
-  min-width: 368px;
-  max-width: 370px;
+  width: 20%;
   a {
     width: 100%;
     height: 100%;

--
Gitblit v1.9.3