Commit Graph

60 Commits

Author SHA1 Message Date
e164d0e0a3 提交评标场所和区域管理部分代码 2022-09-20 15:28:52 +08:00
e0f3fd574b 9.7 同步master版本,解决冲突 2022-09-07 14:03:12 +08:00
e7ee9ca2f0 9.1 电子评标室统一路由和模块 2022-09-01 15:08:47 +08:00
bb0b21ed30 Merge branch 'master-电子评标室-现场人员管理-zyx' into 'release_electronic_bid_evaluation_room'
9.1 电子评标室 现场人员管理 zyx

See merge request eshop/fe_service_ebtp_frontend!274
2022-09-01 13:16:59 +08:00
96d7406055 生产网关地址 2022-09-01 10:47:14 +08:00
1c2c6a0d8d 评标现场管理 2022-09-01 09:22:51 +08:00
bdfba93034 修改网关地址 2022-08-31 15:50:51 +08:00
34ac005b2b 修改网关地址 2022-08-26 20:53:42 +08:00
a050770b9b 评标场所人员维护路由 2022-08-26 17:31:34 +08:00
1c44103137 Merge branch 'master-电子评标室-预约管理-liuh' into 'release_electronic_bid_evaluation_room'
8.26 接口修改

See merge request eshop/fe_service_ebtp_frontend!254
2022-08-26 16:02:37 +08:00
49ec519781 8.26 接口修改 2022-08-26 16:01:37 +08:00
31fbad0176 Merge branch 'uat-评标室-风险防控-告警处理' into 'release_electronic_bid_evaluation_room'
8.26 电子评标室 风险防控 告警处理

See merge request eshop/fe_service_ebtp_frontend!245
2022-08-26 13:39:35 +08:00
3ffb4e0f0e Merge branch 'master-电子评标室-预约管理-liuh' into 'release_electronic_bid_evaluation_room'
8.26 电子评标室 预约管理 liuh

See merge request eshop/fe_service_ebtp_frontend!246
2022-08-26 13:39:18 +08:00
02325fc77f Merge branch '20220804-监控大屏' into 'release_electronic_bid_evaluation_room'
8.26 电子评标室 监控大屏

See merge request eshop/fe_service_ebtp_frontend!247
2022-08-26 13:39:13 +08:00
90d9860fd7 Merge branch 'uat-video-monitor' into 'release_electronic_bid_evaluation_room'
8.26 电子评标室 在线监督 事后监督

See merge request eshop/fe_service_ebtp_frontend!248
2022-08-26 13:39:06 +08:00
257edd46a2 配置生产环境客服地址 2022-08-25 15:51:05 +08:00
28632ac119 Merge branch '20220802-评标室预约情况' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master-电子评标室-预约管理-liuh 2022-08-25 15:09:43 +08:00
c0e2564b4a 修改路由位置,跳转功能完善 2022-08-25 14:44:05 +08:00
b505638c26 异常告警基本开发完成 2022-08-25 14:30:39 +08:00
2a69d4531d 8.25 2022-08-25 14:08:06 +08:00
19b9929923 Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice 2022-08-25 08:41:49 +08:00
d9459b13bd 设备管理 2022-08-24 15:14:09 +08:00
6403286fa4 提交在线监督和事后监督部分代码 2022-08-23 09:01:29 +08:00
a7ff7ccd9d 预约评标室 2022-08-11 17:32:15 +08:00
a4d3a36e9a 8.9 2022-08-09 14:17:24 +08:00
cde9e97e96 Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220802-评标室预约情况 2022-08-02 17:17:43 +08:00
ca37297a8e 8.2 2022-08-02 17:17:20 +08:00
d0c2deb4c9 8.2 四个路由引用地址大小写错误 2022-08-02 17:14:21 +08:00
04b9f73d3d 7.15 取消富文本组件路由 2022-07-15 11:00:36 +08:00
9ab4413e88 7.15 党建攻坚管理端 2022-07-15 08:58:51 +08:00
c98f3d1a71 Merge branch '20220705-wangeditor' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220712-topic-management 2022-07-13 15:15:59 +08:00
20f092d6b1 7.12 2022-07-12 15:10:29 +08:00
503e8ed03f 部署供货商客服入口 2022-07-11 16:01:49 +08:00
ec06e3ff8f 去掉客服代码 2022-07-08 18:29:39 +08:00
59e99b5a38 7.8 党建攻坚修改标签页名称 2022-07-08 11:10:28 +08:00
65e2cd0001 7.7 党建专题7.4需求 2022-07-07 15:46:34 +08:00
93fc1e3e44 7.5 wangeditor 2022-07-05 21:57:38 +08:00
aaea609833 Merge branch '20220621-PartyMemberTopic' into 'release_20220629'
6.29 党员专题 党建攻坚

See merge request eshop/fe_service_ebtp_frontend!151
2022-06-29 21:31:10 +08:00
918c790b06 6.28 党建攻坚第二版 2022-06-28 16:48:36 +08:00
f17ebf9c5d 6.27 集成 2022-06-27 09:12:56 +08:00
15499447aa Merge branch '20220505-物资市场闲置物资-内拍新增功能' into 'release_20220624'
6.24 物资市场闲置物资-内拍新增功能

See merge request eshop/fe_service_ebtp_frontend!136
2022-06-24 21:23:10 +08:00
011adf28bc 四个页面搭建 2022-06-24 13:33:16 +08:00
50b1821242 6.23 党员专题首页 2022-06-23 08:42:54 +08:00
1bea5b2fb1 Merge branch 'master' into master_jnryy_customerservice 2022-06-22 11:03:01 +08:00
ca0e348bee Merge branch '20220517-门户-3.0修改-单点中转页与商机列表页修改' into 'release_20220617'
6.17 门户 3.0修改 单点中转页与商机列表页修改

See merge request eshop/fe_service_ebtp_frontend!122
2022-06-17 21:23:09 +08:00
7e0639b1b8 Merge branch '20220616-询价修改新的外网平台地址' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice 2022-06-17 12:21:07 +08:00
dfb22c2a06 6.17 询价修改 2022-06-17 12:12:09 +08:00
dcc6935304 Merge branch '20220413-zjl-公共服务平台' into 'master-20220527'
5.27 公共服务平台对接

See merge request eshop/fe_service_ebtp_frontend!88
2022-05-27 15:56:46 +08:00
50107faab3 Merge branch '20220413-zjl-公共服务平台' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220505-物资市场闲置物资-内拍新增功能 2022-05-20 14:51:09 +08:00
7c3e7d9ad5 任务【4411】:修改监督项目列表、增加审查项目列表 2022-05-20 13:42:11 +08:00