From 56f7ab1f14f2de2ceff75db982b8acca1d80ca46 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 03 十一月 2020 15:59:18 +0800
Subject: [PATCH] 新增vuedraggable package,算力管理摄像机ip排序方法重定义,比对库/数据栈列表size调试

---
 src/pages/cameraAccess/components/DataStackInfo.vue |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index 94a4cb9..328e263 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -105,15 +105,20 @@
         </el-tooltip>
 
         <!-- 鏂囦欢涓婁紶 -->
-        <el-button
-          type="primary"
-          size="small"
-          :disabled="!DataStackPool.selectedDir.id"
-          @click="handleUpload"
-        >
-          涓婁紶
-          <i class="el-icon-upload el-icon--right"></i>
-        </el-button>
+        <template v-for="stack in DataStackPool.dirs">
+          <el-button
+            :class="`uploader_${stack.id}`"
+            :key="stack.id"
+            type="primary"
+            size="small"
+            v-show="stack.id == DataStackPool.selectedDir.id"
+            :disabled="!DataStackPool.selectedDir.id"
+            @click="handleUpload"
+          >
+            涓婁紶
+            <i class="el-icon-upload el-icon--right"></i>
+          </el-button>
+        </template>
       </div>
     </div>
 
@@ -128,7 +133,7 @@
       @select="handleSelect"
       @select-all="handleSelect"
     >
-      <el-table-column type="selection" width="50" align="center" :selectable="isSelectable"></el-table-column>
+      <el-table-column type="selection" align="center" :selectable="isSelectable"></el-table-column>
       <el-table-column prop="name" label="鏂囦欢鍚�">
         <template slot-scope="{row}">
           <div :class="snapshotClass">
@@ -167,7 +172,7 @@
           >{{row.name}}</a>
         </template>
       </el-table-column>
-      <el-table-column prop="fileSize" label="澶у皬" width="120">
+      <el-table-column prop="fileSize" label="澶у皬" >
         <template slot-scope="scope">{{scope.row.size | readFileSizeUnit}}</template>
       </el-table-column>
       <el-table-column prop="duration" label="鏃堕暱" show-overflow-tooltip align="center"></el-table-column>
@@ -252,10 +257,11 @@
     <!-- 鍒嗛〉 -->
     <div class="pagination">
       <el-pagination
+        v-show="activeName=='uploaded'"
         @size-change="handleSizeChange"
         @current-change="handleRefrashFileList"
         :current-page="page"
-        :page-sizes="[5, 10, 15, 20]"
+        :page-sizes="[10, 20, 50, 100]"
         :page-size="size"
         style="position:absolute;right:10px;bottom:5px"
         :total="total"
@@ -263,10 +269,11 @@
       ></el-pagination>
     </div>
 
-    <!-- 鏂囦欢涓婁紶缁勪欢 -->
-    <file-uploader ref="uploader" v-show="activeName === 'uploading'" :attrs="attrs" />
-    <!-- <file-uploader ref="uploader" v-show="activeName === 'uploading'" /> -->
-
+    <template v-for="stack in DataStackPool.dirs">
+      <!-- 鏂囦欢涓婁紶缁勪欢 -->
+      <file-uploader :ref="`uploader_${stack.id}`" :key="stack.id" v-show="activeName === 'uploading' && stack.id == DataStackPool.selectedDir.id" :attrs="attrs" />
+      <!-- <file-uploader ref="uploader" v-show="activeName === 'uploading'" /> -->
+    </template>
     <!-- 鏂囦欢棰勮 -->
     <el-dialog title="鏌ョ湅鏂囦欢" :visible.sync="previewDialog" width="500px">
       <video v-if="videoUrl" :src="videoUrl" controls style="margin-top: 12px;">鎮ㄧ殑娴忚鍣ㄤ笉鏀寔 video 鏍囩銆�</video>
@@ -427,7 +434,6 @@
       handler (n, o) {
         //鏁版嵁鏍堟枃浠舵暟閲忓彉鏇�
         //鏇存柊鐙珛鍦烘櫙鏁版嵁鏍堟枃浠�
-        console.log(this.$root.$children[0].$children[1].$refs['sepRule']);
         this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
       }
     },
@@ -437,7 +443,7 @@
         if (n == 1) {
           //浠呮敮鎸佷笂浼犺棰�
           this.$set(this.attrs, 'accept', ".mp4");
-        }else if (n == 2) {
+        } else if (n == 2) {
           //鍥剧墖
           this.$set(this.attrs, 'accept', ".jpg,.jpeg,.png");
         }
@@ -521,7 +527,7 @@
     },
     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) {
+        if (rsp && rsp.success && rsp.data.total >= 0) {
           this.fileList = rsp.data.dataList;
 
           this.total = rsp.data.total;
@@ -605,10 +611,9 @@
       this.multipleSelection = [];
     },
     handleUpload () {
-
       console.log(this.DataStackPool.selectedDir.id)
-      console.log(this.$refs.uploader.$refs.button.attrs)
-      console.log(this.$refs.uploader.$refs.button.$refs.btn.click())
+      debugger
+      console.log(this.$refs[`uploader_${this.DataStackPool.selectedDir.id}`][0].$refs.button.$refs.btn.click())
     },
     handleRefrashFileList (val) {
       this.page = val;

--
Gitblit v1.8.0