|
@@ -1,6 +1,6 @@
|
|
<template>
|
|
<template>
|
|
<el-container
|
|
<el-container
|
|
- v-loading="isAppLoadings" class="hc-layout-box"
|
|
|
|
|
|
+ v-loading="isAppLoadings" class="hc-layout-box"
|
|
|
|
|
|
:class="{ 'yn-theme': !isYunNanProject, 'is-no-layout': !isNullES(isLayout) && isLayout === 'no' }"
|
|
:class="{ 'yn-theme': !isYunNanProject, 'is-no-layout': !isNullES(isLayout) && isLayout === 'no' }"
|
|
>
|
|
>
|
|
@@ -105,7 +105,7 @@ onMounted(async () => {
|
|
isLayout.value = layout ?? layout2
|
|
isLayout.value = layout ?? layout2
|
|
annRefs.value = []
|
|
annRefs.value = []
|
|
initButtons()
|
|
initButtons()
|
|
-
|
|
|
|
|
|
+
|
|
// 确保初始化时加载样式
|
|
// 确保初始化时加载样式
|
|
currentStyle = await loadStyles()
|
|
currentStyle = await loadStyles()
|
|
})
|
|
})
|
|
@@ -131,7 +131,7 @@ watch(() => isAppLoading.value, (res) => {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
}, { immediate:true })
|
|
}, { immediate:true })
|
|
|
|
|
|
//路由信息
|
|
//路由信息
|
|
@@ -167,7 +167,7 @@ watch(() => store.getMenus, (val) => {
|
|
let newArr = []
|
|
let newArr = []
|
|
for (let index = 0; index < newVal.length; index++) {
|
|
for (let index = 0; index < newVal.length; index++) {
|
|
const element = newVal[index]
|
|
const element = newVal[index]
|
|
- if (element.parentId === '0' && ( element.code !== 'tasks' && element.code !== 'patrol-menu' && element.code !== 'tentative-menu' )) {
|
|
|
|
|
|
+ if (element.parentId === '0' && ( element.code !== 'tasks' && element.code !== 'patrol-menu' && element.code !== 'tentative-menu' && element.code !== 'system-service')) {
|
|
let arr2 = element.children
|
|
let arr2 = element.children
|
|
if (arr2) {
|
|
if (arr2) {
|
|
for (let index = 0; index < arr2.length; index++) {
|
|
for (let index = 0; index < arr2.length; index++) {
|
|
@@ -175,21 +175,23 @@ watch(() => store.getMenus, (val) => {
|
|
newArr.push(element2)
|
|
newArr.push(element2)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
} else if (element.code === 'patrol-menu') {
|
|
} else if (element.code === 'patrol-menu') {
|
|
newArr.push(element)
|
|
newArr.push(element)
|
|
|
|
+ } else if (element.code === 'system-service') {
|
|
|
|
+ newArr.push(element)
|
|
} else if (element.code === 'tasks') {
|
|
} else if (element.code === 'tasks') {
|
|
// 先跳过 tasks,最后再添加
|
|
// 先跳过 tasks,最后再添加
|
|
newArr.push(element)
|
|
newArr.push(element)
|
|
}
|
|
}
|
|
|
|
|
|
// 最后添加 tasks
|
|
// 最后添加 tasks
|
|
-
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
let obj1 = newArr[newArr.length - 1]
|
|
let obj1 = newArr[newArr.length - 1]
|
|
let obj2 = newArr[newArr.length - 2]
|
|
let obj2 = newArr[newArr.length - 2]
|
|
newArr[newArr.length - 1] = obj2
|
|
newArr[newArr.length - 1] = obj2
|
|
@@ -247,6 +249,8 @@ const cascaderSend = async ({ projectId, contractId }) => {
|
|
socket = new HcSocket({ projectId, contractId, userId: userId.value }, (res) => {
|
|
socket = new HcSocket({ projectId, contractId, userId: userId.value }, (res) => {
|
|
socketData(res?.data)
|
|
socketData(res?.data)
|
|
})
|
|
})
|
|
|
|
+ console.log(socket, 'socket')
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
//长链接消息
|
|
//长链接消息
|
|
@@ -371,10 +375,10 @@ const loadStyles = async () => {
|
|
styleElement.setAttribute('data-theme', isYunNanProject.value ? 'yunnan' : 'default')
|
|
styleElement.setAttribute('data-theme', isYunNanProject.value ? 'yunnan' : 'default')
|
|
|
|
|
|
// 3. 加载对应的样式模块
|
|
// 3. 加载对应的样式模块
|
|
- const module = isYunNanProject.value
|
|
|
|
|
|
+ const module = isYunNanProject.value
|
|
? await import('./test-yn/index-yn.scss?inline')
|
|
? await import('./test-yn/index-yn.scss?inline')
|
|
: await import('./index.scss?inline')
|
|
: await import('./index.scss?inline')
|
|
-
|
|
|
|
|
|
+
|
|
styleElement.textContent = module.default
|
|
styleElement.textContent = module.default
|
|
document.head.appendChild(styleElement)
|
|
document.head.appendChild(styleElement)
|
|
currentStyle = styleElement
|
|
currentStyle = styleElement
|
|
@@ -411,14 +415,14 @@ watch(() =>store.getProjectId, (newProjectId) => {
|
|
//重新加载菜单
|
|
//重新加载菜单
|
|
let val = store.getMenus
|
|
let val = store.getMenus
|
|
if (!isYunNanProject.value) {
|
|
if (!isYunNanProject.value) {
|
|
-
|
|
|
|
|
|
+
|
|
return
|
|
return
|
|
}
|
|
}
|
|
let newVal = getArrValue(val)
|
|
let newVal = getArrValue(val)
|
|
let newArr = []
|
|
let newArr = []
|
|
for (let index = 0; index < newVal.length; index++) {
|
|
for (let index = 0; index < newVal.length; index++) {
|
|
const element = newVal[index]
|
|
const element = newVal[index]
|
|
- if (element.parentId === '0' && ( element.code !== 'tasks' && element.code !== 'patrol-menu' && element.code !== 'tentative-menu' )) {
|
|
|
|
|
|
+ if (element.parentId === '0' && ( element.code !== 'tasks' && element.code !== 'patrol-menu' && element.code !== 'tentative-menu' && element.code !== 'system-service')) {
|
|
let arr2 = element.children
|
|
let arr2 = element.children
|
|
if (arr2) {
|
|
if (arr2) {
|
|
for (let index = 0; index < arr2.length; index++) {
|
|
for (let index = 0; index < arr2.length; index++) {
|
|
@@ -426,21 +430,23 @@ watch(() =>store.getProjectId, (newProjectId) => {
|
|
newArr.push(element2)
|
|
newArr.push(element2)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
} else if (element.code === 'patrol-menu') {
|
|
} else if (element.code === 'patrol-menu') {
|
|
newArr.push(element)
|
|
newArr.push(element)
|
|
|
|
+ } else if (element.code === 'system-service') {
|
|
|
|
+ newArr.push(element)
|
|
} else if (element.code === 'tasks') {
|
|
} else if (element.code === 'tasks') {
|
|
// 先跳过 tasks,最后再添加
|
|
// 先跳过 tasks,最后再添加
|
|
newArr.push(element)
|
|
newArr.push(element)
|
|
}
|
|
}
|
|
|
|
|
|
// 最后添加 tasks
|
|
// 最后添加 tasks
|
|
-
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
let obj1 = newArr[newArr.length - 1]
|
|
let obj1 = newArr[newArr.length - 1]
|
|
let obj2 = newArr[newArr.length - 2]
|
|
let obj2 = newArr[newArr.length - 2]
|
|
newArr[newArr.length - 1] = obj2
|
|
newArr[newArr.length - 1] = obj2
|
|
@@ -448,7 +454,7 @@ watch(() =>store.getProjectId, (newProjectId) => {
|
|
menuBarData.value = newArr
|
|
menuBarData.value = newArr
|
|
console.log(menuBarData.value, 'menuBarData.value')
|
|
console.log(menuBarData.value, 'menuBarData.value')
|
|
isAsideMenu.value = true
|
|
isAsideMenu.value = true
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
})
|
|
})
|
|
</script>
|
|
</script>
|
|
@@ -456,13 +462,13 @@ watch(() =>store.getProjectId, (newProjectId) => {
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
.logo-transition {
|
|
.logo-transition {
|
|
transition: all 0.3s ease;
|
|
transition: all 0.3s ease;
|
|
-
|
|
|
|
|
|
+
|
|
img {
|
|
img {
|
|
max-height: 28px;
|
|
max-height: 28px;
|
|
transition: all 0.3s ease;
|
|
transition: all 0.3s ease;
|
|
will-change: transform;
|
|
will-change: transform;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
&.hc-layout-header-logo {
|
|
&.hc-layout-header-logo {
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|