From e1467b19874294a9a36dcfb06083081f9d4b504d Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 05 十一月 2020 11:32:16 +0800
Subject: [PATCH] 上传组件回复至三方原始包,数据栈根据文件夹动态传入资源类型;联动刷新底图修复
---
src/pages/cameraAccess/components/DataStackInfo.vue | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index cad4022..d20e8e7 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -133,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">
@@ -172,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>
@@ -261,7 +261,7 @@
@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"
@@ -271,7 +271,7 @@
<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_${stack.id}`" :key="stack.id" v-show="activeName === 'uploading' && stack.id == DataStackPool.selectedDir.id" :sourceType="stack.type" />
<!-- <file-uploader ref="uploader" v-show="activeName === 'uploading'" /> -->
</template>
<!-- 鏂囦欢棰勮 -->
@@ -416,9 +416,7 @@
timer: 0,
targetDir: "",
targetFile: "",
- attrs: {
- accept: ""
- }
+
};
},
mounted () {
@@ -437,18 +435,7 @@
this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
}
},
- 'form.type': {
- handler (n, o) {
- console.log(n, o)
- if (n == 1) {
- //浠呮敮鎸佷笂浼犺棰�
- this.$set(this.attrs, 'accept', ".mp4");
- } else if (n == 2) {
- //鍥剧墖
- this.$set(this.attrs, 'accept', ".jpg,.jpeg,.png");
- }
- }
- }
+
},
methods: {
preview (row) {
@@ -482,11 +469,9 @@
this.fileList = [];
},
selectDir (node) {
-
if (node.id === "") {
return
}
-
this.isDisabled = false;
this.isAdd = false;
this.videoItem = null;
@@ -517,9 +502,7 @@
if (uid !== this.taskUid || this.form.id === "") {
return;
}
-
this.fetchFileList();
-
let _this = this;
this.timer = setTimeout(() => {
_this.timingtask(uid);
@@ -545,7 +528,6 @@
}).catch(err => {
console.log(err)
})
-
},
// 淇濆瓨
@@ -612,7 +594,6 @@
},
handleUpload () {
console.log(this.DataStackPool.selectedDir.id)
- debugger
console.log(this.$refs[`uploader_${this.DataStackPool.selectedDir.id}`][0].$refs.button.$refs.btn.click())
},
handleRefrashFileList (val) {
--
Gitblit v1.8.0