Skip to content

T
TOSTUMI
Commit 9ba8c8c0 authored by MrShi's avatar MrShi
Browse files
Options

config.ts更新

parent 8aaedb3b
Hide whitespace changes
Inline Side-by-side
Showing with 516 additions and 49 deletions
config/config.ts
View file @ 9ba8c8c0
......@@ -28,14 +28,14 @@ export default defineConfig({
},
// umi routes: https://umijs.org/docs/routing
routes: [
{
/* {
path: '/login2',
component: '../pages/user/login2',
},
{
path: '/others',
component: '../pages/user/others',
},
},*/
{
path: '/user',
component: '../layouts/UserLayout',
......@@ -61,10 +61,6 @@ export default defineConfig({
component: '../layouts/BasicLayout',
authority: ['admin', 'user'],
routes: [
/* {
path: '/',
redirect: '/runTest',
},*/
{
path: '/',
......@@ -76,22 +72,22 @@ export default defineConfig({
icon: 'smile',
component: './Welcome',
},*/
{
/* {
path: '/admin',
name: 'admin',
icon: 'crown',
component: './Admin',
// authority: ['admin'],
authority: ['admin'],
routes: [
{
path: '/admin/sub-page',
name: 'sub-page',
icon: 'smile',
component: './Welcome',
// authority: ['admin'],
authority: ['admin'],
},
],
},
},*/
/* {
name: 'list.table-list',
icon: 'table',
......@@ -250,19 +246,19 @@ export default defineConfig({
component: './device/DeviceDetails',
hideInMenu: true,
},
{
/* {
// path: '/warn',
name: 'Commercial Service',
icon: 'Alert',
// component: './warn/Warn',
routes: [
/* { name: '小区保养', path: '/tosMaintain', hidden: true },
/!* { name: '小区保养', path: '/tosMaintain', hidden: true },
{ name: '业主投诉', path: '/owerComplaint', hidden: true },
{ name: '问题反馈', path: '/feedback', hidden: true },
{ name: '装修申请', path: '/tosDecoration', hidden: true },
{ name: '住户卡申请', path: '/owerCard', hidden: true },
{ name: '在线报事', path: '/onlineNews', hidden: true },
{ name: '保质期服务', path: '/shelfLife', hidden: true },*/
{ name: '保质期服务', path: '/shelfLife', hidden: true },*!/
{ name: 'Community Maintenance',
path: '/tosMaintain',
icon: 'smile',
......@@ -334,38 +330,60 @@ export default defineConfig({
},
// { name: 'Shelf life Service', path: '/shelfLife', hidden: true },
],
},*/
{
path: '/warn',
name: 'Commercial Service',
icon: 'Alert',
component: './warn/Warn',
children: [
/* { name: '小区保养', path: '/tosMaintain', hidden: true },
{ name: '业主投诉', path: '/owerComplaint', hidden: true },
{ name: '问题反馈', path: '/feedback', hidden: true },
{ name: '装修申请', path: '/tosDecoration', hidden: true },
{ name: '住户卡申请', path: '/owerCard', hidden: true },
{ name: '在线报事', path: '/onlineNews', hidden: true },
{ name: '保质期服务', path: '/shelfLife', hidden: true },*/
{ name: 'Community Maintenance', path: '/tosMaintain', hidden: true },
{ name: 'Owners Complaints', path: '/owerComplaint', hidden: true },
{ name: 'Problem Feedback', path: '/feedback', hidden: true },
{ name: 'Renovation Application', path: '/tosDecoration', hidden: true },
{ name: 'Access Card Application', path: '/owerCard', hidden: true },
{ name: 'Report Online', path: '/onlineNews', hidden: true },
{ name: 'Shelf life Service', path: '/shelfLife', hidden: true },
],
},
// {
// path: '/tosMaintain',
// component: './tosMaintain/TosMaintain',
// hideInMenu: true,
// },
// {
// path: '/tosMaintain/reply',
// component: './tosMaintain/ReplyToMaintenance',
// hideInMenu: true,
// },
/* {
{
path: '/tosMaintain',
component: './tosMaintain/TosMaintain',
hideInMenu: true,
},
{
path: '/tosMaintain/reply',
component: './tosMaintain/ReplyToMaintenance',
hideInMenu: true,
},
{
path: '/tosMaintain/detail',
component: './tosMaintain/TosMaintainDetail',
hideInMenu: true,
},*/
/* {
},
{
path: '/owerComplaint',
component: './owerComplaint/OwerComplaint',
hideInMenu: true,
},*/
/* {
},
{
path: '/owerComplaint/reply',
component: './owerComplaint/ReplyToComplaint',
hideInMenu: true,
},*/
/* {
},
{
path: '/owerComplaint/detail',
component: './owerComplaint/OwerComplaintDetail',
hideInMenu: true,
},*/
/* {
},
{
path: '/feedback',
component: './feedback/feedback',
hideInMenu: true,
......@@ -379,8 +397,8 @@ export default defineConfig({
path: '/feedback/detail',
component: './feedback/FeedbackDetail',
hideInMenu: true,
},*/
/* {
},
{
path: '/tosDecoration',
component: './tosDecoration/tosDecoration',
hideInMenu: true,
......@@ -394,8 +412,8 @@ export default defineConfig({
path: '/tosDecoration/detail',
component: './tosDecoration/tosDecorationDetail',
hideInMenu: true,
},*/
/* {
},
{
path: '/owerCard',
component: './owerCard/owerCard',
hideInMenu: true,
......@@ -409,8 +427,8 @@ export default defineConfig({
path: '/owerCard/detail',
component: './owerCard/OwerCardDetail',
hideInMenu: true,
},*/
/* {
},
{
path: '/onlineNews',
component: './onlineNews/onlineNews',
hideInMenu: true,
......@@ -424,8 +442,8 @@ export default defineConfig({
path: '/onlineNews/detail',
component: './onlineNews/OnlineNewsDetail',
hideInMenu: true,
},*/
/* {
},
{
path: '/shelfLife',
component: './shelfLife/shelfLife',
hideInMenu: true,
......@@ -439,7 +457,7 @@ export default defineConfig({
path: '/shelfLife/detail',
component: './shelfLife/ShelfLifeDetail',
hideInMenu: true,
},*/
},
{
path: '/warn/edit',
component: './warn/WarnEdit',
......@@ -549,6 +567,445 @@ export default defineConfig({
{ name: '公司信息', path: '/companyInformation', hidden: true },*/
{ name: 'Account Management', path: '/account', hidden: false },
{ name: 'Company Information', path: '/companyInformation', hidden: true },
{ name: 'Language Settings', path: '/languageSwitch', component: './languageSwitch/LanguageSwitch',hidden: true },
],
},
{
path: '/languageSwitch',
/* name: '语言设置',*/
name: 'Language Settings',
icon: 'user',
component: './languageSwitch/LanguageSwitch.tsx',
hideInMenu: true,
},
{
path: '/companyInformation',
component: './companyInformation/CompanyInformation',
hideInMenu: false,
},
/* {
path: '/',
redirect: '/runTest',
},*/
/* {
path: '/',
redirect: '/tosUser',
},
/!* {
path: '/welcome',
name: 'welcome',
icon: 'smile',
component: './Welcome',
},*!/
{
path: '/admin',
name: 'admin',
icon: 'crown',
component: './Admin',
// authority: ['admin'],
routes: [
{
path: '/admin/sub-page',
name: 'sub-page',
icon: 'smile',
component: './Welcome',
// authority: ['admin'],
},
],
},
/!* {
name: 'list.table-list',
icon: 'table',
path: '/list',
component: './ListTableList',
},*!/
{
path: '/monitorcenter',
name: 'monitorcenter',
icon: 'table',
component: './monitorcenter',
},
/!* {
// path: '/device',
name: 'User Management',
icon: 'Desktop',
// component: './device/Device',
routes: [
{ name: 'LIFE User Management',
path: '/tosUser',
icon: 'smile',
routes: [
{ path: './', component: './tosUser/TosUser' },
{ path: './create', component: './tosUser/TosUserCreate' },
{ path: './detail', component: './tosUser/TosUserDetails' },
{ path: './edit', component: './tosUser/TosUserEdit' },
{ path: './common', component: './tosUser/commonUser' }
]
},
// { name: 'Community Maintenance', path: '/tosMaintain', hidden: true },
{ name: 'Service Provider Management',
path: '/tosBusiness',
icon: 'smile',
routes: [
{ path: './', component: './tosBusiness/TosBusiness' },
{ path: './create', component: './tosBusiness/TosBusinessCreate' },
{ path: './edit', component: './tosBusiness/TosBusinessEdit' },
{ path: './detail', component: './tosBusiness/TosBusinessDetail' },
{ path: './ProviderCreate', component: './tosBusiness/ServiceProviderCreate' },
{ path: './ProviderEdit', component: './tosBusiness/ServiceProviderEdit' },
{ path: './ProviderDetail', component: './tosBusiness/ServiceProviderDetail' },
{ path: './SecurityGuard', component: './tosBusiness/SecurityGuard' }
// { path: './ServiceAvaliable', component: './tosBusiness/ServiceAvaliable' },
]
},
],
},*!/
{
path: '/device',
name: 'User Management',
icon: 'Desktop',
component: './device/Device',
children: [
{ name: 'LIFE User Management', path: '/tosUser', hidden: true },
{ name: 'Service Provider Management', path: '/tosBusiness', hidden: true },
// {name: "状态管理Redux", icon: "inbox", path: "/redux",hidden: true}
],
},
{
path: '/tosBusiness/SecurityGuard',
component: './tosBusiness/SecurityGuard',
hideInMenu: true,
},
{
path: '/tosBusiness/ServiceAvaliable',
component: './tosBusiness/ServiceAvaliable',
hideInMenu: true,
},
{
path: '/tosBusiness/ProviderCreate',
component: './tosBusiness/ServiceProviderCreate',
hideInMenu: true,
},
{
path: '/tosBusiness/ProviderEdit',
component: './tosBusiness/ServiceProviderEdit',
hideInMenu: true,
},
{
path: '/tosBusiness/ProviderDetail',
component: './tosBusiness/ServiceProviderDetail',
hideInMenu: true,
},
{
path: '/tosBusiness/create',
component: './tosBusiness/TosBusinessCreate',
hideInMenu: true,
},
{
path: '/tosBusiness/edit',
component: './tosBusiness/TosBusinessEdit',
hideInMenu: true,
},
{
path: '/tosBusiness/detail',
component: './tosBusiness/TosBusinessDetail',
hideInMenu: true,
},
{
path: '/tosUser/common',
component: './tosUser/commonUser',
hideInMenu: true,
},
{
path: '/tosUser/edit',
component: './tosUser/TosUserEdit',
hideInMenu: true,
},
{
path: '/device/details',
component: './device/DeviceDetails',
hideInMenu: true,
},
{
path: '/tosUser/details',
component: './tosUser/TosUserDetails',
hideInMenu: true,
},
{
path: '/tosUser',
component: './tosUser/TosUser',
hideInMenu: true,
},
{
path: '/tosBusiness',
component: './tosBusiness/TosBusiness',
hideInMenu: true,
},
{
path: '/device/edit',
component: './device/DeviceEdit',
hideInMenu: true,
},
{
path: '/tosUser/create',
component: './tosUser/TosUserCreate',
hideInMenu: true,
},
/!* {
path: '/PropertyManagement',
name: 'propertymanagement',
icon: 'ReconciliationOutlined',
routes: [
{ path: './', component: './PropertyManagement/ChargeManager' },
// { path: './AccoutingDetail', component: './PropertyManagement/AccoutingContent' },
// { path: './AccoutingEdit',component:'./PropertyManagement/AccoutingContent'},
]
},*!/
{
path: '/advertisement/AdvertisementEdit',
component: './advertisement/AdvertisementEdit',
hideInMenu: true,
},
{
path: '/device/details',
component: './device/DeviceDetails',
hideInMenu: true,
},
{
path: '/banner',
name: 'BANNER',
icon: 'user',
component: './banner/Banner',
},
{
name: 'Commercial Service',
icon: 'Alert',
routes: [
{ name: 'Community Maintenance',
path: '/tosMaintain',
icon: 'smile',
routes: [
{ path: './', component: './languageSwitch/LanguageSwitch.tsx' },
{ path: './reply', component: './tosMaintain/ReplyToMaintenance' },
{ path: './detail', component: './tosMaintain/TosMaintainDetail' },
]
},
// { name: 'Community Maintenance', path: '/tosMaintain', hidden: true },
{ name: 'Owners Complaints',
path: '/owerComplaint',
icon: 'smile',
routes: [
{ path: './', component: './owerComplaint/OwerComplaint' },
{ path: './reply', component: './owerComplaint/ReplyToComplaint' },
{ path: './detail', component: './owerComplaint/OwerComplaintDetail' },
]
},
// { name: 'Owners Complaints', path: '/owerComplaint', hidden: true },
{ name: 'Problem Feedback',
path: '/feedback',
icon: 'smile',
routes: [
{ path: './', component: './feedback/feedback' },
{ path: './reply', component: './feedback/ReplyToFeedback' },
{ path: './detail', component: './feedback/FeedbackDetail' },
]
},
// { name: 'Problem Feedback', path: '/feedback', hidden: true },
{ name: 'Renovation Application',
path: '/tosDecoration',
icon: 'smile',
routes: [
{ path: './', component: './tosDecoration/tosDecoration' },
{ path: './reply', component: './tosDecoration/ReplyToDecoration' },
{ path: './detail', component: './tosDecoration/tosDecorationDetail' },
]
},
// { name: 'Renovation Application', path: '/tosDecoration', hidden: true },
{ name: 'Access Card Application',
path: '/owerCard',
icon: 'smile',
routes: [
{ path: './', component: './owerCard/owerCard' },
{ path: './reply', component: './owerCard/ReplyToOwerCard' },
{ path: './detail', component: './owerCard/OwerCardDetail' },
]
},
// { name: 'Access Card Application', path: '/owerCard', hidden: true },
{ name: 'Report Online',
path: '/onlineNews',
icon: 'smile',
routes: [
{ path: './', component: './onlineNews/onlineNews' },
{ path: './reply', component: './onlineNews/ReplyToOnlineNews' },
{ path: './detail', component: './onlineNews/OnlineNewsDetail' },
]
},
// { name: 'Report Online', path: '/onlineNews', hidden: true },
{ name: 'Shelf life Service',
path: '/shelfLife',
icon: 'smile',
routes: [
{ path: './', component: './shelfLife/shelfLife' },
{ path: './reply', component: './shelfLife/ReplyToShelfLife' },
{ path: './detail', component: './shelfLife/ShelfLifeDetail' },
]
},
// { name: 'Shelf life Service', path: '/shelfLife', hidden: true },
],
},
/!* {
path: '/warn/edit',
component: './warn/WarnEdit',
hideInMenu: true,
},*!/
{
path: '/account',
component: './account/Account',
hideInMenu: true,
},
{
path: '/account/edit',
component: './account/AccountEdit',
hideInMenu: true,
},
{
path: '/account/reset',
component: './account/AccountReset',
hideInMenu: true,
},
{
name: 'Order Management',
path: '/orderManagement',
/!*name: '订单管理',*!/
icon: 'Laptop',
component: './orderManagement/OrderManagement',
},
{
path: '/version/modelEdit',
component: './versionModel/Version',
hideInMenu: true,
},
{
path: '/version/edit',
component: './versionModel/VersionEdit',
hideInMenu: true,
},
{
path: '/version/update',
component: './versionModel/VersionUpdate',
hideInMenu: true,
},
{
path: '/version/record',
component: './versionModel/VersionRecord',
hideInMenu: true,
},
{
name: 'Contract Management',
path: '/contractManagement',
/!* name: '合同管理',*!/
icon: 'Desktop',
component: './contractManagement/ContractManagement',
},
{
name: 'Property Management',
path: '/propertyFee',
icon: 'OneToOne',
// component: './propertyFee/PropertyFee.tsx' ,
routes: [
{ path: './', component: './propertyFee/PropertyFee' },
]
},
{
path: '/propertyFee/PaymentSetting',
component: './propertyFee/PaymentSetting',
hideInMenu: true,
},
{
path: '/propertyFee/PaymentDetail',
component: './propertyFee/PaymentDetail',
hideInMenu: true,
},
{
path: '/propertyFee/AddAccounting',
component: './propertyFee/AddAccounting',
hideInMenu: true,
},
{
name: 'Community Management',
path: '/communityManagement',
/!* name: '小区管理',*!/
icon: 'Desktop',
// component: './advertisement/AdvertisementEdit',
routes: [
/!* { name: '小区列表', path: '/housingList', hidden: false },
{ name: '小区公告', path: '/communityNotice', hidden: true },
{ name: '预订设施', path: '/bookFacilities', hidden: true },
{ name: '访客记录', path: '/visitorRecord', hidden: true },*!/
{ name: 'Cell List', path: '/housingList', component: './housingList/HousingList', hidden: false },
{ name: 'Community Announcement', path: '/communityNotice', component: './communityNotice/CommunityNotice',hidden: true },
{ name: 'Facility Bookings', path: '/bookFacilities', component: './bookFacilities/BookFacilities', hidden: true },
{ name: 'Visitor Record', path: '/visitorRecord', component: './visitorRecord/VisitorRecord', hidden: true },
],
},
{
path: '/housingList',
component: './housingList/HousingList',
hideInMenu: true,
},
{
path: '/communityNotice',
component: './communityNotice/CommunityNotice',
hideInMenu: true,
},
{
path: '/bookFacilities',
component: './bookFacilities/BookFacilities',
hideInMenu: true,
},
{
path: '/visitorRecord',
component: './visitorRecord/VisitorRecord',
hideInMenu: true,
},
{
name: 'Account Management',
path: '/device/details',
/!* name: '后台管理',*!/
icon: 'user',
component: './device/DeviceDetails',
routes: [
/!*{ name: '账号管理', path: '/account', hidden: false },
{ name: '公司信息', path: '/companyInformation', hidden: true },*!/
{ name: 'Account Management', path: '/account', hidden: false },
{ name: 'Company Information', path: '/companyInformation', hidden: true },
{ name: 'Language Settings', path: '/languageSwitch', component: './languageSwitch/LanguageSwitch.tsx',hidden: false },
],
},
......@@ -558,7 +1015,7 @@ export default defineConfig({
// {
// path: '/languageSwitch',
// /* name: '语言设置',*/
// /!* name: '语言设置',*!/
// name: 'Language Settings',
// icon: 'user',
// component: './languageSwitch/LanguageSwitch.tsx',
......@@ -568,7 +1025,9 @@ export default defineConfig({
path: '/companyInformation',
component: './companyInformation/CompanyInformation',
hideInMenu: false,
},
},*/
//合并的另一部分
{
path: '/runTest',
name: 'monitoringcenter',
......@@ -584,7 +1043,7 @@ export default defineConfig({
path: './LIFEUserManagement',
name: 'lifeusers',
routes: [
{ path: './', component: './UserManagement/LIFEUserManagement/Users' },
{ path: './', component: './UserManagement/LIFEUserManagement/Users.tsx' },
{ path: './Add', component: './UserManagement/LIFEUserManagement/UsersAdd' },
]
},
......
src/locales/en-US/menu.ts
View file @ 9ba8c8c0
......@@ -50,7 +50,7 @@ export default {
'menu.editor.mind': 'Mind Editor',
'menu.editor.koni': 'Koni Editor',
'menu.usemanagement': 'User Management',
/*'menu.usemanagement': 'User Management',
'menu.monitoringcenter': 'Monitoring Center',
'menu.usemanagement.lifeusers': 'LIFE Users',
'menu.usemanagement.serviceproviders': 'Service Providers',
......@@ -72,5 +72,5 @@ export default {
'menu.accountmanagement': 'Account Management',
'menu.accountmanagement.accountmanagement1': 'Account Management',
'menu.accountmanagement.companyinformation': 'Company Information',
'menu.accountmanagement.languagesettings': 'Language Settings',
'menu.accountmanagement.languagesettings': 'Language Settings',*/
};
src/locales/zh-CN/menu.ts
View file @ 9ba8c8c0
......@@ -57,8 +57,8 @@ export default {
'menu.account.changePassword': '修改密碼',
'menu.accountReset':'账号管理',
'menu.User Management':'用户管理',
'menu.LIFE User Management':'LIFE用户管理',
'menu.Service Provider Management':'服务商管理',
'menu.User Management.LIFE User Management':'LIFE用户管理',
'menu.User Management.Service Provider Management':'服务商管理',
'menu.Commercial Service':'物业服务',
"menu.Order Management":"订单管理",
"menu.Contract Management":"合同管理",
......@@ -72,4 +72,11 @@ export default {
"menu.Commercial Service.Report Online":"在线报事",
"menu.Commercial Service.Shelf life Service":"保质期服务",
"menu.Community Management.Cell List":"小区列表",
"menu.Community Management.Community Announcement":"小区公告",
"menu.Community Management.Facility Bookings":"预定设施",
"menu.Community Management.Visitor Record":"访客记录",
};
src/pages/housingList/style.less
View file @ 9ba8c8c0
@import '~antd/lib/style/themes/default.less';
@import '../../../node_modules/antd/lib/style/themes/default.less';
.pre {
margin: 12px 0;
......
src/pages/tosBusiness/ServiceAvaliable.tsx
View file @ 9ba8c8c0
......@@ -307,6 +307,7 @@ class ServiceAvaliable extends React.Component {
}
}
// @ts-ignore
const WarnEdit1 = Form.create()(ServiceAvaliable);
export default connect(({user}: ConnectState) => ({
currentUser: user.currentUser,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment