From 2a11a72faa23ad8ae896b59c333d772d4207fe75 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Tue, 2 Dec 2025 11:29:07 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/index/index.js | 5 +-
.../homeworkControlProcess.vue | 8 +-
.../videoSurveillance/areaTree.vue | 126 ++++++++----------
3 files changed, 62 insertions(+), 77 deletions(-)
diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index ae42de01..239cebdb 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -326,6 +326,8 @@ Vue.directive('permission', {
const { value } = binding;
// 判断当前用户是否拥有该按钮权限
if (!Vue.prototype.checkPermission(value)) {
+ console.log('权限:', el.parentNode)
+
el.parentNode.removeChild(el);
}
}
@@ -337,13 +339,14 @@ Vue.prototype.checkPermission = function(permission) {
permissions = permissions.filter(
(x) => x.path == permission.menuPath
)[0];
- // console.log('权限', permissions)
+ console.log('权限', permissions)
if (!permissions || !permissions.actionList) {
return false;
}
let index = permissions.actionList.findIndex(
(x) => x.actionCode == permission.key
)
+ console.log('index', index != -1, permission.key)
return index != -1 ? true : false;
}
// 加载缩略图
diff --git a/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue b/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue
index c74c9a47..a173ee5f 100644
--- a/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue
+++ b/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue
@@ -237,12 +237,12 @@
{{ workTicketDetail.applicationTime }}
-
+
作业内容
@@ -674,7 +674,7 @@
}}
-
+
作业内容
diff --git a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue
index f3f07043..875e84e0 100644
--- a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue
+++ b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue
@@ -33,11 +33,11 @@
-
@@ -85,12 +85,12 @@
>
{{ node.label }}
@@ -109,11 +109,7 @@
v-show="data.projectNum && videoType == 0"
>{{ data.projectNum }} -->
-
+
{
if (res.code == 200) {
console.log(res.result, "resresresres");
@@ -387,8 +382,8 @@ export default {
this.recursiveFilterList(cur.children, rountCount, resultList);
}
if (cur.type == "video") {
- if(this.searchInfo.deviceState) {
- if(this.searchInfo.deviceState == cur.videoItem.deviceState){
+ if (this.searchInfo.deviceState) {
+ if (this.searchInfo.deviceState == cur.videoItem.deviceState) {
resultList.push(cur);
}
return prev;
@@ -537,11 +532,7 @@ export default {
},
playMutipleVideo(data) {
this.videoInfo = data.allvideolist[0];
- this.getProjectVideoConfigList(
- data.allvideolist[0],
- "all",
- data.allvideolist
- );
+ this.getProjectVideoConfigList(data.allvideolist[0], "all", data.allvideolist);
},
filterNode(value, data) {
this.defaultExpand = true;
@@ -549,30 +540,34 @@ export default {
return data.name.indexOf(value) !== -1;
},
recursion(array) {
- return array.map((item) => {
- if (
- item.children &&
- Array.isArray(item.children) &&
- item.children.length > 0
- ) {
- item.children = this.recursion(item.children);
- if(item.children.length > 0) {
- return item;
+ return array
+ .map((item) => {
+ if (item.children && Array.isArray(item.children) && item.children.length > 0) {
+ item.children = this.recursion(item.children);
+ if (item.children.length > 0) {
+ return item;
+ }
+ return;
}
- return
- }
- console.log(item.deviceState, this.searchInfo.deviceState);
- if(item.type == "video") {
- if(item.videoItem && item.videoItem.deviceState == this.searchInfo.deviceState) {
- return item;
+ console.log(888444, item);
+ if (item.type == "video") {
+ if (
+ item.videoItem &&
+ item.videoItem.deviceState == this.searchInfo.deviceState
+ ) {
+ return item;
+ }
+ return;
}
- return
- }
- return item;
- }).filter(item => item != undefined);
+ return item;
+ })
+ .filter((item) => item != undefined)
+ .filter((item) => (item.type != "video" ? item.children.length > 0 : true));
},
},
computed: {
+ // 计算树形数据的总数、在线数和离线数
+ // type: 1-总数 2-在线数 3-离线数
filterTreeDataTotal() {
return (type) => {
if (type == 1) {
@@ -599,11 +594,7 @@ export default {
const dataList = structuredClone(this.treeData);
return dataList.map((item) => {
let children = [];
- if (
- item.children &&
- Array.isArray(item.children) &&
- item.children.length > 0
- ) {
+ if (item.children && Array.isArray(item.children) && item.children.length > 0) {
children = this.recursion(item.children);
}
return {
@@ -631,8 +622,8 @@ export default {
};
-
\ No newline at end of file