From 37cf2800ad61c59e50100b9c08df77d01454fa9f Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 12 Sep 2024 09:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/carouselChart.vue              | 13 ++++--
 .../components/morePicPreveiw.vue             | 46 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index d48fac5..8856946 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -99,7 +99,7 @@
               "
             >
               <!-- <el-image v-lazy="item.path + '!260x160'"></el-image> -->
-              <img v-lazy="item.path + '!260x160'" />
+              <img v-lazy="item.path + '!160x101'" />
               <!--  <img :src="item.path + '!260x160'" />-->
               <!-- :class="{ alarmSpan: item.isAlarm === 1 }" -->
               <p class="timeInfo">
@@ -134,7 +134,7 @@
             </div>
             <div class="picBox" v-else-if="item.mediaType == 1">
               <!-- <el-image :src="item.thumb + '!260x160'"></el-image> -->
-              <img v-lazy="item.thumb + '!260x160'" />
+              <img v-lazy="item.thumb + '!260x161'" />
               <p class="timeInfo">
                 <i class="el-icon-video-camera"></i>
                 <el-tooltip
@@ -218,6 +218,9 @@ export default {
     protocolInfo: {
       type: Number,
     },
+    fistPath: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -233,7 +236,7 @@ export default {
         "Item 9",
         "Item 10",
       ],
-      picLoading: true,
+      picLoading: false,
       currentPicPath: "", //大图
       mediaType: "", //判断图片类型是视频还是图片
       activeSmall: 0, //索引选中小图,
@@ -260,6 +263,7 @@ export default {
   },
   mounted() {
     ////console.log(this.terminalPhoto);
+
     this.changeBigPic(this.terminalPhoto[0], 0);
   },
   watch: {
@@ -457,6 +461,9 @@ export default {
     loadImage() {
       console.log("loading");
       this.picLoading = false;
+
+      this.currentPicPath = this.fistPath;
+
       this.drawlineBig(this.picDataAlarm);
     },
     setDefaultImage(e) {
diff --git a/src/views/realTimeMonitor/components/morePicPreveiw.vue b/src/views/realTimeMonitor/components/morePicPreveiw.vue
index c3c3592..0723155 100644
--- a/src/views/realTimeMonitor/components/morePicPreveiw.vue
+++ b/src/views/realTimeMonitor/components/morePicPreveiw.vue
@@ -19,10 +19,22 @@
       </div>
     </div>
     <div class="picmain" v-loading="picLoading">
+      <el-skeleton v-if="fistflag" style="width: 100%; height: 100%" animated>
+        <template slot="template">
+          <el-skeleton-item variant="image" />
+          <div class="littleBox">
+            <el-skeleton-item variant="image" />
+            <el-skeleton-item variant="image" />
+            <el-skeleton-item variant="image" />
+            <el-skeleton-item variant="image" />
+          </div>
+        </template>
+      </el-skeleton>
       <carouselChart
         ref="carouselpic"
         :terminalPhoto="terminalPhoto"
         :photoNum="photoNum"
+        :fistPath="fistPath"
         v-if="terminalPhoto.length > 0"
       ></carouselChart>
     </div>
@@ -47,6 +59,8 @@ export default {
       nopicPath: require("@/assets/img/nopic.jpg"),
       picLoading: false,
       photoNum: 10,
+      fistPath: "",
+      fistflag: true,
     };
   },
   mounted() {},
@@ -55,6 +69,7 @@ export default {
       this.isShow = true;
       console.log(data);
       this.deviceData = data;
+      this.fistPath = data.path;
       if (data.photoTime == null) {
         data.photoTime = new Date().getTime();
       }
@@ -63,7 +78,7 @@ export default {
     //获取图片
     getTerminalPhotoList(channelid, date, termId) {
       this.terminalPhoto = [];
-      this.picLoading = true;
+      //this.picLoading = true;
       getTerminalPhotoListJoggle({
         channelid: channelid,
         time: date,
@@ -72,6 +87,7 @@ export default {
         .then((res) => {
           console.log(res);
           this.picLoading = false;
+          this.fistflag = false;
           if (res.data.list.length == 0) {
             this.terminalPhoto = [
               {
@@ -107,6 +123,7 @@ export default {
     },
     handleclose() {
       this.isShow = false;
+      this.fistflag = true;
     },
   },
 };
@@ -151,6 +168,33 @@ export default {
   .picmain {
     width: 100%;
     height: calc(100% - 10px);
+    .el-skeleton {
+      width: 100%;
+      height: 100%;
+      .el-skeleton__image {
+        width: 100%;
+        height: 80%;
+        svg {
+          width: 60%;
+          height: 60%;
+        }
+      }
+      .littleBox {
+        display: flex;
+        height: 18%;
+        margin-top: 2%;
+        align-items: center;
+        justify-content: space-around;
+        .el-skeleton__image {
+          width: 23%;
+          height: 100%;
+        }
+        svg {
+          width: 30%;
+          height: 30%;
+        }
+      }
+    }
   }
 }
 </style>