commit
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
<link rel="stylesheet" href="${base!}/assets/platform/fonts/themify-icons.css">
|
<link rel="stylesheet" href="${base!}/assets/platform/fonts/themify-icons.css">
|
||||||
<link rel="stylesheet" href="${base!}/assets/platform/fonts/font-awesome.min.css">
|
<link rel="stylesheet" href="${base!}/assets/platform/fonts/font-awesome.min.css">
|
||||||
<link rel="stylesheet" href="${base!}/assets/platform/css/common.css">
|
<link rel="stylesheet" href="${base!}/assets/platform/css/common.css">
|
||||||
<link rel="stylesheet" href="${base!}/assets/platform/css/main.css">
|
<link rel="stylesheet" href="${base!}/assets/platform/css/main.css?v=1.0.0">
|
||||||
<link rel="stylesheet" href="${base!}/assets/platform/css/elmain.css">
|
<link rel="stylesheet" href="${base!}/assets/platform/css/elmain.css">
|
||||||
<link rel="stylesheet" href="${base!}/assets/platform/css/panel.css">
|
<link rel="stylesheet" href="${base!}/assets/platform/css/panel.css">
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
<script src="${base!}/assets/platform/plugins/moment/moment.min.js"></script>
|
<script src="${base!}/assets/platform/plugins/moment/moment.min.js"></script>
|
||||||
<!-- 浏览器通知 -->
|
<!-- 浏览器通知 -->
|
||||||
<script src="${base!}/assets/platform/plugins/push/push.min.js"></script>
|
<script src="${base!}/assets/platform/plugins/push/push.min.js"></script>
|
||||||
<script src="${base!}/assets/platform/js/main.js?v=1.0.0"></script>
|
<script src="${base!}/assets/platform/js/main.js?v=1.0.1"></script>
|
||||||
<script src="${base!}/assets/platform/js/offscreen.js"></script>
|
<script src="${base!}/assets/platform/js/offscreen.js"></script>
|
||||||
<!-- <script src="https://cdn.jsdelivr.net/npm/vue-echarts@4.0.2"></script>-->
|
<!-- <script src="https://cdn.jsdelivr.net/npm/vue-echarts@4.0.2"></script>-->
|
||||||
<script src="${base!}/assets/platform/plugins/vue-charts/echartTheme.js"></script>
|
<script src="${base!}/assets/platform/plugins/vue-charts/echartTheme.js"></script>
|
||||||
@@ -271,7 +271,7 @@
|
|||||||
parentMenus.push(matchMenu)
|
parentMenus.push(matchMenu)
|
||||||
|
|
||||||
//获取到该菜单所属的模块
|
//获取到该菜单所属的模块
|
||||||
const moduleId = state.moduleMenus.find(v=>v.containsMenu.includes(parentMenus[0].id))?.id
|
const moduleId = state.moduleMenus.find(v => v.containsMenu.includes(parentMenus[0].id))?.id
|
||||||
|
|
||||||
//判断下是否跨模块跳转
|
//判断下是否跨模块跳转
|
||||||
if (moduleId !== state.activeMenuModuleId) {
|
if (moduleId !== state.activeMenuModuleId) {
|
||||||
@@ -511,7 +511,7 @@
|
|||||||
return this.$store.state.activeMenuModuleId || null
|
return this.$store.state.activeMenuModuleId || null
|
||||||
},
|
},
|
||||||
selectEntranceModule() {
|
selectEntranceModule() {
|
||||||
if (this.selectEntranceModuleId && this.moduleMenus) {
|
if (this.selectEntranceModuleId && this.moduleMenus && this.moduleMenus.length > 0) {
|
||||||
return this.moduleMenus.find(v => v.id === this.selectEntranceModuleId)
|
return this.moduleMenus.find(v => v.id === this.selectEntranceModuleId)
|
||||||
}
|
}
|
||||||
return {}
|
return {}
|
||||||
@@ -573,8 +573,8 @@
|
|||||||
return this.$store.state.activeMenuModuleId || null
|
return this.$store.state.activeMenuModuleId || null
|
||||||
},
|
},
|
||||||
selectEntranceModule() {
|
selectEntranceModule() {
|
||||||
if (this.selectEntranceModuleId && this.moduleMenus) {
|
if (this.selectEntranceModuleId && this.entranceModules) {
|
||||||
return this.moduleMenus.find(v => v.id === this.selectEntranceModuleId)
|
return this.entranceModules.find(v => v.id === this.selectEntranceModuleId)
|
||||||
}
|
}
|
||||||
return {}
|
return {}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user