From 55c0f98d49463fb11ec7e5c7d9fd02424cb72e5e Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 24 May 2023 10:38:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=98=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/carouselChart.vue                      | 6 +++++-
 .../photographicDevice/components/pictureTags.vue           | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 92eac44..645edf4 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -202,8 +202,12 @@ export default {
     console.log("this.bigPicPath");
 
     this.localPoints = this.terminalPhoto[0].list;
+    console.log("111111111111111111111");
     console.log(this.localPoints);
-    if (this.localPoints !== "") {
+    if (this.localPoints == undefined) {
+      console.log("无数据");
+      return;
+    } else if (this.localPoints) {
       this.drawline();
     }
   },
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
index 85bcded..58e992e 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
@@ -134,6 +134,7 @@ export default {
     submitForm() {
       this.isShow = false;
       this.saveCanvas();
+      this.$parent.terminalList(); //刷新
     },
     display(val) {
       this.isShow = true;

From 5327285e225bc2f1a2399dc42bcf249924ba8a56 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 24 May 2023 13:20:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=98=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/carouselChart.vue                       | 5 ++---
 .../photographicDevice/components/pictureTags.vue            | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 645edf4..a3443ed 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -3,7 +3,6 @@
     <div class="picTop">
       <div
         class="bigimg"
-        :options="OptionssalseImg"
         v-if="
           bigPicPath.indexOf('nopic') == -1 &&
           bigPicPath.indexOf('videos') == -1
@@ -103,7 +102,7 @@
             <img
               src="../../assets/img/loading.jpg"
               style="object-fit: cover"
-              v-if="item.thumb.indexOf('jpg') == -1"
+              v-if="item.thumb == null"
             />
             <img :src="item.thumb" v-else />
             <p class="videoicon"><i class="el-icon-video-play"></i></p>
@@ -199,7 +198,7 @@ export default {
     this.bigPicPath = this.terminalPhoto[0].path;
     this.fiveList = this.terminalPhoto.slice(this.page - 1, this.pagesize);
     this.total = this.terminalPhoto.length / this.pagesize;
-    console.log("this.bigPicPath");
+    console.log(this.fiveList);
 
     this.localPoints = this.terminalPhoto[0].list;
     console.log("111111111111111111111");
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
index 58e992e..f72bfbc 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
@@ -20,6 +20,7 @@
       </div>
       <div class="imgbox" v-else>
         <img ref="picJpg" src="../../../../../assets/img/nopic.jpg" />
+        <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
       </div>
 
       <div class="setBox">