eoss-ui 0.5.97 → 0.5.99

package/lib/eoss-ui.common.js

@@ -2174,6 +2174,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2272,7 +2273,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
@@ -2675,7 +2679,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3838,7 +3842,7 @@ module.exports = require("vue");
 /* 15 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("[\"zuomian\",\"monitor\",\"maximize\",\"pointer-up\",\"pointer-left\",\"pointer-down\",\"tri-down\",\"retrograde\",\"rainfall\",\"caveat\",\"print\",\"alarm\",\"table\",\"duigouquan\",\"bumen\",\"mm\",\"accelerate\",\"quanping\",\"password\",\"qing\",\"kaifa\",\"daoru\",\"piaochongicon\",\"instructions\",\"notice\",\"wifi\",\"tishicuo\",\"minganciguanli\",\"switch-off\",\"switch-on\",\"narrow\",\"yidongduan\",\"web\",\"upload\",\"message\",\"go-back\",\"close\",\"shujutongji\",\"folder\",\"edit\",\"enter\",\"dian\",\"wendu\",\"shangwu\",\"shenbao\",\"magnifier\",\"project-add\",\"xiexian\",\"caidan\",\"tupian\",\"yinyu\",\"wenhao\",\"template\",\"daiban\",\"set\",\"zhengwen\",\"cuowu\",\"chenggong\",\"indent\",\"increase\",\"ziliaoku\",\"tuichu\",\"quit\",\"leaf\",\"refresh\",\"statistic\",\"gengduo\",\"lvyou\",\"mail\",\"user\",\"zhishi\",\"weizhi\",\"jinggao\",\"zuzhijigou\",\"xue\",\"fenxiang\",\"jinrong\",\"shanchu\",\"jianhao\",\"jiahao\",\"yinzhang\",\"renyuanqiehuan\",\"gouxuanzhong1\",\"circle\",\"fuxuankuang1\",\"fangkuang\",\"application\",\"wenjianjia\",\"jiaren\",\"xiugai\",\"duanxinguanli\",\"workbench\",\"rizhi\",\"gongwen\",\"qingshi\",\"shiwu\",\"official\",\"baogao\",\"document\",\"wodeyouxiang\",\"ziliaojiaohuan\",\"denglu\",\"podium\",\"fangkuai\",\"xuewei\",\"duoyun\",\"pm\",\"xiajia\",\"huanbao\",\"dunpai\",\"shu\",\"gongzuozheng\",\"more\",\"fenlei\",\"delete\",\"fengsu\",\"bar\",\"yuanqu\",\"duomeiti\",\"youjian\",\"qiye\",\"zuixinzixun\",\"biaoge\",\"omit\",\"diaotou\",\"jiantou-left\",\"jiantou-right\",\"jiantou-up\",\"roles\",\"jiantou-next\",\"chijiuhuacunchu\",\"zhuanhuan\",\"cloudy\",\"form\",\"wuye\",\"tri-up\",\"pointer-right\",\"bianji\",\"tri-right\",\"tri-left\",\"daimaguanli\",\"jiankong\",\"kaifazhong\",\"fujian\",\"bingtu\",\"zhuzhuangtu\",\"lose\",\"rmb\",\"move\",\"xiazai\",\"yiban\",\"laoshi\",\"clear\",\"jinyong\",\"yunxing\",\"weihu\",\"chakan\",\"pifu\",\"ren\",\"gouwuche\",\"loading2\",\"yulan\",\"ziliao\",\"yidong\",\"fenxiang11\",\"kaoqin\",\"change\",\"shidu\",\"portfolio\",\"info\",\"yanjing\",\"laba\",\"camera\",\"xitongxiaoxi\",\"xitongguanli\",\"webduan\",\"wagnz\",\"group\",\"shengqian\",\"jiantou-prev\",\"attention\",\"look\",\"guanzhu\",\"daikuan\",\"tubiao\",\"duigou\",\"star\",\"dayin\",\"xinzeng\",\"reduce\",\"goup\",\"calendar\",\"tree\",\"yingyong\",\"caution\",\"zhuanfa\",\"add\",\"zongtiqixian\",\"daochu\",\"gongwu\",\"ihouse\",\"chilun\",\"weixiu\",\"chengguo\",\"trophy\",\"duiwu\",\"qiehuanjiaose\",\"door\",\"shebei\",\"fangjian\",\"microscope\",\"huaxue\",\"shiyanshianquan\",\"shiyan\",\"qiyexinxi\",\"yewuxinxi\",\"lab\",\"shiyanguanli\",\"yuqing\",\"big-screen\",\"signal-search\",\"database\",\"star-mark\",\"cng\",\"professor\",\"informatization\",\"code\",\"science\",\"price\",\"xunhuan\",\"savings\",\"administration\",\"aid\",\"biao\",\"line\",\"xietong\",\"jingzheng\",\"enterprise\",\"datatable\",\"toubiao\",\"bingdu\",\"keji2\",\"qiyeku5\",\"touzi5\",\"zijinliu\",\"zhishichanquan3\",\"kejifuwu2\",\"zhishichanquan2\",\"zijinanquan\",\"kejifuwu1\",\"geju\",\"yiqingfangkong\",\"kejifuwu\",\"anquanfangkong\",\"shujufuwu\",\"shujuceng\",\"shujugongxiang\",\"flows\",\"setup\",\"shujulian\",\"caiwujianguan\",\"caiwuliushui\",\"mubiaogeju\",\"juxing\",\"fuwuqi\",\"touzijigou\",\"xiezilou\",\"jianzhu\",\"logo\",\"touzhi\",\"zijin\",\"fintech\",\"touzixiangmu\",\"library\",\"touziguanli\",\"zhongda\",\"ziyuan\",\"shujutai\",\"shujudongtai\",\"bank\",\"shujuzhongxin\",\"zhongyaomubiao\",\"touzishijian\",\"caiwuguanli\",\"mingzhong\",\"touzishenpi\",\"jingzhenggeju\",\"property\",\"keji\",\"qiyeku\",\"zhongyaojihui\",\"touzilicai\",\"zhishichanquan\",\"touzi\",\"tzz\",\"menu\",\"xiangmushu\",\"pdf\",\"jiazai\",\"gongsi\",\"rise\",\"jbxx\",\"zwxx\",\"jypx\",\"jcgl\",\"ndkh\",\"grjl\",\"shgx\",\"gou\",\"shijian\",\"fukuan\",\"guoji\",\"shoukuan\",\"down\",\"gongzuotai\",\"gaigedongtai\",\"xitongshezhi\",\"relation\",\"zuzhirenshi\",\"kaohepingjia\",\"caiwujiandu\",\"sanzhongyida\",\"mima\",\"xianshi\",\"zhanghao\",\"bangongshi\",\"checked\",\"checke\",\"help\",\"kuoda\",\"banli\",\"xiaoxi\",\"shouqicaidan\",\"shouqicaidan-right\",\"smile\",\"tongzhi\",\"guanji\",\"shuaxin\",\"guiji\",\"tianjiawenjianjia\",\"yunxiazai\",\"del\",\"touzifangan\",\"zongheguanli\",\"sanzhongyida_mian\",\"gongwenguanli1\",\"heguiguanli\",\"jingyingfenxi\",\"txl\",\"diannao\",\"renliziyuan\",\"caiwuxitong\",\"shiwuguanli\",\"shouye\",\"bangongyongpin\",\"sidebar\",\"zhidulashi\",\"log\",\"fawenguanli\",\"huiyiguanli\",\"zuzhishishi\",\"gongwenqianshou\",\"jinxiupeixun\",\"gongwenbao\",\"jiaohuan\",\"daibanshixiang\",\"richeng\",\"tongxunlu\",\"yongche\",\"yanzheng\",\"daibanxinxi\",\"shuben\",\"fanfu\",\"guangbo\",\"shuzhuangtu\",\"bengqiye\",\"tongguo\",\"dengdai\",\"cross\",\"daichuli\",\"zhenggai\",\"shouli\",\"shujuhecha\",\"guanli\",\"paper-file\",\"wenjian\",\"dakaiwenjian\",\"yewu\",\"jiance\",\"jiheguanli\",\"jinru\",\"arrow-right\",\"lingdao\",\"rencai\",\"prev\",\"next\",\"jianpan\",\"qrcode\",\"bohui\",\"homepage\",\"download\",\"gantanhao\",\"dingding\",\"weixin\",\"pad\",\"ios\",\"android\",\"txt\",\"doc\",\"audioo\",\"video\",\"zip\",\"shuru\",\"duanxin\",\"saoma\",\"youxiang\",\"word\",\"excel\",\"fileword\",\"picture\",\"ppt\",\"ca\",\"usb-key\",\"wenjianjiadakai\",\"yingyonglan\",\"home\"]");
+module.exports = JSON.parse("[\"zuomian\",\"monitor\",\"maximize\",\"pointer-up\",\"pointer-left\",\"pointer-down\",\"tri-down\",\"retrograde\",\"rainfall\",\"caveat\",\"print\",\"alarm\",\"table\",\"duigouquan\",\"bumen\",\"mm\",\"accelerate\",\"quanping\",\"password\",\"qing\",\"kaifa\",\"daoru\",\"piaochongicon\",\"instructions\",\"notice\",\"wifi\",\"tishicuo\",\"minganciguanli\",\"switch-off\",\"switch-on\",\"narrow\",\"yidongduan\",\"web\",\"upload\",\"message\",\"go-back\",\"close\",\"shujutongji\",\"folder\",\"edit\",\"enter\",\"dian\",\"wendu\",\"shangwu\",\"shenbao\",\"magnifier\",\"project-add\",\"xiexian\",\"caidan\",\"tupian\",\"yinyu\",\"wenhao\",\"template\",\"daiban\",\"set\",\"zhengwen\",\"cuowu\",\"chenggong\",\"indent\",\"increase\",\"ziliaoku\",\"tuichu\",\"quit\",\"leaf\",\"refresh\",\"statistic\",\"gengduo\",\"lvyou\",\"mail\",\"user\",\"zhishi\",\"weizhi\",\"jinggao\",\"zuzhijigou\",\"xue\",\"fenxiang\",\"jinrong\",\"shanchu\",\"jianhao\",\"jiahao\",\"yinzhang\",\"renyuanqiehuan\",\"gouxuanzhong1\",\"circle\",\"fuxuankuang1\",\"fangkuang\",\"application\",\"wenjianjia\",\"jiaren\",\"xiugai\",\"duanxinguanli\",\"workbench\",\"rizhi\",\"gongwen\",\"qingshi\",\"shiwu\",\"official\",\"baogao\",\"document\",\"wodeyouxiang\",\"ziliaojiaohuan\",\"denglu\",\"podium\",\"fangkuai\",\"xuewei\",\"duoyun\",\"pm\",\"xiajia\",\"huanbao\",\"dunpai\",\"shu\",\"gongzuozheng\",\"more\",\"fenlei\",\"delete\",\"fengsu\",\"bar\",\"yuanqu\",\"duomeiti\",\"youjian\",\"qiye\",\"zuixinzixun\",\"biaoge\",\"omit\",\"diaotou\",\"jiantou-left\",\"jiantou-right\",\"jiantou-up\",\"roles\",\"jiantou-next\",\"chijiuhuacunchu\",\"zhuanhuan\",\"cloudy\",\"form\",\"wuye\",\"tri-up\",\"pointer-right\",\"bianji\",\"tri-right\",\"tri-left\",\"daimaguanli\",\"jiankong\",\"kaifazhong\",\"fujian\",\"bingtu\",\"zhuzhuangtu\",\"lose\",\"rmb\",\"move\",\"xiazai\",\"yiban\",\"laoshi\",\"clear\",\"jinyong\",\"yunxing\",\"weihu\",\"chakan\",\"pifu\",\"ren\",\"gouwuche\",\"loading2\",\"yulan\",\"ziliao\",\"yidong\",\"fenxiang11\",\"kaoqin\",\"change\",\"shidu\",\"portfolio\",\"info\",\"yanjing\",\"laba\",\"camera\",\"xitongxiaoxi\",\"xitongguanli\",\"webduan\",\"wagnz\",\"group\",\"shengqian\",\"jiantou-prev\",\"attention\",\"look\",\"guanzhu\",\"daikuan\",\"tubiao\",\"duigou\",\"star\",\"dayin\",\"xinzeng\",\"reduce\",\"goup\",\"calendar\",\"tree\",\"yingyong\",\"caution\",\"zhuanfa\",\"add\",\"zongtiqixian\",\"daochu\",\"gongwu\",\"ihouse\",\"chilun\",\"weixiu\",\"chengguo\",\"trophy\",\"duiwu\",\"qiehuanjiaose\",\"door\",\"shebei\",\"fangjian\",\"microscope\",\"huaxue\",\"shiyanshianquan\",\"shiyan\",\"qiyexinxi\",\"yewuxinxi\",\"lab\",\"shiyanguanli\",\"yuqing\",\"big-screen\",\"signal-search\",\"database\",\"star-mark\",\"cng\",\"professor\",\"informatization\",\"code\",\"science\",\"price\",\"xunhuan\",\"savings\",\"administration\",\"aid\",\"biao\",\"line\",\"xietong\",\"jingzheng\",\"enterprise\",\"datatable\",\"toubiao\",\"bingdu\",\"keji2\",\"qiyeku5\",\"touzi5\",\"zijinliu\",\"zhishichanquan3\",\"kejifuwu2\",\"zhishichanquan2\",\"zijinanquan\",\"kejifuwu1\",\"geju\",\"yiqingfangkong\",\"kejifuwu\",\"anquanfangkong\",\"shujufuwu\",\"shujuceng\",\"shujugongxiang\",\"flows\",\"setup\",\"shujulian\",\"caiwujianguan\",\"caiwuliushui\",\"mubiaogeju\",\"juxing\",\"fuwuqi\",\"touzijigou\",\"xiezilou\",\"jianzhu\",\"logo\",\"touzhi\",\"zijin\",\"fintech\",\"touzixiangmu\",\"library\",\"touziguanli\",\"zhongda\",\"ziyuan\",\"shujutai\",\"shujudongtai\",\"bank\",\"shujuzhongxin\",\"zhongyaomubiao\",\"touzishijian\",\"caiwuguanli\",\"mingzhong\",\"touzishenpi\",\"jingzhenggeju\",\"property\",\"keji\",\"qiyeku\",\"zhongyaojihui\",\"touzilicai\",\"zhishichanquan\",\"touzi\",\"tzz\",\"menu\",\"xiangmushu\",\"pdf\",\"jiazai\",\"gongsi\",\"rise\",\"jbxx\",\"zwxx\",\"jypx\",\"jcgl\",\"ndkh\",\"grjl\",\"shgx\",\"gou\",\"shijian\",\"fukuan\",\"guoji\",\"shoukuan\",\"down\",\"gongzuotai\",\"gaigedongtai\",\"xitongshezhi\",\"relation\",\"zuzhirenshi\",\"kaohepingjia\",\"caiwujiandu\",\"sanzhongyida\",\"mima\",\"xianshi\",\"zhanghao\",\"bangongshi\",\"checked\",\"checke\",\"help\",\"kuoda\",\"banli\",\"xiaoxi\",\"shouqicaidan\",\"shouqicaidan-right\",\"smile\",\"tongzhi\",\"guanji\",\"shuaxin\",\"guiji\",\"tianjiawenjianjia\",\"yunxiazai\",\"del\",\"touzifangan\",\"zongheguanli\",\"sanzhongyida_mian\",\"gongwenguanli1\",\"heguiguanli\",\"jingyingfenxi\",\"txl\",\"diannao\",\"renliziyuan\",\"caiwuxitong\",\"shiwuguanli\",\"shouye\",\"bangongyongpin\",\"sidebar\",\"zhidulashi\",\"log\",\"fawenguanli\",\"huiyiguanli\",\"zuzhishishi\",\"gongwenqianshou\",\"jinxiupeixun\",\"gongwenbao\",\"jiaohuan\",\"daibanshixiang\",\"richeng\",\"tongxunlu\",\"yongche\",\"yanzheng\",\"daibanxinxi\",\"shuben\",\"fanfu\",\"guangbo\",\"shuzhuangtu\",\"bengqiye\",\"tongguo\",\"dengdai\",\"cross\",\"daichuli\",\"zhenggai\",\"shouli\",\"shujuhecha\",\"guanli\",\"paper-file\",\"wenjian\",\"dakaiwenjian\",\"yewu\",\"jiance\",\"jiheguanli\",\"jinru\",\"arrow-right\",\"lingdao\",\"rencai\",\"prev\",\"next\",\"jianpan\",\"qrcode\",\"bohui\",\"homepage\",\"download\",\"gantanhao\",\"dingding\",\"weixin\",\"pad\",\"ios\",\"android\",\"txt\",\"doc\",\"audioo\",\"video\",\"zip\",\"shuru\",\"duanxin\",\"saoma\",\"youxiang\",\"word\",\"excel\",\"fileword\",\"picture\",\"ppt\",\"ca\",\"usb-key\",\"wenjianjiadakai\",\"yingyonglan\",\"home\",\"tiyanxinban\",\"shiyongjiuban\"]");
 
 /***/ }),
 /* 16 */
@@ -3868,7 +3872,7 @@ module.exports = require("js-base64");
 /* 20 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(24);
+module.exports = __webpack_require__(25);
 
 
 /***/ }),
@@ -3881,16 +3885,22 @@ module.exports = require("sm-crypto");
 /* 22 */
 /***/ (function(module, exports) {
 
-module.exports = require("video.js/dist/video-js.css");
+module.exports = require("slate");
 
 /***/ }),
 /* 23 */
 /***/ (function(module, exports) {
 
-module.exports = require("qrcode");
+module.exports = require("video.js/dist/video-js.css");
 
 /***/ }),
 /* 24 */
+/***/ (function(module, exports) {
+
+module.exports = require("qrcode");
+
+/***/ }),
+/* 25 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7025,8 +7035,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=24d19c7c&
-var mainvue_type_template_id_24d19c7c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=260d7f48&
+var mainvue_type_template_id_260d7f48_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7424,11 +7434,11 @@ var mainvue_type_template_id_24d19c7c_render = function () {
     1
   )
 }
-var mainvue_type_template_id_24d19c7c_staticRenderFns = []
-mainvue_type_template_id_24d19c7c_render._withStripped = true
+var mainvue_type_template_id_260d7f48_staticRenderFns = []
+mainvue_type_template_id_260d7f48_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=24d19c7c&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=260d7f48&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=271bb842&
 var childrenvue_type_template_id_271bb842_render = function () {
@@ -10042,9 +10052,13 @@ var pageView = utils_util["a" /* default */].getParams('pageView');
       default: true
     },
     index: {
-      type: [Boolean, Number],
+      type: [Number, Function],
       default: 1
     },
+    accumulated: {
+      type: Boolean,
+      default: true
+    },
     immediate: {
       type: Boolean,
       default: true
@@ -10172,14 +10186,18 @@ var pageView = utils_util["a" /* default */].getParams('pageView');
         }
         if (this.numbers && !types.includes('index')) {
           var index = 1;
-          if (this.orders == 'desc') {
-            index = function index(num) {
-              return _this.config.totalCount - num;
-            };
-          } else if (this.infiniteScroll) {
-            index = typeof this.index == 'boolean' ? 1 : this.index;
-          } else if (this.index || this.index === 0) {
-            index = this.index === true ? (this.config.pageNum - 1) * this.config.pageSize + 1 : this.index;
+          if (typeof this.index === 'function') {
+            index = this.index;
+          } else {
+            if (this.orders == 'desc') {
+              index = function index(num) {
+                return _this.config.totalCount - num;
+              };
+            } else if (this.accumulated) {
+              index = (this.config.pageNum - 1) * this.config.pageSize + this.index;
+            } else {
+              index = this.index;
+            }
           }
           thead.push({
             type: 'index',
@@ -11265,8 +11283,8 @@ var pageView = utils_util["a" /* default */].getParams('pageView');
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_24d19c7c_render,
-  mainvue_type_template_id_24d19c7c_staticRenderFns,
+  mainvue_type_template_id_260d7f48_render,
+  mainvue_type_template_id_260d7f48_staticRenderFns,
   false,
   null,
   null,
@@ -13403,8 +13421,8 @@ date_picker_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var date_picker = (date_picker_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=8647525a&
-var mainvue_type_template_id_8647525a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=11ebf026&
+var mainvue_type_template_id_11ebf026_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13918,11 +13936,11 @@ var mainvue_type_template_id_8647525a_render = function () {
     2
   )
 }
-var mainvue_type_template_id_8647525a_staticRenderFns = []
-mainvue_type_template_id_8647525a_render._withStripped = true
+var mainvue_type_template_id_11ebf026_staticRenderFns = []
+mainvue_type_template_id_11ebf026_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=8647525a&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=11ebf026&
 
 // EXTERNAL MODULE: external "wujie-vue2"
 var external_wujie_vue2_ = __webpack_require__(7);
@@ -14324,7 +14342,7 @@ var mainvue_type_script_lang_js_systemMode = utils_util["a" /* default */].win.t
         mini: { width: '800px', height: '400px' },
         sm: { width: '960px', height: '500px' },
         md: { width: '1060px', height: '600px' },
-        lg: { width: '1200px', height: '800px' },
+        lg: { width: '1200px', height: availHeight < 800 ? '560px' : '800px' },
         max: { width: availWidth + 'px', height: availHeight + 'px' },
         full: { width: '100%', height: '100%' }
       },
@@ -14485,8 +14503,8 @@ var mainvue_type_script_lang_js_systemMode = utils_util["a" /* default */].win.t
 
 var dialog_src_main_component = normalizeComponent(
   packages_dialog_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_8647525a_render,
-  mainvue_type_template_id_8647525a_staticRenderFns,
+  mainvue_type_template_id_11ebf026_render,
+  mainvue_type_template_id_11ebf026_staticRenderFns,
   false,
   null,
   null,
@@ -39176,8 +39194,8 @@ handle_user_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var handle_user = (handle_user_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=template&id=25b75938&
-var mainvue_type_template_id_25b75938_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=template&id=0bf8fbcc&
+var mainvue_type_template_id_0bf8fbcc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -39400,11 +39418,11 @@ var mainvue_type_template_id_25b75938_render = function () {
     2
   )
 }
-var mainvue_type_template_id_25b75938_staticRenderFns = []
-mainvue_type_template_id_25b75938_render._withStripped = true
+var mainvue_type_template_id_0bf8fbcc_staticRenderFns = []
+mainvue_type_template_id_0bf8fbcc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=25b75938&
+// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=0bf8fbcc&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=script&lang=js&
 //
@@ -39544,7 +39562,7 @@ mainvue_type_template_id_25b75938_render._withStripped = true
     hide: {
       type: Object,
       default: function _default() {
-        return { system: true };
+        return { system: true, new: true };
       }
     },
     online: {
@@ -39621,14 +39639,14 @@ mainvue_type_template_id_25b75938_render._withStripped = true
         type: 'home',
         icon: 'es-icon-zuomian',
         title: '个人工作台'
-      }, {
-        type: 'notice',
-        icon: 'es-icon-tongzhi',
-        title: '通知消息'
       }, {
         type: 'index',
         icon: 'es-icon-home',
         title: '门户'
+      }, {
+        type: 'notice',
+        icon: 'es-icon-tongzhi',
+        title: '通知消息'
       }, {
         type: 'refresh',
         icon: 'es-icon-shuaxin',
@@ -39761,8 +39779,8 @@ mainvue_type_template_id_25b75938_render._withStripped = true
 
 var handler_src_main_component = normalizeComponent(
   packages_handler_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_25b75938_render,
-  mainvue_type_template_id_25b75938_staticRenderFns,
+  mainvue_type_template_id_0bf8fbcc_render,
+  mainvue_type_template_id_0bf8fbcc_staticRenderFns,
   false,
   null,
   null,
@@ -41309,9 +41327,9 @@ layout_src_main.install = function (Vue) {
   return Vue.component(layout_src_main.name, layout_src_main);
 };
 
-/* harmony default export */ var layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=1151d028&
-var mainvue_type_template_id_1151d028_render = function () {
+/* harmony default export */ var packages_layout = (layout_src_main);
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=7a4efc38&
+var mainvue_type_template_id_7a4efc38_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -42298,11 +42316,11 @@ var mainvue_type_template_id_1151d028_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_1151d028_staticRenderFns = []
-mainvue_type_template_id_1151d028_render._withStripped = true
+var mainvue_type_template_id_7a4efc38_staticRenderFns = []
+mainvue_type_template_id_7a4efc38_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=1151d028&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=7a4efc38&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=cab38660&
 var resetPasswordvue_type_template_id_cab38660_render = function () {
@@ -43714,7 +43732,7 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
     if (ceshi == 'true' || ceshi == true) {
       this.loginModel = '0';
     }
-    if (this.isScale) {
+    if (this.isScale || utils_util["a" /* default */].getParams('scale')) {
       utils_util["a" /* default */].setScale();
       window.addEventListener('resize', this.setScale);
     }
@@ -44062,6 +44080,7 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
       this.wechatScope = res.wechatScope;
       this.download = login_src_mainvue_type_script_lang_js_extends({}, this.downLoadUrls, downloads);
       if (res.sysLogoIco) {
+        localStorage.setItem('sysLogoIco', res.sysLogoIco);
         utils_util["a" /* default */].setFavicon(res.sysLogoIco);
       }
     },
@@ -44532,8 +44551,8 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1151d028_render,
-  mainvue_type_template_id_1151d028_staticRenderFns,
+  mainvue_type_template_id_7a4efc38_render,
+  mainvue_type_template_id_7a4efc38_staticRenderFns,
   false,
   null,
   null,
@@ -44550,8 +44569,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// 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=c342434c&
-var mainvue_type_template_id_c342434c_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/main.vue?vue&type=template&id=72ff8660&
+var mainvue_type_template_id_72ff8660_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -44560,12 +44579,19 @@ var mainvue_type_template_id_c342434c_render = function () {
         "div",
         { staticClass: "es-main-box" },
         [
-          _vm.type == "simplicity"
+          _vm.layoutType == "simplicity"
             ? _c(
                 "simplicity",
                 _vm._g(
                   _vm._b(
-                    { ref: "main", attrs: { appCode: _vm.appCode } },
+                    {
+                      ref: "main",
+                      attrs: {
+                        appCode: _vm.appCode,
+                        "old-version": _vm.multiple,
+                      },
+                      on: { "chang-layout": _vm.changLayout },
+                    },
                     "simplicity",
                     _vm.$attrs,
                     false
@@ -44576,7 +44602,16 @@ var mainvue_type_template_id_c342434c_render = function () {
             : _c(
                 "main-default",
                 _vm._g(
-                  _vm._b({ ref: "main" }, "main-default", _vm.$attrs, false),
+                  _vm._b(
+                    {
+                      ref: "main",
+                      attrs: { "new-version": _vm.multiple, scene: _vm.layout },
+                      on: { "chang-layout": _vm.changLayout },
+                    },
+                    "main-default",
+                    _vm.$attrs,
+                    false
+                  ),
                   _vm.$listeners
                 )
               ),
@@ -44622,14 +44657,14 @@ var mainvue_type_template_id_c342434c_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_c342434c_staticRenderFns = []
-mainvue_type_template_id_c342434c_render._withStripped = true
+var mainvue_type_template_id_72ff8660_staticRenderFns = []
+mainvue_type_template_id_72ff8660_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=c342434c&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=72ff8660&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=03f1f7f2&scoped=true&
-var simplicityvue_type_template_id_03f1f7f2_scoped_true_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/simplicity/index.vue?vue&type=template&id=e9f89944&scoped=true&
+var simplicityvue_type_template_id_e9f89944_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45178,6 +45213,8 @@ var simplicityvue_type_template_id_03f1f7f2_scoped_true_render = function () {
           _vm._b(
             {
               attrs: {
+                "layout-type": "simplicity",
+                active: "simplicity",
                 theme: _vm.themeColor,
                 predefine: _vm.themes,
                 visible: _vm.showSet,
@@ -45187,6 +45224,7 @@ var simplicityvue_type_template_id_03f1f7f2_scoped_true_render = function () {
                   _vm.showSet = $event
                 },
                 change: _vm.handleChange,
+                layout: _vm.handleLayout,
               },
             },
             "settings",
@@ -45256,11 +45294,11 @@ var simplicityvue_type_template_id_03f1f7f2_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_03f1f7f2_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_03f1f7f2_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_e9f89944_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_e9f89944_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=03f1f7f2&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=e9f89944&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=1560e8bf&scoped=true&
 var avatarvue_type_template_id_1560e8bf_scoped_true_render = function () {
@@ -45409,8 +45447,8 @@ var avatar_component = normalizeComponent(
 )
 
 /* harmony default export */ var avatar = (avatar_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/simplicity/handler.vue?vue&type=template&id=7eac3976&scoped=true&
-var handlervue_type_template_id_7eac3976_scoped_true_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/simplicity/handler.vue?vue&type=template&id=bfe50be8&scoped=true&
+var handlervue_type_template_id_bfe50be8_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45443,58 +45481,54 @@ var handlervue_type_template_id_7eac3976_scoped_true_render = function () {
       ]),
       _vm._l(_vm.lists, function (item) {
         return [
-          _vm.isShow(item.type)
-            ? [
-                item.type === "notice"
-                  ? _c(
-                      "el-badge",
-                      {
-                        key: item.type,
-                        staticClass: "es-simplicity-handler-item",
-                        attrs: {
-                          value: _vm.noticeNum,
-                          max: 99,
-                          hidden: _vm.noticeNum === 0,
-                        },
-                      },
-                      [
-                        _c("div", {
-                          staticClass: "es-simplicity-handler-icon",
-                          class: item.icon,
-                          attrs: { title: item.title },
-                          on: {
-                            click: function ($event) {
-                              _vm.handleClick(item)
-                            },
-                          },
-                        }),
-                      ]
-                    )
-                  : _c("div", {
-                      key: item.type,
-                      staticClass:
-                        "es-simplicity-handler-item es-simplicity-handler-icon",
-                      class: item.icon,
-                      attrs: { title: item.title },
-                      on: {
-                        click: function ($event) {
-                          _vm.handleClick(item)
-                        },
+          item.type === "notice"
+            ? _c(
+                "el-badge",
+                {
+                  key: item.type,
+                  staticClass: "es-simplicity-handler-item",
+                  attrs: {
+                    value: _vm.noticeNum,
+                    max: 99,
+                    hidden: _vm.noticeNum === 0,
+                  },
+                },
+                [
+                  _c("div", {
+                    staticClass: "es-simplicity-handler-icon",
+                    class: item.icon,
+                    attrs: { title: item.title },
+                    on: {
+                      click: function ($event) {
+                        _vm.handleClick(item)
                       },
-                    }),
-              ]
-            : _vm._e(),
+                    },
+                  }),
+                ]
+              )
+            : _c("div", {
+                key: item.type,
+                staticClass:
+                  "es-simplicity-handler-item es-simplicity-handler-icon",
+                class: item.icon,
+                attrs: { title: item.title },
+                on: {
+                  click: function ($event) {
+                    _vm.handleClick(item)
+                  },
+                },
+              }),
         ]
       }),
     ],
     2
   )
 }
-var handlervue_type_template_id_7eac3976_scoped_true_staticRenderFns = []
-handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
+var handlervue_type_template_id_bfe50be8_scoped_true_staticRenderFns = []
+handlervue_type_template_id_bfe50be8_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/handler.vue?vue&type=template&id=7eac3976&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/handler.vue?vue&type=template&id=bfe50be8&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/handler.vue?vue&type=script&lang=js&
 //
@@ -45542,8 +45576,6 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
 //
 //
 //
-//
-//
 
 
 /* harmony default export */ var handlervue_type_script_lang_js_ = ({
@@ -45614,7 +45646,9 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
     hide: {
       type: Object,
       default: function _default() {
-        return {};
+        return {
+          old: true
+        };
       }
     },
     noticeNum: {
@@ -45666,13 +45700,6 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
         _this2.time = utils_util["a" /* default */].formatDate('', 'HH:mm:ss');
       });
     },
-    isShow: function isShow(res) {
-      if (Array.isArray(this.hide)) {
-        return !this.hide.includes(res);
-      } else {
-        return !this.hide[res];
-      }
-    },
     handleClick: function handleClick(res) {
       this.$emit('click', res);
     }
@@ -45693,11 +45720,11 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
 
 var handler_component = normalizeComponent(
   simplicity_handlervue_type_script_lang_js_,
-  handlervue_type_template_id_7eac3976_scoped_true_render,
-  handlervue_type_template_id_7eac3976_scoped_true_staticRenderFns,
+  handlervue_type_template_id_bfe50be8_scoped_true_render,
+  handlervue_type_template_id_bfe50be8_scoped_true_staticRenderFns,
   false,
   null,
-  "7eac3976",
+  "bfe50be8",
   null
   
 )
@@ -48724,8 +48751,8 @@ var notice_component = normalizeComponent(
 )
 
 /* harmony default export */ var notice = (notice_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/simplicity/settings.vue?vue&type=template&id=48437ba0&
-var settingsvue_type_template_id_48437ba0_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/public/settings.vue?vue&type=template&id=47a98925&
+var settingsvue_type_template_id_47a98925_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48803,16 +48830,277 @@ var settingsvue_type_template_id_48437ba0_render = function () {
         ],
         1
       ),
+      _c("div", { staticClass: "es-setting-item" }, [
+        _c("div", { staticClass: "es-setting-title" }, [_vm._v("菜单风格")]),
+        _c(
+          "div",
+          { staticClass: "es-setting-navs-box" },
+          [
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "顶部菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [
+                _c(
+                  "div",
+                  {
+                    staticClass: "es-setting-navs es-setting-top-nav",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("default", "topnav")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value:
+                            _vm.layoutType == "default" &&
+                            _vm.activeName == "topnav",
+                          expression:
+                            "layoutType == 'default' && activeName == 'topnav'",
+                        },
+                      ],
+                      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-side-nav",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("default", "default")
+                      },
+                    },
+                  },
+                  [
+                    _c("div", { staticClass: "es-setting-side-sub-nav" }),
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value:
+                            _vm.layoutType == "default" &&
+                            _vm.activeName == "default",
+                          expression:
+                            "layoutType == 'default' && 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("default", "subsystem")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value:
+                            _vm.layoutType == "default" &&
+                            _vm.activeName == "subsystem",
+                          expression:
+                            "layoutType == 'default' && 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("default", "topside")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value:
+                            _vm.layoutType == "default" &&
+                            _vm.activeName == "topside",
+                          expression:
+                            "layoutType == 'default' && activeName == 'topside'",
+                        },
+                      ],
+                      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-side-navs",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("default", "side")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value:
+                            _vm.layoutType == "default" &&
+                            _vm.activeName == "side",
+                          expression:
+                            "layoutType == 'default' && activeName == 'side'",
+                        },
+                      ],
+                      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-app-nav",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("simplicity")
+                      },
+                    },
+                  },
+                  [
+                    _c("div", { staticClass: "es-setting-side-sub-nav" }),
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value:
+                            _vm.layoutType == "simplicity" &&
+                            _vm.activeName == "simplicity",
+                          expression:
+                            "layoutType == 'simplicity' && activeName == 'simplicity'",
+                        },
+                      ],
+                      staticClass: "es-icon-gou",
+                    }),
+                  ]
+                ),
+              ]
+            ),
+          ],
+          1
+        ),
+      ]),
     ]
   )
 }
-var settingsvue_type_template_id_48437ba0_staticRenderFns = []
-settingsvue_type_template_id_48437ba0_render._withStripped = true
+var settingsvue_type_template_id_47a98925_staticRenderFns = []
+settingsvue_type_template_id_47a98925_render._withStripped = true
+
 
+// CONCATENATED MODULE: ./packages/main/src/public/settings.vue?vue&type=template&id=47a98925&
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/settings.vue?vue&type=template&id=48437ba0&
+// EXTERNAL MODULE: external "slate"
+var external_slate_ = __webpack_require__(22);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/settings.vue?vue&type=script&lang=js&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/settings.vue?vue&type=script&lang=js&
 //
 //
 //
@@ -48850,10 +49138,114 @@ settingsvue_type_template_id_48437ba0_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
 
 
 /* harmony default export */ var settingsvue_type_script_lang_js_ = ({
-  name: 'Message',
+  name: 'message',
   props: {
     visible: Boolean,
     //主题颜色选择颜色集合
@@ -48867,10 +49259,8 @@ settingsvue_type_template_id_48437ba0_render._withStripped = true
         return ['#a60006', '#409eff'];
       }
     },
-    layout: {
-      type: String,
-      default: 'default'
-    }
+    active: String,
+    layoutType: String
   },
   computed: {
     show: {
@@ -48904,7 +49294,8 @@ settingsvue_type_template_id_48437ba0_render._withStripped = true
   data: function data() {
     return {
       color: '',
-      activeName: this.layout
+      layoutName: this.layoutType,
+      activeName: this.active
     };
   },
   mounted: function mounted() {},
@@ -48922,17 +49313,17 @@ settingsvue_type_template_id_48437ba0_render._withStripped = true
     },
 
     //选择菜单布局
-    handleLayout: function handleLayout(res) {
+    handleLayout: function handleLayout(res, active) {
       var old = this.activeName;
-      this.activeName = res;
-      this.$emit('update:layout', res);
-      this.$emit('layout', res, old);
+      this.layoutName = res;
+      this.activeName = active;
+      this.$emit('layout', res, active, old);
     }
   }
 });
-// CONCATENATED MODULE: ./packages/main/src/simplicity/settings.vue?vue&type=script&lang=js&
- /* harmony default export */ var simplicity_settingsvue_type_script_lang_js_ = (settingsvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/settings.vue
+// CONCATENATED MODULE: ./packages/main/src/public/settings.vue?vue&type=script&lang=js&
+ /* harmony default export */ var public_settingsvue_type_script_lang_js_ = (settingsvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/main/src/public/settings.vue
 
 
 
@@ -48941,9 +49332,9 @@ settingsvue_type_template_id_48437ba0_render._withStripped = true
 /* normalize component */
 
 var settings_component = normalizeComponent(
-  simplicity_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_48437ba0_render,
-  settingsvue_type_template_id_48437ba0_staticRenderFns,
+  public_settingsvue_type_script_lang_js_,
+  settingsvue_type_template_id_47a98925_render,
+  settingsvue_type_template_id_47a98925_staticRenderFns,
   false,
   null,
   null,
@@ -50364,6 +50755,9 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
+//
 
 
 
@@ -50547,7 +50941,9 @@ var events = [function (tabs, index, that) {
       default: function _default() {
         return sessionStorage.getItem('host') || '';
       }
-    }
+    },
+    //切换旧版样式
+    oldVersion: Boolean
   },
   data: function data() {
     return {
@@ -50641,7 +51037,8 @@ var events = [function (tabs, index, that) {
       active: '',
       //单位名称
       simpleUserInfo: {},
-      topRightToolHide: ''
+      topRightToolHide: '',
+      showOld: this.oldVersion
     };
   },
 
@@ -50692,7 +51089,8 @@ var events = [function (tabs, index, that) {
       }
       var hides = {
         home: this.indexUrl ? false : true,
-        index: this.doorIndex ? false : true
+        index: this.doorIndex ? false : true,
+        old: this.showOld ? false : true
       };
 
       if (this.layout === 'subsystem' || this.application) {
@@ -50830,7 +51228,7 @@ var events = [function (tabs, index, that) {
           utils_util["a" /* default */].setStorage('loginPage', results[i]);
         }
         if (i === 'sysLogoIco' && results[i]) {
-          sessionStorage.setItem('sysLogoIco', results[i]);
+          localStorage.setItem('sysLogoIco', results[i]);
           utils_util["a" /* default */].setFavicon(results[i]);
         }
         if (i === 'userStyle' && results[i]) {
@@ -50878,6 +51276,9 @@ var events = [function (tabs, index, that) {
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
+          if (results[i].multipleVersion || results[i].oldVersion) {
+            this.showOld = results[i].oldVersion ? results[i].oldVersion : true;
+          }
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
           }
@@ -50956,104 +51357,19 @@ var events = [function (tabs, index, that) {
     getMenus: function getMenus(loading) {
       var _this2 = this;
 
+      var menuData = utils_store.get('nav');
+      if (menuData && menuData.length) {
+        loading.close();
+        this.renderMenus(menuData);
+        return;
+      }
       utils_util["a" /* default */].ajax({ url: this._menuUrl }).then(function (res) {
         loading.close();
         if (res.rCode === 0) {
           if (res.results && res.results.length) {
-            _this2.menus = res.results;
-            _this2.setTips(_this2.menus);
-            utils_store.set('nav', _this2.menus);
-            if (_this2.appCode) {
-              var code = _this2.sysCode || _this2.appCode;
-              var app = _this2.userApps.filter(function (item) {
-                return item.code === code;
-              })[0];
-              if (app) {
-                _this2.active = app.id;
-                if (app.url) {
-                  var obj = _this2.getMenu(_this2.menus, app.url);
-                  if (obj) {
-                    var tab = _this2.setIframeType(obj);
-                    _this2.tabs = [tab];
-                    _this2.activeName = tab.id;
-                  } else {
-                    _this2.tabs = [app];
-                  }
-                }
-              }
-              if (_this2.sysCode) {
-                var subMenus = _this2.getMenu(_this2.menus, _this2.sysCode, 'appCode');
-                if (subMenus) {
-                  var _obj = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
-                  if (_obj) {
-                    if (!_obj.url) {
-                      _obj = _this2.getFirst(_obj);
-                    }
-                    _this2.subActive = _obj.id;
-                    var _tab = _this2.setIframeType(_obj);
-                    _this2.tabs = [_tab];
-                    _this2.activeName = _tab.id;
-                  } else {
-                    _this2.subActive = '';
-                  }
-                  _this2.subMenus = subMenus;
-                  _this2.showMenu = true;
-                } else {
-                  _this2.subMenus = null;
-                  _this2.showMenu = false;
-                }
-              } else {
-                var _subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
-                if (_subMenus) {
-                  if (_this2.tabs.length == 0) {
-                    var _obj2 = _this2.getFirst(_subMenus);
-                    if (_obj2) {
-                      _this2.subActive = _obj2.id;
-                      var _tab2 = _this2.setIframeType(_obj2);
-                      _this2.tabs = [_tab2];
-                      _this2.activeName = _tab2.id;
-                    } else {
-                      _this2.subActive = '';
-                    }
-                  }
-                  _this2.subMenus = _subMenus;
-                  _this2.showMenu = true;
-                } else {
-                  _this2.subMenus = null;
-                  _this2.showMenu = false;
-                }
-              }
-            } else {
-              if (_this2.indexUrl) {
-                var _obj3 = _this2.getMenu(_this2.menus, _this2.indexUrl);
-                if (_obj3) {
-                  if (!_this2.appCode) {
-                    var _tab3 = _this2.setIframeType(_obj3);
-                    _this2.tabs = [_tab3];
-                    _this2.activeName = _tab3.id;
-                  }
-                  _this2.homePage = _obj3;
-                } else {
-                  _this2.homePage = _this2.setIframeType({
-                    url: _this2.indexUrl,
-                    text: '工作台',
-                    id: '0',
-                    appCode: 'indexUrl'
-                  });
-                  if (!_this2.appCode) {
-                    _this2.tabs = [_this2.homePage];
-                    _this2.activeName = '0';
-                  }
-                }
-              } else if (_this2.initApps && _this2.initApps.length && !_this2.appCode) {
-                var _obj4 = _this2.getMenu(_this2.menus, _this2.initApps[_this2.initApps.length - 1]);
-                if (_obj4) {
-                  var _tab4 = _this2.setIframeType(_obj4);
-                  _this2.tabs.push(_tab4);
-                  _this2.activeName = _tab4.id;
-                }
-              }
-            }
+            //this.$emit('update:menuData', res.results);
+            utils_store.set('nav', JSON.parse(JSON.stringify(res.results)));
+            _this2.renderMenus(JSON.parse(JSON.stringify(res.results)));
           } else {
             _this2.$message.error('未分配菜单权限，请联系管理员！');
           }
@@ -51069,6 +51385,99 @@ var events = [function (tabs, index, that) {
       });
     },
 
+    /**
+     * @desc:处理菜单列表
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    renderMenus: function renderMenus(res) {
+      this.menus = res;
+      this.setTips(this.menus);
+      utils_store.set('nav', this.menus);
+      if (this.indexUrl) {
+        var obj = this.getMenu(this.menus, this.indexUrl);
+        obj = obj ? obj : {
+          url: this.indexUrl,
+          text: '工作台',
+          id: '0',
+          appCode: 'indexUrl'
+        };
+        this.homePage = this.setIframeType(obj);
+        if (!this.appCode) {
+          this.tabs = [this.homePage];
+          this.activeName = this.homePage.id;
+        }
+      }
+      if (this.appCode) {
+        var code = this.sysCode || this.appCode;
+        var app = this.userApps.filter(function (item) {
+          return item.code === code;
+        })[0];
+        if (app) {
+          this.active = app.id;
+          if (app.url) {
+            var _obj = this.getMenu(this.menus, app.url);
+            if (_obj) {
+              var tab = this.setIframeType(_obj);
+              this.tabs = [tab];
+              this.activeName = tab.id;
+            } else {
+              this.tabs = [app];
+            }
+          }
+        }
+        if (this.sysCode) {
+          var subMenus = this.getMenu(this.menus, this.sysCode, 'appCode');
+          if (subMenus) {
+            var _obj2 = this.getMenu(this.menus, this.appCode, 'appCode');
+            if (_obj2) {
+              if (!_obj2.url) {
+                _obj2 = this.getFirst(_obj2);
+              }
+              this.subActive = _obj2.id;
+              var _tab = this.setIframeType(_obj2);
+              this.tabs = [_tab];
+              this.activeName = _tab.id;
+            } else {
+              this.subActive = '';
+            }
+            this.subMenus = subMenus;
+            this.showMenu = true;
+          } else {
+            this.subMenus = null;
+            this.showMenu = false;
+          }
+        } else {
+          var _subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
+          if (_subMenus) {
+            if (this.tabs.length == 0) {
+              var _obj3 = this.getFirst(_subMenus);
+              if (_obj3) {
+                this.subActive = _obj3.id;
+                var _tab2 = this.setIframeType(_obj3);
+                this.tabs = [_tab2];
+                this.activeName = _tab2.id;
+              } else {
+                this.subActive = '';
+              }
+            }
+            this.subMenus = _subMenus;
+            this.showMenu = true;
+          } else {
+            this.subMenus = null;
+            this.showMenu = false;
+          }
+        }
+      } else if (this.initApps && this.initApps.length && !this.indexUrl) {
+        var _obj4 = this.getMenu(this.menus, this.initApps[this.initApps.length - 1]);
+        if (_obj4) {
+          var _tab3 = this.setIframeType(_obj4);
+          this.tabs.push(_tab3);
+          this.activeName = _tab3.id;
+        }
+      }
+    },
+
     /**
      * @desc:设置页面加载类型
      * @author huangbo
@@ -51370,9 +51779,9 @@ var events = [function (tabs, index, that) {
                   }
                 }
               } else {
-                var _tab5 = this.setIframeType(res);
-                this.tabs.push(_tab5);
-                this.activeName = _tab5.id;
+                var _tab4 = this.setIframeType(res);
+                this.tabs.push(_tab4);
+                this.activeName = _tab4.id;
               }
             } else {
               if (res.method == 'iframe') {
@@ -51397,8 +51806,8 @@ var events = [function (tabs, index, that) {
               var _i = utils_util["a" /* default */].indexOfObj(this.tabs, subMenus, 'id');
               this.activeName = subMenus.id;
               if (_i == -1) {
-                var _tab6 = this.setIframeType(subMenus);
-                this.tabs.push(_tab6);
+                var _tab5 = this.setIframeType(subMenus);
+                this.tabs.push(_tab5);
               } else {
                 if (subMenus.method == 'iframe') {
                   subMenus.url = utils_util["a" /* default */].handlerUrl(subMenus.url);
@@ -51457,15 +51866,15 @@ var events = [function (tabs, index, that) {
         this.tabs.push(tab);
         this.activeName = res.id;
       } else {
-        var _tab7 = this.tabs[i];
-        if (_tab7.method === 'iframe') {
+        var _tab6 = this.tabs[i];
+        if (_tab6.method === 'iframe') {
           this.activeName = res.id;
-          this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab7.url));
+          this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab6.url));
         } else {
-          if (_tab7.method === 'wujie' && _tab7.appCode) {
-            window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.reload(true);
+          if (_tab6.method === 'wujie' && _tab6.appCode) {
+            window.document.querySelector('iframe[name=' + _tab6.appCode + ']').contentWindow.location.reload(true);
           }
-          if (_tab7.method === 'router') {
+          if (_tab6.method === 'router') {
             this.$set(this.tabs[i], 'keys', utils_util["a" /* default */].uuid());
           }
           this.activeName = res.id;
@@ -51524,14 +51933,14 @@ var events = [function (tabs, index, that) {
       if (tab.method === 'iframe') {
         tab.url = utils_util["a" /* default */].handlerUrl(tab.url);
       } else {
-        var _tab8 = this.tabs[i];
-        if (_tab8.method === 'iframe') {
-          this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab8.url));
+        var _tab7 = this.tabs[i];
+        if (_tab7.method === 'iframe') {
+          this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab7.url));
         }
-        if (_tab8.method === 'wujie' && _tab8.appCode) {
-          window.document.querySelector('iframe[name=' + _tab8.appCode + ']').contentWindow.location.reload(true);
+        if (_tab7.method === 'wujie' && _tab7.appCode) {
+          window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.reload(true);
         }
-        if (_tab8.method === 'router') {
+        if (_tab7.method === 'router') {
           this.$set(this.tabs[i], 'keys', utils_util["a" /* default */].uuid());
         }
       }
@@ -51765,6 +52174,18 @@ var events = [function (tabs, index, that) {
       }
     },
 
+    /**
+     * @desc:菜单布局样式切换
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleLayout: function handleLayout(res, active) {
+      if (active) {
+        localStorage.setItem('layout', active);
+      }
+      this.$emit('chang-layout', res, active);
+    },
+
     /**
      * @desc:消息修改总数
      * @author huangbo
@@ -51812,14 +52233,14 @@ var events = [function (tabs, index, that) {
           var tab = this.setIframeType(obj);
           this.tabs.splice(n + 1, 0, tab);
         } else {
-          var _tab9 = this.tabs[i];
-          if (_tab9.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab9.url));
+          var _tab8 = this.tabs[i];
+          if (_tab8.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab8.url));
           }
-          if (_tab9.method === 'wujie' && _tab9.appCode) {
-            window.document.querySelector('iframe[name=' + _tab9.appCode + ']').contentWindow.location.reload(true);
+          if (_tab8.method === 'wujie' && _tab8.appCode) {
+            window.document.querySelector('iframe[name=' + _tab8.appCode + ']').contentWindow.location.reload(true);
           }
-          if (_tab9.method === 'router') {
+          if (_tab8.method === 'router') {
             this.$set(this.tabs[i], 'keys', utils_util["a" /* default */].uuid());
           }
         }
@@ -51880,18 +52301,18 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = normalizeComponent(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_03f1f7f2_scoped_true_render,
-  simplicityvue_type_template_id_03f1f7f2_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_e9f89944_scoped_true_render,
+  simplicityvue_type_template_id_e9f89944_scoped_true_staticRenderFns,
   false,
   null,
-  "03f1f7f2",
+  "e9f89944",
   null
   
 )
 
 /* harmony default export */ var simplicity = (simplicity_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/default/index.vue?vue&type=template&id=3c855b6a&
-var defaultvue_type_template_id_3c855b6a_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/default/index.vue?vue&type=template&id=48dad2d4&
+var defaultvue_type_template_id_48dad2d4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -52183,14 +52604,15 @@ var defaultvue_type_template_id_3c855b6a_render = function () {
         _vm._b(
           {
             attrs: {
+              "layout-type": "default",
+              active: _vm.layout,
               theme: _vm.color,
               predefine: _vm.themes,
-              visible: _vm.showSet,
-              layout: _vm.layout,
+              visible: _vm.showSets,
             },
             on: {
               "update:visible": function ($event) {
-                _vm.showSet = $event
+                _vm.showSets = $event
               },
               change: _vm.handleChange,
               layout: _vm.handleLayout,
@@ -52278,11 +52700,11 @@ var defaultvue_type_template_id_3c855b6a_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_3c855b6a_staticRenderFns = []
-defaultvue_type_template_id_3c855b6a_render._withStripped = true
+var defaultvue_type_template_id_48dad2d4_staticRenderFns = []
+defaultvue_type_template_id_48dad2d4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=3c855b6a&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=48dad2d4&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=d207c2e8&
 var userinfovue_type_template_id_d207c2e8_render = function () {
@@ -52764,506 +53186,6 @@ var default_userinfo_component = normalizeComponent(
 )
 
 /* harmony default export */ var default_userinfo = (default_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/default/settings.vue?vue&type=template&id=2d7a058d&
-var settingsvue_type_template_id_2d7a058d_render = function () {
-  var _vm = this
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
-  return _c(
-    "el-drawer",
-    {
-      attrs: {
-        title: "设置",
-        "custom-class": "es-sets-drawer",
-        size: "280px",
-        visible: _vm.show,
-        "append-to-body": true,
-      },
-      on: {
-        "update:visible": function ($event) {
-          _vm.show = $event
-        },
-      },
-    },
-    [
-      _c(
-        "div",
-        { staticClass: "es-setting-item" },
-        [
-          _c("div", { staticClass: "es-setting-title" }, [_vm._v("主题色")]),
-          _vm.themes
-            ? _c(
-                "el-radio-group",
-                {
-                  staticClass: "es-setting-theme",
-                  attrs: { size: "mini" },
-                  on: { change: _vm.handleTheme },
-                  model: {
-                    value: _vm.color,
-                    callback: function ($$v) {
-                      _vm.color = $$v
-                    },
-                    expression: "color",
-                  },
-                },
-                _vm._l(_vm.themes, function (item, index) {
-                  return _c(
-                    "el-radio-button",
-                    {
-                      key: index,
-                      style: { backgroundColor: item },
-                      attrs: { label: index },
-                    },
-                    [_c("i", { staticClass: "el-icon-check" })]
-                  )
-                }),
-                1
-              )
-            : _c(
-                "div",
-                { staticClass: "es-color-picker" },
-                [
-                  _c("el-color-picker", {
-                    attrs: { predefine: _vm.predefineColor },
-                    on: { change: _vm.handleTheme },
-                    model: {
-                      value: _vm.color,
-                      callback: function ($$v) {
-                        _vm.color = $$v
-                      },
-                      expression: "color",
-                    },
-                  }),
-                  _c("div", { staticClass: "el-color-picker-tip" }, [
-                    _vm._v("请不要选择偏白或者偏黑的颜色"),
-                  ]),
-                ],
-                1
-              ),
-        ],
-        1
-      ),
-      _c("div", { staticClass: "es-setting-item" }, [
-        _c("div", { staticClass: "es-setting-title" }, [_vm._v("导航模式")]),
-        _c(
-          "div",
-          { staticClass: "es-setting-navs-box" },
-          [
-            _c(
-              "el-tooltip",
-              {
-                staticClass: "es-setting-navs-item",
-                attrs: {
-                  effect: "dark",
-                  content: "顶部菜单布局",
-                  placement: "bottom",
-                },
-              },
-              [
-                _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",
-              {
-                staticClass: "es-setting-navs-item",
-                attrs: {
-                  effect: "dark",
-                  content: "侧边双列菜单布局",
-                  placement: "bottom",
-                },
-              },
-              [
-                _c(
-                  "div",
-                  {
-                    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",
-                    }),
-                  ]
-                ),
-              ]
-            ),
-            _c(
-              "el-tooltip",
-              {
-                staticClass: "es-setting-navs-item",
-                attrs: {
-                  effect: "dark",
-                  content: "侧边菜单布局",
-                  placement: "bottom",
-                },
-              },
-              [
-                _c(
-                  "div",
-                  {
-                    staticClass: "es-setting-navs es-setting-side-navs",
-                    on: {
-                      click: function ($event) {
-                        $event.stopPropagation()
-                        _vm.handleLayout("side")
-                      },
-                    },
-                  },
-                  [
-                    _c("i", {
-                      directives: [
-                        {
-                          name: "show",
-                          rawName: "v-show",
-                          value: _vm.activeName == "side",
-                          expression: "activeName == 'side'",
-                        },
-                      ],
-                      staticClass: "es-icon-gou",
-                    }),
-                  ]
-                ),
-              ]
-            ),
-          ],
-          1
-        ),
-      ]),
-    ]
-  )
-}
-var settingsvue_type_template_id_2d7a058d_staticRenderFns = []
-settingsvue_type_template_id_2d7a058d_render._withStripped = true
-
-
-// CONCATENATED MODULE: ./packages/main/src/default/settings.vue?vue&type=template&id=2d7a058d&
-
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/settings.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-
-/* harmony default export */ var default_settingsvue_type_script_lang_js_ = ({
-  name: 'message',
-  props: {
-    visible: Boolean,
-    //主题颜色选择颜色集合
-    themes: Array,
-    //默认主题色
-    theme: String,
-    //颜色板预设颜色
-    predefine: {
-      type: Array,
-      default: function _default() {
-        return ['#a60006', '#409eff'];
-      }
-    },
-    layout: {
-      type: String,
-      default: 'default'
-    }
-  },
-  computed: {
-    show: {
-      get: function get() {
-        return this.visible;
-      },
-      set: function set(val) {
-        this.$emit('update:visible', val);
-      }
-    },
-    //颜色板预设颜色
-    predefineColor: function predefineColor() {
-      if (this.theme && this.predefine.indexOf(this.theme.toLowerCase()) === -1) {
-        var arry = this.predefine;
-        arry.push(this.theme);
-        return arry;
-      }
-      return this.predefine;
-    }
-  },
-  watch: {
-    theme: {
-      immediate: true,
-      handler: function handler(val) {
-        if (val) {
-          this.color = val;
-        }
-      }
-    }
-  },
-  data: function data() {
-    return {
-      color: '',
-      activeName: this.layout
-    };
-  },
-  mounted: function mounted() {},
-
-  methods: {
-    //选择主题颜色
-    handleTheme: function handleTheme(res) {
-      res = res.toLowerCase();
-      // const rgb = util.getRgb(res);
-      // const luma = 0.2126 * rgb[0] + 0.7152 * rgb[1] + 0.0722 * rgb[2];
-      utils_util["a" /* default */].updateTheme(res);
-      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);
-    }
-  }
-});
-// CONCATENATED MODULE: ./packages/main/src/default/settings.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_default_settingsvue_type_script_lang_js_ = (default_settingsvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./packages/main/src/default/settings.vue
-
-
-
-
-
-/* normalize component */
-
-var default_settings_component = normalizeComponent(
-  src_default_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_2d7a058d_render,
-  settingsvue_type_template_id_2d7a058d_staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* harmony default export */ var default_settings = (default_settings_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/default/message.vue?vue&type=template&id=503171a2&
 var messagevue_type_template_id_503171a2_render = function () {
   var _vm = this
@@ -54192,6 +54114,7 @@ var defaultvue_type_script_lang_js_extends = Object.assign || function (target)
 //
 //
 //
+//
 
 
 
@@ -54217,7 +54140,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
   components: {
     userinfo: default_userinfo,
-    settings: default_settings,
+    settings: settings,
     message: default_message,
     notice: default_notice,
     online: online
@@ -54379,7 +54302,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     onlineView: {
       type: [String, Boolean],
       default: true
-    }
+    },
+    newVersion: Boolean
   },
   computed: {
     showHeader: function showHeader() {
@@ -54448,10 +54372,10 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         topRightToolHide = JSON.parse(this.topRightToolHide.replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:/g, '"$2":'));
       }
       var hides = {
-        set: !this.set,
+        set: !this.showSet,
         index: this.doorIndex ? false : true,
         system: true,
-        home: this.homePage ? false : true
+        home: this.homePage ? false : tru
       };
 
       if (this.layout === 'subsystem' || this.application) {
@@ -54505,6 +54429,11 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           utils_util["a" /* default */].updateTheme(val);
         }
       }
+    },
+    scene: function scene(val) {
+      if (val) {
+        this.layout = val.toLowerCase();
+      }
     }
   },
   data: function data() {
@@ -54573,7 +54502,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       //刷新路由
       refresh: true,
       //显示设置面板
-      showSet: false,
+      showSets: false,
       //当前设置的主题
       color: utils_util["a" /* default */].getStorage('theme') ? utils_util["a" /* default */].getStorage('theme') : this.theme,
       //显示用户信息
@@ -54601,10 +54530,13 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       dialog: {},
       hideSubMenu: false,
       doorIndex: '',
-      topRightToolHide: ''
+      topRightToolHide: '',
+      showSet: this.set
     };
   },
   created: function created() {
+    var layout = localStorage.getItem('layout');
+    layout && (this.layout = layout);
     var params = utils_util["a" /* default */].getParams() || {};
     if (params.homePage == 0) {
       this.isLoadHomePage = false;
@@ -54752,7 +54684,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
     //显示隐藏设置面板
     handleSet: function handleSet() {
-      this.showSet = !this.showSet;
+      this.showSets = !this.showSets;
     },
     setConfig: function setConfig(results) {
       if (this.socket) {
@@ -54846,6 +54778,9 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
+          if (results[i].multipleVersion) {
+            this.showSet = true;
+          }
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
           }
@@ -55054,6 +54989,13 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     getMenu: function getMenu() {
       var _this4 = this;
 
+      var menuData = utils_store.get('nav');
+      if (menuData && menuData.length) {
+        this.menus = JSON.parse(JSON.stringify(menuData));
+        this.setTips(this.menus);
+        this.setMenu(this.menus);
+        return;
+      }
       var param = this.menuCode ? { menuCode: this.menuCode } : {};
       var params = defaultvue_type_script_lang_js_extends({}, this.param, param);
       utils_util["a" /* default */].ajax({ url: this.action, params: params }).then(function (res) {
@@ -55061,7 +55003,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           if (res.results && res.results.length) {
             _this4.menus = JSON.parse(JSON.stringify(res.results));
             _this4.setTips(_this4.menus);
-            utils_store.set('nav', _this4.menus);
+            utils_store.set('nav', JSON.parse(JSON.stringify(res.results)));
             _this4.setMenu(_this4.menus);
           } else {
             _this4.$message.error('未分配菜单权限，请联系管理员！');
@@ -55767,11 +55709,13 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       }
       return false;
     },
-    handleLayout: function handleLayout(res, old) {
-      if (res == old) {
+    handleLayout: function handleLayout(layout, res, old) {
+      this.$emit('chang-layout', layout);
+      if (res == old || layout == 'simplicity') {
         return;
       }
       this.layout = res;
+      localStorage.setItem('layout', res);
       switch (res) {
         case 'topnav':
           this.navs = this.menus;
@@ -55946,8 +55890,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
 var default_component = normalizeComponent(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_3c855b6a_render,
-  defaultvue_type_template_id_3c855b6a_staticRenderFns,
+  defaultvue_type_template_id_48dad2d4_render,
+  defaultvue_type_template_id_48dad2d4_staticRenderFns,
   false,
   null,
   null,
@@ -55998,6 +55942,11 @@ var default_component = normalizeComponent(
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -56020,6 +55969,7 @@ var src_mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
     MainDefault: src_default
   },
   props: {
+    scene: String,
     launch: Boolean,
     type: String,
     launchImage: {
@@ -56034,7 +55984,8 @@ var src_mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
     launchTime: {
       type: Number,
       default: 3000
-    }
+    },
+    multiple: Boolean
   },
   computed: {
     _launchImage: function _launchImage() {
@@ -56050,10 +56001,16 @@ var src_mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
       params: {},
       dialogs: [],
       visibles: [],
-      isLogin: false
+      isLogin: false,
+      layoutType: this.type,
+      layout: this.scene
     };
   },
   created: function created() {
+    var layoutType = localStorage.getItem('layoutType');
+    if (layoutType) {
+      this.layoutType = layoutType;
+    }
     this.params = utils_util["a" /* default */].getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
@@ -56117,6 +56074,19 @@ var src_mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
   },
 
   methods: {
+    /**
+     * @desc: 切换布局风格
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    changLayout: function changLayout(res, active) {
+      this.layoutType = res;
+      localStorage.setItem('layoutType', res);
+      if (active) {
+        this.layout = active;
+      }
+    },
+
     /**
      * @desc:重新登录
      * @author huangbo
@@ -56286,8 +56256,8 @@ var src_mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_c342434c_render,
-  mainvue_type_template_id_c342434c_staticRenderFns,
+  mainvue_type_template_id_72ff8660_render,
+  mainvue_type_template_id_72ff8660_staticRenderFns,
   false,
   null,
   null,
@@ -58493,7 +58463,7 @@ var zh_CN_json_ = __webpack_require__(16);
 var zh_CN_json_default = /*#__PURE__*/__webpack_require__.n(zh_CN_json_);
 
 // EXTERNAL MODULE: external "video.js/dist/video-js.css"
-var video_js_css_ = __webpack_require__(22);
+var video_js_css_ = __webpack_require__(23);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/player/src/main.vue?vue&type=script&lang=js&
 var player_src_mainvue_type_script_lang_js_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; };
@@ -58788,7 +58758,7 @@ mainvue_type_template_id_15448f0a_render._withStripped = true
 //
 
 
-var QRCode = __webpack_require__(23);
+var QRCode = __webpack_require__(24);
 /* harmony default export */ var qr_code_src_mainvue_type_script_lang_js_ = ({
   name: 'EsQrCode',
   props: {
@@ -76669,7 +76639,7 @@ wxlogin_src_main.install = function (Vue) {
 
 
 
-var components = [packages_button, button_group, calendar, card, cascader, checkbox_group, clients, data_table, data_table_form, date_picker, packages_dialog, enterprise, error_page, packages_form, packages_flow, flow_group, flow_list, handle_user, packages_handler, icon, icons, packages_input, input_number, packages_label, layout, login, packages_main, menu, nav, packages_notify, pagination, packages_page, player, qr_code, radio_group, retrial_auth, packages_select, select_ganged, selector, selector_panel, packages_sizer, steps, packages_switch, packages_tabs, tabs_panel, tips, packages_tree, tree_group, packages_toolbar, table_form, upload, wujie, wxlogin];
+var components = [packages_button, button_group, calendar, card, cascader, checkbox_group, clients, data_table, data_table_form, date_picker, packages_dialog, enterprise, error_page, packages_form, packages_flow, flow_group, flow_list, handle_user, packages_handler, icon, icons, packages_input, input_number, packages_label, packages_layout, login, packages_main, menu, nav, packages_notify, pagination, packages_page, player, qr_code, radio_group, retrial_auth, packages_select, select_ganged, selector, selector_panel, packages_sizer, steps, packages_switch, packages_tabs, tabs_panel, tips, packages_tree, tree_group, packages_toolbar, table_form, upload, wujie, wxlogin];
 
 var install = function install(Vue) {
   var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -76684,7 +76654,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.97',
+  version: '0.5.99',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,
@@ -76710,7 +76680,7 @@ if (typeof window !== 'undefined' && window.Vue) {
   Input: packages_input,
   InputNumber: input_number,
   Label: packages_label,
-  Layout: layout,
+  Layout: packages_layout,
   Login: login,
   Main: packages_main,
   Menu: menu,