From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/components/LeftNav.vue | 528 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 306 insertions(+), 222 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 3bd521f..c6da90e 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -1,10 +1,6 @@
<template>
<transition name="slideLeft">
- <div
- class="left-tree-box"
- :style="`height:${height}px;animation-duration: 0.7s`"
- v-show="TreeDataPool.showTreeBox"
- >
+ <div class="left-tree-box" v-show="TreeDataPool.showTreeBox" v-loading="menuLoading">
<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="showCam">
<el-menu
@@ -12,18 +8,14 @@
background-color="#fff"
text-color="#303133"
active-text-color="#409EFF"
- style="height: 100%;"
+ style="height: 100%"
class="el-menu-vertical-demo"
unique-opened
@open="menuOpen"
@close="menuClose"
>
<li class="navTopSelect">
- <el-select
- v-model="TreeDataPool.searchCamType"
- placeholder="璇烽�夋嫨"
- @change="searchAreaData"
- >
+ <el-select v-model="TreeDataPool.searchCamType" placeholder="璇烽�夋嫨" @change="searchAreaData">
<el-option
v-for="item in searchTypeOptions"
:key="item.value"
@@ -31,7 +23,7 @@
:value="item.value"
></el-option>
</el-select>
- <span style="display: inline-block;padding: 0px 3px;"></span>
+ <span style="display: inline-block; padding: 0px 3px"></span>
<el-input
v-model="TreeDataPool.searchInput"
placeholder="鎼滅储"
@@ -40,7 +32,7 @@
>
<i
class="el-icon-search el-input__icon"
- style="color:#DCDFE6"
+ style="color: #dcdfe6"
slot="prefix"
@click="searchAreaData"
></i>
@@ -53,10 +45,9 @@
@click="closeTree"
></i>
</el-tooltip>
- </div> -->
+ </div>-->
</li>
- <!-- 娣诲姞鍖哄煙鍥炬爣 -->
<div class="tree-edit area-add" v-show="!TreeDataPool.readonly">
<el-tooltip content="娣诲姞鍖哄煙" placement="bottom" popper-class="atooltip">
<button @click="addNode($event)">
@@ -70,7 +61,17 @@
<el-tooltip content="娣诲姞璁惧" placement="bottom" popper-class="atooltip">
<button @click="addCamera('0')">
<!-- <i class="el-icon-video-camera"></i> -->
- <span class="iconfont iconshishishipin" style="font-size:14px;"></span>
+ <span class="iconfont iconshishishipin" style="font-size: 14px"></span>
+ </button>
+ </el-tooltip>
+ </div>
+
+ <!-- 瀵煎叆璁惧 -->
+ <div class="tree-edit import-btn" v-show="!TreeDataPool.readonly">
+ <el-tooltip content="瀵煎叆璁惧" placement="bottom" popper-class="atooltip">
+ <button @click="importCameras('0')">
+ <!-- <i class="el-icon-video-camera"></i> -->
+ <span class="iconfont icondaoru" style="font-size: 16px"></span>
</button>
</el-tooltip>
</div>
@@ -87,10 +88,7 @@
<el-submenu index="0">
<template slot="title">
<!-- <i class="iconfont iconjiankongshexiangji"></i> -->
- <span
- class="iconfont iconjiankongshexiangji"
- style="padding-right:10px;font-size:13px;"
- ></span>
+ <span class="iconfont iconjiankongshexiangji" style="padding-right: 10px; font-size: 13px"></span>
<b class="tree-font">鎽勫儚鏈�</b>
</template>
<el-menu-item-group class="item-group">
@@ -101,27 +99,29 @@
:node="TreeDataPool.treeData"
:height="height"
@addDevice="addCamera"
+ @import="importCameras"
/>
</el-menu-item-group>
</el-submenu>
<el-submenu index="1">
<template slot="title">
- <i class="iconfont iconGBx"></i>
+ <i class="iconfont iconGBx" style="margin-left: -4px"></i>
<b class="tree-font">GB28181</b>
</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 class="el-icon-refresh" style="font-size:16px"></i>
+ <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>
- <i v-else class="el-icon-unlock" style="font-size:16px"></i>
+ <i v-if="TreeDataPool.gbReadonly" class="el-icon-lock" style="font-size: 16px"></i>
+ <i v-else class="el-icon-unlock" style="font-size: 16px"></i>
</button>
</div>
<el-menu-item-group class="item-group">
@@ -139,21 +139,62 @@
</el-submenu>
</el-menu>
</el-tab-pane>
- <el-tab-pane
- label="鏁版嵁鏍�"
- name="dataStack"
- :style="`height:${height - 56}px;`"
- v-if="showDataStack"
- >
+ <el-tab-pane label="闆嗙兢" name="cluster" :style="`height:${height - 56}px;`" v-if="showCluster">
+ <div class="local-vedio-area">
+ <!-- 鎼滅储 -->
+ <div class="navTopSelect">
+ <div class="search-input flex-box">
+ <el-select v-model="TreeDataPool.searchCamType" placeholder="璇烽�夋嫨" @change="searchClusterData">
+ <el-option
+ v-for="item in searchTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ <span style="display: inline-block; padding: 0px 3px"></span>
+ <el-input
+ v-model="TreeDataPool.searchInput"
+ placeholder="鎼滅储"
+ clearable
+ @input="querySearchAsync('cluster')"
+ >
+ <i
+ class="el-icon-search el-input__icon"
+ style="color: #dcdfe6"
+ slot="prefix"
+ @click="searchClusterData"
+ ></i>
+ </el-input>
+ </div>
+ </div>
+ <div class="top-menu" style="margin: 0 0 10px; text-align: left">
+ <span class="iconfont iconjiqun" style="font-size: 20px"></span>
+ <span style="font-size: 14px; margin-left: 5px; font-weight: 600">{{ clusterName }}</span>
+ </div>
+ <div class="cluster-list">
+ <tree-menu
+ ref="tree"
+ :app="appName"
+ :treeName="'localTree'"
+ :node="TreeDataPool.clusterData"
+ :height="height"
+ @addDevice="addCamera"
+ @import="importCameras"
+ />
+ </div>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鏁版嵁鏍�" name="dataStack" v-if="showDataStack">
<div class="local-vedio-area">
<!-- 鎼滅储 -->
<div class="search-input">
- <span style="display: inline-block;padding: 0px 3px;"></span>
+ <!-- <span style="display: inline-block;padding: 0px 3px;"></span> -->
<el-select
v-model="DataStackPool.searchType"
placeholder="璇烽�夋嫨"
size="small"
- style="width: 134px;height: 34px;margin-left: 10px;"
+ style="width: 134px; height: 34px; margin-left: 10px"
@change="searchDataStack"
>
<el-option
@@ -163,18 +204,18 @@
:value="item.value"
></el-option>
</el-select>
- <span style="display: inline-block;padding: 0px 3px;"></span>
+ <span style="display: inline-block; padding: 0px 3px"></span>
<el-input
v-model="DataStackPool.searchInput"
placeholder="璇疯緭鍏�"
size="small"
clearable
@input="querySearchAsync('dir')"
- :style="'width:103px;'"
+ :style="'width:148px;'"
>
<i
class="el-icon-search el-input__icon"
- style="color:black"
+ style="color: black"
slot="prefix"
@click="searchDataStack"
></i>
@@ -186,7 +227,7 @@
style="color: #3D68E1;line-height: 22px;font-size: 27px;"
@click="closeTree"
></i>
- </div> -->
+ </div>-->
</div>
<!-- 鏈湴瑙嗛婧愬垪琛� -->
@@ -210,24 +251,37 @@
<LocalVedioList :dataList="TreeDataPool.localVedioList"></LocalVedioList>
</div>
</div>
- <file-upload v-show="fileUploadBox" @close="fileUploadBox= false" />
+ <file-upload v-show="fileUploadBox" @close="fileUploadBox = false" />
</el-tab-pane>
</el-tabs>
+
+ <!-- 瀵煎叆璁惧缁勪欢 浜嬩欢瑙﹀彂 -->
+ <el-upload
+ class="upload-btn"
+ action="https://jsonplaceholder.typicode.com/posts/"
+ accept=".xlsx"
+ :on-exceed="exceed"
+ :limit="10"
+ :on-remove="remove"
+ :http-request="uploadFile"
+ :show-file-list="false"
+ >
+ <button ref="import-btn" v-show="false"></button>
+ </el-upload>
</div>
</transition>
</template>
<script>
-import {
- show,
- changeEnable,
- deleteLocalFile,
- updateStatus
-} from "@/api/localVedio";
+import { createCamera } from "@/api/camera"
-import TreeMenu from "@/components/treeMenu/index";
-import LocalVedioList from '@/components/subComponents/LocalVedioList';
-import FileUpload from '@/components/subComponents/FileUpload/index';
+import bus from "@/plugin/bus"
+// 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"
+import { findCluster } from "@/api/clusterManage"
export default {
components: {
@@ -252,45 +306,67 @@
computed: {
showTab() {
- return true;
+ return true
},
showCam() {
- return this.appName === "Camera" || this.appName === "Search";
+ return (
+ this.appName === "Camera" ||
+ this.appName === "Cluster" ||
+ (this.appName === "Search" && (this.buttonAuthority.indexOf("search:camera") >= 0 || this.isAdmin))
+ )
},
+ showCluster() {
+ return this.appName === "Cluster"
+ },
+ // 鏁版嵁鏍堥厤缃繀椤绘樉绀恒�� 妫�绱㈤�氳繃鏉冮檺鎺у埗鏄剧ず, 鏈畨瑁呮暟鎹爤涔熶笉鏄剧ず
showDataStack() {
- return this.appName === "DataStack" || this.appName === "Search";
- },
- showLock() {
- return this.edit;
- },
- openeds() {
- let arry = [];
- for (let i = 0; i < this.TreeDataPool.openeds.length; i++) {
- if (this.TreeDataPool.openeds[i]) {
- arry.push(i + "");
- // 榛樿灞曞紑涓�棰楁湁鏁版嵁鐨勬爲
- break;
+ if (this.appName === "DataStack") {
+ return true
+ }
+
+ if (this.appName === "Search") {
+ // 鏈畨瑁呮暟鎹爤閰嶇疆
+ if (this.installedApps.indexOf("dataStack") >= 0) {
+ if (this.isAdmin) {
+ return true
+ }
+
+ if (this.buttonAuthority.indexOf("search:stack") >= 0) {
+ return true
+ }
}
}
- return arry;
+
+ return false
+ },
+ showLock() {
+ return this.edit
+ },
+ openeds() {
+ let arry = []
+ for (let i = 0; i < this.TreeDataPool.openeds.length; i++) {
+ if (this.TreeDataPool.openeds[i]) {
+ arry.push(i + "")
+ // 榛樿灞曞紑涓�棰楁湁鏁版嵁鐨勬爲 . 鍔熻兘鏈夐棶棰�. 娉ㄩ攢
+ // break
+ }
+ }
+
+ return arry
},
isAdmin() {
- if (
- sessionStorage.getItem("userInfo") &&
- sessionStorage.getItem("userInfo") !== ""
- ) {
- let loginName = JSON.parse(sessionStorage.getItem("userInfo")).username;
- return loginName === "superadmin" || loginName === "basic";
+ if (sessionStorage.getItem("userInfo") && sessionStorage.getItem("userInfo") !== "") {
+ let loginName = JSON.parse(sessionStorage.getItem("userInfo")).username
+ return loginName === "superadmin" || loginName === "basic"
}
- return false;
+ return false
}
},
data() {
return {
- cameraAuth: "videoMonitor:camera",
dataStack: "videoMonitor:dataStack",
- activeIndexVideo: "",
buttonAuthority: sessionStorage.getItem("buttonAuthoritys") || [],
+ installedApps: sessionStorage.getItem("apps") || [],
loginName: JSON.parse(sessionStorage.getItem("userInfo")).username || "鐢ㄦ埛鍚�",
searchTypeOptions: [
{
@@ -310,219 +386,219 @@
label: "鑱斿姩鎽勫儚鏈�"
}
],
- searchTypeLocalVideo: [
- {
- value: 0,
- label: "鍏ㄩ儴"
- },
- {
- value: 1,
- label: "澶勭悊瀹屾垚"
- },
- {
- value: 2,
- label: "澶勭悊涓�"
- },
- {
- value: 3,
- label: "鏈厤瑙勫垯"
- },
- {
- value: 4,
- label: "鏈紑鍚�"
- }
- ],
timeout: null,
fileUploadBox: false,
- loadingGBTree: false
- };
+ loadingGBTree: false,
+ importAreaId: "",
+ menuLoading: false,
+ clusterName: ""
+ }
},
- // watch: {
- // $route(to, from) {
- // switch (to.name) {
- // case "Searching":
- // this.cameraAuth = "videoSearch:camera"
- // this.dataStack = "videoSearch:dataStack"
- // break
- // case "VideoManage":
- // this.cameraAuth = "VIDEOCAMERA:camera"
- // this.dataStack = "VIDEOCAMERA:dataStack"
- // break
- // default:
- // this.cameraAuth = "videoMonitor:camera"
- // this.dataStack = "videoMonitor:dataStack"
- // }
- // // console.log("璺敱鍙樺寲锛�", to, from)
- // }
- // },
created() {
if (this.showCam) {
this.TreeDataPool.treeActiveName = "camera"
- this.TreeDataPool.fetchTreeData();
-
+ this.TreeDataPool.fetchTreeData()
} else {
this.TreeDataPool.treeActiveName = "dataStack"
- this.DataStackPool.fetchFiles();
-
+ this.DataStackPool.fetchFiles()
+ }
+ if (this.showCluster) {
+ this.TreeDataPool.treeActiveName = "cluster"
+ this.TreeDataPool.fetchClusterTree()
+ findCluster().then((res) => {
+ if (res.success) {
+ this.clusterName = res.data.clusterName
+ }
+ })
}
},
methods: {
searchAreaData() {
- this.TreeDataPool.fetchTreeData();
+ this.TreeDataPool.fetchTreeData()
},
searchDataStack() {
- this.DataStackPool.fetchFiles();
+ this.DataStackPool.fetchFiles()
+ },
+ searchClusterData() {
+ this.TreeDataPool.fetchClusterTree()
},
lockSwitch() {
- this.TreeDataPool.readonly = !this.TreeDataPool.readonly;
- console.log(this.TreeDataPool.readonly)
+ this.TreeDataPool.readonly = !this.TreeDataPool.readonly
},
gbLockSwitch() {
- this.TreeDataPool.gbReadonly = !this.TreeDataPool.gbReadonly;
+ this.TreeDataPool.gbReadonly = !this.TreeDataPool.gbReadonly
},
dataStackLockSwitch() {
- this.DataStackPool.readonly = !this.DataStackPool.readonly;
+ this.DataStackPool.readonly = !this.DataStackPool.readonly
},
closeTree() {
- this.TreeDataPool.showTreeBox = false;
- // bus.$emit('refreshCompareImg')
+ this.TreeDataPool.showTreeBox = false
+ bus.$emit("refreshCompareImg")
},
addNode(event) {
- this.$refs.tree.addNode(event, { id: 0 });
+ this.$refs.tree.addNode(event, { id: 0 })
},
addCamera(node) {
- // bus.$emit("addCameraOnTree", node);
+ bus.$emit("addCameraOnTree", node)
},
addDir(node) {
- // bus.$emit("addDirOnTree", node);
+ bus.$emit("addDirOnTree", node)
},
menuOpen(index) {
- this.TreeDataPool.openeds[index] = true;
+ this.TreeDataPool.openeds[index] = true
},
menuClose(index) {
- this.TreeDataPool.openeds[index] = false;
+ this.TreeDataPool.openeds[index] = false
},
refreshGB() {
// 闃叉閲嶅鍒锋柊
if (this.loadingGBTree) {
- return;
+ return
}
// 鍥芥爣鎽勫儚鏈烘暟鎹槸鍥芥爣鏈嶅姟鍒嗘壒鎺ㄩ�佺殑锛岃姹傚埛鏂板垪琛ㄥ悗锛岄渶瑕佺瓑寰呯害1鍒嗛挓鐨勬椂闂村悗绔墠鑳藉悓姝ュ畬鏁版嵁銆�
- this.TreeDataPool.refreshGB28181();
- this.loadingGBTree = true;
+ this.TreeDataPool.refreshGB28181()
+ this.loadingGBTree = true
setTimeout(() => {
- this.TreeDataPool.fetchGbTree();
- this.loadingGBTree = false;
- }, 1000 * 60);
+ this.TreeDataPool.fetchGbTree()
+ this.loadingGBTree = false
+ }, 1000 * 60)
},
querySearchAsync(type) {
- clearTimeout(this.timeout);
+ clearTimeout(this.timeout)
this.timeout = setTimeout(() => {
if (type === "camera") {
- this.TreeDataPool.fetchTreeData();
+ this.TreeDataPool.fetchTreeData()
+ }
+ if (type === "cluster") {
+ this.TreeDataPool.fetchClusterTree()
}
if (type === "dir") {
- this.DataStackPool.fetchFiles();
+ this.DataStackPool.fetchFiles()
}
- }, 500);
+ }, 500)
},
handleClick(event) {
- if (event.name == 'dataStack') {
- this.DataStackPool.fetchFiles();
- this.DataStackPool.clean();
- this.TreeDataPool.clean();
+ if (event.name == "dataStack") {
+ this.DataStackPool.fetchFiles()
+ this.DataStackPool.clean()
+ this.TreeDataPool.clean()
}
this.TreeDataPool.treeActiveName = event.name
- console.log("褰撳墠婵�娲籲ame锛�", this.TreeDataPool.treeActiveName)
- },
- async changeEnable() {
- if (this.PollData.localVideo === 0) {
- this.$notify({
- title: "澶辫触",
- type: "warning",
- message: "寮�鍚湰鍦版暟鎹棰戝垎鏋愬鐞嗭紝闇�鍏堜负鏈湴鏁版嵁鎵嬪姩璁剧疆绠楀姏璧勬簮锛�"
- })
- return false;
- }
- let res = await changeEnable({
- enable: this.TreeDataPool.vedioAnaliyseSwitch
- })
- if (res && res.success) {
- console.log(res, '鍒囨崲鏈湴鏂囦欢鍒嗘瀽寮�鍏�')
- }
},
getCheckedFiles() {
- let list1 = this.TreeDataPool.localVedioList.filter(i => {
+ let list1 = this.TreeDataPool.localVedioList.filter((i) => {
return i.checkStatus
})
return list1
},
- async stopVedio(status) {
- // let list1 = this.getCheckedFiles();
- if (this.TreeDataPool.checkedLocalVedio.length == 0) {
- this.$notify({
- type: "warning",
- message: "璇峰厛閫夋嫨闇�瑕佸仠姝㈢殑瑙嗛锛�"
- });
- // this.$notify({
- // type:"info",
- // message:"璇峰厛閫夋嫨闇�瑕佸仠姝㈢殑瑙嗛锛�"
- // })
- return false;
- }
- let res = await updateStatus({
- ids: this.TreeDataPool.checkedLocalVedio.map(i => {
- return i.id
- }),
- status: status
- })
- if (res && res.success) {
- console.log(res, '寮�鍚殏鍋滃弬鏁�')
- }
- },
- async deleteLocalFiles() {
- let list1 = this.getCheckedFiles();
- console.log(list1, '宸插嬀閫夌殑瑙嗛')
- if (list1.length == 0) {
- return false
- }
- let res = await deleteLocalFile({
- ids: list1.map(i => { return i.id })
- })
- if (res && res.success) {
- this.$notify({
- type: 'success',
- message: '鍒犻櫎鎴愬姛锛侊紒'
- })
- } else {
- this.$notify({
- type: "error",
- message: "鍒犻櫎澶辫触锛�"
- })
- }
+ refrash(current, pageSize) {
+ this.TreeDataPool.localCurrentPage = current
},
- refrash(current, pageSize) {
- this.TreeDataPool.localCurrentPage = current;
+ importCameras(area) {
+ this.importAreaId = area
+ this.$refs["import-btn"].click()
},
+
+ async uploadFile(params) {
+ const _file = params.file
+ const fileReader = new FileReader()
+ fileReader.onload = (ev) => {
+ this.menuLoading = true
+ try {
+ const data = ev.target.result
+ const workbook = XLSX.read(data, {
+ type: "binary"
+ })
+
+ for (let sheet in workbook.Sheets) {
+ //寰幆璇诲彇姣忎釜鏂囦欢
+ const sheetArray = XLSX.utils.sheet_to_json(workbook.Sheets[sheet])
+ //鑻ュ綋鍓峴heet娌℃湁鏁版嵁锛屽垯continue
+ if (sheetArray.length == 0) {
+ continue
+ }
+
+ let succeed = 0
+ let failed = 0
+ let promiseArr = []
+ for (let item in sheetArray) {
+ let camera = this.newCamera()
+ camera.areaid = this.importAreaId
+ camera.name = String(sheetArray[item].name)
+ camera.rtsp = String(sheetArray[item].rtsp)
+ camera.addr = String(sheetArray[item].addr)
+
+ promiseArr.push(createCamera(camera))
+ }
+ let _this = this
+ Promise.allSettled(promiseArr)
+ .then((res) => {
+ res.forEach((item) => {
+ if (item.status === "fulfilled") {
+ succeed++
+ } else {
+ failed++
+ }
+ })
+ _this.menuLoading = false
+ _this.$message({
+ type: "success",
+ message: "鎿嶄綔瀹屾垚, 瀵煎叆鎴愬姛:" + succeed + "涓� 澶辫触:" + failed + "涓�"
+ })
+ _this.TreeDataPool.fetchTreeData()
+ })
+ .catch((e) => {
+ console.log(e)
+ })
+ }
+ } catch (e) {
+ this.menuLoading = false
+ this.$message.warning("鏂囦欢绫诲瀷涓嶆纭紒")
+ }
+ }
+ fileReader.readAsBinaryString(_file)
+ },
+ exceed() {
+ this.$message.error("鏈�澶氬彧鑳戒笂浼�1涓獂ls鏂囦欢")
+ },
+ //鍒犻櫎鏂囦欢
+ remove() {},
+ newCamera() {
+ return {
+ latitude: 0,
+ rtsp: "",
+ longitude: 0,
+ name: "",
+ addr: "",
+ areaid: "",
+ reserved: "",
+ run_type: -1,
+ username: "",
+ password: "",
+ sensors: []
+ }
+ }
}
-};
+}
</script>
<style lang="scss">
.left-tree-box {
float: left;
width: 100%;
- .el-tabs__nav-prev,.el-tabs__nav-next{
+ .el-tabs__nav-prev,
+ .el-tabs__nav-next {
display: none;
}
.el-tabs--border-card {
border: none;
box-shadow: none;
.el-tabs__header {
+ display: none;
border-bottom: none;
- margin: 0 0 15px;
+ //margin: 0 0 15px;
}
.el-tabs__content {
padding: 0;
@@ -579,6 +655,10 @@
font-size: 20px;
padding: 0px 5px;
}
+ // .el-input__inner:focus {
+ // outline: none;
+ // border-color: #3D68E1;
+ // }
.el-menu {
border-right: none;
}
@@ -645,6 +725,7 @@
.search-input {
padding-top: 8px;
padding-bottom: 12px;
+ text-align: left;
.dev-tree-close {
width: 10%;
margin-left: 10px;
@@ -665,15 +746,11 @@
}
.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 {
/*婊氬姩鏉℃暣浣撴牱寮�*/
@@ -693,7 +770,7 @@
}
.tree-edit {
- z-index: 1;
+ z-index: 2;
font-size: 16px;
position: absolute;
top: 56px;
@@ -730,6 +807,10 @@
.camera-add {
left: 128px;
}
+
+.import-btn {
+ left: 156px;
+}
.tree-font {
font-family: PingFangSC-Medium;
font-size: 14px;
@@ -756,4 +837,7 @@
color: #606266;
}
}
-</style>
\ No newline at end of file
+.flex-box {
+ display: flex;
+}
+</style>
--
Gitblit v1.8.0