Merge branch 'Lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/LiaoNingDangAn

src/permission.js

@@ -11,62 +11,50 @@ function kickOut() {
     location.href = location.origin + "/login";
   }
 }
-const whiteList = [
+// const whiteList = [
-  "/404",
+  // "/404",
-  "/401",
+  // "/401",
   // '/drugArchives',
   // "/cosmeticsArchives",
-  "/cosmeticsDetail",
+  // "/cosmeticsDetail",
-  "/health",
+  // "/health",
-  "/zyzj",  
+  // "/zyzj", 
-];
+// ];
 NProgress.configure({ showSpinner: false });
 router.beforeEach((to, from, next) => {
   NProgress.start();
+
   let token = localStorage.getItem('MSSM-LIAONING__TOKEN')
   console.log(to.path);
-  if (whiteList.indexOf(to.path) == -1) {
+  if (token) {
-    if (token) {
+    if (store.state.myselfPermission.routerList.length == 0) {
-      console.log(store.state.myselfPermission.routerList,'store.state.myselfPermission.routerList')
+
-      if (store.state.myselfPermission.routerList.length > 0) {
+      store.dispatch("GetPermission").then((res) => {
-        let current = store.state.myselfPermission.routerList.filter(
+        next({path:to.path});
-          (item) => item.path == to.path || from.path == "/"
+      }).catch((error) => {
-        );
+        kickOut();
-        console.log(current,'current')
+      });
-        if (current.length > 0) {
+
+    } else {
+      let current = store.state.myselfPermission.routerList.filter(
+        (item) => item.path == to.path || from.path == "/"
+      );
+      if (current.length > 0) {
+        next();
+      } else {
+        //根据参数判断是否可以跳
+        if (to.query.type && to.path == '/cosmeticsDetail') {
           next();
         } else {
-          //根据参数判断是否可以跳
+          Message.error("无权限访问！");
-          if (to.query.type && to.path == '/cosmeticsDetail') {
-            next();
-          } else {
-            next()
-            Message.error("无权限访问！");
-          }
         }
-      } else {
-        store
-          .dispatch("GetPermission")
-          .then((res) => {
-            console.log(res,'res')
-            if (res.length > 0) {
-              next({ path: res });
-            } else {
-              kickOut();
-            }
-          })
-          .catch((error) => {
-            kickOut();
-          });
       }
-    } else {
-      // 没有token
-      Message.error("获取令牌失败！");
-      kickOut();
     }
   } else {
+    // 没有token
+    Message.error("获取令牌失败！");
     kickOut();
-  }
+}
 });
 
 router.afterEach(() => {

src/store/modules/myselfPermission.js

@@ -62,9 +62,19 @@ const selfPermission = {
               (item) => item.appCode == "CPGL"
             );
             let fileTreeOut = filterTree(menuTree[0].childMenuList, []);
-            fileTreeOut[0].meta.affix = true
+            // let fileTreeOut = [];
+
+            // menuTree[0].childMenuList.forEach((item) => {
+            //   staticRouter.forEach((router, index) => {
+            //     if (item.menuUrl == router.path) {
+            //       fileTreeOut.push(router);
+            //     }
+            //   });
+            // });
+            
+            fileTreeOut[4].meta.affix = true
             commit("SET_ROUTER", fileTreeOut);
-            resolve(fileTreeOut.length > 0 ? fileTreeOut[0].path : []);
+            resolve(fileTreeOut.length > 0 ? fileTreeOut[4].path : []);
           })
           .catch((error) => {
             reject(error);

src/views/index.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="container">
     <myHeader></myHeader>
-    <div class="body-container">
+    <div v-if="$route.meta.title && $route.meta.title == '首页'">
+      <router-view />
+    </div>
+    <div class="body-container" v-else>
       <div class="tree-menu">
         <router-link
           tag="div"
@@ -37,19 +40,11 @@ export default {
     return {
     };
   },
-  watch:{
-    $router:{
-      handler(newRouter){
-        console.log(newRouter,'newRouter')
-      },
-      deep:true,
-      immediate:true,
-    }
-  },
   computed: {
     //获取自定义路由
     myRouter() {
-      return this.$store.state.myselfPermission.routerList;
+      return this.$store.state.myselfPermission.routerList.slice(0,this.$store.state.myselfPermission.routerList.length-1);
+      // return this.$store.state.myselfPermission.routerList;
     },
   },
   created() {},

src/views/portal/index.vue

@@ -1,14 +1,6 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: JC9527
- * @Date: 2023-11-22 09:55:23
- * @LastEditors: JC9527
- * @LastEditTime: 2023-11-22 10:00:27
--->
 <template>
-  <div>
+  <div class="portal-L">
-    搜索首页
+    
   </div>
 </template>
 <script>
@@ -18,9 +10,14 @@ export default {
     }
   },
   methods:{
+    pushRouter(){
+      this.$router.push('/drugArchives')
+    }
   },
 }
 </script>
 <style lang="scss" scoped>
-
+.portal-L {
+  
+}
 </style>

src/views/productsMsg/components/cosmeticsArchives.vue

@@ -159,7 +159,6 @@ export default {
   components: {},
   data() {
     return {
-      //===========
       loading: false,
       tableData: [],
       A1: "产品名称",
@@ -464,11 +463,11 @@ export default {
     background: white;
   }
 }
-.exportBtn {
+// .exportBtn {
-  padding: 10px 20px;
+//   padding: 10px 20px;
-}
+// }
 .table-box {
-  padding: 0 20px;
+  padding: 10px 20px;
   .table-item {
   }
 }

src/views/productsMsg/index.vue

@@ -255,7 +255,7 @@ export default {
       };
       this.jieliuFunc();
     },
-    //国产化妆品
+    // 药品
     async chinaCosmetics() {
       this.loading = true;
       let msg1 = await this.$api.cosmetics.vRdgYpwhGxwz(this.form);