diff --git a/src/App.vue b/src/App.vue index b3c7081d490f6dd8197e921931a21e47ba805170..ea273819b75e82c3bb45f5d8a5f6e8d1fb7337de 100644 --- a/src/App.vue +++ b/src/App.vue @@ -92,21 +92,21 @@ export default { menuIndex:'', } }, - created(){}, - mounted() { + created(){ this.initMsg() }, + mounted() { + }, methods:{ openMsg(data) { - console.log(123123123) this.readFlag = !this.readFlag; }, initMsg() { - if(this.userInfo && this.userInfo.userId) { - this.$trace.setOptionValue('userId',this.userInfo.userId) - this.$trace.setOptionValue('userType',this.userInfo.userType) - this.$trace.setOptionValue('roleId',this.userInfo.roleIds.join(',')) - this.$trace.setOptionValue('organization',this.userInfo.orgId) + if(this.userInfo && this.userInfo.system_id) { + this.$trace.setOptionValue('userId',this.userInfo.system_id) + // this.$trace.setOptionValue('userType',this.userInfo.userType) + // this.$trace.setOptionValue('roleId',this.userInfo.roleIds.join(',')) + this.$trace.setOptionValue('organization',this.userInfo.organization_id) } }, handleClose() { diff --git a/src/page/main/develop/menu/index.vue b/src/page/main/develop/menu/index.vue index cd27ed0d185e6c980477ac3149d5387ef07c3463..db9db512ad428a0773ba982669e6c1666f0f13f1 100644 --- a/src/page/main/develop/menu/index.vue +++ b/src/page/main/develop/menu/index.vue @@ -305,6 +305,7 @@ const fileAction = (val,data,parent,disabled=false) => { state: 1, // 启用状态 menu_url: "", // 路径 menu_logo: "", // 图标 + source: "", level: data.level, // 当前的level p_menu_type: parent ? parent.menu_type : 0 // 父级的类型,用于判断菜单下不能建目录 } @@ -325,6 +326,7 @@ const fileAction = (val,data,parent,disabled=false) => { state: 1, menu_url: "", menu_logo: "", + source: "", p_menu_type: data.menu_type, level: data.level + 1 } @@ -443,6 +445,7 @@ const saveMenu = (el,type) => { state: el.menuForm.state, menu_url: el.menuForm.menu_url, menu_logo: el.menuForm.menu_logo, + source: el.menuForm.menu_type == 0 ? "" : el.menuForm.source, } if (state.selectData.id) { // 编辑 axios diff --git a/src/page/main/develop/menu/menu-form.vue b/src/page/main/develop/menu/menu-form.vue index 25b9aba77c9e1ba1d43de4e6aa0ccef13f87f303..2f0f717f5b7b08262bb957018d5823f532b763e4 100644 --- a/src/page/main/develop/menu/menu-form.vue +++ b/src/page/main/develop/menu/menu-form.vue @@ -90,7 +90,9 @@ - + + + @@ -117,6 +119,7 @@ const state = reactive({ state: 1, menu_url: "", menu_logo: "", + source: "", }, formRules: { menu_name: [