From ac6d81e4f154ebc92ceb199e5ddaad9e43ef9818 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期六, 01 八月 2020 17:47:02 +0800
Subject: [PATCH] 合并摄像机接入和数据栈
---
src/components/LeftNav.vue | 56 +++++++++++++++++---------------------------------------
1 files changed, 17 insertions(+), 39 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 90ad872..e3ef85e 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -6,12 +6,7 @@
v-show="TreeDataPool.showTreeBox"
>
<el-tabs v-model="TreeDataPool.treeActiveName" type="border-card" @tab-click="handleClick">
- <el-tab-pane
- label="鎽勫儚鏈�"
- name="camera"
- :style="`height:${height - 56}px;`"
- v-if="isShow(cameraAuth)"
- >
+ <el-tab-pane label="鎽勫儚鏈�" name="camera" :style="`height:${height - 56}px;`" v-if="showCam">
<el-menu
:default-openeds="openeds"
background-color="#fff"
@@ -27,7 +22,6 @@
<el-select
v-model="TreeDataPool.searchCamType"
placeholder="璇烽�夋嫨"
-
@change="searchAreaData"
>
<el-option
@@ -43,7 +37,6 @@
placeholder="鎼滅储"
clearable
@input="querySearchAsync('camera')"
-
>
<i
class="el-icon-search el-input__icon"
@@ -150,7 +143,7 @@
label="鏁版嵁鏍�"
name="dataStack"
:style="`height:${height - 56}px;`"
- v-if="isShow(dataStack)"
+ v-if="showDataStack"
>
<div class="local-vedio-area">
<!-- 鎼滅储 -->
@@ -216,21 +209,9 @@
</div>
<LocalVedioList :dataList="TreeDataPool.localVedioList"></LocalVedioList>
</div>
- <!-- 鍒嗛〉 -->
- <!-- <div class="paginationClass flex-box">
- <el-pagination
- @current-change="refrash"
- :current-page="TreeDataPool.localCurrentPage"
- :page-size="TreeDataPool.localPageSize"
- style="margin: 10px 0;"
- :total="TreeDataPool.localTotal"
- ></el-pagination>
- </div>-->
</div>
<file-upload v-show="fileUploadBox" @close="fileUploadBox= false" />
</el-tab-pane>
- <!-- <el-tab-pane label="鏈湴鍥剧墖" name="localPic" v-if="isShow('VIDEOCAMERA:image')">鏈湴鍥剧墖</el-tab-pane>
- <el-tab-pane label="鏈湴闊抽" name="localAudio" v-if="isShow('VIDEOCAMERA:audio')">鏈湴闊抽</el-tab-pane>-->
</el-tabs>
</div>
</transition>
@@ -270,6 +251,15 @@
},
computed: {
+ showTab() {
+ return true;
+ },
+ showCam() {
+ return this.appName === "Camera" || this.appName === "Search";
+ },
+ showDataStack() {
+ return this.appName === "DataStack" || this.appName === "Search";
+ },
showLock() {
return this.edit;
},
@@ -366,33 +356,21 @@
}
},
created() {
- if (this.isShow('VIDEOCAMERA:camera')) {
+ if (this.showCam) {
this.TreeDataPool.treeActiveName = "camera"
+ this.TreeDataPool.fetchTreeData();
+
} else {
this.TreeDataPool.treeActiveName = "dataStack"
+ this.DataStackPool.fetchFiles();
+
}
- this.TreeDataPool.fetchTreeData().then(_ => {
- // todo
- // if (this.$route.path == '/Layout/Searching') {
- // this.TreeDataPool.filterLocalVideoWell()
- // }
- });
},
methods: {
- isShow(authority) {
- if (this.isAdmin) {
- return true;
- } else if (this.buttonAuthority.indexOf("," + authority + ",") > -1) {
- return true;
- } else {
- return false;
- }
- },
searchAreaData() {
this.TreeDataPool.fetchTreeData();
},
searchDataStack() {
- debugger
this.DataStackPool.fetchFiles();
},
lockSwitch() {
@@ -577,7 +555,7 @@
.navTopSelect {
display: flex;
text-align: left;
-
+
.el-input__icon {
line-height: 34px;
}
--
Gitblit v1.8.0