Merge branch 'fly' into xy-ly

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,11 +198,15 @@ 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");
     console.log(this.localPoints);
-    if (this.localPoints !== "") {
+    if (this.localPoints == undefined) {
+      console.log("无数据");
+      return;
+    } else if (this.localPoints) {
       this.drawline();
     }
   },

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">
@@ -134,6 +135,7 @@ export default {
     submitForm() {
       this.isShow = false;
       this.saveCanvas();
+      this.$parent.terminalList(); //刷新
     },
     display(val) {
       this.isShow = true;