From 1fbade862552c9387809f7e50dd75d6b019086f1 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 13 十月 2020 15:04:45 +0800
Subject: [PATCH] 数据栈底图修复,场景配置算法关系改为读取字典

---
 src/pages/cameraAccess/components/SeparateRules.vue |   70 ++++++++++++++++++++--------------
 1 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index b176fa1..6bce67a 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -144,7 +144,7 @@
                 ></polygon-canvas>
               </template>
               <template v-else>
-                <div style="width:100%" v-loading='getStackFileLoading'>
+                <div style="width:100%" v-loading="getStackFileLoading">
                   <swiper
                     ref="swiper"
                     :auto-update="true"
@@ -182,12 +182,20 @@
                       </div>
                     </swiper-slide>
                   </swiper>
-                  <div class="swiper-local-prev" v-show="swipercanvasData.length>1" @click="prevClick">
+                  <div
+                    class="swiper-local-prev"
+                    v-show="swipercanvasData.length>1"
+                    @click="prevClick"
+                  >
                     <div class="icon-btn" slot="button-prev">
                       <i class="iconfont iconzuo"></i>
                     </div>
                   </div>
-                  <div class="swiper-local-next" v-show="swipercanvasData.length>1" @click="nextClick">
+                  <div
+                    class="swiper-local-next"
+                    v-show="swipercanvasData.length>1"
+                    @click="nextClick"
+                  >
                     <div class="icon-btn" slot="button-next">
                       <i class="iconfont iconyou1"></i>
                     </div>
@@ -319,14 +327,15 @@
 
   },
   watch: {
-    'Camera.cameraId':{
-      handler(n,o){
+    'Camera.cameraId': {
+      handler (n, o) {
         if (n) {
           if (this.TreeDataPool.treeActiveName == "dataStack") {
             this.stackFilesPage = 1;
             this.stackFilesSize = 5;
             this.stackId = n;
-            if(this.stackId){
+            if (this.stackId) {
+              console.log('getStackFiles')
               this.swipercanvasData = [];
               this.getStackFiles()
             }
@@ -336,28 +345,28 @@
     }
   },
   methods: {
-    prevClick(){
+    prevClick () {
       console.log(this.swiperIndex)
       console.log(this.$refs.swiper.swiper.activeIndex)
-      if(this.swiperIndex == 0){
+      if (this.swiperIndex == 0) {
         console.log('鏈鍒嗛〉鐨勭涓�鏉�')
         //璇锋眰涓婁竴椤�
-        if(this.stackFilesPage > 1){
+        if (this.stackFilesPage > 1) {
           this.stackFilesPage--;
           this.getStackFiles();
-        }else{
+        } else {
           this.$message({
-            type:'info',
-            message:'褰撳墠宸叉槸绗竴椤�'
+            type: 'info',
+            message: '褰撳墠宸叉槸绗竴椤�'
           });
         }
-        
+
       }
     },
-    nextClick(){
+    nextClick () {
       console.log(this.swiperIndex)
       console.log(this.$refs.swiper.swiper.activeIndex)
-      if(this.swiperIndex == this.swipercanvasData.length-1){
+      if (this.swiperIndex == this.swipercanvasData.length - 1) {
         console.log('鏈�鍚庝竴寮�,鍔犺浇鏇村')
         //璇锋眰涓嬩竴椤�
         this.stackFilesPage++;
@@ -366,38 +375,41 @@
     },
     getStackFiles () {
       this.getStackFileLoading = true;
+      let _this = this;
       findAllFileByStackId({ name: '', stackId: this.stackId, page: this.stackFilesPage, size: this.stackFilesSize, type: 0 }).then(res => {
-        if (res && res.success ) {
-          if(res.data.dataList.length > 0){
+        if (res && res.success) {
+          if (res.data.dataList.length > 0) {
             this.swipercanvasData = [];
             this.swipercanvasData = res.data.dataList.map(item => {
               return {
                 name: item.name,
                 stackId: item.stack_id,
-                baseImg: item.type == 2 ? `/files/${item.identifier}.jpg` : item.snapshot_url,
+                baseImg: item.type == 2 ? `/files/${item.path.substr(item.path.lastIndexOf('/') + 1)}` : item.snapshot_url,
                 type: item.type,
                 id: item.id,
                 loading: false
               }
             });
+            console.log(_this.swipercanvasData)
+            console.log(this.swipercanvasData)
             this.swiperIndex = 0;
             this.$refs.swiper.swiper.activeIndex = 0;
-            
-          }else{
+
+          } else {
             console.log(this.swipercanvasData)
             this.$message({
-              type:'info',
-              message:'宸叉棤鏇村鏁版嵁!'
+              type: 'info',
+              message: '宸叉棤鏇村鏁版嵁!'
             });
           }
-        }else{
+        } else {
           console.log(this.swipercanvasData)
           this.$message({
-            type:'error',
-            message:'鏁版嵁璇锋眰澶辫触,璇风◢鍚庨噸璇�!'
+            type: 'error',
+            message: '鏁版嵁璇锋眰澶辫触,璇风◢鍚庨噸璇�!'
           });
         }
-        this.getStackFileLoading = false;  
+        this.getStackFileLoading = false;
       }).catch(e => {
         console.log(e);
         this.getStackFileLoading = false;
@@ -454,7 +466,7 @@
         this.loading = false;
         this.Camera.cameraId = id;
         await this.Camera.update();
-        debugger
+
       }
 
       this.$refs.timeSlider.activeTab = this.VideoManageData.TimeRules[0].id;
@@ -480,7 +492,7 @@
             message: "绛栫暐淇濆瓨鎴愬姛锛�"
           });
           //鍒锋柊宸︿晶鏍�
-          debugger
+
           _this.$root.$children[0].$children[0].querySearchAsync('camera')
 
         }
@@ -624,7 +636,7 @@
 };
 </script>
 <style lang="scss">
-.el-message--info .el-message__content{
+.el-message--info .el-message__content {
   color: #999;
 }
 .swiper-container {

--
Gitblit v1.8.0