renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/linzhijun_扣子智能体_0710

Browse Source 
# Conflicts:
#	src/components/_base/navbar/index.vue
#	src/main.ts
#	src/permission/permission.ts
#	vite.config.ts
This commit is contained in:
林志军
2025-07-30 09:59:41 +08:00
parent 9fc33d62c7 2123398f40
commit 896ac9ad74
239 changed files with 6246 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/router/guard/userLoginInfo.ts
View File

@ -18,9 +18,10 @@ export default function setupUserLoginInfoGuard(router: Router) {
const routeName = to?.name as string;
const requiresAuth = to?.meta?.requiresAuth || false;
const requireLogin = to?.meta?.requireLogin || false;
const query = to?.query ?? {};
if (requireLogin && !userStore.isLogin) {
goUserLogin();
goUserLogin(query);
next();
return;
}

75
src/router/routes/modules/propertyMarketing.ts
View File

@ -5,10 +5,11 @@
import type { AppRouteRecordRaw } from '../types';
import { MENU_GROUP_IDS } from '@/router/constants';
import IconRepository from '@/assets/svg/icon-repository.svg';
import IconMediaAccount from '@/assets/svg/icon-mediaAccount.svg';
import IconPutAccount from '@/assets/svg/icon-putAccount.svg';
import IconIntelligentSolution from '@/assets/svg/icon-intelligentSolution.svg';
import IconRepository from '@/assets/svg/svg-repository.svg';
import IconMediaAccount from '@/assets/svg/svg-mediaAccount.svg';
import IconPutAccount from '@/assets/svg/svg-putAccount.svg';
import IconIntelligentSolution from '@/assets/svg/svg-intelligentSolution.svg';
import IconProjectManagement from '@/assets/svg/svg-projectManagement.svg';
const COMPONENTS: AppRouteRecordRaw[] = [
{
@ -158,13 +159,50 @@ const COMPONENTS: AppRouteRecordRaw[] = [
},
],
},
// {
// path: '/intelligent-solution',
// name: 'IntelligentSolution',
// redirect: 'intelligent-solution/businessAnalysisReport',
// meta: {
// locale: '智能方案管理',
// icon: IconIntelligentSolution,
// requiresAuth: true,
// requireLogin: true,
// roles: ['*'],
// id: MENU_GROUP_IDS.PROPERTY_ID,
// },
// children: [
// {
// path: 'businessAnalysisReport',
// name: 'IntelligentSolutionBusinessAnalysisReport',
// meta: {
// locale: '业务洞察报告',
// requiresAuth: true,
// requireLogin: true,
// roles: ['*'],
// },
// component: () => import('@/views/property-marketing/intelligent-solution/businessAnalysisReport'),
// },
// {
// path: 'competitiveProductAnalysisReport',
// name: 'IntelligentSolutionCompetitiveProductAnalysisReport',
// meta: {
// locale: '竟品对比报告',
// requiresAuth: true,
// requireLogin: true,
// roles: ['*'],
// },
// component: () => import('@/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport'),
// },
// ],
// },
{
path: '/intelligent-solution',
name: 'IntelligentSolution',
redirect: 'intelligent-solution/businessAnalysisReport',
path: '/project-manage',
name: 'ProjectManagement',
redirect: 'project-manage/project-list',
meta: {
locale: '智能方案管理',
icon: IconIntelligentSolution,
locale: '项目管理',
icon: IconProjectManagement,
requiresAuth: true,
requireLogin: true,
roles: ['*'],
@ -172,26 +210,15 @@ const COMPONENTS: AppRouteRecordRaw[] = [
},
children: [
{
path: 'businessAnalysisReport',
name: 'IntelligentSolutionBusinessAnalysisReport',
path: 'project-list',
name: 'ProjectList',
meta: {
locale: '业务洞察报告',
locale: '项目列表',
requiresAuth: true,
requireLogin: true,
roles: ['*'],
},
component: () => import('@/views/property-marketing/intelligent-solution/businessAnalysisReport'),
},
{
path: 'competitiveProductAnalysisReport',
name: 'IntelligentSolutionCompetitiveProductAnalysisReport',
meta: {
locale: '竟品对比报告',
requiresAuth: true,
requireLogin: true,
roles: ['*'],
},
component: () => import('@/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport'),
component: () => import('@/views/property-marketing/project-manage/project-list'),
},
],
},