From 9bb8ee8f5d5a38b295e029a708c833a51a11267b Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Mon, 31 Jul 2023 20:36:38 +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/layout/components/TagsView/index.vue      |   5 +-
 src/permission.js                             |  82 ++++++-----
 src/router/index.js                           |  98 +++++--------
 src/store/modules/myselfPermission.js         |   5 +-
 src/views/a1/index.vue                        |   3 +
 src/views/administrative/index.vue            |   3 +
 src/views/enterpriseMsg/index.vue             |   3 +
 src/views/index.vue                           | 135 +++++++++++++++++-
 src/views/logout/index.vue                    |   3 +
 .../components/cosmeticsArchives.vue          |   5 +
 .../productsMsg/components/drugArchives.vue   |   3 +
 src/views/productsMsg/components/health.vue   |   5 +
 src/views/productsMsg/index.vue               |   3 +
 13 files changed, 249 insertions(+), 104 deletions(-)
 create mode 100644 src/views/a1/index.vue
 create mode 100644 src/views/administrative/index.vue
 create mode 100644 src/views/enterpriseMsg/index.vue
 create mode 100644 src/views/logout/index.vue
 create mode 100644 src/views/productsMsg/components/cosmeticsArchives.vue
 create mode 100644 src/views/productsMsg/components/drugArchives.vue
 create mode 100644 src/views/productsMsg/components/health.vue
 create mode 100644 src/views/productsMsg/index.vue

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 55f766e..704b72f 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -26,7 +26,7 @@
         </div>
       </router-link>
     </scroll-pane>
-    <!-- <el-dropdown class="avatar-container" trigger="click">
+    <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span class="user-name" style="margin-right: 3px">操作</span>
         <i class="el-icon-caret-bottom" />
@@ -39,7 +39,7 @@
           <span>关闭当前</span>
         </el-dropdown-item>
       </el-dropdown-menu>
-    </el-dropdown> -->
+    </el-dropdown>
     <!-- <ul
       v-show="visible"
       :style="{ left: left + 'px', top: top + 'px' }"
@@ -126,6 +126,7 @@ export default {
       };
     },
     isAffix(tag) {
+      console.log(tag);
       return tag.meta && tag.meta.affix;
     },
     isFirstView() {
diff --git a/src/permission.js b/src/permission.js
index 52fea0a..81cc6d7 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();
diff --git a/src/router/index.js b/src/router/index.js
index 21abf03..1c093a6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -62,94 +62,74 @@ export const constantRoutes = [
     hidden: true,
   },
 
-  {
-    path: "",
-    component: Layout,
-    redirect: "index",
-    // children: [
-    //   {
-    //     path: "index",
-    //     component: () => import("@/views/index"),
-    //     name: "Index",
-    //     meta: { title: "检查员统计", icon: "netWork", affix: true },
-    //   },
-    // ],
-  },
+  // {
+  //   path: "",
+  //   component: Layout,
+  //   redirect: "index",
+  //   // children: [
+  //   //   {
+  //   //     path: "index",
+  //   //     component: () => import("@/views/index"),
+  //   //     name: "Index",
+  //   //     meta: { title: "检查员统计", icon: "netWork", affix: true },
+  //   //   },
+  //   // ],
+  // },
 
   {
-    path: "/index",
+    path: "",
     component: () => import("@/views/index"),
     name: "Index",
     meta: { title: "首页", icon: "netWork", affix: true },
     isDiy: true,
     hidden: true,
-    redirect: "/netWorkStat",
+    redirect: "/administrative",
     children: [
       {
-        path: "/netWorkStat",
-        name: "检查员统计",
-        icon: require("@/assets/images/tree1.svg"),
-        component: () => import("@/views/netWorkStat/index"),
-        meta: { title: "检查员统计", icon: "netWork", affix: true },
-      },
-      {
-        path: "/censor",
-        name: "全局检查员信息",
-        icon: require("@/assets/images/tree2.svg"),
-        component: () => import("@/views/censor/index"),
-        meta: { title: "全局检查员信息", icon: "netWork" },
-      },
-      {
-        path: "/statistics",
-        name: "培训情况统计",
-        icon: require("@/assets/images/tree3.svg"),
-        component: () => import("@/views/statistics/index"),
-        meta: { title: "培训情况统计", icon: "netWork" },
-      },
-      {
-        path: "/personalData",
-        name: "检查员个人资料",
-        icon: require("@/assets/images/tree3.svg"),
-        component: () => import("@/views/personalData/index"),
-        meta: { title: "检查员个人资料", icon: "netWork" },
+        path: "/administrative",
+        name: "行政审批",
+        icon: require("@/assets/images/tree4.svg"),
+        component: () => import("@/views/administrative/index"),
+        meta: { title: "行政审批", icon: "netWork" },
       },
       {
-        path: "/changePassword",
-        name: "修改密码",
+        path: "/enterpriseMsg",
+        name: "企业档案",
         icon: require("@/assets/images/tree4.svg"),
-        component: () => import("@/views/changePassword/index"),
-        meta: { title: "修改密码", icon: "netWork" },
+        component: () => import("@/views/enterpriseMsg/index"),
+        meta: { title: "企业档案", icon: "netWork" },
       },
       {
-        path: "/changePassword",
-        name: "行政审批",
+        path: "/drugArchives",
+        name: "药品档案",
         icon: require("@/assets/images/tree4.svg"),
-        component: () => import("@/views/changePassword/index"),
-        meta: { title: "行政审批", icon: "netWork" },
+        component: () => import("@/views/productsMsg/components/drugArchives.vue"),
+        meta: { title: "药品档案", icon: "netWork" },
       },
       {
-        path: "/changePassword",
-        name: "企业档案",
+        path: "/cosmeticsArchives",
+        name: "化妆品档案",
         icon: require("@/assets/images/tree4.svg"),
-        component: () => import("@/views/changePassword/index"),
-        meta: { title: "企业档案", icon: "netWork" },
+        component: () => import("@/views/productsMsg/components/cosmeticsArchives.vue"),
+        meta: { title: "化妆品档案", icon: "netWork" },
       },
       {
-        path: "/changePassword",
-        name: "产品档案",
+        path: "/health",
+        name: "医疗器械档案",
         icon: require("@/assets/images/tree4.svg"),
-        component: () => import("@/views/changePassword/index"),
-        meta: { title: "产品档案", icon: "netWork" },
+        component: () => import("@/views/productsMsg/components/health.vue"),
+        meta: { title: "医疗器械档案", icon: "netWork" },
       },
       {
-        path: "/changePassword",
+        path: "/logout",
         name: "依法注销",
         icon: require("@/assets/images/tree4.svg"),
-        component: () => import("@/views/changePassword/index"),
+        component: () => import("@/views/logout/index"),
         meta: { title: "依法注销", icon: "netWork" },
       },
     ],
   },
+  //可以按着若依的思路来写,把菜单全部都设置成一级路由，然后有下拉选择框的去进行区别判断设置成二级子路由
 ];
 
 // 动态路由，基于用户权限动态去加载
diff --git a/src/store/modules/myselfPermission.js b/src/store/modules/myselfPermission.js
index affae83..96500eb 100644
--- a/src/store/modules/myselfPermission.js
+++ b/src/store/modules/myselfPermission.js
@@ -40,6 +40,7 @@ const selfPermission = {
             let query = {
               id: infoData.userDto.cardId,
             };
+            //这个好像是获取那个检查员的身份信息
             getcarid(query).then((res) => {
               commit(
                 "SET_INSPECTORID",
@@ -53,14 +54,16 @@ const selfPermission = {
             let menuButton = infoData.menuButton.filter(
               (item) => item.appCode == "JCYGL"
             );
+            console.log(menuButton);
             commit("SET_PERMISSIONLIST", menuButton);
             //过滤菜单
             let menuTree = infoData.menuTree.filter(
               (item) => item.appCode == "JCYGL"
             );
+            console.log(menuTree);
             let fileTreeOut = filterTree(menuTree[0].childMenuList, []);
             commit("SET_ROUTER", fileTreeOut);
-
+            console.log(fileTreeOut);
             resolve(fileTreeOut.length > 0 ? fileTreeOut[0].path : []);
           })
           .catch((error) => {
diff --git a/src/views/a1/index.vue b/src/views/a1/index.vue
new file mode 100644
index 0000000..6a603e8
--- /dev/null
+++ b/src/views/a1/index.vue
@@ -0,0 +1,3 @@
+<template>
+    <div>00000</div>
+</template>
\ No newline at end of file
diff --git a/src/views/administrative/index.vue b/src/views/administrative/index.vue
new file mode 100644
index 0000000..7666d9b
--- /dev/null
+++ b/src/views/administrative/index.vue
@@ -0,0 +1,3 @@
+<template>
+    <div>   11111111</div>
+</template>
\ No newline at end of file
diff --git a/src/views/enterpriseMsg/index.vue b/src/views/enterpriseMsg/index.vue
new file mode 100644
index 0000000..cc21e28
--- /dev/null
+++ b/src/views/enterpriseMsg/index.vue
@@ -0,0 +1,3 @@
+<template>
+    <div>   22222</div>
+</template>
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index 4fe5c08..3fd60c4 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -3,7 +3,7 @@
     <myHeader></myHeader>
     <div class="body-container">
       <div class="tree-menu">
-        <router-link
+        <!-- <router-link
           tag="div"
           :to="{ path: item.path }"
           v-for="(item, index) in myRouter"
@@ -11,10 +11,54 @@
           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>
+        </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"
+          >
+            <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>
+        </el-menu>
       </div>
       <div class="view-box">
         <tags-view ref="tagsView" />
@@ -33,7 +77,64 @@ import router from "@/router";
 export default {
   components: { myHeader, TagsView },
   data() {
-    return {};
+    return {
+      routerIndex: "1-1",
+      routerList: [
+        {
+          path: "/administrative",
+          name: "行政审批",
+          icon: require("@/assets/images/tree4.svg"),
+          component: () => import("@/views/administrative/index"),
+          meta: { title: "行政审批", icon: "netWork" },
+        },
+    
+        {
+          path: "/enterpriseMsg",
+          name: "企业档案",
+          icon: require("@/assets/images/tree4.svg"),
+          component: () => import("@/views/enterpriseMsg/index"),
+          meta: { title: "企业档案", icon: "netWork" },
+        },
+        {
+          path: "/productsMsg",
+          name: "产品档案",
+          icon: require("@/assets/images/tree4.svg"),
+          meta: { title: "产品档案", icon: "netWork" },
+          children: [
+            {
+              path: "/drugArchives",
+              name: "药品档案",
+              icon: require("@/assets/images/tree4.svg"),
+              component: () =>
+                import("@/views/productsMsg/components/drugArchives"),
+              meta: { title: "药品档案", icon: "netWork" },
+            },
+            {
+              path: "/cosmeticsArchives",
+              name: "化妆品档案",
+              icon: require("@/assets/images/tree4.svg"),
+              component: () =>
+                import("@/views/productsMsg/components/cosmeticsArchives"),
+              meta: { title: "化妆品档案", icon: "netWork" },
+            },
+            {
+              path: "/health",
+              name: "医疗器械档案",
+              icon: require("@/assets/images/tree4.svg"),
+              component: () => import("@/views/productsMsg/components/health"),
+              meta: { title: "医疗器械档案", icon: "netWork" },
+            },
+          ],
+        },
+        {
+          path: "/logout",
+          name: "依法注销",
+          icon: require("@/assets/images/tree4.svg"),
+          component: () => import("@/views/logout/index"),
+          meta: { title: "依法注销", icon: "netWork" },
+        },
+      ],
+    };
   },
   computed: {
     //获取自定义路由
@@ -44,14 +145,40 @@ export default {
       // )[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;
     },
+    get1(e) {
+      console.log(e);
+    },
   },
   created() {},
 };
 </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 {
diff --git a/src/views/logout/index.vue b/src/views/logout/index.vue
new file mode 100644
index 0000000..444cae0
--- /dev/null
+++ b/src/views/logout/index.vue
@@ -0,0 +1,3 @@
+<template>
+    <div>  4444</div>
+</template>
\ No newline at end of file
diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue
new file mode 100644
index 0000000..a076494
--- /dev/null
+++ b/src/views/productsMsg/components/cosmeticsArchives.vue
@@ -0,0 +1,5 @@
+<template>
+    <div>   
+        dsafasdfasdfasdfasd
+    </div>
+</template>
\ No newline at end of file
diff --git a/src/views/productsMsg/components/drugArchives.vue b/src/views/productsMsg/components/drugArchives.vue
new file mode 100644
index 0000000..0781e12
--- /dev/null
+++ b/src/views/productsMsg/components/drugArchives.vue
@@ -0,0 +1,3 @@
+<template>
+    <div>77777777777</div>
+</template>
\ No newline at end of file
diff --git a/src/views/productsMsg/components/health.vue b/src/views/productsMsg/components/health.vue
new file mode 100644
index 0000000..85acc76
--- /dev/null
+++ b/src/views/productsMsg/components/health.vue
@@ -0,0 +1,5 @@
+<template>
+    <div>   
+        adsfadsfasdfasdfasdf
+    </div>
+</template>
\ No newline at end of file
diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue
new file mode 100644
index 0000000..5b0c7a5
--- /dev/null
+++ b/src/views/productsMsg/index.vue
@@ -0,0 +1,3 @@
+<template>
+    <div>   3333</div>
+</template>
\ No newline at end of file