diff --git a/config/config.UAT.ts b/config/config.UAT.ts index 22b07c1..c31047c 100644 --- a/config/config.UAT.ts +++ b/config/config.UAT.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV:'UAT', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8280/provider_uat', + // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8280/provider_uat', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/config/config.dev.ts b/config/config.dev.ts index 971d818..2a4cf79 100644 --- a/config/config.dev.ts +++ b/config/config.dev.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV: 'DEV', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider_dev', + // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider_dev', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/config/config.prod.ts b/config/config.prod.ts index 99e7610..c00bb2e 100644 --- a/config/config.prod.ts +++ b/config/config.prod.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV:'PROD', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'https://60.10.26.178/provider', + // REACT_APP_XUNJIA_REDIRECT: 'https://60.10.26.178/provider', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/config/config.sim.ts b/config/config.sim.ts index bce3024..fa9e473 100644 --- a/config/config.sim.ts +++ b/config/config.sim.ts @@ -18,6 +18,8 @@ export default defineConfig({ START_ENV: 'sim', //询价查看报价跳转地址 - REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider', + // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider', + //询价-查看报价详情-虚拟用户uid + REACT_APP_XUNJIA_UID: 'admin_entrance', }, }); diff --git a/config/router.config.ts b/config/router.config.ts index b4159e9..f1e96f5 100644 --- a/config/router.config.ts +++ b/config/router.config.ts @@ -3,11 +3,14 @@ import transfer from './router_transfer'; import home from './HomePage/router_home'; import juryRoom from './JuryRoom/router_menuJury.config'; import approvalForm from './router_approval_form'; +import partyMemberTopic from './router_partyMemberTopic'; export default [ //========================================================================登陆 ...transfer,//跳转、登陆 //审批单 ...approvalForm, + //党建攻坚 + ...partyMemberTopic, { path: '/userformal', // component: '../layouts/UserLayout', @@ -29,10 +32,15 @@ export default [ ], }, //日历组件暂时用 - { - path: '/Calendar', - component: './MainPage/ProjectManager/components/CalendarForm', - }, + // { + // path: '/Calendar', + // component: './MainPage/ProjectManager/components/CalendarForm', + // }, + //富文本组件 + // { + // path: '/editor', + // component: './MainPage/ProjectManager/components/WangEditor', + // }, //401错误页 { exact: true, @@ -71,6 +79,14 @@ export default [ }, ], }, + {//内拍-参与竞拍列表 + path: '/AuctionParticipateList', + component: './Auction/AuctionParticipateList', + }, + {//内拍-参与竞拍详情 + path: '/AuctionParticipateDetail', + component: './Auction/AuctionParticipateDetail', + }, {//公共服务平台 path: '/PublicPlatform', component: './Bid/BiddingAnnouncement/components/PublicPlatform', @@ -232,7 +248,7 @@ export default [ path: '/Supervision', component: './Project/ProjectManage/Supervision' }, - {//审查人员 项目管理页 + {//审查人员 项目管理页 name: 'Examination', path: '/Examination', component: './Project/ProjectManage/Examination' diff --git a/config/router_partyMemberTopic.ts b/config/router_partyMemberTopic.ts new file mode 100644 index 0000000..45847b2 --- /dev/null +++ b/config/router_partyMemberTopic.ts @@ -0,0 +1,53 @@ +export default [ + { + name: '党建攻坚', + path: '/partyMemberTopic', + routes: [ + {//首页 + name: 'home', + path: '/partyMemberTopic/home', + component: './PartyMemberTopic/Home', + }, + { //物资采购与管理专业线 党支部 省分 + name: 'partyBranch', + path: '/partyMemberTopic/partyBranch', + component: './PartyMemberTopic/PartyBranch', + }, + { //物资采购与管理专业线 党支部数据 + name: 'partyBranches', + path: '/partyMemberTopic/partyBranches', + component: './PartyMemberTopic/PartyBranches', + }, + { //物资采购与管理专业线 党支部人员信息 + name: 'personInfor', + path: '/partyMemberTopic/personInfor', + component: './PartyMemberTopic/PersonInfor', + }, + { // 攻坚克难项目 更多 + name: 'overDifficult', + path: '/partyMemberTopic/overDifficult', + component: './PartyMemberTopic/OverDifficult', + }, + { // 活动风采 更多 + name: 'activityStyle', + path: '/partyMemberTopic/activityStyle', + component: './PartyMemberTopic/ActivityStyle', + }, + { // 攻坚克难详情 + name: 'hardDetail', + path: '/partyMemberTopic/hardDetail', + component: './PartyMemberTopic/HardDetail', + }, + { // 活动风采和banner详情 + name: 'newsDetail', + path: '/partyMemberTopic/newsDetail', + component: './PartyMemberTopic/NewsDetail', + }, + {//管理端首页 + name: 'manage', + path: '/partyMemberTopic/manage', + component: './PartyMemberTopic/Management/Manage', + }, + ] + }, +]; \ No newline at end of file diff --git a/config/router_transfer.ts b/config/router_transfer.ts index cb935d6..0a255ad 100644 --- a/config/router_transfer.ts +++ b/config/router_transfer.ts @@ -50,10 +50,6 @@ export default [ path: '/redirect', component: './LoadingPage', }, - { - path: '/toAuth', - component: './LoadingPage/ToAuth', - }, //跨工程跳转中间页开始 { path: '/xunjia', @@ -64,6 +60,16 @@ export default [ path: '/chooseRole', component: './LoadingPage/MiddleLoading/chooseRole', }, + //寻找商机跳转 + { + path: '/ToFindBusiness', + component: './LoadingPage/MiddleLoading/ToFindBusiness', + }, + //项目跟进跳转 + { + path: '/ToHomePage', + component: './LoadingPage/MiddleLoading/ToHomePage', + }, //跨工程跳转中间页结束 { name: 'index_1', diff --git a/public/Weboffice4Path.html b/public/Weboffice4Path.html index aa62682..22f6797 100644 --- a/public/Weboffice4Path.html +++ b/public/Weboffice4Path.html @@ -4,9 +4,9 @@
当前时间:
- / - / - - : - : - + / + / + + : + : +
序号 | @@ -46,7 +48,7 @@||||
---|---|---|---|---|
@@ -54,7 +56,7 @@ |
diff --git a/public/bidOpening/bidOpening.html b/public/bidOpening/bidOpening.html index 04acc0c..2266398 100644 --- a/public/bidOpening/bidOpening.html +++ b/public/bidOpening/bidOpening.html @@ -1,11 +1,13 @@ - + +
+
+