Browse Source

fit:打开外链

master
pengwei 2 weeks ago
parent
commit
a53b9f7b92
  1. 13
      src/layout/components/Aside.vue
  2. 3
      src/router/index.ts
  3. 4
      src/views/Home.vue
  4. 8
      src/views/rightsComfort/MyComfort.vue
  5. 18
      src/views/system/Menu.vue

13
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 {
}
}
}
</style>
</style>

3
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;
export default router;

4
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'

8
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;
}
}

18
src/views/system/Menu.vue

@ -200,6 +200,21 @@
</div>
</div>
</el-form-item> -->
<el-form-item
v-if="formData.menuType === MenuEnum.MENU"
label="打开外链"
prop="openOutside"
:rules="{
required: true,
message: '请选择是否打开外链',
trigger: ['blur'],
}"
>
<el-radio-group v-model="formData.openOutside">
<el-radio :value="false"></el-radio>
<el-radio :value="true"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
v-if="formData.menuType === MenuEnum.MENU"
label="打开新页面"
@ -292,6 +307,7 @@ getList();
const show = ref(false);
const formData = ref({
openNewPage: false,
openOutside:false,
isShow: 1,
isCache: 1,
});
@ -367,4 +383,4 @@ const handleDelete = async (row) => {
line-height: 1.2;
color: #666;
}
</style>
</style>

Loading…
Cancel
Save