From cfe33505dc83ecaff395e9d207139d3b43e5a9b6 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 06 十一月 2020 16:46:14 +0800
Subject: [PATCH] 规则列表加入事件声音;数据栈目录树样式优化;集群目录树关键字搜索框查询修复
---
src/pages/cameraAccess/components/DataStackInfo.vue | 88 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index a2ce20f..aebdd67 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,10 +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>
@@ -118,13 +128,12 @@
v-show="activeName === 'uploaded' "
:data="fileList"
tooltip-effect="dark"
-
border
:header-cell-style="{background:'#f8f8f8', color:'#222222', textAlign:'center'}"
@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">
@@ -139,10 +148,10 @@
</el-image>
<el-image
v-if="row.type==2"
- style="width: 30x; height: 30px"
- :src="`/files/${row.identifier}.jpg`"
+ style="width: 30x; height: 30px;background:#fff;"
+ :src="`/files/${row.path.substr(row.path.lastIndexOf('/')+1)}`"
fit="fill"
- :preview-src-list="[`/files/${row.identifier}.jpg`]"
+ :preview-src-list="[`/files/${row.path.substr(row.path.lastIndexOf('/')+1)}`]"
>
<div slot="error" :class="snapshotClass"></div>
</el-image>
@@ -163,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>
@@ -248,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"
@@ -259,9 +269,15 @@
></el-pagination>
</div>
- <!-- 鏂囦欢涓婁紶缁勪欢 -->
- <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"
+ />
+ </template>
<!-- 鏂囦欢棰勮 -->
<el-dialog title="鏌ョ湅鏂囦欢" :visible.sync="previewDialog" width="500px">
<video v-if="videoUrl" :src="videoUrl" controls style="margin-top: 12px;">鎮ㄧ殑娴忚鍣ㄤ笉鏀寔 video 鏍囩銆�</video>
@@ -403,25 +419,36 @@
editRowId: "",
timer: 0,
targetDir: "",
- targetFile: ""
+ targetFile: "",
+
};
},
mounted() {
this.initFormData();
console.log(this.PollData.barCharts)
+
},
beforeDestroy() {
this.taskUid = 0;
+ },
+ watch: {
+ 'fileList.length': {
+ handler(n, o) {
+ //鏁版嵁鏍堟枃浠舵暟閲忓彉鏇�
+ //鏇存柊鐙珛鍦烘櫙鏁版嵁鏍堟枃浠�
+ this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
+ }
+ },
},
methods: {
preview(row) {
this.previewDialog = true;
if (row.type === 1) {
-
+
this.videoUrl = "/files/" + row.identifier + ".mp4"
- }else if(row.type===2){
-
- this.imgUrl = "/files/" + row.identifier + ".jpg"
+ } else if (row.type === 2) {
+
+ this.imgUrl = "/files/" + row.path.substr(row.path.lastIndexOf('/') + 1)
}
},
// 娓呯┖杈撳叆妗�
@@ -445,11 +472,9 @@
this.fileList = [];
},
selectDir(node) {
- debugger
if (node.id === "") {
return
}
-
this.isDisabled = false;
this.isAdd = false;
this.videoItem = null;
@@ -480,9 +505,7 @@
if (uid !== this.taskUid || this.form.id === "") {
return;
}
-
this.fetchFileList();
-
let _this = this;
this.timer = setTimeout(() => {
_this.timingtask(uid);
@@ -490,8 +513,9 @@
},
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;
// 瀹氭椂鍒锋柊浼氭竻绌洪�変腑鐘舵�侊紝鍦ㄨ繖閲屾仮澶�
@@ -507,7 +531,6 @@
}).catch(err => {
console.log(err)
})
-
},
// 淇濆瓨
@@ -574,7 +597,7 @@
},
handleUpload() {
console.log(this.DataStackPool.selectedDir.id)
- 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;
@@ -593,6 +616,9 @@
})
if (res && res.success) {
this.fetchFileList();
+ //鏇存柊鐙珛鍦烘櫙鏁版嵁鏍堟枃浠�
+ console.log(this.$root.$children[0].$children[1].$refs['sepRule'])
+ this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
this.$notify({
type: "success",
message: "鏂囦欢鎺掑簭鎴愬姛锛�"
@@ -631,6 +657,7 @@
cmd.cb(cmd.data);
},
handleFileDelete(rows, multi = false) {
+ let _this = this;
let ids = this.multipleSelection;
if (!multi) {
ids = [rows.id];
@@ -652,7 +679,8 @@
type: "error",
message: "鏂囦欢宸插垹闄�"
})
- })
+ });
+
}).catch(() => { })
},
handleFileMove(row) {
@@ -740,9 +768,9 @@
.el-form-item__label {
text-align: left;
}
- .el-button--primary.is-disabled{
+ .el-button--primary.is-disabled {
background-color: #9eb4f0 !important;
- border-color: #9eb4f0 !important;
+ border-color: #9eb4f0 !important;
}
.label {
color: #606266;
--
Gitblit v1.8.0