Merge remote-tracking branch 'origin/feature/0902_antd组件替换' into test
# Conflicts: # src/App.vue # src/components/common-select/index.vue # src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue # src/views/components/login/index.vue # src/views/home/components/history-conversation-drawer/index.vue # src/views/login/style.scss # src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
This commit is contained in:
rd
@ -3,6 +3,7 @@
|
||||
* @Date: 2025-06-22 22:59:16
|
||||
*/
|
||||
import type { Router } from 'vue-router';
|
||||
import { message } from 'ant-design-vue';
|
||||
import NProgress from 'nprogress';
|
||||
import { goUserLogin } from '@/utils/user';
|
||||
// import router from '@/router';
|
||||
@ -29,7 +30,7 @@ export default function setupUserLoginInfoGuard(router: Router) {
|
||||
// if (requiresAuth) {
|
||||
// const hasPermission = checkRoutePermission(routeName);
|
||||
// if (!hasPermission) {
|
||||
// AMessage.error('您没有权限访问该页面');
|
||||
// message.error('您没有权限访问该页面');
|
||||
// next('/');
|
||||
// return;
|
||||
// }
|
||||
|
||||
@ -1,89 +1,89 @@
|
||||
// import { IconBookmark } from '@arco-design/web-vue/es/icon';
|
||||
// import type { AppRouteRecordRaw } from '../types';
|
||||
// import { MENU_GROUP_IDS } from '@/router/constants';
|
||||
import { IconBookmark } from '@arco-design/web-vue/es/icon';
|
||||
import type { AppRouteRecordRaw } from '../types';
|
||||
import { MENU_GROUP_IDS } from '@/router/constants';
|
||||
|
||||
// const COMPONENTS: AppRouteRecordRaw[] = [
|
||||
// {
|
||||
// path: '/dataEngine',
|
||||
// name: 'DataEngine',
|
||||
// redirect: 'dataEngine/hotTranslation',
|
||||
// meta: {
|
||||
// locale: '全域数据引擎',
|
||||
// icon: IconBookmark,
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// id: MENU_GROUP_IDS.DATA_ENGINE_ID,
|
||||
// },
|
||||
// children: [
|
||||
// {
|
||||
// path: 'hotTranslation',
|
||||
// name: 'DataEngineHotTranslation',
|
||||
// meta: {
|
||||
// locale: '行业热门话题洞察',
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// },
|
||||
// component: () => import('@/views/components/dataEngine/hotTranslation.vue'),
|
||||
// },
|
||||
// {
|
||||
// path: 'hotCloud',
|
||||
// name: 'DataEngineHotCloud',
|
||||
// meta: {
|
||||
// locale: '行业词云',
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// },
|
||||
// component: () => import('@/views/components/dataEngine/hotCloud.vue'),
|
||||
// },
|
||||
// {
|
||||
// path: 'keyWord',
|
||||
// name: 'DataEngineKeyWord',
|
||||
// meta: {
|
||||
// locale: '行业关键词动向',
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// },
|
||||
// component: () => import('@/views/components/dataEngine/keyWord.vue'),
|
||||
// },
|
||||
// {
|
||||
// path: 'userPainPoints',
|
||||
// name: 'DataEngineUserPainPoints',
|
||||
// meta: {
|
||||
// locale: '用户痛点观察',
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// },
|
||||
// component: () => import('@/views/components/dataEngine/userPainPoints.vue'),
|
||||
// },
|
||||
// {
|
||||
// path: 'keyBrandMovement',
|
||||
// name: 'DataEngineKeyBrandMovement',
|
||||
// meta: {
|
||||
// locale: '重点品牌动向',
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// },
|
||||
// component: () => import('@/views/components/dataEngine/keyBrandMovement.vue'),
|
||||
// },
|
||||
// {
|
||||
// path: 'userPersona',
|
||||
// name: 'DataEngineUserPersona',
|
||||
// meta: {
|
||||
// locale: '用户画像',
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// },
|
||||
// component: () => import('@/views/components/dataEngine/userPersona.vue'),
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// ];
|
||||
const COMPONENTS: AppRouteRecordRaw[] = [
|
||||
{
|
||||
path: '/dataEngine',
|
||||
name: 'DataEngine',
|
||||
redirect: 'dataEngine/hotTranslation',
|
||||
meta: {
|
||||
locale: '全域数据引擎',
|
||||
icon: IconBookmark,
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
id: MENU_GROUP_IDS.DATA_ENGINE_ID,
|
||||
},
|
||||
children: [
|
||||
{
|
||||
path: 'hotTranslation',
|
||||
name: 'DataEngineHotTranslation',
|
||||
meta: {
|
||||
locale: '行业热门话题洞察',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/components/dataEngine/hotTranslation.vue'),
|
||||
},
|
||||
{
|
||||
path: 'hotCloud',
|
||||
name: 'DataEngineHotCloud',
|
||||
meta: {
|
||||
locale: '行业词云',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/components/dataEngine/hotCloud.vue'),
|
||||
},
|
||||
{
|
||||
path: 'keyWord',
|
||||
name: 'DataEngineKeyWord',
|
||||
meta: {
|
||||
locale: '行业关键词动向',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/components/dataEngine/keyWord.vue'),
|
||||
},
|
||||
{
|
||||
path: 'userPainPoints',
|
||||
name: 'DataEngineUserPainPoints',
|
||||
meta: {
|
||||
locale: '用户痛点观察',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/components/dataEngine/userPainPoints.vue'),
|
||||
},
|
||||
{
|
||||
path: 'keyBrandMovement',
|
||||
name: 'DataEngineKeyBrandMovement',
|
||||
meta: {
|
||||
locale: '重点品牌动向',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/components/dataEngine/keyBrandMovement.vue'),
|
||||
},
|
||||
{
|
||||
path: 'userPersona',
|
||||
name: 'DataEngineUserPersona',
|
||||
meta: {
|
||||
locale: '用户画像',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/components/dataEngine/userPersona.vue'),
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
// export default COMPONENTS;
|
||||
export default COMPONENTS;
|
||||
|
||||
@ -7,9 +7,9 @@ import { MENU_GROUP_IDS } from '@/router/constants';
|
||||
|
||||
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';
|
||||
// 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[] = [
|
||||
{
|
||||
@ -184,77 +184,6 @@ const COMPONENTS: AppRouteRecordRaw[] = [
|
||||
},
|
||||
component: () => import('@/views/property-marketing/assignment-management/index.vue'),
|
||||
},
|
||||
{
|
||||
path: '/put-account',
|
||||
name: 'PutAccount',
|
||||
redirect: 'put-account/accountManagement',
|
||||
meta: {
|
||||
locale: '投放资源中心',
|
||||
icon: IconPutAccount,
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
id: MENU_GROUP_IDS.PROPERTY_ID,
|
||||
},
|
||||
children: [
|
||||
{
|
||||
path: 'manage',
|
||||
name: 'PutAccountAccountManagement',
|
||||
meta: {
|
||||
locale: '账户管理',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/property-marketing/put-account/account-manage/index.vue'),
|
||||
},
|
||||
{
|
||||
path: 'data',
|
||||
name: 'PutAccountAccountData',
|
||||
meta: {
|
||||
locale: '账户数据',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/property-marketing/put-account/account-data/index.vue'),
|
||||
},
|
||||
{
|
||||
path: 'account-dashboard',
|
||||
name: 'PutAccountAccountDashboard',
|
||||
meta: {
|
||||
locale: '投放表现分析',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/property-marketing/put-account/account-dashboard/index.vue'),
|
||||
},
|
||||
{
|
||||
path: 'investmentGuidelines',
|
||||
name: 'PutAccountInvestmentGuidelines',
|
||||
meta: {
|
||||
locale: '投放指南',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/property-marketing/put-account/investment-guidelines/index.vue'),
|
||||
},
|
||||
{
|
||||
path: 'detail/:id',
|
||||
name: 'guideDetail',
|
||||
meta: {
|
||||
locale: '投放指南详情',
|
||||
requiresAuth: true,
|
||||
hideInMenu: true,
|
||||
roles: ['*'],
|
||||
activeMenu: 'PutAccountInvestmentGuidelines',
|
||||
},
|
||||
component: () => import('@/views/property-marketing/put-account/investment-guidelines/detail.vue'),
|
||||
},
|
||||
],
|
||||
},
|
||||
// {
|
||||
// path: '/intelligent-solution',
|
||||
// name: 'IntelligentSolution',
|
||||
@ -292,32 +221,32 @@ const COMPONENTS: AppRouteRecordRaw[] = [
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
{
|
||||
path: '/project-manage',
|
||||
name: 'ProjectManagement',
|
||||
redirect: 'project-manage/project-list',
|
||||
meta: {
|
||||
locale: '项目管理',
|
||||
icon: IconProjectManagement,
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
id: MENU_GROUP_IDS.PROPERTY_ID,
|
||||
},
|
||||
children: [
|
||||
{
|
||||
path: 'project-list',
|
||||
name: 'ProjectList',
|
||||
meta: {
|
||||
locale: '项目列表',
|
||||
requiresAuth: true,
|
||||
requireLogin: true,
|
||||
roles: ['*'],
|
||||
},
|
||||
component: () => import('@/views/property-marketing/project-manage/project-list/index.vue'),
|
||||
},
|
||||
],
|
||||
},
|
||||
// {
|
||||
// path: '/project-manage',
|
||||
// name: 'ProjectManagement',
|
||||
// redirect: 'project-manage/project-list',
|
||||
// meta: {
|
||||
// locale: '项目管理',
|
||||
// icon: IconProjectManagement,
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// id: MENU_GROUP_IDS.PROPERTY_ID,
|
||||
// },
|
||||
// children: [
|
||||
// {
|
||||
// path: 'project-list',
|
||||
// name: 'ProjectList',
|
||||
// meta: {
|
||||
// locale: '项目列表',
|
||||
// requiresAuth: true,
|
||||
// requireLogin: true,
|
||||
// roles: ['*'],
|
||||
// },
|
||||
// component: () => import('@/views/property-marketing/project-manage/project-list/index.vue'),
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
];
|
||||
|
||||
export default COMPONENTS;
|
||||
|
||||
Reference in New Issue
Block a user