From ccee429d379e0108b7445f72ade8d97c110a6fb3 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 18:01:59 +0800
Subject: [PATCH] 问题修复

---
 src/pages/cameraAccess/index/VideoManage.vue |   46 ++++++++++++++++++++--------------------------
 1 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index 5e2ba7e..217ac51 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -10,21 +10,21 @@
       <el-tab-pane
         :label="firstLabeName"
         name="camera-info"
-        v-if="this.TreeDataPool.treeActiveName == 'camera' && isShow('VIDEOCAMERA:camera:info')"
+        v-if="this.TreeDataPool.treeActiveName == 'camera' && isShow('cameraAccess:cameraInfo')"
       >
         <camera-info ref="cameraInfo" />
       </el-tab-pane>
       <el-tab-pane
         :label="firstLabeName"
         name="camera-info"
-        v-if="this.TreeDataPool.treeActiveName == 'dataStack' && isShow('VIDEOCAMERA:dataStack:stackInfo')"
+        v-if="this.TreeDataPool.treeActiveName == 'dataStack' && isShow('dataStack:cameraInfo')"
       >
         <data-stack-info ref="dataStackInfo" />
       </el-tab-pane>
       <el-tab-pane
         label="鐙珛鍦烘櫙"
         name="separate-rule"
-        v-if="this.TreeDataPool.treeActiveName == 'camera' && isShow('VIDEOCAMERA:camera:selfRule')"
+        v-if="this.TreeDataPool.treeActiveName == 'camera' && isShow('cameraAccess:selfRule')"
       >
         <separate-rules ref="sepRule" />
         <!-- <local-separate ref="localSeparate" v-else></local-separate> -->
@@ -32,7 +32,7 @@
       <el-tab-pane
         label="鐙珛鍦烘櫙"
         name="separate-rule"
-        v-if="this.TreeDataPool.treeActiveName == 'dataStack' && isShow('VIDEOCAMERA:dataStack:selfRule')"
+        v-if="this.TreeDataPool.treeActiveName == 'dataStack' && isShow('dataStack:selfRule')"
       >
         <separate-rules ref="sepRule" />
         <!-- <local-separate ref="localSeparate" v-else></local-separate> -->
@@ -40,7 +40,7 @@
       <el-tab-pane
         label="鑱斿姩鍦烘櫙"
         name="linkage-rule"
-        v-if="(isShow('VIDEOCAMERA:camera:linkRule') || isShow('VIDEOCAMERA:dataStack:linkRule')) && this.TreeDataPool.treeActiveName == 'camera'"
+        v-if="(isShow('cameraAccess:linkRule')) && this.TreeDataPool.treeActiveName == 'camera'"
       >
         <linkage-rule ref="linkRule" />
       </el-tab-pane>
@@ -64,7 +64,8 @@
     CameraInfo,
     DataStackInfo,
     SeparateRules,
-    LinkageRule  },
+    LinkageRule
+  },
   data() {
     return {
       activeName: "camera-info",
@@ -81,6 +82,7 @@
         let loginName = JSON.parse(sessionStorage.getItem("userInfo")).username;
         return loginName === "superadmin" || loginName === "basic";
       }
+
       return false;
     },
     firstLabeName() {
@@ -131,26 +133,21 @@
   },
   created() {
     if (this.TreeDataPool.treeActiveName == 'camera') {
-      if (this.isShow('VIDEOCAMERA:camera:info')) {
+      if (this.isShow('cameraAccess:cameraInfo')) {
         this.activeName = "camera-info"
-      } else if (this.isShow('VIDEOCAMERA:camera:selfRule') || this.isShow('VIDEOCAMERA:datastack:selfRule')) {
+      } else if (this.isShow('cameraAccess:selfRule')) {
         this.activeName = "separate-rule"
-      } else if (this.isShow('VIDEOCAMERA:camera:linkRule') || this.isShow('VIDEOCAMERA:datastack:linkRule')) {
+      } else if (this.isShow('cameraAccess:linkRule')) {
         this.activeName = "linkage-rule"
-      } else if (this.isShow('VIDEOCAMERA:camera:resourceCalc') || this.isShow('VIDEOCAMERA:datastack:resourceCalc')) {
-        this.activeName = "poll-setting"
       }
     } else {
-      if (this.isShow('VIDEOCAMERA:camera:info')) {
+      if (this.isShow('dataStack:cameraInfo')) {
         this.activeName = "camera-info"
-      } else if (this.isShow('VIDEOCAMERA:camera:selfRule') || this.isShow('VIDEOCAMERA:datastack:selfRule')) {
+      } else if (this.isShow('dataStack:selfRule')) {
         this.activeName = "separate-rule"
-      } else if (this.isShow('VIDEOCAMERA:camera:linkRule') || this.isShow('VIDEOCAMERA:datastack:linkRule')) {
-        this.activeName = "linkage-rule"
-      } else if (this.isShow('VIDEOCAMERA:camera:resourceCalc') || this.isShow('VIDEOCAMERA:datastack:resourceCalc')) {
-        this.activeName = "poll-setting"
       }
     }
+
     this.TreeDataPool.readonly = true;
     this.TreeDataPool.gbReadonly = true;
     this.TreeDataPool.multiple = false;
@@ -181,15 +178,7 @@
   },
   methods: {
     isShow(authority) {
-      if (this.isAdmin) {
-        return true;
-      } else if (this.buttonAuthority.indexOf("," + authority + ",") > -1) {
-        return true;
-      } else if ("videoCamera:pollSetting" === authority) {
-        return true;
-      } else {
-        return false;
-      }
+      return this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1
     },
     handAddDevice(node) {
       let _this = this;
@@ -298,6 +287,11 @@
     overflow-y: auto;
     padding: 0;
   }
+  .video-tab > .el-tabs__content::-webkit-scrollbar {
+    /*婊氬姩鏉℃暣浣撴牱寮�*/
+    width: 6px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+    height: 6px;
+  }
   .el-tab-pane {
     width: 100%;
     //height: 100%;

--
Gitblit v1.8.0