diff --git a/src/components/comNav/index.vue b/src/components/comNav/index.vue
index 537d023..fcc6acc 100644
--- a/src/components/comNav/index.vue
+++ b/src/components/comNav/index.vue
@@ -1,8 +1,7 @@
-
@@ -20,56 +19,41 @@ const menuInfo: any = reactive({
backgroundColor: '#fff',
textColor: "",
activeTextColor: '',
- defaultActive: "",
- defaultOpeneds: ['staticDefault_PathParent&&配置管理'],
+ defaultActive: '',
+ defaultOpeneds:[],
router: false,
collapseTransition: true,
menuList: list,
isCustomLink: true,
customLinkCallBack: (ev: any) => {
- console.log("customLinkCallBack", ev)
- if (ev.title.startsWith('staticDefault')) {
- return
- }
+ // console.log("customLinkCallBack", ev)
+ // if (ev.title.startsWith('staticDefault')) {
+ // return
+ // }
+ console.log("evevevevev",ev)
router.push({
- name: ev.path
+ path: ev.path
})
navStore.setDefaultActive(ev)
navStore.addNavTarget(ev)
}
})
-onMounted(() => {
+onBeforeMount(() => {
+ menuInfo.defaultActive = routes.path
console.log("routes", router.getRoutes())
- initRouteList()
-
+ // initRouteList()
+ console.log("menuInfomenuInfo",menuInfo)
+ navStore.setDefaultActive(routes.path)
})
-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)
- menuInfo.defaultOpeneds.push()
- const routes: any = list
- console.log("routes", router)
- const currentNav = routes.find((ele:any)=>ele.meta.folder).children[0]
- // if (navStore.topNavList.length == 0) {
- // 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)
-}
+// const initRouteList = () => {
+// menuInfo.defaultActive = routes.path
+// menuInfo.defaultOpeneds.push()
+// }
diff --git a/src/components/comNav/sideBar/menuItem.vue b/src/components/comNav/sideBar/menuItem.vue
index 2e36308..65a0048 100644
--- a/src/components/comNav/sideBar/menuItem.vue
+++ b/src/components/comNav/sideBar/menuItem.vue
@@ -1,7 +1,7 @@
-
+
@@ -11,7 +11,7 @@
{{ item.meta.title }}
-
+
@@ -26,11 +26,8 @@
\ No newline at end of file
diff --git a/src/components/comNav/sideBar/subMenu.vue b/src/components/comNav/sideBar/subMenu.vue
index 5b2cc52..77cd8b2 100644
--- a/src/components/comNav/sideBar/subMenu.vue
+++ b/src/components/comNav/sideBar/subMenu.vue
@@ -2,13 +2,14 @@
+ :router="props.router" :collapse-transition="props.collapseTransition" :popper-effect="props.popperEffect" @select="customLinkCallBackFn($event)" >
\ No newline at end of file
diff --git a/src/http/api/myInfo.ts b/src/http/api/myInfo.ts
index 7ea7a9d..c1f9d34 100644
--- a/src/http/api/myInfo.ts
+++ b/src/http/api/myInfo.ts
@@ -1,7 +1,13 @@
-import { post } from '../index'
+import { get, post ,detele} from '../index'
// 登录接口
export const loginApi = (data: any) => {
return post('/zlpt-auth/login', data)
-}
\ No newline at end of file
+}
+
+// 登录接口
+
+export const apiLogout = (data: any) => {
+ return detele('/zlpt-auth/logout', data)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index be34db4..12c441e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,6 @@
import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
import {useStore} from "store/main"
const routes: Array = [
-
{
path: '/',
name: 'home',
@@ -13,7 +12,7 @@ const routes: Array = [
routeListRoot: true
},
children: [],
- redirect: '/index/enterpriseType',
+
},
{
path: '/index',
@@ -28,7 +27,7 @@ const routes: Array = [
},
children: [
{
- path: 'swiperConfig',
+ path:'configManage/swiperConfig',
name: 'swiperConfig',
component: () => import('views/configuration/swiperConfig/index.vue'),
meta: {
@@ -40,7 +39,7 @@ const routes: Array = [
},
{
- path: 'specialInformationConfiguration',
+ path:'configManage/specialInformationConfiguration',
name: 'specialInformationConfiguration',
component: () => import('views/configuration/specialInformationConfiguration/index.vue'),
meta: {
@@ -50,7 +49,7 @@ const routes: Array = [
}
},
{
- path: 'privacyAgreement',
+ path:'configManage/privacyAgreement',
name: 'privacyAgreement',
component: () => import('views/configuration/privacyAgreement/index.vue'),
meta: {
@@ -61,7 +60,7 @@ const routes: Array = [
},
{
- path: 'enterpriseManagement',
+ path:'enterpriseTypeManage',
name: 'enterpriseManagement',
component: () => import('views/enterpriseManagement/index.vue'),
meta: {
@@ -72,7 +71,7 @@ const routes: Array = [
},
{
- path: 'enterpriseType',
+ path:'enterpriseTypeManage/enterpriseType',
name: 'enterpriseType',
component: () => import('views/enterpriseManagement/enterpriseType/index.vue'),
meta: {
@@ -82,7 +81,7 @@ const routes: Array = [
}
},
{
- path: 'enterpriseEntryReview',
+ path:'enterpriseTypeManage/enterpriseEntryReview',
name: 'enterpriseEntryReview',
component: () => import('views/enterpriseManagement/enterpriseEntryReview/index.vue'),
meta: {
@@ -93,7 +92,7 @@ const routes: Array = [
},
{
- path: 'businessReview',
+ path:'enterpriseTypeManage/businessReview',
name: 'businessReview',
component: () => import('views/enterpriseManagement/businessReview/index.vue'),
meta: {
@@ -103,7 +102,7 @@ const routes: Array = [
}
},
{
- path: 'enterpriseInfo',
+ path:'enterpriseTypeManage/enterpriseInfo',
name: 'enterpriseInfo',
component: () => import('views/enterpriseManagement/enterpriseInfo/index.vue'),
meta: {
@@ -114,7 +113,7 @@ const routes: Array = [
},
// 企业装备管理
{
- path: 'equipmentTypeTemplate',
+ path:'enterpriseEquipmentManage/equipmentTypeTemplate',
name: 'equipmentTypeTemplate',
component: () => import('views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue'),
meta: {
@@ -125,7 +124,7 @@ const routes: Array = [
},
{
- path: 'equipmentListingApproval',
+ path:'enterpriseEquipmentManage/equipmentListingApproval',
name: 'equipmentListingApproval',
component: () => import('views/enterpriseEquipmentManage/equipmentListingApproval/index.vue'),
meta: {
@@ -135,7 +134,7 @@ const routes: Array = [
}
},
{
- path: 'iotEquipmentManagement',
+ path:'enterpriseEquipmentManage/iotEquipmentManagement',
name: 'iotEquipmentManagement',
component: () => import('views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue'),
meta: {
@@ -144,19 +143,10 @@ const routes: Array = [
AuthFlag: true
}
},
- {
- path: 'orderManagement',
- name: 'orderManagement',
- component: () => import('views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue'),
- meta: {
- title: 'iot设备管理',
- keepAlive: true,
- AuthFlag: true
- }
- },
+
{
name: "orderManagement",
- path: 'orderManagement',
+ path:'orderManagement',
component: () => import('views/orderManagement/index.vue'),
meta: {
title: '订单管理',
@@ -168,7 +158,7 @@ const routes: Array = [
// 111
{
name: "systemVersion",
- path: 'systemVersion',
+ path:'systemManage/systemVersion',
component: () => import('views/systemManage/systemVersion/index.vue'),
meta: {
title: '系统版本管理',
@@ -179,7 +169,7 @@ const routes: Array = [
},
{
name: "userManage",
- path: 'userManage',
+ path:'systemManage/userManage',
component: () => import('views/systemManage/userManage/index.vue'),
meta: {
title: '用户管理',
@@ -191,18 +181,7 @@ const routes: Array = [
{
name: "systemLog",
- path: 'systemLog',
- component: () => import('views/systemManage/systemLog/index.vue'),
- meta: {
- title: '系统日志',
- keepAlive: true,
- AuthFlag: true
- },
- children: []
- },
- {
- name: "systemLog",
- path: 'systemLog',
+ path:'systemManage/systemLog',
component: () => import('views/systemManage/systemLog/index.vue'),
meta: {
title: '系统日志',
@@ -211,9 +190,10 @@ const routes: Array = [
},
children: []
},
+
{
name: "entryAuditDetails",
- path: 'entryAuditDetails',
+ path: 'enterpriseManagement/entryAuditDetails',
component: () => import('views/enterpriseManagement/enterpriseEntryReview/details.vue'),
meta: {
title: '审批详情',
@@ -224,7 +204,7 @@ const routes: Array = [
},
{
name: "businessReviewDetails",
- path: 'businessReviewDetails',
+ path: 'enterpriseManagement/businessReviewDetails',
component: () => import('views/enterpriseManagement/businessReview/details.vue'),
meta: {
title: '审批详情',
@@ -234,7 +214,7 @@ const routes: Array = [
children: []
}, {
name: "enterpriseInfoDetails",
- path: 'enterpriseInfoDetails',
+ path: 'enterpriseManagement/enterpriseInfoDetails',
component: () => import('views/enterpriseManagement/enterpriseInfo/details.vue'),
meta: {
title: '审批详情',
@@ -244,7 +224,7 @@ const routes: Array = [
children: []
}, {
name: "lonLatPick",
- path: 'lonLatPick',
+ path: 'systemManage/lonLatPick',
component: () => import('views/enterpriseManagement/lonLatPick/index.vue'),
meta: {
title: '经纬度拾取',
@@ -256,9 +236,9 @@ const routes: Array = [
]
},
{
- name: "Login",
- path: '/Login',
- component: () => import('views/Login.vue'),
+ name: "login",
+ path: '/login',
+ component: () => import('views/login.vue'),
meta: {
title: '登录',
keepAlive: true,
diff --git a/src/router/routerData copy.ts b/src/router/routerData copy.ts
deleted file mode 100644
index 08481a5..0000000
--- a/src/router/routerData copy.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-export const list: any = [
- {
- name: "configManage",
- path:'/index/configManage',
- meta: {
- title: '配置管理',
- keepAlive: true,
- AuthFlag: true
- },
- children: [
- {
- path:'/index/configManage/swiperConfig',
- name: 'swiperConfig',
- component: 'views/configuration/swiperConfig.vue',
- meta: {
- title: '轮播图配置',
- keepAlive: true,
- AuthFlag: true
- }
- },
- {
- path:'/index/configManage/specialInformationConfiguration',
- name: 'specialInformationConfiguration',
- component: 'views/configuration/specialInformationConfiguration/index.vue',
- meta: {
- title: '专题资讯配置',
- keepAlive: true,
- AuthFlag: true
- }
- },
- {
- path:'/index/configManage/privacyAgreement',
- name: 'privacyAgreement',
- component: 'views/configuration/privacyAgreement/index.vue',
- meta: {
- title: '隐私协议模板管理',
- keepAlive: true,
- AuthFlag: true
- }
- },
- ]
- },
- {
- name: "企业管理",
- path:'/index/enterpriseTypeManage',
- meta: {
- title: '企业管理',
- keepAlive: true,
- AuthFlag: true
- },
- children: [
-
-
- {
- path:'/index/enterpriseTypeManage/enterpriseType',
- name: 'configuration',
- component: 'views/enterpriseManagement/enterpriseType/index.vue',
- meta: {
- title: '企业类型',
- keepAlive: true,
- AuthFlag: true
- }
- },
- {
- path:'/index/enterpriseTypeManage/enterpriseEntryReview',
- name: 'enterpriseEntryReview',
- component: 'views/enterpriseManagement/enterpriseEntryReview/index.vue',
- meta: {
- title: '企业入驻审核',
- keepAlive: true,
- AuthFlag: true
- },
-
- },
- {
- path:'/index/enterpriseTypeManage/businessReview',
- name: 'businessReview',
- component: 'views/enterpriseManagement/businessReview/index.vue',
- meta: {
- title: '企业业务开通审核',
- keepAlive: true,
- AuthFlag: true
- }
- },
- {
- path:'/index/enterpriseTypeManage/enterpriseInfo',
- name: 'enterpriseInfo',
- component: 'views/enterpriseManagement/enterpriseInfo/index.vue',
- meta: {
- title: '企业信息',
- keepAlive: true,
- AuthFlag: true
- }
- },
- ]
- },
- {
- name: "企业装备管理",
- path:'/index/enterpriseEquipmentManage',
- meta: {
- title: '企业装备管理',
- keepAlive: true,
- AuthFlag: true
- },
- children: [
- {
- path:'/index/enterpriseEquipmentManage/equipmentTypeTemplate',
- name: 'equipmentTypeTemplate',
- component: 'views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue',
- meta: {
- title: '装备类型模板',
- keepAlive: true,
- AuthFlag: true
- }
- },
-
- {
- path:'/index/enterpriseEquipmentManage/equipmentListingApproval',
- name: 'equipmentListingApproval',
- component: 'views/enterpriseEquipmentManage/equipmentListingApproval/index.vue',
- meta: {
- title: '装备上架审批',
- keepAlive: true,
- AuthFlag: true
- },
-
- },
- // iotEquipmentManagement
- {
- path:'/index/enterpriseEquipmentManage/iotEquipmentManagement',
- name: 'iotEquipmentManagement',
- component: 'views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue',
- meta: {
- title: 'iot设备管理',
- keepAlive: true,
- AuthFlag: true
- }
- }
- ]
- },
- {
- name: "orderManagement",
- path:'/index/orderManagement',
- component: 'views/orderManagement/index.vue',
- meta: {
- title: '订单管理',
- keepAlive: true,
- AuthFlag: true
- },
- children: []
- },
- {
- name: "systemManage",
- path:'/index/systemManage',
- meta: {
- title: '系统管理',
- keepAlive: true,
- AuthFlag: true
- },
- children: [
- {
- path:'/index/systemManage/systemVersion',
- name: 'systemVersion',
- component: 'views/systemManage/systemVersion/index.vue',
- meta: {
- title: '系统版本管理',
- keepAlive: true,
- AuthFlag: true
- }
- },
- {
- path:'/index/systemManage/userManage',
- name: 'userManage',
- component: 'views/systemManage/userManage/index.vue',
- meta: {
- title: '用户管理',
- keepAlive: true,
- AuthFlag: true
- }
- } ,
- {
- path:'/index/systemManage/systemLog',
- name: 'systemLog',
- component: 'views/systemManage/systemLog/index.vue',
- meta: {
- title: '系统日志',
- keepAlive: true,
- AuthFlag: true
- }
- } ,
- {
- name: "lonLatPick",
- path: 'lonLatPick',
- component: () => import('views/enterpriseManagement/lonLatPick/index.vue'),
- meta: {
- title: '经纬度拾取',
- keepAlive: true,
- AuthFlag: true
- },
- }
- ]
- }
-
-]
\ No newline at end of file
diff --git a/src/router/routerData.ts b/src/router/routerData.ts
index 8604469..8d8519f 100644
--- a/src/router/routerData.ts
+++ b/src/router/routerData.ts
@@ -1,61 +1,57 @@
export const list: any = [
- // {
- // name: "configManage",
- // path:'/index/configManage',
- // meta: {
- // title: '配置管理',
- // keepAlive: true,
- // AuthFlag: true
- // },
- // children: [
- // {
- // path:'/index/configManage/swiperConfig',
- // name: 'swiperConfig',
- // component: 'views/configuration/swiperConfig.vue',
- // meta: {
- // title: '轮播图配置',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // },
- // {
- // path:'/index/configManage/specialInformationConfiguration',
- // name: 'specialInformationConfiguration',
- // component: 'views/configuration/specialInformationConfiguration/index.vue',
- // meta: {
- // title: '专题资讯配置',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // },
- // {
- // path:'/index/configManage/privacyAgreement',
- // name: 'privacyAgreement',
- // component: 'views/configuration/privacyAgreement/index.vue',
- // meta: {
- // title: '隐私协议模板管理',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // },
- // ]
- // },
{
- name: "enterpriseTypeManage",
- path:'/index/enterpriseTypeManage',
+ name: "configManage",
+ path: '/index/configManage/swiperConfig',
+ meta: {
+ title: '配置管理',
+ keepAlive: true,
+ AuthFlag: true,
+ folder: true
+ },
+ children: [
+ {
+ path: '/index/configManage/swiperConfig',
+ name: 'swiperConfig',
+ meta: {
+ title: '轮播图配置',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ path: '/index/configManage/specialInformationConfiguration',
+ name: 'specialInformationConfiguration',
+ meta: {
+ title: '专题资讯配置',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ path: '/index/configManage/privacyAgreement',
+ name: 'privacyAgreement',
+ meta: {
+ title: '隐私协议模板管理',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ ]
+ },
+ {
+ name: "企业管理",
+ path: '/index/enterpriseTypeManage/enterpriseType',
meta: {
title: '企业管理',
keepAlive: true,
AuthFlag: true,
- folder:true
+ folder: true
},
children: [
-
{
- path:'/index/enterpriseTypeManage/enterpriseType',
+ path: '/index/enterpriseTypeManage/enterpriseType',
name: 'enterpriseType',
- component: 'views/enterpriseManagement/enterpriseType/index.vue',
meta: {
title: '企业类型',
keepAlive: true,
@@ -63,9 +59,9 @@ export const list: any = [
}
},
{
- path:'/index/enterpriseTypeManage/enterpriseEntryReview',
+ path: '/index/enterpriseTypeManage/enterpriseEntryReview',
name: 'enterpriseEntryReview',
- component: 'views/enterpriseManagement/enterpriseEntryReview/index.vue',
+
meta: {
title: '企业入驻审核',
keepAlive: true,
@@ -74,9 +70,9 @@ export const list: any = [
},
{
- path:'/index/enterpriseTypeManage/businessReview',
+ path: '/index/enterpriseTypeManage/businessReview',
name: 'businessReview',
- component: 'views/enterpriseManagement/businessReview/index.vue',
+
meta: {
title: '企业业务开通审核',
keepAlive: true,
@@ -84,9 +80,8 @@ export const list: any = [
}
},
{
- path:'/index/enterpriseTypeManage/enterpriseInfo',
+ path: '/index/enterpriseTypeManage/enterpriseInfo',
name: 'enterpriseInfo',
- component: 'views/enterpriseManagement/enterpriseInfo/index.vue',
meta: {
title: '企业信息',
keepAlive: true,
@@ -97,29 +92,27 @@ export const list: any = [
},
{
name: "企业装备管理",
- path:'/index/enterpriseEquipmentManage',
+ path: '/index/enterpriseEquipmentManage/equipmentTypeTemplate',
meta: {
title: '企业装备管理',
keepAlive: true,
AuthFlag: true,
- folder:true
+ folder: true
},
children: [
- // {
- // path:'/index/enterpriseEquipmentManage/equipmentTypeTemplate',
- // name: 'equipmentTypeTemplate',
- // component: 'views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue',
- // meta: {
- // title: '装备类型模板',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // },
-
{
- path:'/index/enterpriseEquipmentManage/equipmentListingApproval',
+ path: '/index/enterpriseEquipmentManage/equipmentTypeTemplate',
+ name: 'equipmentTypeTemplate',
+ meta: {
+ title: '装备类型模板',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+
+ {
+ path: '/index/enterpriseEquipmentManage/equipmentListingApproval',
name: 'equipmentListingApproval',
- component: 'views/enterpriseEquipmentManage/equipmentListingApproval/index.vue',
meta: {
title: '装备上架审批',
keepAlive: true,
@@ -128,79 +121,75 @@ export const list: any = [
},
// iotEquipmentManagement
- // {
- // path:'/index/enterpriseEquipmentManage/iotEquipmentManagement',
- // name: 'iotEquipmentManagement',
- // component: 'views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue',
- // meta: {
- // title: 'iot设备管理',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // }
+ {
+ path: '/index/enterpriseEquipmentManage/iotEquipmentManagement',
+ name: 'iotEquipmentManagement',
+ meta: {
+ title: 'iot设备管理',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ }
]
},
- // {
- // name: "orderManagement",
- // path:'/index/orderManagement',
- // component: 'views/orderManagement/index.vue',
- // meta: {
- // title: '订单管理',
- // keepAlive: true,
- // AuthFlag: true
- // },
- // children: []
- // },
- // {
- // name: "systemManage",
- // path:'/index/systemManage',
- // meta: {
- // title: '系统管理',
- // keepAlive: true,
- // AuthFlag: true
- // },
- // children: [
- // {
- // path:'/index/systemManage/systemVersion',
- // name: 'systemVersion',
- // component: 'views/systemManage/systemVersion/index.vue',
- // meta: {
- // title: '系统版本管理',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // },
- // {
- // path:'/index/systemManage/userManage',
- // name: 'userManage',
- // component: 'views/systemManage/userManage/index.vue',
- // meta: {
- // title: '用户管理',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // } ,
- // {
- // path:'/index/systemManage/systemLog',
- // name: 'systemLog',
- // component: 'views/systemManage/systemLog/index.vue',
- // meta: {
- // title: '系统日志',
- // keepAlive: true,
- // AuthFlag: true
- // }
- // } ,
- // {
- // name: "lonLatPick",
- // path: 'lonLatPick',
- // component: () => import('views/enterpriseManagement/lonLatPick/index.vue'),
- // meta: {
- // title: '经纬度拾取',
- // keepAlive: true,
- // AuthFlag: true
- // },
- // }
- // ]
- // }
+ {
+ name: "orderManagement",
+ path: '/index/orderManagement',
+ meta: {
+ title: '订单管理',
+ keepAlive: true,
+ AuthFlag: true,
+ folder: true
+ },
+ children: []
+ },
+ {
+ name: "systemManage",
+ path: '/index/systemManage/systemVersion',
+ meta: {
+ title: '系统管理',
+ keepAlive: true,
+ AuthFlag: true,
+ folder: true
+ },
+ children: [
+ {
+ path: '/index/systemManage/systemVersion',
+ name: 'systemVersion',
+ meta: {
+ title: '系统版本管理',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ path: '/index/systemManage/userManage',
+ name: 'userManage',
+ meta: {
+ title: '用户管理',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ path: '/index/systemManage/systemLog',
+ name: 'systemLog',
+ meta: {
+ title: '系统日志',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ name: "lonLatPick",
+ path: '/index/systemManage/lonLatPick',
+ meta: {
+ title: '经纬度拾取',
+ keepAlive: true,
+ AuthFlag: true
+ },
+ }
+ ]
+ }
]
\ No newline at end of file
diff --git a/src/router/routerData1.ts b/src/router/routerData1.ts
new file mode 100644
index 0000000..8604469
--- /dev/null
+++ b/src/router/routerData1.ts
@@ -0,0 +1,206 @@
+export const list: any = [
+ // {
+ // name: "configManage",
+ // path:'/index/configManage',
+ // meta: {
+ // title: '配置管理',
+ // keepAlive: true,
+ // AuthFlag: true
+ // },
+ // children: [
+ // {
+ // path:'/index/configManage/swiperConfig',
+ // name: 'swiperConfig',
+ // component: 'views/configuration/swiperConfig.vue',
+ // meta: {
+ // title: '轮播图配置',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // },
+ // {
+ // path:'/index/configManage/specialInformationConfiguration',
+ // name: 'specialInformationConfiguration',
+ // component: 'views/configuration/specialInformationConfiguration/index.vue',
+ // meta: {
+ // title: '专题资讯配置',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // },
+ // {
+ // path:'/index/configManage/privacyAgreement',
+ // name: 'privacyAgreement',
+ // component: 'views/configuration/privacyAgreement/index.vue',
+ // meta: {
+ // title: '隐私协议模板管理',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // },
+ // ]
+ // },
+ {
+ name: "enterpriseTypeManage",
+ path:'/index/enterpriseTypeManage',
+ meta: {
+ title: '企业管理',
+ keepAlive: true,
+ AuthFlag: true,
+ folder:true
+ },
+ children: [
+
+
+ {
+ path:'/index/enterpriseTypeManage/enterpriseType',
+ name: 'enterpriseType',
+ component: 'views/enterpriseManagement/enterpriseType/index.vue',
+ meta: {
+ title: '企业类型',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ path:'/index/enterpriseTypeManage/enterpriseEntryReview',
+ name: 'enterpriseEntryReview',
+ component: 'views/enterpriseManagement/enterpriseEntryReview/index.vue',
+ meta: {
+ title: '企业入驻审核',
+ keepAlive: true,
+ AuthFlag: true
+ },
+
+ },
+ {
+ path:'/index/enterpriseTypeManage/businessReview',
+ name: 'businessReview',
+ component: 'views/enterpriseManagement/businessReview/index.vue',
+ meta: {
+ title: '企业业务开通审核',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ {
+ path:'/index/enterpriseTypeManage/enterpriseInfo',
+ name: 'enterpriseInfo',
+ component: 'views/enterpriseManagement/enterpriseInfo/index.vue',
+ meta: {
+ title: '企业信息',
+ keepAlive: true,
+ AuthFlag: true
+ }
+ },
+ ]
+ },
+ {
+ name: "企业装备管理",
+ path:'/index/enterpriseEquipmentManage',
+ meta: {
+ title: '企业装备管理',
+ keepAlive: true,
+ AuthFlag: true,
+ folder:true
+ },
+ children: [
+ // {
+ // path:'/index/enterpriseEquipmentManage/equipmentTypeTemplate',
+ // name: 'equipmentTypeTemplate',
+ // component: 'views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue',
+ // meta: {
+ // title: '装备类型模板',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // },
+
+ {
+ path:'/index/enterpriseEquipmentManage/equipmentListingApproval',
+ name: 'equipmentListingApproval',
+ component: 'views/enterpriseEquipmentManage/equipmentListingApproval/index.vue',
+ meta: {
+ title: '装备上架审批',
+ keepAlive: true,
+ AuthFlag: true
+ },
+
+ },
+ // iotEquipmentManagement
+ // {
+ // path:'/index/enterpriseEquipmentManage/iotEquipmentManagement',
+ // name: 'iotEquipmentManagement',
+ // component: 'views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue',
+ // meta: {
+ // title: 'iot设备管理',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // }
+ ]
+ },
+ // {
+ // name: "orderManagement",
+ // path:'/index/orderManagement',
+ // component: 'views/orderManagement/index.vue',
+ // meta: {
+ // title: '订单管理',
+ // keepAlive: true,
+ // AuthFlag: true
+ // },
+ // children: []
+ // },
+ // {
+ // name: "systemManage",
+ // path:'/index/systemManage',
+ // meta: {
+ // title: '系统管理',
+ // keepAlive: true,
+ // AuthFlag: true
+ // },
+ // children: [
+ // {
+ // path:'/index/systemManage/systemVersion',
+ // name: 'systemVersion',
+ // component: 'views/systemManage/systemVersion/index.vue',
+ // meta: {
+ // title: '系统版本管理',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // },
+ // {
+ // path:'/index/systemManage/userManage',
+ // name: 'userManage',
+ // component: 'views/systemManage/userManage/index.vue',
+ // meta: {
+ // title: '用户管理',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // } ,
+ // {
+ // path:'/index/systemManage/systemLog',
+ // name: 'systemLog',
+ // component: 'views/systemManage/systemLog/index.vue',
+ // meta: {
+ // title: '系统日志',
+ // keepAlive: true,
+ // AuthFlag: true
+ // }
+ // } ,
+ // {
+ // name: "lonLatPick",
+ // path: 'lonLatPick',
+ // component: () => import('views/enterpriseManagement/lonLatPick/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 896a671..c5b080a 100644
--- a/src/store/comNav.ts
+++ b/src/store/comNav.ts
@@ -26,16 +26,19 @@ export const comNavStore = defineStore('main_com_nav', {
}
this.currentNav = this.topNavList[index]
},
- clearTarget(val: any) {
+ clearTarget() {
this.topNavList = []
+ this.currentNav=''
+ this.defaultActive=""
},
setCurrentNav(ev:any){
console.log("setCurrentNav00",ev)
this.currentNav = ev
+
} ,
setDefaultActive(ev:any){
console.log("setCurrentNav")
- this.defaultActive = ev.path+'&&'+ev.title
+ this.defaultActive = ev
}
diff --git a/src/store/main.ts b/src/store/main.ts
index a4d896c..1a9f640 100644
--- a/src/store/main.ts
+++ b/src/store/main.ts
@@ -2,7 +2,8 @@ export const useStore = defineStore('main', {
state: () => {
return {
loadingFlag: false, //loading控制,
- token: ""
+ token: "",
+ userInfo:{}
}
},
getters: {},
diff --git a/src/store/myInfo.ts b/src/store/myInfo.ts
deleted file mode 100644
index 2c23e58..0000000
--- a/src/store/myInfo.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export const useStore = defineStore('myInfo', {
- state: () => {
- return {
- userName: '99'
- }
- },
- getters: {
- textConbain: (state) => state.userName + '4444',
- textEnd() {
- return this.textConbain + '666'
- }
- },
- actions: {
- updateText() {
- console.log('updateText')
- }
- },
- persist: {
- enabled: true, // 开启数据缓存
- strategies: [
- {
- // 自定义存储的 key,默认是 store.$id
- key: 'userName',
- storage: sessionStorage, //缓存模式 可选 localStorage sessionStorage
- // state 中的字段名,按组打包储存
- paths: ['userName'] //需要缓存的字段 与 state中相关联
- }
- ]
- }
-})
diff --git a/src/views/AppMain.vue b/src/views/AppMain.vue
index 471c301..129b035 100644
--- a/src/views/AppMain.vue
+++ b/src/views/AppMain.vue
@@ -65,9 +65,10 @@ import headerNav from "components/headerCom/headerNav.vue"
.view_out_c {
- width:calc(100% - 24px) ;
+ width:calc(100% - 12px) ;
flex: 1;
margin: 12px;
+ margin-left:0;
display:flex;
flex-direction: column;
}