|
@@ -168,8 +168,39 @@ const topMenuChange = (data) => {
|
|
// 修改菜单数据的监听逻辑
|
|
// 修改菜单数据的监听逻辑
|
|
watch(() => store.getMenus, (val) => {
|
|
watch(() => store.getMenus, (val) => {
|
|
if (isYunNanProject.value) {
|
|
if (isYunNanProject.value) {
|
|
-
|
|
|
|
- menuBarData.value = getArrValue(val)
|
|
|
|
|
|
+ let newVal = getArrValue(val)
|
|
|
|
+ let newArr = []
|
|
|
|
+ for (let index = 0; index < newVal.length; index++) {
|
|
|
|
+ const element = newVal[index]
|
|
|
|
+ if (element.parentId === '0' && ( element.code !== 'tasks' && element.code !== 'patrol-menu' && element.code !== 'tentative-menu' )) {
|
|
|
|
+ let arr2 = element.children
|
|
|
|
+ if (arr2) {
|
|
|
|
+ for (let index = 0; index < arr2.length; index++) {
|
|
|
|
+ const element2 = arr2[index]
|
|
|
|
+ newArr.push(element2)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ } else if (element.code === 'patrol-menu') {
|
|
|
|
+ newArr.push(element)
|
|
|
|
+ } else if (element.code === 'tasks') {
|
|
|
|
+ // 先跳过 tasks,最后再添加
|
|
|
|
+ newArr.push(element)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 最后添加 tasks
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ let obj1 = newArr[newArr.length - 1]
|
|
|
|
+ let obj2 = newArr[newArr.length - 2]
|
|
|
|
+ newArr[newArr.length - 1] = obj2
|
|
|
|
+ newArr[newArr.length - 2] = obj1
|
|
|
|
+ menuBarData.value = newArr
|
|
|
|
+ // menuBarData.value = getArrValue(val)
|
|
}
|
|
}
|
|
}, { immediate: true })
|
|
}, { immediate: true })
|
|
//菜单被点击
|
|
//菜单被点击
|