From 3ba1f2423a7ef6d8f7c3282ca5f5293bc0da4b45 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 30 十月 2020 13:58:41 +0800
Subject: [PATCH] 绘制多边形区域命名规则更新,数据栈按文件夹实例化绑定上传组件
---
src/components/canvas/Dialog.vue | 5 ++
src/components/subComponents/DataStackCard.vue | 18 ++++++---
src/pages/cameraAccess/components/DataStackInfo.vue | 41 +++++++++++---------
src/pages/cameraAccess/components/SeparateRules.vue | 2
4 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/src/components/canvas/Dialog.vue b/src/components/canvas/Dialog.vue
index 8d66184..f56437b 100644
--- a/src/components/canvas/Dialog.vue
+++ b/src/components/canvas/Dialog.vue
@@ -1269,7 +1269,10 @@
this.lineIndex = this.canvasData.line.length;
this.rectIndex = this.canvasData.rect.length;
this.arrowIndex = this.canvasData.arrow.length;
- this.polygonIndex = this.canvasData.polygon.length;
+ //鎺掗櫎this.canvasData.polygon鍏ㄩ儴鍖哄煙(鍏ㄩ儴鍖哄煙鐨刬d灏辨槸鎽勫儚鏈虹殑id)
+
+ let filterPolygonArr = this.canvasData.polygon.filter(item=>item.id != this.TreeDataPool.selectedNode.id)
+ this.polygonIndex = filterPolygonArr.length;
},
// 鐢熸垚uuid
getUuid() {
diff --git a/src/components/subComponents/DataStackCard.vue b/src/components/subComponents/DataStackCard.vue
index fa6f9c4..135926a 100644
--- a/src/components/subComponents/DataStackCard.vue
+++ b/src/components/subComponents/DataStackCard.vue
@@ -17,7 +17,7 @@
<div slot="content">鍏ㄩ儴鎵撳紑鍒嗘瀽寮�鍏�</div>
<span class="bottom-text">
<i class="iconfont iconquanbu" style="color:#3D68E1;" v-show="ValidCount.length"></i>
- {{ValidCount}}
+ <i class="value">{{ValidCount}}</i>
</span>
</el-tooltip>
</div>
@@ -27,10 +27,10 @@
<span class="bottom-text">
<i
class="iconfont iconicon-test6"
- style="color:#3D68E1;margin-left: 15px;"
+ style="color:#3D68E1;"
v-show="InValidCount.length"
></i>
- {{InValidCount}}
+ <i class="value">{{InValidCount}}</i>
</span>
</el-tooltip>
</div>
@@ -40,7 +40,7 @@
<div slot="content">姝ｅ湪鎵ц鍒嗘瀽澶勭悊</div>
<span class="bottom-text">
<i class="iconfont iconicon-test11" style="color:#3D68E1" v-show="RunningCount.length"></i>
- {{RunningCount}}
+ <i class="value">{{RunningCount}}</i>
</span>
</el-tooltip>
</div>
@@ -50,10 +50,10 @@
<span class="bottom-text">
<i
:class="`iconfont ${fourIcon}`"
- style="color:#3D68E1;margin-left:15px;"
+ style="color:#3D68E1;"
v-show="NoDeal.length"
></i>
- {{NoDeal}}
+ <i class="value">{{NoDeal}}</i>
</span>
</el-tooltip>
</div>
@@ -156,6 +156,12 @@
// left: 1px;
// color: #666666;
// font-size: 13px;
+ .value{
+ display: inline-block;
+ width: 30px;
+ font-size: 14px;
+ font-style: normal;
+ }
}
em {
font-weight: 700;
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index 94a4cb9..c87fe5e 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>
@@ -252,6 +257,7 @@
<!-- 鍒嗛〉 -->
<div class="pagination">
<el-pagination
+ v-show="activeName=='uploaded'"
@size-change="handleSizeChange"
@current-change="handleRefrashFileList"
:current-page="page"
@@ -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");
}
@@ -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;
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 37bb077..6993ed4 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -455,7 +455,7 @@
polyon.camera_id = this.Camera.cameraId;
savePolygon(polyon).then(rsp => {
this.Camera.getPolygon();
- this.Camera.getCameraTask();
+ //this.Camera.getCameraTask();
});
},
refresh(url) {
--
Gitblit v1.8.0