eoss-ui 0.4.61 → 0.4.63

package/lib/main.js

@@ -247,52 +247,54 @@ var ajax = function ajax(_ref) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           var remind = sessionStorage.getItem('remind');
-          !remind && (loginMsg = setTimeout(function () {
-            sessionStorage.setItem('remind', 1);
-            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-              confirmButtonText: '确定',
-              closeOnClickModal: false,
-              type: 'warning'
-            } : {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              closeOnClickModal: false,
-              type: 'warning'
-            }).then(function () {
-              var loginPage = getStorage('login') || getStorage('loginPage');
-              if (loginPage) {
-                var src = void 0;
-                if (!startWith(loginPage, ['http', '/'])) {
-                  var pathname = win.top.location.pathname;
-                  if (pathname !== '/') {
-                    pathname = pathname.split('/');
-                    pathname.splice(pathname.length - 1);
-                    pathname = pathname.join('/');
-                    src = pathname + '/' + loginPage.replace('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            loginMsg = setTimeout(function () {
+              sessionStorage.setItem('remind', 1);
+              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+                confirmButtonText: '确定',
+                closeOnClickModal: false,
+                type: 'warning'
+              } : {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                type: 'warning'
+              }).then(function () {
+                var loginPage = getStorage('login') || getStorage('loginPage');
+                if (loginPage) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    var pathname = win.top.location.pathname;
+                    if (pathname !== '/') {
+                      pathname = pathname.split('/');
+                      pathname.splice(pathname.length - 1);
+                      pathname = pathname.join('/');
+                      src = pathname + '/' + loginPage.replace('./', '');
+                    } else {
+                      src = pathname + loginPage.replace('./', '');
+                    }
                   } else {
-                    src = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } else {
-                  src = loginPage;
-                }
-                win.top.location.href = src;
-              } else if (win.top.location.href.indexOf('main.html') > -1) {
-                win.top.location.href = './login.html';
-              } else {
-                var hash = win.top.location.hash;
-                if (hash) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                } else {
-                  win.top.location.href = '/login.html';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var len = win.top.location.href.indexOf(hash);
+                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    win.top.location.href = '/login.html';
+                  }
                 }
-              }
-            }).catch(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2081,7 +2083,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -2897,29 +2899,29 @@ module.exports = require("babel-runtime/regenerator");
 /* 11 */,
 /* 12 */,
 /* 13 */,
-/* 14 */
+/* 14 */,
+/* 15 */,
+/* 16 */,
+/* 17 */,
+/* 18 */,
+/* 19 */
 /***/ (function(module, exports) {
 
 module.exports = require("runtime-import");
 
 /***/ }),
-/* 15 */
+/* 20 */
 /***/ (function(module, exports) {
 
 module.exports = require("sockjs-client");
 
 /***/ }),
-/* 16 */
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("stompjs");
 
 /***/ }),
-/* 17 */,
-/* 18 */,
-/* 19 */,
-/* 20 */,
-/* 21 */,
 /* 22 */,
 /* 23 */,
 /* 24 */,
@@ -2934,7 +2936,7 @@ module.exports = require("stompjs");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=3f0e5c30&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=1686d4f2&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2992,6 +2994,7 @@ var render = function () {
                           popperClass: "el-menu--popup-" + _vm.layout,
                           data: _vm.navs,
                           deep: _vm.layout === "topnav",
+                          height: _vm.layout === "topnav" ? "370px" : undefined,
                           "default-active": _vm.topActive,
                         },
                         on: {
@@ -3300,9 +3303,6 @@ var render = function () {
               "update:visible": function ($event) {
                 _vm.showSet = $event
               },
-              "update:layout": function ($event) {
-                _vm.layout = $event
-              },
               change: _vm.handleChange,
               layout: _vm.handleLayout,
             },
@@ -3362,10 +3362,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=3f0e5c30&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=1686d4f2&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=2f7a984a&
-var userinfovue_type_template_id_2f7a984a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=2b6e9e21&
+var userinfovue_type_template_id_2b6e9e21_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3381,11 +3381,11 @@ var userinfovue_type_template_id_2f7a984a_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_2f7a984a_staticRenderFns = []
-userinfovue_type_template_id_2f7a984a_render._withStripped = true
+var userinfovue_type_template_id_2b6e9e21_staticRenderFns = []
+userinfovue_type_template_id_2b6e9e21_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=2f7a984a&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=2b6e9e21&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3703,11 +3703,11 @@ var util = __webpack_require__(0);
           email: this.values.email,
           officeTel: this.values.officetel,
           phone: this.values.phone,
-          oldPassword: initLogin && initLogin.secret ? util["a" /* default */].esmEncrypt({
+          oldPassword: initLogin && initLogin.secret && this.values.oldpassword ? util["a" /* default */].esmEncrypt({
             data: this.values.oldpassword,
             key: initLogin.secret
           }) : this.values.oldpassword,
-          password: initLogin && initLogin.secret ? util["a" /* default */].esmEncrypt({
+          password: initLogin && initLogin.secret && this.values.password ? util["a" /* default */].esmEncrypt({
             data: this.values.password,
             key: initLogin.secret
           }) : this.values.password
@@ -3724,7 +3724,7 @@ var util = __webpack_require__(0);
               var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
               if (loginPage) {
                 var src = void 0;
-                if (!util["a" /* default */].startWith(loginPage, ['http', '/'])) {
+                if (!util["a" /* default */].startWith(loginPage, ['http', '/'], true)) {
                   var pathname = util["a" /* default */].win.top.location.pathname;
                   if (pathname !== '/') {
                     pathname = pathname.split('/');
@@ -3806,8 +3806,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_2f7a984a_render,
-  userinfovue_type_template_id_2f7a984a_staticRenderFns,
+  userinfovue_type_template_id_2b6e9e21_render,
+  userinfovue_type_template_id_2b6e9e21_staticRenderFns,
   false,
   null,
   null,
@@ -5008,7 +5008,7 @@ var regenerator_ = __webpack_require__(9);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // EXTERNAL MODULE: external "runtime-import"
-var external_runtime_import_ = __webpack_require__(14);
+var external_runtime_import_ = __webpack_require__(19);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/async-component/index.vue?vue&type=script&lang=js&
 
@@ -5160,11 +5160,11 @@ var async_component_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var async_component = (async_component_component.exports);
 // EXTERNAL MODULE: external "sockjs-client"
-var external_sockjs_client_ = __webpack_require__(15);
+var external_sockjs_client_ = __webpack_require__(20);
 var external_sockjs_client_default = /*#__PURE__*/__webpack_require__.n(external_sockjs_client_);
 
 // EXTERNAL MODULE: external "stompjs"
-var external_stompjs_ = __webpack_require__(16);
+var external_stompjs_ = __webpack_require__(21);
 var external_stompjs_default = /*#__PURE__*/__webpack_require__.n(external_stompjs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
@@ -5416,6 +5416,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 
@@ -5553,6 +5554,10 @@ var log = util["a" /* default */].getParams('console');
     userHeight: {
       type: String,
       default: '740px'
+    },
+    history: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -5575,7 +5580,6 @@ var log = util["a" /* default */].getParams('console');
       return true;
     },
     navWidth: function navWidth() {
-      console.log(this.layout === 'topside' ? '230px' : undefined, 9000);
       return this.layout === 'topside' ? '230px' : undefined;
     },
     showNavTitle: function showNavTitle() {
@@ -5761,7 +5765,8 @@ var log = util["a" /* default */].getParams('console');
       isHeader: '',
       isSide: null,
       navIds: null,
-      timer: null
+      timer: null,
+      pid: null
     };
   },
   created: function created() {
@@ -5861,6 +5866,15 @@ var log = util["a" /* default */].getParams('console');
           thalk.innerText = globalThalk;
         }
     },
+    setTitle: function setTitle(id) {
+      for (var i = 0; i < this.menus.length; i++) {
+        var item = this.menus[i];
+        if (item.id == id) {
+          this.title = item.text;
+          return item;
+        }
+      }
+    },
     renderMenu: function renderMenu() {
       if (this.data !== undefined && this.data.length) {
         this.menus = JSON.parse(JSON.stringify(this.data));
@@ -5869,6 +5883,8 @@ var log = util["a" /* default */].getParams('console');
           var ids = this.getId(this.menus, applicationid);
           if (ids) {
             this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
           }
         } else if (util["a" /* default */].win.location.hash) {
           var hash = util["a" /* default */].win.location.hash;
@@ -5879,17 +5895,23 @@ var log = util["a" /* default */].getParams('console');
             var _ids = this.getId(this.menus, util["a" /* default */].win.location.hash, true);
             if (_ids) {
               this.defaultActive = _ids;
+              this.navIds = _ids;
+              this.setTitle(_ids[0]);
             }
-          } else if (sessionStorage.getItem('jump')) {
+          } else if (sessionStorage.getItem('jump') && this.history) {
             var _ids2 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
             if (_ids2) {
               this.defaultActive = _ids2;
+              this.navIds = _ids2;
+              this.setTitle(_ids2[0]);
             }
           }
-        } else if (sessionStorage.getItem('jump')) {
+        } else if (sessionStorage.getItem('jump') && this.history) {
           var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
           if (_ids3) {
             this.defaultActive = _ids3;
+            this.navIds = _ids3;
+            this.setTitle(_ids3[0]);
           }
         }
         this.setMenu(this.menus);
@@ -5943,7 +5965,7 @@ var log = util["a" /* default */].getParams('console');
           key: {
             userId: results.userModel.userId,
             userName: results.userModel.username,
-            useCaseCodes: results.resourceCodes
+            useCaseCodes: results.resourceCodes || results.userModel.resourceCodes
           }
         });
       }
@@ -5961,10 +5983,10 @@ var log = util["a" /* default */].getParams('console');
           this.homePage = results[i];
           if (this.isHomePage) {
             if (this.menus) {
-              var ids = null;
-              this.homePage && (ids = this.getId(this.menus, this.homePage));
-              if (ids) {
-                this.defaultActive = ids;
+              var _ids4 = null;
+              this.homePage && (_ids4 = this.getId(this.menus, this.homePage));
+              if (_ids4) {
+                this.defaultActive = _ids4;
               } else if (this.homePage) {
                 this.handleJump(this.homePage);
               }
@@ -5979,9 +6001,6 @@ var log = util["a" /* default */].getParams('console');
         if (i === 'subsystemName') {
           document.title = results[i];
         }
-        if (i === 'resourceCodes') {
-          sessionStorage.setItem('useCaseCodes', results[i]);
-        }
         if (i === 'sysLogoIco' && results[i]) {
           sessionStorage.setItem('sysLogoIco', results[i]);
           util["a" /* default */].setFavicon(results[i]);
@@ -6116,9 +6135,9 @@ var log = util["a" /* default */].getParams('console');
           _this5.menus = JSON.parse(JSON.stringify(res.results));
           var applicationid = util["a" /* default */].getParams('applicationid') || util["a" /* default */].getParams('applicationId');
           if (applicationid) {
-            var ids = _this5.getId(_this5.menus, applicationid);
-            if (ids) {
-              _this5.defaultActive = ids;
+            var _ids5 = _this5.getId(_this5.menus, applicationid);
+            if (_ids5) {
+              _this5.defaultActive = _ids5;
             }
           } else if (util["a" /* default */].win.location.hash) {
             var hash = util["a" /* default */].win.location.hash;
@@ -6126,20 +6145,26 @@ var log = util["a" /* default */].getParams('console');
               hash = hash.split('?')[0];
             }
             if (hash !== '#/' && hash !== '#/main') {
-              var _ids4 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
-              if (_ids4) {
-                _this5.defaultActive = _ids4;
+              var _ids6 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
+              if (_ids6) {
+                _this5.defaultActive = _ids6;
+                _this5.navIds = _ids6;
+                _this5.setTitle(_ids6[0]);
               }
-            } else if (sessionStorage.getItem('jump')) {
-              var _ids5 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-              if (_ids5) {
-                _this5.defaultActive = _ids5;
+            } else if (sessionStorage.getItem('jump') && _this5.history) {
+              var _ids7 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+              if (_ids7) {
+                _this5.defaultActive = _ids7;
+                _this5.navIds = _ids7;
+                _this5.setTitle(_ids7[0]);
               }
             }
-          } else if (sessionStorage.getItem('jump')) {
-            var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-            if (_ids6) {
-              _this5.defaultActive = _ids6;
+          } else if (sessionStorage.getItem('jump') && _this5.history) {
+            var _ids8 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+            if (_ids8) {
+              _this5.defaultActive = _ids8;
+              _this5.navIds = _ids8;
+              _this5.setTitle(_ids8[0]);
             }
           }
           _this5.setTips(_this5.menus);
@@ -6158,7 +6183,6 @@ var log = util["a" /* default */].getParams('console');
 
     //设置默认左侧导航
     setMenu: function setMenu(res) {
-      console.log(9000);
       if (this.defaultActive && this.defaultActive.length) {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
@@ -6166,9 +6190,9 @@ var log = util["a" /* default */].getParams('console');
         if (this.homePage || !util["a" /* default */].getStorage('mainConfig')) {
           this.isDefault = true;
           if (this.homePage && (!this.defaultActive || !this.defaultActive.length)) {
-            var ids = this.getId(this.menus, this.homePage);
-            if (ids) {
-              this.defaultActive = ids;
+            var _ids9 = this.getId(this.menus, this.homePage);
+            if (_ids9) {
+              this.defaultActive = _ids9;
               this.isDefault = false;
               this.setDefault(res, this.defaultActive);
               return false;
@@ -6242,11 +6266,15 @@ var log = util["a" /* default */].getParams('console');
       if (!obj) {
         return '';
       }
+      var openIdex = 0;
+      if (obj.extendData && (obj.extendData.subDefOpenIndex || obj.extendData.subDefOpen)) {
+        openIdex = parseInt(obj.extendData.subDefOpenIndex || obj.extendData.subDefOpen, 10);
+      }
       if (obj.children && obj.children.length) {
-        return this.getFirst(obj.children[0]);
+        return this.getFirst(obj.children[openIdex]);
       } else if (obj.fourthTabs && obj.fourthTabs.length) {
         if (this.layout === 'topnav') {
-          return this.getFirst(obj.fourthTabs[0]);
+          return this.getFirst(obj.fourthTabs[openIdex]);
         } else {
           this.tabs = obj.fourthTabs;
           if (obj.url) {
@@ -6408,15 +6436,17 @@ var log = util["a" /* default */].getParams('console');
       var _url = params._baseUrl ? params._baseUrl : './primary.html';
       return util["a" /* default */].urlJoinParams({ url: _url, param: obj });
     },
-    handleOpenNav: function handleOpenNav(res) {
-      console.log(res, 777);
-    },
 
     //应用导航交互
     handleSelect: function handleSelect(res, type, open) {
-      console.log(type);
-      var node = res.node;
+      console.log(type, 11);
+      var node = res.node,
+          fourthTabs = res.fourthTabs;
 
+      var openIdex = 0;
+      if (node.extendData && (node.extendData.subDefOpenIndex || node.extendData.subDefOpen)) {
+        openIdex = parseInt(node.extendData.subDefOpenIndex || node.extendData.subDefOpen, 10);
+      }
       if (!open) {
         if (node.extendData && node.extendData.businessStatus == 0 && node.extendData.businessWarnMsg) {
           this.$alert(node.extendData.businessWarnMsg, '提示', {
@@ -6435,28 +6465,17 @@ var log = util["a" /* default */].getParams('console');
             this.navIds = [node.id];
             this.menu = node.children;
             this.title = node.text;
-            var subNode = this.getFirst(node.children[0]);
-            if (subNode) {
-              this.active = subNode.id;
-              this.navIds = [node.id].concat(this.getId(subNode.url));
+            if (this.setFirstAsDefault) {
+              var subNode = this.getFirst(node.children[openIdex]);
+              if (subNode) {
+                this.active = subNode.id;
+                this.navIds = [node.id].concat(this.getId(node.children, subNode.url, true));
+              }
             }
           } else {
             this.navIds = this.getId(this.menus, node.url, true);
-            if (node.url) {
-              var tab = node.fourthTabs.filter(function (item) {
-                return item.url === node.url;
-              })[0];
-              if (tab) {
-                this.tabs = node.fourthTabs;
-                this.tabsId = tab.id;
-              }
-            } else {
-              if (node.fourthTabs.length) {
-                this.tabs = node.fourthTabs;
-                this.tabsId = this.tabs[0].id;
-                this.handleJump(this.tabs[0].url, this.tabs[0].urlopenmode, this.tabs[0]);
-              }
-            }
+            this.setTitle(ids[0]);
+            this.tabsId = fourthTabs ? node.id : '';
           }
           break;
         case 'sys':
@@ -6465,7 +6484,9 @@ var log = util["a" /* default */].getParams('console');
             this.tabs = [];
             this.menu = node.children;
             this.title = node.text;
-            this.active = this.getFirst(node.children[0]).id;
+            if (this.setFirstAsDefault) {
+              this.active = this.getFirst(node.children[openIdex]).id;
+            }
             this.isSide = true;
           }
           break;
@@ -6476,10 +6497,9 @@ var log = util["a" /* default */].getParams('console');
           }
           if (this.setFirstAsDefault) {
             var _subNode = this.getFirst(node);
-            this.$set(this.active, 0, node.id);
+            this.active = [node.id];
             if (_subNode && node.id !== _subNode.id) {
-              console.log(_subNode, _subNode.url);
-              console.log(this.getId(this.menus, _subNode.url, true));
+              this.navIds = this.getId(this.menus, _subNode.url, true);
               this.$set(this.active, 1, _subNode.id);
             }
           }
@@ -6497,33 +6517,39 @@ var log = util["a" /* default */].getParams('console');
           }
           if (node.url) {
             if (node.children && node.children.length) {
-              var _tab = node.children.filter(function (item) {
+              var tab = node.children.filter(function (item) {
                 return item.url === node.url;
               })[0];
-              if (_tab) {
+              if (tab) {
                 if (this.biserial) {
-                  this.$set(this.active, 1, _tab.id);
+                  this.$set(this.active, 1, tab.id);
                 } else {
-                  this.active = _tab.id;
+                  this.active = tab.id;
                 }
+                this.navIds = this.getId(this.menus, tab.url, true);
               }
             } else {
-              var _tab2 = (node.fourthTabs || []).filter(function (item) {
+              var _tab = (node.fourthTabs || []).filter(function (item) {
                 return item.url === node.url;
               })[0];
-              if (_tab2) {
+              if (_tab) {
                 this.tabs = node.fourthTabs;
-                this.tabsId = _tab2.id;
+                this.tabsId = _tab.id;
+                this.navIds = this.getId(this.menus, _tab.url, true);
+              } else {
+                this.navIds = this.getId(this.menus, node.url, true);
               }
             }
           } else if (node.fourthTabs.length) {
             this.tabs = node.fourthTabs;
             this.tabsId = this.tabs[0].id;
             this.handleJump(this.tabs[0].url, this.tabs[0].urlopenmode, this.tabs[0]);
+            this.navIds = this.getId(this.menus, this.tabs[0].url, true);
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
+          this.navIds = this.getId(this.menus, node.url, true);
           break;
       }
       if (node.url) {
@@ -6630,6 +6656,13 @@ var log = util["a" /* default */].getParams('console');
 
       console.log(page);
       sessionStorage.setItem('jump', page);
+      if (res) {
+        if (res.fourthTabs && res.fourthTabs.length) {
+          this.pid = res.id;
+        } else {
+          this.pid = res.pid;
+        }
+      }
       if (util["a" /* default */].win.location.hash === page) {
         this.refresh = true;
         return;
@@ -6721,24 +6754,98 @@ var log = util["a" /* default */].getParams('console');
           break;
       }
     },
+    getFourthTabs: function getFourthTabs(menus, id) {
+      if (Array.isArray(menus)) {
+        for (var i = 0; i < menus.length; i++) {
+          var fourth = this.getFourthTabs(menus[i], id);
+          if (fourth) {
+            return fourth;
+          }
+        }
+      } else {
+        if (menus.fourthTabs && menus.fourthTabs.length) {
+          for (var _i = 0; _i < menus.fourthTabs.length; _i++) {
+            var item = menus.fourthTabs[_i];
+            if (item.id === id) {
+              return item;
+            }
+          }
+        }
+        if (menus.children && menus.children.length) {
+          for (var _i2 = 0; _i2 < menus.children.length; _i2++) {
+            var _fourth = this.getFourthTabs(menus.children[_i2], id);
+            if (_fourth) {
+              return _fourth;
+            }
+          }
+        }
+      }
+      return false;
+    },
     handleLayout: function handleLayout(res, old) {
+      this.layout = res;
       switch (res) {
         case 'topnav':
           this.navs = this.menus;
           this.tabs = [];
           this.subsystem = [];
-          switch (old) {
-            case 'subsystem':
-              break;
-            default:
-              this.topActive = this.active.length ? this.active[this.active.length - 1] : '';
-              console.log(this.active, this.topActive, 666);
+          this.topActive = this.navIds && this.navIds.length ? this.navIds[this.navIds.length - 1] : '';
+          break;
+        case 'subsystem':
+          this.subsystem = this.menus;
+          this.navs = [];
+          this.tabs = [];
+          if (this.navIds && this.navIds.length) {
+            var node = this.setTitle(this.navIds[0]);
+            this.active = JSON.parse(JSON.stringify(this.navIds)).slice(1);
+            var tabs = this.getFourthTabs(this.menus, this.pid);
+            if (tabs) {
+              this.active.pop();
+              this.tabs = tabs.fourthTabs;
+              this.tabsId = this.navIds[this.navIds.length - 1];
+            }
+            this.menu = node.children;
+            this.title = node.text;
+          } else {
+            //this.navIds = [this.menus[0].id]
+            this.menu = this.menus[0].children;
+            this.title = this.menus[0].text;
           }
           break;
+        case 'topside':
+          this.navs = this.menus;
+          this.subsystem = [];
+          this.tabs = [];
+          if (this.navIds && this.navIds.length) {
+            var _node = this.setTitle(this.navIds[0]);
+            this.active = JSON.parse(JSON.stringify(this.navIds)).slice(1);
+            var _tabs = this.getFourthTabs(this.menus, this.pid);
+            if (_tabs) {
+              this.active.pop();
+              this.tabs = _tabs.fourthTabs;
+              this.tabsId = this.navIds[this.navIds.length - 1];
+            }
+            this.topActive = this.navIds[0];
+            this.menu = _node.children;
+          } else {
+            this.menu = this.menus[0].children;
+            this.topActive = this.menus[0].id;
+          }
+          break;
+        default:
+          this.navs = [];
+          this.subsystem = [];
+          this.menu = this.menus;
+          if (this.navIds && this.navIds.length) {
+            this.active = JSON.parse(JSON.stringify(this.navIds));
+            var _tabs2 = this.getFourthTabs(this.menus, this.pid);
+            if (_tabs2) {
+              this.active.pop();
+              this.tabs = _tabs2.fourthTabs;
+              this.tabsId = this.navIds[this.navIds.length - 1];
+            }
+          }
       }
-      console.log(this.sysId, this.topActive, this.active, this.tabsId);
-      //this.setMenu(this.menus);
-      console.log(this.layout, old, this.hide);
     },
 
     //监听改变菜单
@@ -6859,43 +6966,48 @@ var log = util["a" /* default */].getParams('console');
           msg = '登录已过期，请重新登录！';
         }
       }
-      !this.timer && (this.timer = setTimeout(function () {
-        console.log('handleReLogin');
-        _this13.$confirm(msg, btn).then(function () {
-          util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-          var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
-          if (loginPage) {
-            var src = void 0;
-            if (!util["a" /* default */].startWith(loginPage, ['http', '/'])) {
-              var pathname = util["a" /* default */].win.top.location.pathname;
-              if (pathname !== '/') {
-                pathname = pathname.split('/');
-                pathname.splice(pathname.length - 1);
-                pathname = pathname.join('/');
-                src = pathname + '/' + loginPage.replace('./', '');
+      cl;
+      var remind = sessionStorage.getItem('remind');
+      if (!remind) {
+        clearTimeout(this.timer);
+        this.timer = setTimeout(function () {
+          console.log('handleReLogin');
+          sessionStorage.setItem('remind', 1);
+          _this13.$confirm(msg, btn).then(function () {
+            util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
+            var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
+            if (loginPage) {
+              var src = void 0;
+              if (!util["a" /* default */].startWith(loginPage, ['http', '/'], true)) {
+                var pathname = util["a" /* default */].win.top.location.pathname;
+                if (pathname !== '/') {
+                  pathname = pathname.split('/');
+                  pathname.splice(pathname.length - 1);
+                  pathname = pathname.join('/');
+                  src = pathname + '/' + loginPage.replace('./', '');
+                } else {
+                  src = pathname + loginPage.replace('./', '');
+                }
               } else {
-                src = pathname + loginPage.replace('./', '');
+                src = loginPage;
               }
+              util["a" /* default */].win.top.location.href = src;
+            } else if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
+              util["a" /* default */].win.top.location.href = './login.html';
             } else {
-              src = loginPage;
-            }
-            util["a" /* default */].win.top.location.href = src;
-          } else if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
-            util["a" /* default */].win.top.location.href = './login.html';
-          } else {
-            var hash = util["a" /* default */].win.top.location.hash;
-            if (hash) {
-              var len = util["a" /* default */].win.top.location.href.indexOf(hash);
-              util["a" /* default */].win.top.location.href = util["a" /* default */].win.location.href.slice(0, len) + '#/login';
-            } else {
-              util["a" /* default */].win.top.location.href = '/login.html';
+              var hash = util["a" /* default */].win.top.location.hash;
+              if (hash) {
+                var len = util["a" /* default */].win.top.location.href.indexOf(hash);
+                util["a" /* default */].win.top.location.href = util["a" /* default */].win.location.href.slice(0, len) + '#/login';
+              } else {
+                util["a" /* default */].win.top.location.href = '/login.html';
+              }
             }
-          }
-        }).catch(function (e) {
-          clearTimeout(_this13.timer);
-          _this13.timer = null;
-        });
-      }, 1000));
+          }).catch(function (e) {
+            sessionStorage.removeItem('remind');
+          });
+        }, 2000);
+      }
     },
     openPage: function openPage(url, name, width, height) {
       var src = url;