From 18ce1d2a85462fa76b86005cdde8044267b2bf5a Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 11 Apr 2024 15:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue                    | 18 +++----------
 src/views/photographicDevice/index.vue        | 26 ++++++++++++++++++-
 .../components/blindMenuPermiss.vue           | 13 +++++++---
 vue.config.js                                 | 12 ++++-----
 4 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index b1cd871..11f0f25 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -134,10 +134,10 @@ export default {
               index: "/roleManagement",
               title: "角色管理",
             },
-            {
-              index: "/menuManagement",
-              title: "菜单功能管理",
-            },
+            // {
+            //   index: "/menuManagement",
+            //   title: "菜单功能管理",
+            // },
             {
               index: "/deviceUpgrade",
               title: "升级管理",
@@ -273,16 +273,6 @@ export default {
       console.log("我是超管");
       this.items = this.items;
     }
-
-    // if (this.role == 0) {
-    //   this.items = this.items;
-    // } else if (this.role == 1) {
-    //   this.items = this.items1;
-    // } else if (this.role == 2) {
-    //   this.items = this.items2;
-    // } else if (this.role == 4) {
-    //   this.items = this.hnjcitems;
-    // }
   },
 };
 </script>
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index ad106e2..73ad7ef 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -64,6 +64,16 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="规约" class="isonLineClass">
+            <el-select v-model="formdata.protocol" filterable>
+              <el-option
+                v-for="item in protocolOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-input
               v-model="formdata.search"
@@ -331,6 +341,7 @@ import {
   deleteTerminalJoggle,
   getSearchInfo,
   getTerminalListExcel,
+  getProtocolList,
 } from "@/utils/api/index";
 import moment from "moment";
 import addPhotoDialog from "./components/addPhotoDialog.vue";
@@ -370,12 +381,14 @@ export default {
         { id: 1, name: "在线" },
         { id: 0, name: "离线" },
       ],
+      protocolOptions: [{ id: -1, name: "全部" }], //规约数据
       formdata: {
         dyId: -1,
         lineId: -1,
         towerId: -1,
         search: "",
         isonline: -1,
+        protocol: -1,
       },
       roleUser: "",
       terminalTableData: [], //表格数据
@@ -418,6 +431,7 @@ export default {
   },
   mounted() {
     this.getSearchdy();
+    this.getProtocol();
     this.terminalList();
   },
   methods: {
@@ -472,7 +486,17 @@ export default {
         })
         .catch((err) => {});
     },
-
+    getProtocol() {
+      //获取规约版本
+      getProtocolList()
+        .then((res) => {
+          console.log(res);
+          this.protocolOptions = [{ id: -1, name: "全部" }];
+          this.protocolOptions = this.protocolOptions.concat(res.data.list);
+          this.formdata.protocol = this.protocolOptions[0].id;
+        })
+        .catch((err) => {});
+    },
     //查询
     onSubmit() {
       this.page = 1;
diff --git a/src/views/system/roleManagement/components/blindMenuPermiss.vue b/src/views/system/roleManagement/components/blindMenuPermiss.vue
index 39c8534..54cffe7 100644
--- a/src/views/system/roleManagement/components/blindMenuPermiss.vue
+++ b/src/views/system/roleManagement/components/blindMenuPermiss.vue
@@ -73,9 +73,14 @@ export default {
           if (res.code == 200) {
             console.log(res);
             this.allCheckList = res.data;
-            this.menuCheckOption = res.data.filter((item) =>
-              item.key.includes("/")
-            );
+            const menuItems = res.data.filter((item) => item.key.includes("/"));
+            this.menuCheckOption = menuItems.filter((item) => {
+              return (
+                item.key !== "/userManagement" &&
+                item.key !== "/menuManagement" &&
+                item.key !== "/roleManagement"
+              );
+            });
             this.btnCheckOption = res.data.filter((item) =>
               item.key.includes("Btn")
             );
@@ -183,7 +188,7 @@ export default {
 <style lang="less">
 .blindMenuDialog {
   .treeBoxList {
-    height: 600px;
+    height: 500px;
     overflow: auto;
     display: flex;
     justify-content: space-between;
diff --git a/vue.config.js b/vue.config.js
index 10e9bbf..bef13bf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,12 +3,12 @@ const { defineConfig } = require("@vue/cli-service");
 // const webpack = require("webpack");
 module.exports = defineConfig({
   //打包清除console
-  // chainWebpack(config) {
-  //   config.optimization.minimizer("terser").tap((args) => {
-  //     args[0].terserOptions.compress.drop_console = true;
-  //     return args;
-  //   });
-  // },
+  chainWebpack(config) {
+    config.optimization.minimizer("terser").tap((args) => {
+      args[0].terserOptions.compress.drop_console = true;
+      return args;
+    });
+  },
   productionSourceMap: false, // 生产环境是否要生成 sourceMap
   publicPath: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : "./", //   部署应用包时的基本 URL
   //assetsPublicPath: process.env.NODE_ENV === "production" ? "" : "/",