diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 0ce0ca8..79ab4ad 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -6,6 +6,7 @@
export {}
declare global {
const EffectScope: typeof import('vue')['EffectScope']
+ const ElMessageBoxOpert: typeof import('element-plus/es')['ElMessageBoxOpert']
const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
const computed: typeof import('vue')['computed']
const createApp: typeof import('vue')['createApp']
diff --git a/src/components/comNav/index.vue b/src/components/comNav/index.vue
index 2c8989c..6d27bdc 100644
--- a/src/components/comNav/index.vue
+++ b/src/components/comNav/index.vue
@@ -37,19 +37,34 @@ const navStore = comNavStore()
onMounted(()=>{
console.log("routes",router.getRoutes())
- // initRouteList()
- menuInfo.defaultOpeneds.push()
+ initRouteList()
+
})
const initRouteList = ()=>{
- const routeList = router.getRoutes()
- menuInfo.menuList = routeList.find(ele=>ele.meta.routeListRoot)?.children
- menuInfo.defaultOpeneds = menuInfo.menuList[0].path
- console.log("menuInfo.menuList",menuInfo.menuList)
-
+ // const routeList = router.getRoutes()
+ // menuInfo.menuList = routeList.find(ele=>ele.meta.routeListRoot)?.children
+ // menuInfo.defaultOpeneds = menuInfo.menuList[0].path
+ // console.log("menuInfo.menuList",menuInfo.menuList)
+ menuInfo.defaultOpeneds.push()
+ const routes:any = router.getRoutes()
+ console.log("routes",routes)
+ const currentNav= routes[0]
+ if(navStore.topNavList){
+ let firstNav = {
+ title:currentNav.meta.title,
+ name:currentNav.name,
+ path:currentNav.path
+ }
+ navStore.addNavTarget(firstNav)
+ navStore.setCurrentNav(currentNav.path)
+ }
+ console.log("currentNav",currentNav)
+ menuInfo.defaultActive=currentNav.name+'&&'+currentNav.meta.title
+ console.log("currentNav",menuInfo.defaultActive)
}
diff --git a/src/components/headerCom/headerNav.vue b/src/components/headerCom/headerNav.vue
index e0bb844..98bed39 100644
--- a/src/components/headerCom/headerNav.vue
+++ b/src/components/headerCom/headerNav.vue
@@ -1,6 +1,6 @@
-
+
{{ tag.title }}
@@ -14,9 +14,11 @@ const closeNavTagFn =(index:any)=>{
navStore.deleteNavTarget(index)
}
const TapNavTagFn=(tag:any)=>{
+
router.push({
name:tag.path
})
+ navStore.addNavTarget(tag)
}
diff --git a/src/router/index.ts b/src/router/index.ts
index 4a5a11b..1dfd225 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -147,7 +147,45 @@ const routes: Array = [
AuthFlag: true
},
children: []
- }
+ },
+// 111
+ {
+ name: "systemVersion",
+ path: 'systemVersion',
+ component: () => import('views/systemManage/systemVersion/index.vue'),
+ meta: {
+ title: '系统版本管理',
+ keepAlive: true,
+ AuthFlag: true
+ },
+ children: []
+ },
+ {
+ name: "userManage",
+ path: 'userManage',
+ component: () => import('views/systemManage/userManage/index.vue'),
+ meta: {
+ title: '用户管理',
+ keepAlive: true,
+ AuthFlag: true
+ },
+ children: []
+ },
+
+ {
+ name: "systemLog",
+ path: 'systemLog',
+ component: () => import('views/systemManage/systemLog/index.vue'),
+ meta: {
+ title: '系统日志',
+ keepAlive: true,
+ AuthFlag: true
+ },
+ children: []
+ },
+
+
+
]
},
diff --git a/src/router/routerData.ts b/src/router/routerData.ts
index 7b197ef..f591ca1 100644
--- a/src/router/routerData.ts
+++ b/src/router/routerData.ts
@@ -148,6 +148,47 @@ export const list: any = [
AuthFlag: true
},
children: []
+ },
+ {
+ name: "systemManage",
+ path: 'systemManage',
+ meta: {
+ title: '系统管理',
+ keepAlive: true,
+ AuthFlag: true
+ },
+ children: [
+ {
+ path: 'systemVersion',
+ name: 'systemVersion',
+ component: 'views/systemManage/systemVersion/index.vue',
+ meta: {
+ title: '系统版本管理',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ path: 'userManage',
+ name: 'userManage',
+ component: 'views/systemManage/userManage/index.vue',
+ meta: {
+ title: '用户管理',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ } ,
+ {
+ path: 'systemLog',
+ name: 'systemLog',
+ component: 'views/systemManage/systemLog/index.vue',
+ meta: {
+ title: '系统日志',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/src/store/comNav.ts b/src/store/comNav.ts
index 86043e5..fe8fbc4 100644
--- a/src/store/comNav.ts
+++ b/src/store/comNav.ts
@@ -3,13 +3,15 @@ export const comNavStore = defineStore('main_com_nav', {
state: () => {
return {
topNavList: [] as any, //loading控制,
- maxNavCount: 8
+ maxNavCount: 8,
+ currentNav:''
}
},
getters: {},
actions: {
addNavTarget(ev: any) {
- console.log("topNavList", this.topNavList)
+ console.log("topNavList", this.topNavList,ev)
+ this.currentNav = ev.path
if (!this.topNavList.map((ele: any) => ele.path).includes(ev.path)) {
this.topNavList.push(ev)
}
@@ -24,6 +26,10 @@ export const comNavStore = defineStore('main_com_nav', {
},
clearTarget(val: any) {
this.topNavList = []
+ },
+ setCurrentNav(ev:any){
+ console.log("setCurrentNav")
+ this.currentNav = ev
}
},
persist: {
diff --git a/src/utils/elementCom.ts b/src/utils/elementCom.ts
index 348eca9..db50ea9 100644
--- a/src/utils/elementCom.ts
+++ b/src/utils/elementCom.ts
@@ -26,7 +26,7 @@ export const ElMessageBoxOpert = (title = '', text = "", onfirmText = "", cancel
confirmButtonText: onfirmText,
cancelButtonText: cancelText,
inputValidator: (val)=>{
- inputValidator(val)
+ return inputValidator(val)
},
inputErrorMessage: inputErrorMessage,
})
diff --git a/src/views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue b/src/views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue
index 6b9c819..a3b5ac9 100644
--- a/src/views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue
+++ b/src/views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue
@@ -34,7 +34,6 @@
+
+
diff --git a/src/views/systemManage/systemLog/com/headerTop.vue b/src/views/systemManage/systemLog/com/headerTop.vue
new file mode 100644
index 0000000..9057046
--- /dev/null
+++ b/src/views/systemManage/systemLog/com/headerTop.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
diff --git a/src/views/systemManage/systemLog/index.vue b/src/views/systemManage/systemLog/index.vue
new file mode 100644
index 0000000..4ddd16c
--- /dev/null
+++ b/src/views/systemManage/systemLog/index.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemManage/systemVersion/com/addCom.vue b/src/views/systemManage/systemVersion/com/addCom.vue
new file mode 100644
index 0000000..95950b0
--- /dev/null
+++ b/src/views/systemManage/systemVersion/com/addCom.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemManage/systemVersion/com/headerTop.vue b/src/views/systemManage/systemVersion/com/headerTop.vue
new file mode 100644
index 0000000..c5eb0ed
--- /dev/null
+++ b/src/views/systemManage/systemVersion/com/headerTop.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
diff --git a/src/views/systemManage/systemVersion/index.vue b/src/views/systemManage/systemVersion/index.vue
new file mode 100644
index 0000000..9bb644d
--- /dev/null
+++ b/src/views/systemManage/systemVersion/index.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemManage/userManage/com/addCom.vue b/src/views/systemManage/userManage/com/addCom.vue
new file mode 100644
index 0000000..beb37d7
--- /dev/null
+++ b/src/views/systemManage/userManage/com/addCom.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemManage/userManage/com/headerTop.vue b/src/views/systemManage/userManage/com/headerTop.vue
new file mode 100644
index 0000000..5bc7832
--- /dev/null
+++ b/src/views/systemManage/userManage/com/headerTop.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue
new file mode 100644
index 0000000..517348b
--- /dev/null
+++ b/src/views/systemManage/userManage/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 重置密码
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file