From 9823dd3fe08c7c98eabbd4f5d40a395b829cab81 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 27 Jul 2023 11:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmHandling/index.vue | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index b2d5fac..1fd3db4 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -209,18 +209,17 @@
               v-if="selectRow.path !== '' && tableData.length !== 0"
             >
               <!-- v-viewer="OptionssalseImg" -->
-              <img
-                ref="picJpg"
-                class="animImg"
-                @load="imgOnload"
-                :src="photoPic + '!1366x768'"
-              />
+              <img ref="picJpg" class="animImg" :src="photoPic + '!1366x768'" />
               <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
             </div>
             <img
               ref="picJpg"
               src="../../assets/img/nopic.jpg"
-              v-if="selectRow.path == '' || tableData.length == 0"
+              v-if="
+                selectRow.path == '' ||
+                selectRow.path == null ||
+                tableData.length == 0
+              "
             />
           </div>
           <div class="editorBtn">
@@ -233,7 +232,7 @@
             >
             <el-button
               type="primary"
-              @click="handleHistory"
+              @click="handleHistory(selectRow)"
               :disabled="tableData.length == 0"
               >历史图片</el-button
             >
@@ -265,6 +264,11 @@
               </div>
               <div class="picshow" @click="handlePicAlarm(item)">
                 <img
+                  v-if="item.path == '' || null"
+                  src="../../assets/img/nodatapic2.jpg"
+                />
+                <img
+                  v-else
                   :id="'img' + index"
                   :ref="'imgref' + index"
                   :src="item.path + '!1366x768'"
@@ -759,8 +763,10 @@ export default {
       //this.$refs.multipleTable.toggleRowSelection(row);
       console.log(this.$refs.picJpg.complete);
       this.alarmLoading = true;
+      if (row.path == "" || row.path == null) {
+        this.alarmLoading = false;
+      }
       this.photoPic = row.path;
-
       this.selectRow = row;
       //未读变已读
       if (row.isread == 0) {