eoss-ui 0.5.98 → 0.6.0

package/lib/main.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 29);
+/******/ 	return __webpack_require__(__webpack_require__.s = 30);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -3974,16 +3974,22 @@ module.exports = require("wujie-vue2");
 /* 24 */,
 /* 25 */,
 /* 26 */,
-/* 27 */,
+/* 27 */
+/***/ (function(module, exports) {
+
+module.exports = require("slate");
+
+/***/ }),
 /* 28 */,
-/* 29 */
+/* 29 */,
+/* 30 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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=6f2b9926&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3993,7 +3999,7 @@ var render = function () {
         "div",
         { staticClass: "es-main-box" },
         [
-          _vm.layout == "simplicity"
+          _vm.layoutType == "simplicity"
             ? _c(
                 "simplicity",
                 _vm._g(
@@ -4019,7 +4025,7 @@ var render = function () {
                   _vm._b(
                     {
                       ref: "main",
-                      attrs: { "new-version": _vm.multiple },
+                      attrs: { "new-version": _vm.multiple, scene: _vm.layout },
                       on: { "chang-layout": _vm.changLayout },
                     },
                     "main-default",
@@ -4075,13 +4081,13 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6f2b9926&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=72ff8660&
 
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(18);
 
-// 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=38f18b0d&scoped=true&
-var simplicityvue_type_template_id_38f18b0d_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=2c8bf964&scoped=true&
+var simplicityvue_type_template_id_2c8bf964_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4630,6 +4636,8 @@ var simplicityvue_type_template_id_38f18b0d_scoped_true_render = function () {
           _vm._b(
             {
               attrs: {
+                "layout-type": "simplicity",
+                active: "simplicity",
                 theme: _vm.themeColor,
                 predefine: _vm.themes,
                 visible: _vm.showSet,
@@ -4639,6 +4647,7 @@ var simplicityvue_type_template_id_38f18b0d_scoped_true_render = function () {
                   _vm.showSet = $event
                 },
                 change: _vm.handleChange,
+                layout: _vm.handleLayout,
               },
             },
             "settings",
@@ -4708,11 +4717,11 @@ var simplicityvue_type_template_id_38f18b0d_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_38f18b0d_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_38f18b0d_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_2c8bf964_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_2c8bf964_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=38f18b0d&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=2c8bf964&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 () {
@@ -4870,8 +4879,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var 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=d8a0cc36&scoped=true&
-var handlervue_type_template_id_d8a0cc36_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
@@ -4947,11 +4956,11 @@ var handlervue_type_template_id_d8a0cc36_scoped_true_render = function () {
     2
   )
 }
-var handlervue_type_template_id_d8a0cc36_scoped_true_staticRenderFns = []
-handlervue_type_template_id_d8a0cc36_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=d8a0cc36&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&
 //
@@ -5035,16 +5044,6 @@ handlervue_type_template_id_d8a0cc36_scoped_true_render._withStripped = true
         };
       }
     },
-    old: {
-      type: Object,
-      default: function _default() {
-        return {
-          type: 'old',
-          icon: 'es-icon-shiyongjiuban',
-          title: '使用旧版'
-        };
-      }
-    },
     notice: {
       type: Object,
       default: function _default() {
@@ -5105,7 +5104,7 @@ handlervue_type_template_id_d8a0cc36_scoped_true_render._withStripped = true
     lists: function lists() {
       var _this = this;
 
-      var data = this.data ? this.data : [this.search, this.index, this.home, this.old, this.notice, this.quit, this.set];
+      var data = this.data ? this.data : [this.search, this.index, this.home, this.notice, this.quit, this.set];
       return data.filter(function (item) {
         return !_this.hide[item.type];
       });
@@ -5153,11 +5152,11 @@ handlervue_type_template_id_d8a0cc36_scoped_true_render._withStripped = true
 
 var handler_component = Object(componentNormalizer["a" /* default */])(
   simplicity_handlervue_type_script_lang_js_,
-  handlervue_type_template_id_d8a0cc36_scoped_true_render,
-  handlervue_type_template_id_d8a0cc36_scoped_true_staticRenderFns,
+  handlervue_type_template_id_bfe50be8_scoped_true_render,
+  handlervue_type_template_id_bfe50be8_scoped_true_staticRenderFns,
   false,
   null,
-  "d8a0cc36",
+  "bfe50be8",
   null
   
 )
@@ -8187,8 +8186,8 @@ var notice_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* 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
@@ -8266,16 +8265,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/simplicity/settings.vue?vue&type=template&id=48437ba0&
+// CONCATENATED MODULE: ./packages/main/src/public/settings.vue?vue&type=template&id=47a98925&
 
-// 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&
+// EXTERNAL MODULE: external "slate"
+var external_slate_ = __webpack_require__(27);
+
+// 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&
 //
 //
 //
@@ -8313,32 +8573,134 @@ settingsvue_type_template_id_48437ba0_render._withStripped = true
 //
 //
 //
-
-
-/* harmony default export */ var 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;
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
+
+/* harmony default export */ var settingsvue_type_script_lang_js_ = ({
+  name: 'message',
+  props: {
+    visible: Boolean,
+    //主题颜色选择颜色集合
+    themes: Array,
+    //默认主题色
+    theme: String,
+    //颜色板预设颜色
+    predefine: {
+      type: Array,
+      default: function _default() {
+        return ['#a60006', '#409eff'];
+      }
+    },
+    active: String,
+    layoutType: String
+  },
+  computed: {
+    show: {
+      get: function get() {
+        return this.visible;
       },
       set: function set(val) {
         this.$emit('update:visible', val);
@@ -8367,7 +8729,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() {},
@@ -8385,17 +8748,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
 
 
 
@@ -8404,9 +8767,9 @@ settingsvue_type_template_id_48437ba0_render._withStripped = true
 /* normalize component */
 
 var settings_component = Object(componentNormalizer["a" /* default */])(
-  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,
@@ -9830,6 +10193,9 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
+//
 
 
 
@@ -10224,18 +10590,22 @@ var events = [function (tabs, index, that) {
         }
         var pathname = url.substring(url.indexOf('#/') + 1);
         pathname = pathname.split('?')[0];
+        var _code = void 0;
         if (res.path !== '/' && pathname == _path) {
           if (res.components) {
-            if (!res.components[code]) {
-              console.error('“命名视图”规范属性名称与菜单appCode不一致', res);
+            if (!res.components[_code]) {
+              console.error('路由“命名视图”规范属性名称与菜单appCode不一致', res, _code);
+              _code = Object.keys(res.components).filter(function (item) {
+                return item !== 'default';
+              })[0];
             }
           } else {
-            console.error('请根据“命名视图”规范，正确添加components属性名称', res);
+            console.error('请根据路由“命名视图”规范，正确添加components属性名称', res);
           }
-          return pathname;
+          return _code ? { path: pathname, appCode: _code } : pathname;
         }
         if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
-          var _path2 = this.hasRouter(res.children, url, code);
+          var _path2 = this.hasRouter(res.children, url, _code);
           if (_path2) {
             return _path2;
           }
@@ -10300,7 +10670,7 @@ var events = [function (tabs, index, that) {
           util["a" /* default */].setStorage('loginPage', results[i]);
         }
         if (i === 'sysLogoIco' && results[i]) {
-          sessionStorage.setItem('sysLogoIco', results[i]);
+          localStorage.setItem('sysLogoIco', results[i]);
           util["a" /* default */].setFavicon(results[i]);
         }
         if (i === 'userStyle' && results[i]) {
@@ -10429,95 +10799,19 @@ var events = [function (tabs, index, that) {
     getMenus: function getMenus(loading) {
       var _this2 = this;
 
+      var menuData = store["a" /* default */].get('nav');
+      if (menuData && menuData.length) {
+        loading.close();
+        this.renderMenus(menuData);
+        return;
+      }
       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);
-            store["a" /* default */].set('nav', _this2.menus);
-            if (_this2.indexUrl) {
-              var obj = _this2.getMenu(_this2.menus, _this2.indexUrl);
-              obj = obj ? obj : {
-                url: _this2.indexUrl,
-                text: '工作台',
-                id: '0',
-                appCode: 'indexUrl'
-              };
-              _this2.homePage = _this2.setIframeType(obj);
-              if (!_this2.appCode) {
-                _this2.tabs = [_this2.homePage];
-                _this2.activeName = _this2.homePage.id;
-              }
-            }
-            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 _obj2 = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
-                  if (_obj2) {
-                    if (!_obj2.url) {
-                      _obj2 = _this2.getFirst(_obj2);
-                    }
-                    _this2.subActive = _obj2.id;
-                    var _tab = _this2.setIframeType(_obj2);
-                    _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 _obj3 = _this2.getFirst(_subMenus);
-                    if (_obj3) {
-                      _this2.subActive = _obj3.id;
-                      var _tab2 = _this2.setIframeType(_obj3);
-                      _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.initApps && _this2.initApps.length && !_this2.indexUrl) {
-              var _obj4 = _this2.getMenu(_this2.menus, _this2.initApps[_this2.initApps.length - 1]);
-              if (_obj4) {
-                var _tab3 = _this2.setIframeType(_obj4);
-                _this2.tabs.push(_tab3);
-                _this2.activeName = _tab3.id;
-              }
-            }
+            //this.$emit('update:menuData', res.results);
+            store["a" /* default */].set('nav', JSON.parse(JSON.stringify(res.results)));
+            _this2.renderMenus(JSON.parse(JSON.stringify(res.results)));
           } else {
             _this2.$message.error('未分配菜单权限，请联系管理员！');
           }
@@ -10533,6 +10827,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);
+      store["a" /* default */].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
@@ -10558,7 +10945,12 @@ var events = [function (tabs, index, that) {
             var path = this.hasRouter(routes, urls[0], res.appCode);
             if (path && this.routeType !== 'wujie') {
               res.method = 'router';
-              res.path = path;
+              if (typeof path === 'string') {
+                res.path = path;
+              } else {
+                res.path = path.path;
+                res.appCode = path.appCode;
+              }
               res.keys = util["a" /* default */].uuid();
             } else {
               var urlopenmode = util["a" /* default */].getParams({
@@ -11108,13 +11500,6 @@ var events = [function (tabs, index, that) {
           case 'index':
             util["a" /* default */].win.open(this.doorIndex, '_self');
             break;
-          case 'old':
-            if (typeof this.showOld === 'string') {
-              window.location.href = this.showOld;
-            } else {
-              this.$emit('chang-layout', 'default');
-            }
-            break;
           case 'set':
             this.showSet = !this.showSet;
             this.showMsg = false;
@@ -11236,6 +11621,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
@@ -11351,18 +11748,18 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_38f18b0d_scoped_true_render,
-  simplicityvue_type_template_id_38f18b0d_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_2c8bf964_scoped_true_render,
+  simplicityvue_type_template_id_2c8bf964_scoped_true_staticRenderFns,
   false,
   null,
-  "38f18b0d",
+  "2c8bf964",
   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=149ff0da&
-var defaultvue_type_template_id_149ff0da_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=215ab02a&
+var defaultvue_type_template_id_215ab02a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11654,14 +12051,15 @@ var defaultvue_type_template_id_149ff0da_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,
@@ -11749,11 +12147,11 @@ var defaultvue_type_template_id_149ff0da_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_149ff0da_staticRenderFns = []
-defaultvue_type_template_id_149ff0da_render._withStripped = true
+var defaultvue_type_template_id_215ab02a_staticRenderFns = []
+defaultvue_type_template_id_215ab02a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=149ff0da&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=215ab02a&
 
 // 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 () {
@@ -12235,20 +12633,22 @@ var default_userinfo_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* 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=52aa078c&
-var settingsvue_type_template_id_52aa078c_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/message.vue?vue&type=template&id=503171a2&
+var messagevue_type_template_id_503171a2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   return _c(
     "el-drawer",
     {
+      staticClass: "es-msgs-box",
       attrs: {
-        title: "设置",
-        "custom-class": "es-sets-drawer",
-        size: "280px",
+        "custom-class": "es-msgs-main",
+        direction: "rtl",
+        size: "200px",
+        modal: false,
+        withHeader: false,
         visible: _vm.show,
-        "append-to-body": true,
       },
       on: {
         "update:visible": function ($event) {
@@ -12257,531 +12657,29 @@ var settingsvue_type_template_id_52aa078c_render = function () {
       },
     },
     [
-      _c(
-        "div",
-        { staticClass: "es-setting-item" },
-        [
-          _c("div", { staticClass: "es-setting-title" }, [_vm._v("主题色")]),
-          _vm.themes
-            ? _c(
-                "el-radio-group",
+      _c("div", { staticClass: "es-msg-header" }, [
+        _c("span", { staticClass: "es-msg-title" }, [_vm._v("消息提示")]),
+        _c(
+          "span",
+          { staticClass: "es-overlook", on: { click: _vm.handleIgnoreAll } },
+          [_vm._v("全部忽略")]
+        ),
+      ]),
+      _c("div", { staticClass: "es-msg-lists-box" }, [
+        _c(
+          "div",
+          { staticClass: "es-msg-lists" },
+          [
+            _c("el-scrollbar", { staticClass: "es-scrollbar" }, [
+              _c(
+                "div",
                 {
-                  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",
+                  directives: [
                     {
-                      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_52aa078c_staticRenderFns = []
-settingsvue_type_template_id_52aa078c_render._withStripped = true
-
-
-// CONCATENATED MODULE: ./packages/main/src/default/settings.vue?vue&type=template&id=52aa078c&
-
-// 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];
-      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 = Object(componentNormalizer["a" /* default */])(
-  src_default_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_52aa078c_render,
-  settingsvue_type_template_id_52aa078c_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
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
-  return _c(
-    "el-drawer",
-    {
-      staticClass: "es-msgs-box",
-      attrs: {
-        "custom-class": "es-msgs-main",
-        direction: "rtl",
-        size: "200px",
-        modal: false,
-        withHeader: false,
-        visible: _vm.show,
-      },
-      on: {
-        "update:visible": function ($event) {
-          _vm.show = $event
-        },
-      },
-    },
-    [
-      _c("div", { staticClass: "es-msg-header" }, [
-        _c("span", { staticClass: "es-msg-title" }, [_vm._v("消息提示")]),
-        _c(
-          "span",
-          { staticClass: "es-overlook", on: { click: _vm.handleIgnoreAll } },
-          [_vm._v("全部忽略")]
-        ),
-      ]),
-      _c("div", { staticClass: "es-msg-lists-box" }, [
-        _c(
-          "div",
-          { staticClass: "es-msg-lists" },
-          [
-            _c("el-scrollbar", { staticClass: "es-scrollbar" }, [
-              _c(
-                "div",
-                {
-                  directives: [
-                    {
-                      name: "infinite-scroll",
-                      rawName: "v-infinite-scroll",
-                      value: _vm.getMsg,
-                      expression: "getMsg",
+                      name: "infinite-scroll",
+                      rawName: "v-infinite-scroll",
+                      value: _vm.getMsg,
+                      expression: "getMsg",
                     },
                   ],
                   attrs: { "infinite-scroll-disabled": _vm.disabled },
@@ -13663,6 +13561,7 @@ var defaultvue_type_script_lang_js_extends = Object.assign || function (target)
 //
 //
 //
+//
 
 
 
@@ -13688,7 +13587,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
   components: {
     userinfo: default_userinfo,
-    settings: default_settings,
+    settings: settings,
     message: default_message,
     notice: default_notice,
     online: online
@@ -13920,11 +13819,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         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,
-        new: this.showNew ? false : true
+        home: this.homePage ? false : true
       };
 
       if (this.layout === 'subsystem' || this.application) {
@@ -13978,6 +13876,11 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           util["a" /* default */].updateTheme(val);
         }
       }
+    },
+    scene: function scene(val) {
+      if (val) {
+        this.layout = val.toLowerCase();
+      }
     }
   },
   data: function data() {
@@ -14046,7 +13949,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       //刷新路由
       refresh: true,
       //显示设置面板
-      showSet: false,
+      showSets: false,
       //当前设置的主题
       color: util["a" /* default */].getStorage('theme') ? util["a" /* default */].getStorage('theme') : this.theme,
       //显示用户信息
@@ -14075,7 +13978,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       hideSubMenu: false,
       doorIndex: '',
       topRightToolHide: '',
-      showNew: this.newVersion
+      showSet: this.set
     };
   },
   created: function created() {
@@ -14228,7 +14131,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
     //显示隐藏设置面板
     handleSet: function handleSet() {
-      this.showSet = !this.showSet;
+      this.showSets = !this.showSets;
     },
     setConfig: function setConfig(results) {
       if (this.socket) {
@@ -14322,8 +14225,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
-          if (results[i].multipleVersion || results[i].newVersion) {
-            this.showNew = results[i].newVersion ? results[i].newVersion : true;
+          if (results[i].multipleVersion) {
+            this.showSet = true;
           }
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
@@ -14533,6 +14436,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     getMenu: function getMenu() {
       var _this4 = this;
 
+      var menuData = store["a" /* default */].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);
       util["a" /* default */].ajax({ url: this.action, params: params }).then(function (res) {
@@ -14540,7 +14450,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           if (res.results && res.results.length) {
             _this4.menus = JSON.parse(JSON.stringify(res.results));
             _this4.setTips(_this4.menus);
-            store["a" /* default */].set('nav', _this4.menus);
+            store["a" /* default */].set('nav', JSON.parse(JSON.stringify(res.results)));
             _this4.setMenu(_this4.menus);
           } else {
             _this4.$message.error('未分配菜单权限，请联系管理员！');
@@ -15086,13 +14996,6 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         case 'set':
           this.handleSet();
           break;
-        case 'new':
-          if (typeof this.showNew === 'string') {
-            window.location.href = this.showNew;
-          } else {
-            this.$emit('chang-layout', 'simplicity');
-          }
-          break;
         case 'goView':
           util["a" /* default */].win.open(res.path, '_blank');
           break;
@@ -15253,8 +15156,9 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       }
       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;
@@ -15433,8 +15337,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_149ff0da_render,
-  defaultvue_type_template_id_149ff0da_staticRenderFns,
+  defaultvue_type_template_id_215ab02a_render,
+  defaultvue_type_template_id_215ab02a_staticRenderFns,
   false,
   null,
   null,
@@ -15493,6 +15397,7 @@ var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wu
 //
 //
 //
+//
 
 
 
@@ -15515,6 +15420,7 @@ var bus = external_wujie_vue2_default.a.bus;
     MainDefault: src_default
   },
   props: {
+    scene: String,
     launch: Boolean,
     type: String,
     launchImage: {
@@ -15547,13 +15453,14 @@ var bus = external_wujie_vue2_default.a.bus;
       dialogs: [],
       visibles: [],
       isLogin: false,
-      layout: this.type
+      layoutType: this.type,
+      layout: this.scene
     };
   },
   created: function created() {
     var layoutType = localStorage.getItem('layoutType');
     if (layoutType) {
-      this.layout = layoutType;
+      this.layoutType = layoutType;
     }
     this.params = util["a" /* default */].getParams() || {};
     this.sysCode = this.params.sysCode;
@@ -15623,9 +15530,12 @@ var bus = external_wujie_vue2_default.a.bus;
      * @author huangbo
      * @date 2024年9月7日
      **/
-    changLayout: function changLayout(res) {
-      this.layout = res;
+    changLayout: function changLayout(res, active) {
+      this.layoutType = res;
       localStorage.setItem('layoutType', res);
+      if (active) {
+        this.layout = active;
+      }
     },
 
     /**