diff --git a/src/layout/components/Aside.vue b/src/layout/components/Aside.vue index 9b7f76b..76702f7 100644 --- a/src/layout/components/Aside.vue +++ b/src/layout/components/Aside.vue @@ -71,6 +71,12 @@ const router = useRouter(); function handleMenuClick(route, index) { active.value = index; if (route.meta.type === MenuEnum.MENU) { + console.log('-------',route.meta) + if(route.meta.openOutside){ + console.log('route-------',route) + window.open(route.path); + return; + } if (route.meta.openNewPage) { window.open(router.resolve(route.path).href); return; @@ -88,6 +94,11 @@ function handleMenuClick(route, index) { const activeSecondMenuName = ref(null); function handleSecondMenuClick(route) { activeSecondMenuName.value = route.name; + if(route.meta.openOutside){ + console.log('route-------',route) + window.open(route.path); + return; + } if (route.meta.openNewPage) { window.open(router.resolve(route.path).href); return; @@ -264,4 +275,4 @@ aside { } } } - \ No newline at end of file + diff --git a/src/router/index.ts b/src/router/index.ts index 19a48f1..d565c51 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -23,6 +23,7 @@ export function createRouteRecord(menus) { perms: menu.perms, icon: menu.icon, type: menu.menuType, + openOutside:menu.openOutside, openNewPage: menu.openNewPage } } @@ -77,4 +78,4 @@ const router = createRouter({ routes }); -export default router; \ No newline at end of file +export default router; diff --git a/src/views/Home.vue b/src/views/Home.vue index fd96e48..c321fe9 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -74,10 +74,6 @@ const links = [ title: "民意感知", url: 'http://65.47.6.114:8001' }, - { - title: "政府投资项目", - url: 'http://65.47.6.108/invest' - }, { title: '视频督察', url: 'http://65.47.26.34' diff --git a/src/views/rightsComfort/MyComfort.vue b/src/views/rightsComfort/MyComfort.vue index 22804ad..d3170bd 100644 --- a/src/views/rightsComfort/MyComfort.vue +++ b/src/views/rightsComfort/MyComfort.vue @@ -1001,7 +1001,6 @@ async function querySearch(queryString, cb) { current: 1, name: queryString, }); - console.log('data',data.records) cb(data.records); } @@ -1012,9 +1011,10 @@ function handleSelect(item) { formData.value.departId=item.orgId; if(formData.value?.idCode){ console.log('formData.value.idCode,',formData.value.idCode ) - let {birthDate,gender,age}= extractInfoFromID(formData.value.idCode); - formData.value.sex=gender; - formData.value.birthday = birthDate; + let res= extractInfoFromID('430902199509098737'); + console.log('res',res) + // formData.value.sex=gender; + // formData.value.birthday = birthDate; } } diff --git a/src/views/system/Menu.vue b/src/views/system/Menu.vue index aa4414f..8e2fd8f 100644 --- a/src/views/system/Menu.vue +++ b/src/views/system/Menu.vue @@ -200,6 +200,21 @@ --> + + + + + + { line-height: 1.2; color: #666; } - \ No newline at end of file +