qj-common 4.3.4 → 4.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qj-common",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"

package/src/views/layout/components/LeftNavbar.vue

@@ -62,7 +62,7 @@ export default {
     console.log(this.$route.meta.menuCode, "this.$route.meta.menuCode");
     let menuCode = sessionStorage.getItem('menuCode') ? sessionStorage.getItem('menuCode') : null
     if (this.$route.path && this.$route.meta) {
-      if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
+      if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta && this.$store.name !== '首页') {
         menuCode = sessionStorage.getItem('menuCode') ? sessionStorage.getItem('menuCode') : localStorage.getItem('menuCode') ? localStorage.getItem('menuCode') : null
 
       }

package/src/views/layout/components/Navbar.vue

@@ -25,8 +25,10 @@
       <div class="nav-head">
         <el-popover placement="bottom-end" width="100" trigger="click">
           <ul class="theme-color-box clearfix">
-            <li @click="themeClick('bda16f')" :class="[activeColor == 'bda16f' ? 'active' : '']" :style="{ background: '#bda16f' }"></li>
-            <li @click="themeClick('2c4158')" :class="[activeColor == '2c4158' ? 'active' : '']" :style="{ background: '#2c4158' }"></li>
+            <li @click="themeClick('bda16f')" :class="[activeColor == 'bda16f' ? 'active' : '']"
+              :style="{ background: '#bda16f' }"></li>
+            <li @click="themeClick('2c4158')" :class="[activeColor == '2c4158' ? 'active' : '']"
+              :style="{ background: '#2c4158' }"></li>
           </ul>
           <!-- <el-button class="theme-box" slot="reference">主题</el-button> -->
         </el-popover>
@@ -46,12 +48,8 @@
 
             <!-- <span class="user_line"></span> -->
             <!-- <i class="icon-yonghu-outline iconfont"></i> -->
-            <el-badge
-              class="msg-icon"
-              v-if="proappEnvLayout && proappEnvLayout.tenantCode == '2021122100000001'"
-              is-dot
-              :hidden='unreadMessageNum==0'
-            >
+            <el-badge class="msg-icon" v-if="proappEnvLayout && proappEnvLayout.tenantCode == '2021122100000001'" is-dot
+              :hidden='unreadMessageNum == 0'>
               <i class="el-icon-bell" @click="jumpToPage"></i>
             </el-badge>
             <span class="user-name" @click="lookInfo">
@@ -83,8 +81,8 @@
             {{ role }}
           </el-form-item>
         </el-form>
-          <!-- <div>联系人：</div> -->
-          <!-- <img :src="proappRemark[1]" alt=""> -->
+        <!-- <div>联系人：</div> -->
+        <!-- <img :src="proappRemark[1]" alt=""> -->
         <!-- <div class="loginInfo-Block-left">
           <div>登录名：</div>
           <div>手机号：</div>
@@ -138,10 +136,10 @@ export default {
   },
   data() {
     return {
-      unreadMessageNum:0,
+      unreadMessageNum: 0,
       activeColor: '2c4158',
       menuList: '',
-      menuCode:'',
+      menuCode: '',
       merberCompname: '',
       centerDialogVisible: false,
       name: '',
@@ -156,6 +154,7 @@ export default {
       gapTime: '',
       beforeUnloadTime: '',
       secDomainName: null,
+      commonShowMenuAction: ''
     };
   },
   computed: {
@@ -171,32 +170,32 @@ export default {
 
     console.log(window.location.href, 'window.location.href本地路由');
     if (window.location.href.indexOf('listDMkf') == -1) {
-        if(this.proappEnvLayout.tenantCode === '2019071800001392'){  // tenantCode 判断
-            let userId = sessionStorage.getItem('personalInfo') ? JSON.parse(sessionStorage.getItem('personalInfo')).userId : '';
-            getUserserviceInfo({
-                userId: userId,
-            }).then((res) => {
-                // console.log(res)
-                this.name = res.userRelname ? res.userRelname : res.userName;
-                this.phone = res.userOcode?res.userOcode:res.userPhone;
-                this.compony = res.userinfoCompname;
-                this.role = res.userRoleName;
-            });
-        }else{
-            let userId = sessionStorage.getItem('personalInfo') ? JSON.parse(sessionStorage.getItem('personalInfo')).userId : '';
-            getUserserviceInfo({
-                userId: userId,
-            }).then((res) => {
-                // console.log(res)
-                this.name = res.userNickname ? res.userNickname : res.userName;
-                this.phone = res.userPhone;
-                this.compony = res.userinfoCompname;
-                this.role = res.userRoleName;
-            });
-        }
+      if (this.proappEnvLayout.tenantCode === '2019071800001392') {  // tenantCode 判断
+        let userId = sessionStorage.getItem('personalInfo') ? JSON.parse(sessionStorage.getItem('personalInfo')).userId : '';
+        getUserserviceInfo({
+          userId: userId,
+        }).then((res) => {
+          // console.log(res)
+          this.name = res.userRelname ? res.userRelname : res.userName;
+          this.phone = res.userOcode ? res.userOcode : res.userPhone;
+          this.compony = res.userinfoCompname;
+          this.role = res.userRoleName;
+        });
+      } else {
+        let userId = sessionStorage.getItem('personalInfo') ? JSON.parse(sessionStorage.getItem('personalInfo')).userId : '';
+        getUserserviceInfo({
+          userId: userId,
+        }).then((res) => {
+          // console.log(res)
+          this.name = res.userNickname ? res.userNickname : res.userName;
+          this.phone = res.userPhone;
+          this.compony = res.userinfoCompname;
+          this.role = res.userRoleName;
+        });
+      }
     }
 
-    if(this.proappEnvLayout && this.proappEnvLayout.tenantCode == '2021122100000001') this.watchLocalStorage()
+    if (this.proappEnvLayout && this.proappEnvLayout.tenantCode == '2021122100000001') this.watchLocalStorage()
   },
   mounted() {
     // 监听 beforeunload 离开或者刷新页面触发
@@ -221,9 +220,9 @@ export default {
     /**
      * 监听保存到本地的未读消息数量用来显示角标
      */
-    watchLocalStorage(){
+    watchLocalStorage() {
       // 监听localStorage的变化
-      window.addEventListener('storage', event=>{
+      window.addEventListener('storage', event => {
         if (event.key === 'unreadMessageNum') {
           // 处理数据变化的逻辑
           this.unreadMessageNum = Number(event.newValue)
@@ -233,7 +232,7 @@ export default {
     /**
      * 跳转到消息列表页面
      */
-    jumpToPage(){
+    jumpToPage() {
       location.href = '/paas/b2b-bus-pc-ayd/index.html#/msgList'
     },
     /**
@@ -271,6 +270,7 @@ export default {
       this.menuList = window.sessionStorage.getItem('menuList') ? window.sessionStorage.getItem('menuList') : '';
       this.menuCode = window.sessionStorage.getItem('menuCode') ? window.sessionStorage.getItem('menuCode') : '';
       this.proappEnvLayout = window.sessionStorage.getItem('proappEnvLayout') ? window.sessionStorage.getItem('proappEnvLayout') : '';
+      this.commonShowMenuAction = window.sessionStorage.getItem('commonShowMenuAction') ? JSON.parse(window.sessionStorage.getItem('commonShowMenuAction')) : ''
       // 获取 SSO 登出配置
       this.ssoLogout();
     },
@@ -354,6 +354,7 @@ export default {
         window.sessionStorage.clear();
         window.sessionStorage.setItem('menuList', this.menuList);
         window.sessionStorage.setItem('menuCode', this.menuCode);
+        window.sessionStorage.setItem('commonShowMenuAction', this.commonShowMenuAction)
         this.$store.dispatch('GetAppRouter').then((reg) => {
           window.sessionStorage.setItem('menuList', JSON.stringify(reg));
         });
@@ -402,30 +403,36 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.flex{
+.flex {
   display: flex;
 }
+
 .loginInfo-Block-left {
   width: 39%;
   height: 100%;
   text-align: right;
   display: inline-block;
 }
-.loginInfo-Block-left > div {
+
+.loginInfo-Block-left>div {
   margin-bottom: 25px;
 }
+
 .loginInfo-Block-right {
   width: 50%;
   height: 100%;
   display: inline-block;
+
   img {
     width: 120px;
     height: 120px;
   }
 }
-.loginInfo-Block-right > div {
+
+.loginInfo-Block-right>div {
   margin-bottom: 25px;
 }
+
 .theme-color-box {
   li {
     width: 40px;
@@ -435,13 +442,15 @@ export default {
     float: left;
     margin: 5px;
     opacity: 0.3;
+
     &.active {
       opacity: 1;
     }
   }
 }
-.user-bar {
-}
+
+.user-bar {}
+
 .user-remark {
   display: inline-block;
   width: 530px;
@@ -465,6 +474,7 @@ export default {
 
   cursor: pointer;
 }
+
 .nav-head {
   flex: 1;
   display: inline-flex;
@@ -472,58 +482,59 @@ export default {
   align-items: center;
   color: #bbbbbb;
   margin-right: 15px;
-  align-items:center
-  // font-weight: normal;
-  // transition: all 10s linear;
-  // i {
-  //   display: inline-block;
-  //   width: 18px;
-  //   height: 18px;
-  //   // margin-right: 25px;
-  //   cursor: pointer;
-  // }
-  // .user_name {
-  //   cursor: pointer;
-  //   margin-right: 15px;
-  //   p {
-  //     width: 100%;
-  //     line-height: 24px;
-  //     height: 24px;
-  //     display: inline-table;
-  //     // .user-icon {
-  //     //   vertical-align: middle;
-  //     //   background: url("../../../assets/nav/admin.png") no-repeat;
-  //     //   background-size: 80%;
-  //     // }
-  //     // .user_line {
-  //     //   border: 1px solid #f8f8f8;
-  //     //   margin: 0 5px;
-  //     // }
-  //   }
-  //   &:hover {
-  //     // .user-icon {
-  //     //   vertical-align: middle;
-  //     //   background-image: url("../../../assets/nav/admin-hover.png");
-  //     //   background-size: 100% 100%;
-  //     // }
-  //     p {
-  //       color: #409dff;
-  //     }
-  //   }
-  // }
-
-  .spl_line {
+  align-items: center // font-weight: normal;
+    // transition: all 10s linear;
+    // i {
+    //   display: inline-block;
+    //   width: 18px;
+    //   height: 18px;
+    //   // margin-right: 25px;
+    //   cursor: pointer;
+    // }
+    // .user_name {
+    //   cursor: pointer;
+    //   margin-right: 15px;
+    //   p {
+    //     width: 100%;
+    //     line-height: 24px;
+    //     height: 24px;
+    //     display: inline-table;
+    //     // .user-icon {
+    //     //   vertical-align: middle;
+    //     //   background: url("../../../assets/nav/admin.png") no-repeat;
+    //     //   background-size: 80%;
+    //     // }
+    //     // .user_line {
+    //     //   border: 1px solid #f8f8f8;
+    //     //   margin: 0 5px;
+    //     // }
+    //   }
+    //   &:hover {
+    //     // .user-icon {
+    //     //   vertical-align: middle;
+    //     //   background-image: url("../../../assets/nav/admin-hover.png");
+    //     //   background-size: 100% 100%;
+    //     // }
+    //     p {
+    //       color: #409dff;
+    //     }
+    //   }
+    // }
+
+    .spl_line {
     height: 40px;
     border: 1px solid #f8f8f8;
     line-height: 46px;
     margin-right: 15px;
   }
+
   .log_uot {
     // height: 24px;
     // line-height: 24px;
     // width: 24px;
     cursor: pointer;
     margin-left: 12px;
+
     // .logout-icon {
     //   vertical-align: middle;
     //   background: url("../../../assets/nav/logout.png") no-repeat;
@@ -534,6 +545,7 @@ export default {
       bottom: -15px;
       font-size: 12px;
     }
+
     &:hover {
       // .logout-icon {
       //   vertical-align: middle;
@@ -541,33 +553,40 @@ export default {
       //   background-size: 100% 100%;
       // }
       color: #409dff;
+
       .logout-text {
         color: #409dff;
       }
     }
   }
 }
+
 .theme-box {
   border: none;
   background: none;
   margin-right: 30px;
+
   &:active {
     background: none;
     color: #409dff;
   }
+
   &:hover {
     background: none;
     color: #409dff;
   }
+
   &:focus {
     background: none;
     color: #409dff;
   }
+
   &:visited {
     background: none;
     color: #409dff;
   }
 }
+
 // .logout-text:hover{
 //   font-weight: bold;
 //   color:#3ca1ec;
@@ -595,6 +614,7 @@ export default {
   background-image: url('../../../assets/nav/info.png');
   background-size: 100% 100%;
 }
+
 .navbar {
   height: 50px;
   line-height: 50px;
@@ -602,47 +622,56 @@ export default {
   box-sizing: border-box;
   border-radius: 0 !important;
   position: relative;
+
   &-title {
     font-size: 14px;
     color: #333;
     margin-left: 12px;
+
     // cursor: pointer;
     ul {
       li:last-child {
         color: #999;
       }
+
       i {
         margin: 0 10px;
         color: #999;
       }
     }
   }
+
   .hamburger-container {
     line-height: 30px;
     height: 30px;
     float: left;
     padding: 0 14px 0 20px;
   }
+
   .screenfull {
     position: absolute;
     right: 90px;
     top: 16px;
     color: red;
   }
+
   .avatar-container {
     height: 46px;
     display: inline-block;
     position: absolute;
     right: 35px;
+
     .avatar-wrapper {
       cursor: pointer;
       margin-top: 5px;
       position: relative;
+
       .user-avatar {
         width: 40px;
         height: 40px;
         border-radius: 10px;
       }
+
       .el-icon-caret-bottom {
         position: absolute;
         right: -20px;
@@ -652,12 +681,14 @@ export default {
     }
   }
 }
-/deep/ .msg-icon{
-  display:inline;
+
+/deep/ .msg-icon {
+  display: inline;
   cursor: pointer;
-  margin-right:20px;
-  .el-badge__content.is-fixed{
-    top:4px;
+  margin-right: 20px;
+
+  .el-badge__content.is-fixed {
+    top: 4px;
     right: 8px;
   }
 }

package/src/views/layout/components/Sidebar/index.vue

@@ -143,7 +143,7 @@ export default {
       }
       if (this.$route.path && this.$route.meta) {
         if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
-          localStorage.setItem('showMenuAction', this.$route.path)
+          sessionStorage.setItem('commonShowMenuAction', this.$route.path)
         }
       }
 
@@ -160,9 +160,9 @@ export default {
 
       console.log(current, 'path');
       console.log(path, 'path');
-      console.log(localStorage.getItem('showMenuAction'), this.$route, '当前路由信息');
-      if (this.$route.name !== '首页') {
-        path = localStorage.getItem('showMenuAction') ? localStorage.getItem('showMenuAction') : path
+      console.log(sessionStorage.getItem('commonShowMenuAction'), this.$route, '当前路由信息');
+      if (this.$route.name !== '首页' && this.$route.path !== '/404') {
+        path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
       }
 
       return path;