eoss-ui 0.4.51 → 0.4.53

package/lib/main.js

@@ -101,6 +101,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -204,6 +206,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -350,9 +353,9 @@ var ajax = function ajax(_ref) {
     if (!mix) {
       params = {};
     }
-    if (format && !headers) {
+    if (format && !header['content-type']) {
       data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-      header['content-type'] = 'application/x-www-form-urlencoded';
+      header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   }
   return http({
@@ -2346,120 +2349,122 @@ var watermark = function watermark(option) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return doCaLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "m", function() { return doUserLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doUserLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "l", function() { return doQrLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return logout; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Q", function() { return initLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lb", function() { return switchUserTo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return logout; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return initLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return switchUserTo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return changeImg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return getLoginCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getLoginCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doCodeLogin; });
 /* unused harmony export updateCode */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getModifyPassCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return getModifyPassCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return codeModifyPass; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return authCenter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return initModifyPassword; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doWechatQrLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return mainConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return initUserSet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return updateUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return initModifyPassword; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return doWechatQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return getTwoFactorLoginCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "m", function() { return doTwoFactorLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return mainConfig; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return initUserSet; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return updateUserInfo; });
 /* unused harmony export getUserImgUrl */
 /* unused harmony export getDoorIndex */
 /* unused harmony export refreshOnlineUsers */
 /* unused harmony export getQuickMenuIds */
 /* unused harmony export getApplicationIdArray */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return getComplexApplications; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return getComplexApplicationsNew; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return getComplexApplications; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return getComplexApplicationsNew; });
 /* unused harmony export getUserCustomInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return updateUserCustomInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return sysMsgPage; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "P", function() { return ignoreSysMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "O", function() { return ignoreAllSysMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "x", function() { return getAdjunctProperties; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return uploads; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return uploadOnlyOne; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return getAdjunctFileInfos; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return uploadSort; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return downloadByAdjunctId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return uploadDownloads; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return previewAdjunct; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return previewAdjunct2; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return previewAdjunctOffice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return updateUserCustomInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return sysMsgPage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return ignoreSysMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Q", function() { return ignoreAllSysMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return getAdjunctProperties; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ub", function() { return uploads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return uploadOnlyOne; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "x", function() { return getAdjunctFileInfos; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return uploadSort; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return downloadByAdjunctId; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return uploadDownloads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return previewAdjunct; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return previewAdjunct2; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return previewAdjunctOffice; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return delAdjunct; });
 /* unused harmony export upload_updateClassify */
 /* unused harmony export getDeleteAdjunctFileInfos */
 /* unused harmony export getPictureBase64 */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getSelectorOrgTree; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getSelectorOrgDetail; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getOrgMainTree; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "J", function() { return getSelectOrgsubids; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return findSysCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return getSelectorOrgTree; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getSelectorOrgDetail; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return getOrgMainTree; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getSelectOrgsubids; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return findSysCode; });
 /* unused harmony export findUserBaseInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return gethelpdoc; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "O", function() { return gethelpdoc; });
 /* unused harmony export getCurrentuser */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return mainDetail; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return toStartFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return tempSave; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return mainDetail; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return toStartFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return tempSave; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return commonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return addCommonOpion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return editCommonOpion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gb", function() { return saveCommonOpinion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return updateCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "q", function() { return editCommonOpion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return saveCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return updateCommonOpinion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return deleteCommonOpion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return getProcessDefList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return getNodeInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "r", function() { return findCodeValues; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "u", function() { return findSysParam; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return findSysCodes; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return getNotificationMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return getHandleInfoHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return taskHandleHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "J", function() { return getProcessDefList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return getNodeInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return findCodeValues; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return findSysParam; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "u", function() { return findSysCodes; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getNotificationMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return getHandleInfoHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return taskHandleHtml; });
 /* unused harmony export getView */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return register; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return pendedhistoryList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return toTaskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return taskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return toStartTaskRead; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return toStartTaskReadIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return taskReadHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return rejectAndEnd; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return toSendMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "kb", function() { return sendMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "q", function() { return endFlowHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return handleInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return wss; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return topic; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return getPresetCustomInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return getPresetNodeInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return toTaskTransferIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return taskTransfer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return toPresetInfoListIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gb", function() { return register; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return pendedhistoryList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return toTaskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return taskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return toStartTaskRead; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return toStartTaskReadIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return taskReadHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return rejectAndEnd; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return toSendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return sendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "r", function() { return endFlowHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "P", function() { return handleInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return loginUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vb", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return topic; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return getPresetCustomInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return getPresetNodeInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toTaskTransferIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return taskTransfer; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return toPresetInfoListIndex; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return deletePresetInfo; });
 /* unused harmony export historyListJson */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return pendedhistoryListJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return pressListJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return pendedhistoryListJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return pressListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return deleteFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return isCanStartSubFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toTaskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return taskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return toTaskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return taskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return toTaskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return taskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return toTaskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return taskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toTaskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return taskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toTwoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return twoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jb", function() { return sendList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return sendInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return isCanStartSubFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toTaskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return taskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toTaskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return taskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return toTaskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return taskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return toTaskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return taskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return toTaskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return taskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return toTwoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return twoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lb", function() { return sendList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "kb", function() { return sendInfo; });
 /* unused harmony export sendSave */
 /* unused harmony export sendUpdate */
 /* unused harmony export sendDelete */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return sendBatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return formContents; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jb", function() { return sendBatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return formContents; });
 // 登录
 var doCaLogin = '/sso2/signIn/auth/doCaLogin'; // ca登录认证
 var doUserLogin = '/sso2/signIn/auth/doUserLogin'; // 一般的账号密码认证含验证码验证
@@ -2476,6 +2481,8 @@ var codeModifyPass = '/sso2/signIn/assembly/codeModifyPass'; // 验证码重置
 var authCenter = '/sso2/authCenter/login'; // 单点登录认证中心
 var initModifyPassword = '/sso2/signIn/assembly/initModifyPassword'; // 初始化密码修改信息
 var doWechatQrLogin = '/sso2/signIn/auth/doWechatQrLogin'; // 微信扫码登录
+var getTwoFactorLoginCode = '/sso2/signIn/auth/getTwoFactorLoginCode'; // 双因素登录，通过消息中心发送登陆验证码给用户
+var doTwoFactorLogin = '/sso2/signIn/auth/doTwoFactorLogin'; // 双因素登录
 // 框架
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
@@ -2876,7 +2883,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=13aacaf9&
+// 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=c4a4a110&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2885,7 +2892,7 @@ var render = function () {
     "div",
     {
       staticClass: "es-main",
-      class: { "es-main-topside": _vm.modal === "topside" },
+      class: { "es-main-topside": _vm.layout === "topside" },
     },
     [
       _vm.showHeader
@@ -2915,7 +2922,7 @@ var render = function () {
                     )
                   )
                 : _vm._e(),
-              _vm.modal !== "topside" && _vm.logoUrl && _vm.showDefault
+              _vm.layout !== "topside" && _vm.logoUrl && _vm.showDefault
                 ? _c("img", {
                     staticClass: "es-main-logo",
                     attrs: { src: _vm.logoUrl },
@@ -2931,9 +2938,9 @@ var render = function () {
                         attrs: {
                           mode: "horizontal",
                           icons: _vm.icons,
-                          popperClass: "el-menu--popup-" + _vm.modal,
+                          popperClass: "el-menu--popup-" + _vm.layout,
                           data: _vm.navs,
-                          deep: _vm.modal === "topnav",
+                          deep: _vm.layout === "topnav",
                           "default-active": _vm.topActive,
                         },
                         on: {
@@ -3002,12 +3009,12 @@ var render = function () {
         : _vm._e(),
       _vm.reset
         ? _c("div", { staticClass: "es-main-box" }, [
-            _vm.modal !== "topnav" && _vm.showSide
+            _vm.layout !== "topnav" && _vm.showSide
               ? _c(
                   "div",
                   { staticClass: "es-main-left" },
                   [
-                    _vm.modal === "topside"
+                    _vm.layout === "topside"
                       ? _c(
                           "div",
                           { staticClass: "es-main-side" },
@@ -3064,6 +3071,7 @@ var render = function () {
                     _vm.showMenu && _vm.showDefault
                       ? _c("es-nav", {
                           attrs: {
+                            "is-top": _vm.layout == "topside",
                             data: _vm.menu,
                             "default-active": _vm.active,
                             width: _vm.navWidth,
@@ -3076,7 +3084,7 @@ var render = function () {
                           },
                           on: {
                             open: function (res) {
-                              _vm.handleSelect(res, "menu")
+                              _vm.handleSelect(res, "menu", true)
                             },
                             trigger: function (res) {
                               _vm.handleSelect(res, "sub")
@@ -3235,12 +3243,17 @@ var render = function () {
               theme: _vm.color,
               predefine: _vm.themes,
               visible: _vm.showSet,
+              layout: _vm.layout,
             },
             on: {
               "update:visible": function ($event) {
                 _vm.showSet = $event
               },
+              "update:layout": function ($event) {
+                _vm.layout = $event
+              },
               change: _vm.handleChange,
+              layout: _vm.handleLayout,
             },
           },
           "settings",
@@ -3298,7 +3311,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=13aacaf9&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=c4a4a110&
 
 // 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=327101d6&
 var userinfovue_type_template_id_327101d6_render = function () {
@@ -3547,7 +3560,7 @@ var util = __webpack_require__(0);
       var _this2 = this;
 
       util["a" /* default */].ajax({
-        url: api["S" /* initUserSet */]
+        url: api["U" /* initUserSet */]
       }).then(function (res) {
         if (res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
@@ -3585,7 +3598,7 @@ var util = __webpack_require__(0);
       if (res.url) {
         url = res.url;
       } else {
-        url = api["o" /* downloadByAdjunctId */] + '?adjunctId=' + res.adjunctId;
+        url = api["p" /* downloadByAdjunctId */] + '?adjunctId=' + res.adjunctId;
       }
       this.$emit('change', 'userHeadUrl', url);
     },
@@ -3594,7 +3607,7 @@ var util = __webpack_require__(0);
 
       switch (type) {
         case 'job':
-          util["a" /* default */].ajax({ url: api["lb" /* switchUserTo */], params: { userId: value.value } }).then(function (res) {
+          util["a" /* default */].ajax({ url: api["nb" /* switchUserTo */], params: { userId: value.value } }).then(function (res) {
             if (res.rCode == 0) {
               util["a" /* default */].setStorage({
                 type: _this3.storage,
@@ -3634,7 +3647,7 @@ var util = __webpack_require__(0);
       var initLogin = util["a" /* default */].getStorage('initLogin');
       initLogin && (initLogin = JSON.parse(initLogin));
       util["a" /* default */].ajax({
-        url: api["Ob" /* updateUserInfo */],
+        url: api["Qb" /* updateUserInfo */],
         params: {
           email: this.values.email,
           officeTel: this.values.officetel,
@@ -3679,7 +3692,7 @@ var util = __webpack_require__(0);
             var notify = _this4.values.notify.sort().join(',');
             if (notify != _this4.notify.split(',').sort().join(',')) {
               util["a" /* default */].ajax({
-                url: api["Nb" /* updateUserCustomInfo */],
+                url: api["Pb" /* updateUserCustomInfo */],
                 params: {
                   notify: notify
                 }
@@ -3740,8 +3753,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var userinfo = (component.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/settings.vue?vue&type=template&id=ff684db0&
-var settingsvue_type_template_id_ff684db0_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/settings.vue?vue&type=template&id=3c983b8c&
+var settingsvue_type_template_id_3c983b8c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3835,7 +3848,33 @@ var settingsvue_type_template_id_ff684db0_render = function () {
                   placement: "bottom",
                 },
               },
-              [_c("div", { staticClass: "es-setting-navs es-setting-top-nav" })]
+              [
+                _c(
+                  "div",
+                  {
+                    staticClass: "es-setting-navs es-setting-top-nav",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("topnav")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.activeName == "topnav",
+                          expression: "activeName == 'topnav'",
+                        },
+                      ],
+                      staticClass: "es-icon-gou",
+                    }),
+                  ]
+                ),
+              ]
             ),
             _c(
               "el-tooltip",
@@ -3843,15 +3882,112 @@ var settingsvue_type_template_id_ff684db0_render = function () {
                 staticClass: "es-setting-navs-item",
                 attrs: {
                   effect: "dark",
-                  content: "侧边菜单布局",
+                  content: "侧边双列菜单布局",
                   placement: "bottom",
                 },
               },
               [
                 _c(
                   "div",
-                  { staticClass: "es-setting-navs es-setting-side-nav" },
-                  [_c("div", { staticClass: "es-setting-side-sub-nav" })]
+                  {
+                    staticClass: "es-setting-navs es-setting-side-nav",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("default")
+                      },
+                    },
+                  },
+                  [
+                    _c("div", { staticClass: "es-setting-side-sub-nav" }),
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.activeName == "default",
+                          expression: "activeName == 'default'",
+                        },
+                      ],
+                      staticClass: "es-icon-gou",
+                    }),
+                  ]
+                ),
+              ]
+            ),
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "子系统+侧边菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [
+                _c(
+                  "div",
+                  {
+                    staticClass: "es-setting-navs es-setting-subsystem-nav",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("subsystem")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.activeName == "subsystem",
+                          expression: "activeName == 'subsystem'",
+                        },
+                      ],
+                      staticClass: "es-icon-gou",
+                    }),
+                  ]
+                ),
+              ]
+            ),
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "顶部+侧边菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [
+                _c(
+                  "div",
+                  {
+                    staticClass: "es-setting-navs es-setting-top-side-nav",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("topside")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.activeName == "topside",
+                          expression: "activeName == 'topside'",
+                        },
+                      ],
+                      staticClass: "es-icon-gou",
+                    }),
+                  ]
                 ),
               ]
             ),
@@ -3862,11 +3998,11 @@ var settingsvue_type_template_id_ff684db0_render = function () {
     ]
   )
 }
-var settingsvue_type_template_id_ff684db0_staticRenderFns = []
-settingsvue_type_template_id_ff684db0_render._withStripped = true
+var settingsvue_type_template_id_3c983b8c_staticRenderFns = []
+settingsvue_type_template_id_3c983b8c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=ff684db0&
+// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=3c983b8c&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=script&lang=js&
 //
@@ -3929,6 +4065,41 @@ settingsvue_type_template_id_ff684db0_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var settingsvue_type_script_lang_js_ = ({
@@ -3945,6 +4116,10 @@ settingsvue_type_template_id_ff684db0_render._withStripped = true
       default: function _default() {
         return ['#a60006', '#409eff'];
       }
+    },
+    layout: {
+      type: String,
+      default: 'default'
     }
   },
   computed: {
@@ -3978,7 +4153,8 @@ settingsvue_type_template_id_ff684db0_render._withStripped = true
   },
   data: function data() {
     return {
-      color: ''
+      color: '',
+      activeName: this.layout
     };
   },
   mounted: function mounted() {},
@@ -3993,6 +4169,14 @@ settingsvue_type_template_id_ff684db0_render._withStripped = true
       this.color = res;
       this.$emit('change', { type: 'theme', value: res });
       //this.setTheme(res);
+    },
+
+    //选择菜单布局
+    handleLayout: function handleLayout(res) {
+      var old = this.activeName;
+      this.activeName = res;
+      this.$emit('update:layout', res);
+      this.$emit('layout', res, old);
     }
   }
 });
@@ -4008,8 +4192,8 @@ settingsvue_type_template_id_ff684db0_render._withStripped = true
 
 var settings_component = Object(componentNormalizer["a" /* default */])(
   src_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_ff684db0_render,
-  settingsvue_type_template_id_ff684db0_staticRenderFns,
+  settingsvue_type_template_id_3c983b8c_render,
+  settingsvue_type_template_id_3c983b8c_staticRenderFns,
   false,
   null,
   null,
@@ -4303,7 +4487,7 @@ messagevue_type_template_id_6b9d422c_render._withStripped = true
       if (this.pageNum <= this.pageCount) {
         this.loading = true;
         util["a" /* default */].ajax({
-          url: api["mb" /* sysMsgPage */],
+          url: api["ob" /* sysMsgPage */],
           params: {
             pageNum: reload ? 1 : this.pageNum,
             pageSize: this.pageSize
@@ -4336,7 +4520,7 @@ messagevue_type_template_id_6b9d422c_render._withStripped = true
       var _this2 = this;
 
       util["a" /* default */].ajax({
-        url: api["P" /* ignoreSysMsg */],
+        url: api["R" /* ignoreSysMsg */],
         params: {
           id: res.id
         }
@@ -4356,7 +4540,7 @@ messagevue_type_template_id_6b9d422c_render._withStripped = true
       var _this3 = this;
 
       util["a" /* default */].ajax({
-        url: api["O" /* ignoreAllSysMsg */]
+        url: api["Q" /* ignoreAllSysMsg */]
       }).then(function (res) {
         _this3.count = 0;
         _this3.msgs = [];
@@ -4676,7 +4860,7 @@ noticevue_type_template_id_b4f91b8e_render._withStripped = true
       var _this = this;
 
       util["a" /* default */].ajax({
-        url: api["O" /* ignoreAllSysMsg */]
+        url: api["Q" /* ignoreAllSysMsg */]
       }).then(function (res) {
         _this.count = 0;
         _this.msgs = [];
@@ -5166,6 +5350,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
+//
 
 
 
@@ -5268,7 +5455,7 @@ var log = util["a" /* default */].getParams('console');
     //获取用户信息的接口
     mainConfig: {
       type: String,
-      default: api["W" /* mainConfig */]
+      default: api["Y" /* mainConfig */]
     },
     iframeId: {
       type: String,
@@ -5306,10 +5493,6 @@ var log = util["a" /* default */].getParams('console');
     }
   },
   computed: {
-    //菜单类型
-    modal: function modal() {
-      return this.scene.toLowerCase();
-    },
     showHeader: function showHeader() {
       return this.isHeader == 0 ? false : this.header;
     },
@@ -5329,10 +5512,11 @@ var log = util["a" /* default */].getParams('console');
       return true;
     },
     navWidth: function navWidth() {
-      return this.modal === 'topside' ? '230px' : undefined;
+      console.log(this.layout === 'topside' ? '230px' : undefined, 9000);
+      return this.layout === 'topside' ? '230px' : undefined;
     },
     showNavTitle: function showNavTitle() {
-      return this.modal !== 'topside';
+      return this.layout !== 'topside';
     },
 
     //tabs菜单
@@ -5346,14 +5530,14 @@ var log = util["a" /* default */].getParams('console');
         return this.menuUrl;
       }
       if (this.application) {
-        return api["z" /* getComplexApplicationsNew */];
+        return api["A" /* getComplexApplicationsNew */];
       }
-      return api["y" /* getComplexApplications */];
+      return api["z" /* getComplexApplications */];
     },
 
     //是否双列右侧菜单
     biserial: function biserial() {
-      if (this.modal === 'subsystem' || this.modal === 'topside' || this.application) {
+      if (this.layout === 'subsystem' || this.layout === 'topside' || this.application) {
         return false;
       } else {
         return true;
@@ -5362,13 +5546,13 @@ var log = util["a" /* default */].getParams('console');
 
     //隐藏操作按键
     hide: function hide() {
-      if (this.modal === 'subsystem' || this.application) {
+      if (this.layout === 'subsystem' || this.application) {
         if (this.hides && Object.keys(this.hides).length) {
           return _extends({}, this.hides, { set: !this.set, system: false });
         } else {
           return { set: !this.set, system: false };
         }
-      } else if (this.modal === 'topside') {
+      } else if (this.layout === 'topside') {
         if (this.hides && Object.keys(this.hides).length) {
           return _extends({}, this.hides, {
             set: !this.set,
@@ -5428,6 +5612,7 @@ var log = util["a" /* default */].getParams('console');
   },
   data: function data() {
     return {
+      layout: this.scene.toLowerCase(),
       showDefault: false,
       themeJSON: {
         logo: { comp: '', data: {} },
@@ -5511,7 +5696,8 @@ var log = util["a" /* default */].getParams('console');
       defaultwjprops: {},
       isTabs: false,
       isHeader: '',
-      isSide: null
+      isSide: null,
+      navIds: null
     };
   },
   created: function created() {
@@ -5554,7 +5740,7 @@ var log = util["a" /* default */].getParams('console');
       var _this = this;
 
       var params = {
-        url: api["X" /* mainDetail */],
+        url: api["Z" /* mainDetail */],
         params: { id: id }
       };
       util["a" /* default */].ajax(params).then(function (res) {
@@ -5654,7 +5840,7 @@ var log = util["a" /* default */].getParams('console');
         return;
       }
       util["a" /* default */].ajax({
-        url: api["Nb" /* updateUserCustomInfo */],
+        url: api["Pb" /* updateUserCustomInfo */],
         params: { color: escape(color.toLowerCase()) },
         data: { color: escape(color.toLowerCase()) }
       }).then(function (res) {
@@ -5794,11 +5980,22 @@ var log = util["a" /* default */].getParams('console');
         }
       });
     },
-    jumpMenu: function jumpMenu(res) {
+    jumpMenu: function jumpMenu(res, flag) {
+      var ids = void 0;
       if (typeof res === 'string') {
-        res = res.split(',');
+        if (flag) {
+          ids = this.getId(this.menus, res, true);
+          if (!ids) {
+            this.$message.error('未在菜单栏中找到此地址');
+            return;
+          }
+        } else {
+          ids = res.split(',');
+        }
+      } else {
+        ids = res;
       }
-      this.setDefault(this.menus, res);
+      this.setDefault(this.menus, ids);
     },
     getId: function getId(arry, res, path) {
       if (!res) {
@@ -5897,6 +6094,7 @@ 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);
@@ -5917,14 +6115,16 @@ var log = util["a" /* default */].getParams('console');
         } else {
           this.isDefault = false;
         }
-        if (this.modal === 'subsystem' || this.modal === 'topside') {
-          if (this.modal === 'subsystem') {
+        if (this.layout === 'subsystem' || this.layout === 'topside') {
+          if (this.layout === 'subsystem') {
+            this.navs = [];
             if (this.menuType === 'custom') {
               this.subsystem = this.customMenu;
             } else {
               this.subsystem = res;
             }
-          } else if (this.modal === 'topside') {
+          } else if (this.layout === 'topside') {
+            this.subsystem = [];
             if (this.menuType === 'custom') {
               this.navs = this.customMenu;
               this.topActive = res[0].id;
@@ -5946,21 +6146,23 @@ var log = util["a" /* default */].getParams('console');
             this.title = res[0].text;
           }
           if (!this.isDefault) {
-            this.active = this.getFirst(this.menu[0]);
+            this.active = this.getFirst(this.menu[0]).id;
           }
-        } else if (this.modal === 'topnav') {
+        } else if (this.layout === 'topnav') {
           if (this.menuType === 'custom') {
             this.navs = this.customMenu;
-            this.topActive = this.getFirst(res[0]);
+            this.topActive = this.getFirst(res[0]).id;
           } else {
             this.navs = res;
-            this.topActive = this.getFirst(res[0]);
+            this.topActive = this.getFirst(res[0]).id;
           }
         } else {
+          this.nav = [];
+          this.subsystem = [];
           this.menu = res;
           if (!this.isDefault) {
             this.active = [this.menu[0].id];
-            var id = this.getFirst(this.menu[0]);
+            var id = this.getFirst(this.menu[0]).id;
             if (id && this.menu[0].id !== id) {
               this.active.push(id);
             } else {
@@ -5979,7 +6181,7 @@ var log = util["a" /* default */].getParams('console');
       if (obj.children && obj.children.length) {
         return this.getFirst(obj.children[0]);
       } else if (obj.fourthTabs && obj.fourthTabs.length) {
-        if (this.modal === 'topnav') {
+        if (this.layout === 'topnav') {
           return this.getFirst(obj.fourthTabs[0]);
         } else {
           this.tabs = obj.fourthTabs;
@@ -5995,12 +6197,11 @@ var log = util["a" /* default */].getParams('console');
             this.tabsId = this.tabs[0].id;
             this.handleJump(this.tabs[0].url, this.tabs[0].urlopenmode, this.tabs[0]);
           }
-          return obj.id;
         }
       } else {
         this.handleJump(obj.url, obj.urlopenmode, obj);
       }
-      return obj.id;
+      return obj;
     },
 
     //遍历设置菜单气泡提醒
@@ -6053,8 +6254,9 @@ var log = util["a" /* default */].getParams('console');
       this.tabsId = '';
       this.active = '';
       this.getUrl(res, active);
-      if (this.modal === 'subsystem' || this.modal === 'subSystem' || this.modal === 'topnav' || this.modal === 'topNav' || this.modal === 'topside' || this.modal === 'topSide') {
-        if (this.modal === 'subsystem' || this.modal === 'subSystem') {
+      if (this.layout === 'subsystem' || this.layout === 'subSystem' || this.layout === 'topnav' || this.layout === 'topNav' || this.layout === 'topside' || this.layout === 'topSide') {
+        if (this.layout === 'subsystem' || this.layout === 'subSystem') {
+          this.navs = [];
           if (this.menuType === 'custom') {
             this.subsystem = this.customMenu;
             this.sysId = active[0];
@@ -6062,7 +6264,8 @@ var log = util["a" /* default */].getParams('console');
             this.subsystem = res;
             this.sysId = active[0];
           }
-        } else if (this.modal === 'topnav' || this.modal === 'topNav' || this.modal === 'topside' || this.modal === 'topSide') {
+        } else if (this.layout === 'topnav' || this.layout === 'topNav' || this.layout === 'topside' || this.layout === 'topSide') {
+          this.subsystem = [];
           if (this.menuType === 'custom') {
             this.navs = this.customMenu;
             this.topActive = active[0];
@@ -6085,6 +6288,8 @@ var log = util["a" /* default */].getParams('console');
           }
         }
       } else {
+        this.navs = [];
+        this.subsystem = [];
         this.menu = res;
         if (this.biserial) {
           this.active = active.slice(0, active.length > 2 ? active.length - 1 : active.length);
@@ -6139,28 +6344,40 @@ 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) {
+    handleSelect: function handleSelect(res, type, open) {
+      console.log(type);
       var node = res.node;
 
-      if (node.extendData && node.extendData.businessStatus == 0 && node.extendData.businessWarnMsg) {
-        this.$alert(node.extendData.businessWarnMsg, '提示', {
-          type: 'warning'
-        });
-        return;
+      if (!open) {
+        if (node.extendData && node.extendData.businessStatus == 0 && node.extendData.businessWarnMsg) {
+          this.$alert(node.extendData.businessWarnMsg, '提示', {
+            type: 'warning'
+          });
+          return;
+        }
+        this.isDefault = false;
+        this.tabsId = '';
       }
-      this.isDefault = false;
-      this.tabsId = '';
       switch (type) {
         case 'nav':
           this.tabs = [];
           this.active = '';
-          if (this.modal === 'topside') {
+          if (this.layout === 'topside') {
+            this.navIds = [node.id];
             this.menu = node.children;
             this.title = node.text;
-            this.active = this.getFirst(node.children[0]);
+            var subNode = this.getFirst(node.children[0]);
+            if (subNode) {
+              this.active = subNode.id;
+              this.navIds = [node.id].concat(this.getId(subNode.url));
+            }
           } 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;
@@ -6179,31 +6396,37 @@ var log = util["a" /* default */].getParams('console');
           }
           break;
         case 'sys':
+          this.navIds = [node.id];
           this.tabs = [];
           this.menu = node.children;
           this.title = node.text;
-          this.active = this.getFirst(node.children[0]);
+          this.active = this.getFirst(node.children[0]).id;
           this.isSide = true;
           break;
         case 'sub':
+          this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
           }
           if (this.setFirstAsDefault) {
-            var id = this.getFirst(node);
-            if (node.id !== id) {
-              this.$set(this.active, 0, node.id);
-              this.$set(this.active, 1, id);
+            var _subNode = this.getFirst(node);
+            this.$set(this.active, 0, node.id);
+            if (_subNode && node.id !== _subNode.id) {
+              console.log(_subNode, _subNode.url);
+              console.log(this.getId(this.menus, _subNode.url, true));
+              this.$set(this.active, 1, _subNode.id);
             }
           }
           break;
         case 'menu':
-          this.tabs = [];
-          if (this.setFirstAsDefault) {
-            if (this.biserial) {
-              this.$set(this.active, 1, node.id);
-            } else {
-              this.active = node.id;
+          if (!open) {
+            this.tabs = [];
+            if (this.setFirstAsDefault) {
+              if (this.biserial) {
+                this.$set(this.active, 1, node.id);
+              } else {
+                this.active = node.id;
+              }
             }
           }
           if (node.url) {
@@ -6432,6 +6655,25 @@ var log = util["a" /* default */].getParams('console');
           break;
       }
     },
+    handleLayout: function handleLayout(res, old) {
+      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);
+          }
+          break;
+      }
+      console.log(this.sysId, this.topActive, this.active, this.tabsId);
+      //this.setMenu(this.menus);
+      console.log(this.layout, old, this.hide);
+    },
 
     //监听改变菜单
     handleListener: function handleListener() {
@@ -6453,7 +6695,7 @@ var log = util["a" /* default */].getParams('console');
     initWebSocket: function initWebSocket() {
       //初始化weosocket
       if (!this.websocket) {
-        var url = (util["a" /* default */].getStorage('wshost') || '') + api["Tb" /* wss */];
+        var url = (util["a" /* default */].getStorage('wshost') || '') + api["Vb" /* wss */];
         this.websocket = new external_sockjs_client_default.a(url);
       }
       this.client = external_stompjs_default.a.over(this.websocket);
@@ -6468,7 +6710,7 @@ var log = util["a" /* default */].getParams('console');
       client.connect({}, function () {
         //localStorage.setItem("socket",true);
         //订阅服务端的
-        client.subscribe(api["Kb" /* topic */], function (response) {
+        client.subscribe(api["Mb" /* topic */], function (response) {
           var res = JSON.parse(response.body);
           var data = res.data;
           for (var i in data) {