From be998f5ced20ecba57031e2fcfba40f8428f19fa Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 8 Dec 2023 09:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A6=86=E5=86=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 -
 src/components/Sidebar.vue                    | 22 ++++-------
 src/components/header.vue                     |  3 +-
 src/router/index.js                           | 37 ++++++++++---------
 src/views/homePage/index.vue                  |  2 +-
 .../components/morePicPreveiw.vue             |  1 +
 6 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d090084..6090de8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,12 +17,10 @@ export default {
       this.$route.matched.forEach((routeMatch) => {
         const instance = routeMatch.components?.default;
         const componentName = instance?.name;
-
         console.log(componentName);
         if (process.env.NODE_ENV === "development") {
           this.checkRouteComponentName(componentName, instance?.__file);
         }
-
         // 配置了meta.keepAlive的路由组件添加到缓存
         if (routeMatch.meta.keepAlive) {
           if (!componentName) {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index c55e31c..2fe0452 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="sidebar">
     <el-menu
-      :default-active="activeIndex"
+      default-active="/stritl"
       class="sidebar-el-menu"
       mode="horizontal"
       router
+      @select="selectmenu"
     >
       <template v-for="item in items">
         <template v-if="item.subs">
@@ -314,21 +315,11 @@ export default {
           title: "历史图片",
         },
       ],
-      fubingItems: [
-        {
-          icon: "iconfont icon-qixiang",
-          index: "/weather",
-          title: "气象检测",
-        },
-        {
-          icon: "iconfont icon-fubing",
-          index: "/icing",
-          title: "覆冰",
-        },
-      ],
+
       role: "",
     };
   },
+
   watch: {
     $route() {
       this.setCurrentRoute();
@@ -336,10 +327,12 @@ export default {
   },
   methods: {
     setCurrentRoute() {
+      console.log(this.$route.path);
       this.activeIndex = this.$route.path; // 通过他就可以监听到当前路由状态并激活当前菜单
     },
   },
   created() {
+    console.log("我是被选中的", this.activeIndex);
     this.setCurrentRoute();
     this.role = localStorage.getItem("role");
     console.log("用户管理");
@@ -353,11 +346,10 @@ export default {
       this.items = this.items2;
     } else if (this.role == 4) {
       this.items = this.hnjcitems;
-    } else if (this.role == 5) {
-      this.items = this.fubingItems;
     }
 
     console.log(this.items);
+    console.log(this.activeIndex);
   },
 };
 </script>
diff --git a/src/components/header.vue b/src/components/header.vue
index c199b78..11cb339 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="header">
-    <div class="logoTitle" v-if="role == 5">覆冰在线检测系统</div>
-    <div class="logoTitle" v-else>视频监控可视化平台</div>
+    <div class="logoTitle">视频监控可视化平台</div>
     <div class="menuBox">
       <vSidebar></vSidebar>
       <div class="userInfo">
diff --git a/src/router/index.js b/src/router/index.js
index 0263db0..f2cc904 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,19 +4,19 @@ import VueRouter from "vue-router";
 Vue.use(VueRouter);
 
 const routes = [
-  { path: "/", redirect: "/login" },
   {
-    path: "/stritl",
+    path: "/",
+    redirect: "/stritl",
     component: () => import("../components/Home.vue"),
     children: [
       {
-        path: "",
+        path: "/stritl",
         component: () => import("../views/homePage/index.vue"),
-        name: "home",
+        name: "stritl",
         meta: {
           title: "首页",
           icon: "el-icon-s-home",
-          // keepAlive: true,
+          keepAlive: true,
         },
       },
       {
@@ -120,23 +120,24 @@ const routes = [
         meta: { title: "echarts图表", icon: "", keepAlive: true },
       },
       //气象检测
-      {
-        path: "/weather",
-        component: () => import("../views/weather/index.vue"),
-        name: "weather",
-        meta: { title: "气象检测", icon: "", keepAlive: true },
-      },
-      //覆冰
-      {
-        path: "/icing",
-        component: () => import("../views/icing/index.vue"),
-        name: "icing",
-        meta: { title: "覆冰", icon: "", keepAlive: true },
-      },
+      // {
+      //   path: "/weather",
+      //   component: () => import("../views/weather/index.vue"),
+      //   name: "weather",
+      //   meta: { title: "气象检测", icon: "", keepAlive: true },
+      // },
+      // //覆冰
+      // {
+      //   path: "/icing",
+      //   component: () => import("../views/icing/index.vue"),
+      //   name: "icing",
+      //   meta: { title: "覆冰", icon: "", keepAlive: true },
+      // },
     ],
   },
   {
     path: "/login",
+    name: "login",
     component: () => import("../views/login/index.vue"),
     meta: { title: "登录" },
   },
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 3b0aa52..2040000 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -126,7 +126,7 @@ import {
   getOnlineTerminalListExcel,
 } from "@/utils/api/index";
 export default {
-  name: "home",
+  name: "stritl",
   data() {
     return {
       termDataNum: "", //总数
diff --git a/src/views/realTimeMonitor/components/morePicPreveiw.vue b/src/views/realTimeMonitor/components/morePicPreveiw.vue
index 3a9f04b..c3c3592 100644
--- a/src/views/realTimeMonitor/components/morePicPreveiw.vue
+++ b/src/views/realTimeMonitor/components/morePicPreveiw.vue
@@ -119,6 +119,7 @@ export default {
   background: #fff;
   top: 0px;
   left: 0px;
+  z-index: 2;
   //z-index: 99999;
   .headTitle {
     height: 40px;