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 | 72 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 43 deletions(-)
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index fffe4d0..d20e8e7 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -50,7 +50,7 @@
<li>
<info-card
style="width: 100%;min-width: 440px"
- :realtime="PollData.RealTimeSum"
+ :realtime="PollData.RealTimeValidCount"
:polling="PollData.PollValidCount"
:dataStack="PollData.stackChannelCount"
></info-card>
@@ -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">
@@ -143,7 +148,7 @@
</el-image>
<el-image
v-if="row.type==2"
- style="width: 30x; height: 30px"
+ style="width: 30x; height: 30px;background:#fff;"
:src="`/files/${row.path.substr(row.path.lastIndexOf('/')+1)}`"
fit="fill"
:preview-src-list="[`/files/${row.path.substr(row.path.lastIndexOf('/')+1)}`]"
@@ -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" :sourceType="stack.type" />
+ <!-- <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>
@@ -409,9 +416,7 @@
timer: 0,
targetDir: "",
targetFile: "",
- attrs: {
- accept: ""
- }
+
};
},
mounted () {
@@ -427,22 +432,10 @@
handler (n, o) {
//鏁版嵁鏍堟枃浠舵暟閲忓彉鏇�
//鏇存柊鐙珛鍦烘櫙鏁版嵁鏍堟枃浠�
- console.log(this.$root.$children[0].$children[1].$refs['sepRule']);
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', "image/jpg,image/jpeg,image/png");
- }
- }
- }
+
},
methods: {
preview (row) {
@@ -476,11 +469,9 @@
this.fileList = [];
},
selectDir (node) {
-
if (node.id === "") {
return
}
-
this.isDisabled = false;
this.isAdd = false;
this.videoItem = null;
@@ -511,9 +502,7 @@
if (uid !== this.taskUid || this.form.id === "") {
return;
}
-
this.fetchFileList();
-
let _this = this;
this.timer = setTimeout(() => {
_this.timingtask(uid);
@@ -521,7 +510,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;
@@ -539,7 +528,6 @@
}).catch(err => {
console.log(err)
})
-
},
// 淇濆瓨
@@ -605,10 +593,8 @@
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())
+ console.log(this.$refs[`uploader_${this.DataStackPool.selectedDir.id}`][0].$refs.button.$refs.btn.click())
},
handleRefrashFileList (val) {
this.page = val;
--
Gitblit v1.8.0