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 | 355 +++++++++++++++++++++-------------------------------------
1 files changed, 130 insertions(+), 225 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index eb10dfc..c6da90e 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -1,11 +1,6 @@
<template>
<transition name="slideLeft">
- <div
- class="left-tree-box"
- :style="`height:${height}px;animation-duration: 0.7s`"
- v-show="TreeDataPool.showTreeBox"
- v-loading="menuLoading"
- >
+ <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
@@ -13,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"
@@ -32,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="鎼滅储"
@@ -41,7 +32,7 @@
>
<i
class="el-icon-search el-input__icon"
- style="color:#DCDFE6"
+ style="color: #dcdfe6"
slot="prefix"
@click="searchAreaData"
></i>
@@ -70,7 +61,7 @@
<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>
@@ -80,7 +71,7 @@
<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>
+ <span class="iconfont icondaoru" style="font-size: 16px"></span>
</button>
</el-tooltip>
</div>
@@ -97,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">
@@ -117,7 +105,7 @@
</el-submenu>
<el-submenu index="1">
<template slot="title">
- <i class="iconfont iconGBx" style="margin-left:-4px;"></i>
+ <i class="iconfont iconGBx" style="margin-left: -4px"></i>
<b class="tree-font">GB28181</b>
</template>
@@ -132,8 +120,8 @@
</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">
@@ -151,21 +139,12 @@
</el-submenu>
</el-menu>
</el-tab-pane>
- <el-tab-pane
- label="闆嗙兢"
- name="cluster"
- :style="`height:${height - 56}px;`"
- v-if="showCluster"
- >
+ <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-select v-model="TreeDataPool.searchCamType" placeholder="璇烽�夋嫨" @change="searchClusterData">
<el-option
v-for="item in searchTypeOptions"
:key="item.value"
@@ -173,7 +152,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="鎼滅储"
@@ -182,16 +161,16 @@
>
<i
class="el-icon-search el-input__icon"
- style="color:#DCDFE6"
+ 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 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
@@ -215,7 +194,7 @@
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
@@ -225,7 +204,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="DataStackPool.searchInput"
placeholder="璇疯緭鍏�"
@@ -236,7 +215,7 @@
>
<i
class="el-icon-search el-input__icon"
- style="color:black"
+ style="color: black"
slot="prefix"
@click="searchDataStack"
></i>
@@ -272,7 +251,7 @@
<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>
@@ -294,24 +273,15 @@
</template>
<script>
-import {
- show,
- changeEnable,
- deleteLocalFile,
- updateStatus
-} from "@/api/localVedio";
-
-import {
- createCamera,
-} from "@/api/camera";
+import { createCamera } from "@/api/camera"
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";
+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: {
@@ -336,58 +306,60 @@
computed: {
showTab() {
- return true;
+ return true
},
showCam() {
- return this.appName === "Camera" || this.appName === 'Cluster' || (this.appName === "Search" && (this.buttonAuthority.indexOf("search:camera") >= 0 || this.isAdmin));
+ return (
+ this.appName === "Camera" ||
+ this.appName === "Cluster" ||
+ (this.appName === "Search" && (this.buttonAuthority.indexOf("search:camera") >= 0 || this.isAdmin))
+ )
},
showCluster() {
- return this.appName === "Cluster";
+ return this.appName === "Cluster"
},
// 鏁版嵁鏍堥厤缃繀椤绘樉绀恒�� 妫�绱㈤�氳繃鏉冮檺鎺у埗鏄剧ず, 鏈畨瑁呮暟鎹爤涔熶笉鏄剧ず
showDataStack() {
if (this.appName === "DataStack") {
- return true;
+ return true
}
if (this.appName === "Search") {
// 鏈畨瑁呮暟鎹爤閰嶇疆
if (this.installedApps.indexOf("dataStack") >= 0) {
if (this.isAdmin) {
- return true;
+ return true
}
if (this.buttonAuthority.indexOf("search:stack") >= 0) {
- return true;
+ return true
}
}
}
- return false;
+ return false
},
showLock() {
- return this.edit;
+ return this.edit
},
openeds() {
- let arry = [];
+ let arry = []
for (let i = 0; i < this.TreeDataPool.openeds.length; i++) {
if (this.TreeDataPool.openeds[i]) {
- arry.push(i + "");
- // 榛樿灞曞紑涓�棰楁湁鏁版嵁鐨勬爲
- break;
+ arry.push(i + "")
+ // 榛樿灞曞紑涓�棰楁湁鏁版嵁鐨勬爲 . 鍔熻兘鏈夐棶棰�. 娉ㄩ攢
+ // break
}
}
- return arry;
+
+ 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() {
@@ -419,174 +391,109 @@
loadingGBTree: false,
importAreaId: "",
menuLoading: false,
- clusterName: ''
- };
+ clusterName: ""
+ }
},
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 => {
+ this.TreeDataPool.fetchClusterTree()
+ findCluster().then((res) => {
if (res.success) {
- this.clusterName = res.data.clusterName;
+ this.clusterName = res.data.clusterName
}
-
})
}
},
methods: {
searchAreaData() {
- this.TreeDataPool.fetchTreeData();
+ this.TreeDataPool.fetchTreeData()
},
searchDataStack() {
- this.DataStackPool.fetchFiles();
+ this.DataStackPool.fetchFiles()
},
searchClusterData() {
- this.TreeDataPool.fetchClusterTree();
+ this.TreeDataPool.fetchClusterTree()
},
lockSwitch() {
- this.TreeDataPool.readonly = !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();
+ 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;
+ this.TreeDataPool.localCurrentPage = current
},
importCameras(area) {
@@ -595,70 +502,69 @@
},
async uploadFile(params) {
- const _file = params.file;
- const fileReader = new FileReader();
+ const _file = params.file
+ const fileReader = new FileReader()
fileReader.onload = (ev) => {
- this.menuLoading = true;
+ this.menuLoading = true
try {
- const data = ev.target.result;
+ const data = ev.target.result
const workbook = XLSX.read(data, {
- type: 'binary'
- });
+ type: "binary"
+ })
for (let sheet in workbook.Sheets) {
//寰幆璇诲彇姣忎釜鏂囦欢
- const sheetArray = XLSX.utils.sheet_to_json(workbook.Sheets[sheet]);
+ const sheetArray = XLSX.utils.sheet_to_json(workbook.Sheets[sheet])
//鑻ュ綋鍓峴heet娌℃湁鏁版嵁锛屽垯continue
if (sheetArray.length == 0) {
- continue;
+ continue
}
- let succeed = 0;
- let failed = 0;
- let promiseArr = [];
+ 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);
+ 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));
+ 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 + "涓�"
+ 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()
})
- _this.TreeDataPool.fetchTreeData();
- }).catch(e => {
- console.log(e)
- });
-
+ .catch((e) => {
+ console.log(e)
+ })
}
} catch (e) {
this.menuLoading = false
- this.$message.warning('鏂囦欢绫诲瀷涓嶆纭紒');
+ this.$message.warning("鏂囦欢绫诲瀷涓嶆纭紒")
}
- };
- fileReader.readAsBinaryString(_file);
+ }
+ fileReader.readAsBinaryString(_file)
},
exceed() {
- this.$message.error("鏈�澶氬彧鑳戒笂浼�1涓獂ls鏂囦欢");
+ this.$message.error("鏈�澶氬彧鑳戒笂浼�1涓獂ls鏂囦欢")
},
//鍒犻櫎鏂囦欢
- remove() {
-
- },
+ remove() {},
newCamera() {
return {
latitude: 0,
@@ -675,7 +581,7 @@
}
}
}
-};
+}
</script>
<style lang="scss">
@@ -845,7 +751,6 @@
//max-height: 740px;
// overflow-x: hidden;
overflow: auto;
-
}
.dev-vedio-list::-webkit-scrollbar {
/*婊氬姩鏉℃暣浣撴牱寮�*/
@@ -935,4 +840,4 @@
.flex-box {
display: flex;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0