From 8661a7e3de4455260dbd23ca60f9755359c272a2 Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Tue, 1 Aug 2023 10:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js   |  84 +++++++------
 src/views/index.vue | 284 ++++++++++++++++----------------------------
 2 files changed, 148 insertions(+), 220 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 52fea0a..c65d0ac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -6,11 +6,11 @@ import "nprogress/nprogress.css";
 import { getToken } from "@/utils/auth";
 
 // 踢出系统
-// function kickOut() {
-//   if (process.env.NODE_ENV === "production") {
-//     location.href = location.origin + "/login";
-//   }
-// }
+function kickOut() {
+  if (process.env.NODE_ENV === "production") {
+    location.href = location.origin + "/login";
+  }
+}
 NProgress.configure({ showSpinner: false });
 const whiteList = [
   "/login",
@@ -21,10 +21,16 @@ const whiteList = [
   "/personalData",
   "/changePassword",
   "/statistics",
+
+  "/administrative",
+  "/enterpriseMsg",
+  "/productsMsg",
+  "/logout",
 ];
 router.beforeEach((to, from, next) => {
   NProgress.start();
   if (getToken()) {
+    console.log('有token');
     to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
     if (to.path === "/login") {
@@ -36,39 +42,39 @@ router.beforeEach((to, from, next) => {
   } else {
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
-      // next();
-      let token = localStorage.getItem("MSSM-LIAONING__TOKEN");
-      if (token) {
-        if (store.state.myselfPermission.routerList.length > 0) {
-          let current = store.state.myselfPermission.routerList.filter(
-            (item) => item.path == to.path || from.path == "/"
-          );
-          if (current.length > 0) {
-            next();
-          } else {
-            Message.error("无权限访问！");
-          }
-        } else {
-          store
-            .dispatch("GetPermission")
-            .then((res) => {
-              if (res.length > 0) {
-                next({ path: res });
-              } else {
-                // kickOut();
-              }
-            })
-            .catch((error) => {
-              // kickOut();
-            });
-        }
-      } else {
-        // //没有token踢出去
-        // Message.error("获取令牌失败！");
-        // kickOut();
-        next();
-
-      }
+      next()
+      // let token = localStorage.getItem("MSSM-LIAONING__TOKEN");
+      // if (token) {
+      //   if (store.state.myselfPermission.routerList.length > 0) {
+      //     let current = store.state.myselfPermission.routerList.filter(
+      //       (item) => item.path == to.path || from.path == "/"
+      //     );
+      //     if (current.length > 0) {
+      //       next();
+      //     } else {
+      //       next();
+      //       // Message.error("无权限访问！");
+      //     }
+      //   } else {
+      //     store
+      //       .dispatch("GetPermission")
+      //       .then((res) => {
+      //         console.log(res);
+      //         if (res.length > 0) {
+      //           next({ path: res });
+      //         } else {
+      //           kickOut();
+      //         }
+      //       })
+      //       .catch((error) => {
+      //         kickOut();
+      //       });
+      //   }
+      // } else {
+      //   //没有token踢出去
+      //   Message.error("获取令牌失败！");
+      //   kickOut();
+      // }
     } else {
       // kickOut();
       NProgress.done();
@@ -78,4 +84,4 @@ router.beforeEach((to, from, next) => {
 
 router.afterEach(() => {
   NProgress.done();
-});
+});
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index 7a84513..0ff23c2 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,8 +2,8 @@
   <div class="container">
     <myHeader></myHeader>
     <div class="body-container">
-      <!-- <div class="tree-menu">
-        <router-link
+      <div class="tree-menu">
+        <!-- <router-link
           tag="div"
           :to="{ path: item.path }"
           v-for="(item, index) in myRouter"
@@ -11,58 +11,61 @@
           active-class="routerActive"
         >
           <div class="view-child">
-            <img :src="item.icon" alt="" class="router-icon" />
+            <img :src="item.icon" alt=""   class="router-icon"  />
             {{ item.name }}
           </div>
-        </router-link>
-      </div> -->
-      <!-- 左边  -->
-      <div class="sidebar_content">
-        <div class="mycontent-left">
-          <el-menu
-            :default-active="routerIndex"
-            class="el-menu-vertical-demo"
-            @open="handleOpen"
-            @close="handleClose"
-            :router="true"
+          <div></div>
+        </router-link> -->
+        <el-menu
+          :default-active="routerIndex"
+          class="el-menu-vertical-demo"
+          :router="true"
+          background-color="#465970"
+          text-color="#fff"
+        >
+          <div
+            :index="item.path"
+            v-for="(item, index) in routerList"
+            :key="index"
           >
-            <el-submenu
-              :index="indexOne - '0'"
-              v-for="(item, indexOne) in myRouter"
-              :key="indexOne - '0'"
-            >
-              <template slot="title">
-                <img :src="item.icon" alt="" class="title_img" />
-                <span>{{ item.name }}</span>
-              </template>
-              <el-menu-item-group>
-                <el-menu-item
-                  :index="indexOne + '-' + index"
-                  v-for="(itemb, index) in item.children"
-                  :key="index"
-                  :route="itemb.path"
-                  >{{ itemb.name }}</el-menu-item
-                >
-              </el-menu-item-group>
-            </el-submenu>
-          </el-menu>
-        </div>
-        <!-- 右边 -->
-        <div class="mycontent-content">
-          <tags-view ref="tagsView" />
-          <div class="mycontent-content-title">
-            <!-- <i class="el-icon-location-outline title-icon" />
-            <span class="title-font">{{ routerTitle }}</span> -->
+            <div v-if="item.children && item.children.length > 0">
+              <el-submenu index="">
+                <template slot="title">
+                  <img :src="item.icon" alt="" class="leftIcon" />
+                  <span>{{ item.name }}</span>
+                </template>
+                <el-menu-item-group v-if="item.children">
+                  <el-menu-item
+                    :index="itemb.path + '66'"
+                    v-for="(itemb, index) in item.children"
+                    :key="index + '3'"
+                    :route="itemb.path"
+                    >{{ itemb.name }}</el-menu-item
+                  >
+                </el-menu-item-group>
+              </el-submenu>
+            </div>
+            <div v-else>
+              <el-menu-item
+                :index="item.path + '2'"
+                :key="index"
+                :route="item.path"
+              >
+                <template slot="title">
+                  <img :src="item.icon" alt="" class="leftIcon" />
+                  <span>{{ item.name }}</span>
+                </template></el-menu-item
+              >
+            </div>
           </div>
-          <router-view></router-view>
-        </div>
+        </el-menu>
       </div>
-      <!-- <div class="view-box">
+      <div class="view-box">
         <tags-view ref="tagsView" />
         <div class="child-views">
           <router-view />
         </div>
-      </div> -->
+      </div>
     </div>
   </div>
 </template>
@@ -139,20 +142,17 @@ export default {
   computed: {
     //获取自定义路由
     myRouter() {
+      console.log(this.$router.options.routes);
       // let staticRouter = router.options.routes.filter(
       //   (item) => item.isDiy == true
       // )[0].children;
       // return staticRouter;
       // return this.$store.state.myselfPermission.routerList;
+      console.log(this.$router.options.routes[6].children);
       return this.$router.options.routes[6].children;
     },
-  },
-  methods:{
-    handleOpen(key, keyPath) {
-      console.log(key, keyPath);
-    },
-    handleClose(key, keyPath) {
-      console.log(key, keyPath);
+    get1(e) {
+      console.log(e);
     },
   },
   created() {},
@@ -160,6 +160,28 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-submenu {
+  margin-right: -1px;
+}
+.leftIcon {
+  display: inline-block;
+  height: 14px;
+  width: 14px;
+  margin-right: 10px;
+}
+::v-deep .el-submenu__title {
+  padding: 0 8px !important;
+}
+::v-deep .el-menu-item {
+  padding: 0 8px !important;
+  margin-right: -1px;
+}
+::v-deep .el-menu-item-group .el-menu-item {
+  padding-left: 35px !important;
+}
+::v-deep .el-menu-item-group__title {
+  padding: 0 !important;
+}
 .container {
   height: 100%;
   .body-container {
@@ -169,142 +191,42 @@ export default {
     & > div {
       height: 100%;
     }
-    // .tree-menu {
-    //   background: #465970;
-    //   width: 220px;
-    //   box-sizing: border-box;
-    //   padding: 14px 10px;
-    //   & > div {
-    //     width: 200px;
-    //     height: 40px;
-    //     display: flex;
-    //     align-items: center;
-    //     font-size: 14px;
-    //     font-weight: 400;
-    //     color: #ffffff;
-    //     padding: 0 10px;
-    //     cursor: pointer;
-    //     .router-icon {
-    //       display: inline-block;
-    //       height: 14px;
-    //       width: 14px;
-    //       margin-right: 10px;
-    //     }
-    //   }
-    // }
-    // .view-box {
-    //   flex: 1;
-    //   height: 100%;
-    //   background: #f2f2f2;
-
-    //   overflow: hidden;
-    // }
-    // .child-views {
-    //   height: calc(100% - 40px);
-    //   width: 100%;
-    //   box-sizing: border-box;
-    //   padding: 10px;
-    // }
-    // 左边侧边栏
-.sidebar_content {
-  width: 100%;
-  height: 94.5%;
-  display: flex;
-  .mycontent-left {
-    width: 18%;
-    height: 100%;
-    background: #465970;
-    .el-menu-vertical-demo {
-      box-sizing: border-box;
-
+    .tree-menu {
       background: #465970;
-      color: #ffffff;
-      overflow: hidden;
-      height: 100%;
-      .title_img {
-        width: vw(20);
-        margin-right: vw(10);
-      }
-      ::v-deep .el-submenu__title {
-        font-size: vw(16);
-        font-family: Source Han Sans CN;
-        font-weight: 500;
-        color: #ffffff;
-        height: vh(80);
-        line-height: vh(80);
-        &:hover {
-          background: none;
-        }
-      }
-      ::v-deep .el-menu-item-group__title {
-        padding: 0;
-      }
-      ::v-deep .el-submenu .el-menu-item {
-        margin: vh(5) 0;
-        height: vh(60);
-        line-height: vh(60);
-        min-width: 100%;
-        font-size: vw(16);
-        font-family: Source Han Regular CN;
+      width: 220px;
+      box-sizing: border-box;
+      padding: 14px 10px;
+      & > div {
+        width: 200px;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        font-size: 14px;
         font-weight: 400;
-        color: #b6cbe4;
-        box-sizing: border-box;
-
-        &:hover {
-          background: #1e80eb;
-          border-radius: vw(5);
-          color: #ffffff;
-        }
-      }
-      ::v-deep .el-menu-item.is-active {
-        box-sizing: border-box;
-        font-size: vw(16);
-        font-family: Source Han Sans CN;
-        font-weight: 500;
-        color: #ffffff;
-        background: #1e80eb;
-        border-radius: vw(5);
-      }
-      ::v-deep .el-submenu__icon-arrow {
-        box-sizing: border-box;
-        font-size: vw(16);
-        font-family: Source Han Sans CN;
-        font-weight: 500;
         color: #ffffff;
-      }
-      ::v-deep .el-menu {
-        padding: 0 vw(20);
-        box-sizing: border-box;
-        background: #465970;
+        padding: 0 10px;
+        cursor: pointer;
+        .router-icon {
+          display: inline-block;
+          height: 14px;
+          width: 14px;
+          margin-right: 10px;
+        }
       }
     }
-  }
-
-  //   右侧内容
-    .mycontent-content {
-      width: 100%;
+    .view-box {
+      flex: 1;
       height: 100%;
-      padding: vw(0) vw(18) vh(18);
       background: #f2f2f2;
-      .mycontent-content-title {
-        display: flex;
-        align-items: center;
-        margin: vh(13) vw(7);
-        .title-icon,
-        .title-font {
-          font-size: vw(14);
-          font-family: Source Han Sans CN;
-          font-weight: 500;
-          color: #292f38;
-        }
-        .title-icon {
-          margin: 0 vw(5) 0 0;
-          font-size: vw(18);
-          color: #1e80eb;
-        }
-      }
+
+      overflow: hidden;
+    }
+    .child-views {
+      height: calc(100% - 40px);
+      width: 100%;
+      box-sizing: border-box;
+      padding: 10px;
     }
-  }
   }
   .routerActive {
     background: #1e80eb;
@@ -315,4 +237,4 @@ export default {
     align-items: center;
   }
 }
-</style>
+</style>
\ No newline at end of file