From ccee429d379e0108b7445f72ade8d97c110a6fb3 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 18:01:59 +0800
Subject: [PATCH] 问题修复

---
 src/pages/cameraAccess/components/DataStackInfo.vue |   67 ++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index a4801b3..7b695db 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -237,7 +237,7 @@
                 :disabled="scope.row.status == 2"
                 class="iconfont iconzhongxinkaishi btn"
                 @click="handleFileStatus(scope.row, 1)"
-                v-show="scope.row.status === 9"
+                v-show="scope.row.status === 9 || scope.row.status === -2"
               ></el-button>
             </el-tooltip>
 
@@ -356,6 +356,7 @@
   filters: {
     statusFormat(value) {
       let statusCode = {
+        "-2": "澶勭悊寮傚父",
         "-1": "宸插垹闄�",
         "0": "鏆傚仠澶勭悊",
         "1": "绛夊緟澶勭悊",
@@ -446,17 +447,8 @@
   beforeDestroy() {
     this.taskUid = 0;
   },
-  watch: {
-    'fileList.length': {
-      handler(n, o) {
-        //鏁版嵁鏍堟枃浠舵暟閲忓彉鏇�
-        //鏇存柊鐙珛鍦烘櫙鏁版嵁鏍堟枃浠�
-        this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
-      }
-    },
-  },
   methods: {
-    checkResolution(val){
+    checkResolution(val) {
       this.form.resolution_width = Number(val.split('*')[0]);
       this.form.resolution_height = Number(val.split('*')[1]);
     },
@@ -465,8 +457,12 @@
       if (row.type === 1) {
 
         this.videoUrl = "/files/" + row.identifier + ".mp4"
-      } else if (row.type === 2) {
 
+        // 涓烘湐榛勪娇鐢ㄦ暟鎹爤瀹氬埗, 娌℃湁MD5
+        if (row.identifier == "") {
+          this.videoUrl = row.path.replace("/opt/vasystem", "");
+        }
+      } else if (row.type === 2) {
         this.imgUrl = "/files/" + row.path.substr(row.path.lastIndexOf('/') + 1)
       }
     },
@@ -490,11 +486,12 @@
       this.DataStackPool.clean();
       this.fileList = [];
     },
+    // 鏁版嵁鏍堟枃浠跺す閫変腑鏃讹紝鐢辩埗缁勪欢瑙﹀彂
     selectDir(node) {
       if (node.id === "") {
         return
       }
-      console.log('閫夋嫨鏁版嵁鏍�',node)
+
       this.isDisabled = false;
       this.isAdd = false;
       this.videoItem = null;
@@ -533,27 +530,37 @@
       }, 2 * 1000);
     },
     fetchFileList() {
-      findAllFileByStackId({ name: this.searchInput, stackId: this.form.id, page: this.page, size: this.size, type: 0 }).then(rsp => {
-        if (rsp && rsp.success && rsp.data.total >= 0) {
-          this.fileList = rsp.data.dataList;
-          this.total = rsp.data.total;
-          // 瀹氭椂鍒锋柊浼氭竻绌洪�変腑鐘舵�侊紝鍦ㄨ繖閲屾仮澶�
-          this.fileList.forEach(row => {
-            //this.polygonDatas.push({snapshot_url:row.snapshot_url})
-            if (this.multipleSelection.indexOf(row.id) !== -1) {
-              this.$nextTick(() => {
-                this.$refs.multipleTable.toggleRowSelection(row);
-              })
-            }
-          });
-        }
-      }).catch(err => {
-        console.log(err)
-      })
+      findAllFileByStackId({ name: this.searchInput, stackId: this.form.id, page: this.page, size: this.size, type: 0 }).then(
+        rsp => {
+          if (rsp && rsp.success && rsp.data.total >= 0) {
+            this.fileList = rsp.data.dataList;
+            this.total = rsp.data.total;
+            // 瀹氭椂鍒锋柊浼氭竻绌洪�変腑鐘舵�侊紝鍦ㄨ繖閲屾仮澶�
+            this.fileList.forEach(row => {
+              //this.polygonDatas.push({snapshot_url:row.snapshot_url})
+              if (this.multipleSelection.indexOf(row.id) !== -1) {
+                this.$nextTick(() => {
+                  this.$refs.multipleTable.toggleRowSelection(row);
+                })
+              }
+            });
+          }
+        }).catch(err => {
+          console.log(err)
+        })
     },
 
     // 淇濆瓨
     onSubmit(formName) {
+      if (formName == 'addForm') {
+        if (this.form.name.indexOf('/') >= 0) {
+          this.$notify({
+            type: "error",
+            message: "淇濆瓨澶辫触,鏁版嵁鏍堝悕绉颁笉鑳藉寘鍚�'/'锛�"
+          });
+          return;
+        }
+      }
       this.$refs[formName].validate(async valid => {
         if (valid) {
           saveDir(this.form).then(rsp => {

--
Gitblit v1.8.0