From 18a49bb53ecfbd47d9a6e33a1fd7a82fafca4ff7 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期一, 22 十一月 2021 16:27:31 +0800
Subject: [PATCH] v0
---
src/components/LeftNav.vue | 63 ++++++++-----------------------
1 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 947c935..eb10dfc 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -57,7 +57,6 @@
</div>-->
</li>
- <!-- 娣诲姞鍖哄煙鍥炬爣 -->
<div class="tree-edit area-add" v-show="!TreeDataPool.readonly">
<el-tooltip content="娣诲姞鍖哄煙" placement="bottom" popper-class="atooltip">
<button @click="addNode($event)">
@@ -123,14 +122,14 @@
</template>
<!-- 鍥芥爣鍒锋柊鍥炬爣 -->
- <div class="tree-edit gb-refresh" v-show="!TreeDataPool.gbReadonly">
+ <!-- <div class="tree-edit gb-refresh" v-show="!TreeDataPool.gbReadonly">
<el-tooltip content="鍒锋柊" placement="top" popper-class="atooltip">
<button @click="refreshGB">
<i v-if="loadingGBTree" class="el-icon-loading" style="font-size:16px"></i>
<i v-else class="el-icon-refresh" style="font-size:16px"></i>
</button>
</el-tooltip>
- </div>
+ </div>-->
<div class="tree-edit gb-lock" v-show="showLock">
<button @click="gbLockSwitch">
<i v-if="TreeDataPool.gbReadonly" class="el-icon-lock" style="font-size:16px"></i>
@@ -207,12 +206,7 @@
</div>
</div>
</el-tab-pane>
- <el-tab-pane
- label="鏁版嵁鏍�"
- name="dataStack"
- :style="`height:${height - 56}px;`"
- v-if="showDataStack"
- >
+ <el-tab-pane label="鏁版嵁鏍�" name="dataStack" v-if="showDataStack">
<div class="local-vedio-area">
<!-- 鎼滅储 -->
<div class="search-input">
@@ -238,7 +232,7 @@
size="small"
clearable
@input="querySearchAsync('dir')"
- :style="'width:103px;'"
+ :style="'width:148px;'"
>
<i
class="el-icon-search el-input__icon"
@@ -312,7 +306,8 @@
} from "@/api/camera";
import bus from "@/plugin/bus"
-import TreeMenu from "@/components/treeMenu/index";
+// import TreeMenu from "@/components/treeMenu/index";
+import TreeMenu from "@/components/giantTree/index";
import LocalVedioList from '@/components/subComponents/LocalVedioList';
import FileUpload from '@/components/subComponents/FileUpload/index';
import XLSX from 'xlsx'
@@ -397,9 +392,7 @@
},
data() {
return {
- cameraAuth: "videoMonitor:camera",
dataStack: "videoMonitor:dataStack",
- activeIndexVideo: "",
buttonAuthority: sessionStorage.getItem("buttonAuthoritys") || [],
installedApps: sessionStorage.getItem("apps") || [],
loginName: JSON.parse(sessionStorage.getItem("userInfo")).username || "鐢ㄦ埛鍚�",
@@ -421,28 +414,6 @@
label: "鑱斿姩鎽勫儚鏈�"
}
],
- searchTypeLocalVideo: [
- {
- value: 0,
- label: "鍏ㄩ儴"
- },
- {
- value: 1,
- label: "澶勭悊瀹屾垚"
- },
- {
- value: 2,
- label: "澶勭悊涓�"
- },
- {
- value: 3,
- label: "鏈厤瑙勫垯"
- },
- {
- value: 4,
- label: "鏈紑鍚�"
- }
- ],
timeout: null,
fileUploadBox: false,
loadingGBTree: false,
@@ -452,8 +423,6 @@
};
},
created() {
- console.log(this.appName)
- console.log(this.showCam)
if (this.showCam) {
this.TreeDataPool.treeActiveName = "camera"
this.TreeDataPool.fetchTreeData();
@@ -531,6 +500,9 @@
this.timeout = setTimeout(() => {
if (type === "camera") {
this.TreeDataPool.fetchTreeData();
+ }
+ if (type === "cluster") {
+ this.TreeDataPool.fetchClusterTree();
}
if (type === "dir") {
this.DataStackPool.fetchFiles();
@@ -868,15 +840,12 @@
}
.dev-vedio-list {
padding: 0 15px;
- max-height: 740px;
- overflow-x: hidden;
- overflow-y: auto;
- @media screen and (max-height: 720px) {
- max-height: 580px;
- }
- @media screen and (min-height: 900px) {
- max-height: 740px;
- }
+ box-sizing: border-box;
+ // height: calc(100vh - 80px);
+ //max-height: 740px;
+ // overflow-x: hidden;
+ overflow: auto;
+
}
.dev-vedio-list::-webkit-scrollbar {
/*婊氬姩鏉℃暣浣撴牱寮�*/
@@ -896,7 +865,7 @@
}
.tree-edit {
- z-index: 1;
+ z-index: 2;
font-size: 16px;
position: absolute;
top: 56px;
--
Gitblit v1.8.0