From 0175cda6150656bc74b34c6f6c71edd1e1fc653c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 04 二月 2021 18:22:54 +0800
Subject: [PATCH] treee, 修复tab切换时树的选中状态.添加区域
---
src/pages/cameraAccess/components/DataStackInfo.vue | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index cad4022..643acd1 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -13,7 +13,22 @@
<el-radio v-model="form.type" :label="3" :disabled="!isAdd">闊抽</el-radio>
<el-radio v-model="form.type" :label="4" :disabled="!isAdd">鍏朵粬鏁版嵁</el-radio>
</el-form-item>
-
+ <el-form-item label="澶勭悊鍒嗚鲸鐜�" style="width:440px">
+ <el-select
+ v-model="form.resolution"
+ placeholder="鏈満鍒嗚鲸鐜�"
+ style="position: absolute;left: 0;"
+ size="small"
+ @change="checkResolution"
+ >
+ <el-option
+ v-for="item in form.resolutions"
+ :key="`${item.width}*${item.height}`"
+ :label="`${item.width}*${item.height}`=='0*0'?'鏈満鍒嗚鲸鐜�':`${item.width}*${item.height}`"
+ :value="`${item.width}*${item.height}`"
+ ></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item
label="澶勭悊瀹屾垚鍚庤嚜鍔ㄥ垹闄ゆ枃浠�"
prop="isAutoDelFile"
@@ -133,7 +148,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 +187,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>
@@ -222,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>
@@ -261,7 +276,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,8 +286,12 @@
<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'" /> -->
+ <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">
@@ -337,6 +356,7 @@
filters: {
statusFormat (value) {
let statusCode = {
+ "-2": "澶勭悊寮傚父",
"-1": "宸插垹闄�",
"0": "鏆傚仠澶勭悊",
"1": "绛夊緟澶勭悊",
@@ -396,7 +416,8 @@
multipleSelection: [],
searchInput: "",
form: {
- id: ""
+ id: "",
+ resolution: ""
},
fileList: [],
// 璁板綍娣诲姞鐘舵��
@@ -416,9 +437,6 @@
timer: 0,
targetDir: "",
targetFile: "",
- attrs: {
- accept: ""
- }
};
},
mounted () {
@@ -437,20 +455,12 @@
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: {
+ checkResolution (val) {
+ this.form.resolution_width = Number(val.split('*')[0]);
+ this.form.resolution_height = Number(val.split('*')[1]);
+ },
preview (row) {
this.previewDialog = true;
if (row.type === 1) {
@@ -482,11 +492,10 @@
this.fileList = [];
},
selectDir (node) {
-
if (node.id === "") {
return
}
-
+ console.log('閫夋嫨鏁版嵁鏍�', node)
this.isDisabled = false;
this.isAdd = false;
this.videoItem = null;
@@ -494,6 +503,7 @@
// this.initFormData();
// this.$refs.addForm.clearValidate();
this.form = { ...node };
+ this.form.resolution = `${node.resolution_width}*${node.resolution_height}`;
delete this.form.createTime;
delete this.form.updateTime;
delete this.form.status;
@@ -517,9 +527,7 @@
if (uid !== this.taskUid || this.form.id === "") {
return;
}
-
this.fetchFileList();
-
let _this = this;
this.timer = setTimeout(() => {
_this.timingtask(uid);
@@ -529,9 +537,7 @@
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})
@@ -545,11 +551,19 @@
}).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 => {
@@ -612,7 +626,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