Commit Graph

781 Commits

Author SHA1 Message Date
b431e82647 Merge branch 'release_20220923' into 'master'
【生产】9.23版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!8
2022-09-26 00:37:31 +00:00
70a64e265c Merge branch '20220829-更换userInfo服务' into 'release_20220923'
9.23 修改获取用户信息接口为userInfo服务

See merge request eshop/fe_service_ebtp_frontend!7
2022-09-24 00:34:40 +00:00
6b3c05532b 在线监督,专家名称不显示全名 2022-09-23 17:21:12 +08:00
3a3b7a0143 设备管理页面初步搭建 2022-09-23 17:04:14 +08:00
7ff9e28f56 Merge branch '20220907-专家算数价格修正提示系统异常' into 'release_20220923'
9.23 专家算数价格修正提示系统异常

See merge request eshop/fe_service_ebtp_frontend!6
2022-09-23 07:55:07 +00:00
fcaf2ecef4 Merge branch '20220920-标书费线下支付成功,无法下载标书' into 'release_20220923'
9.23 标书费线下支付成功,无法下载标书

See merge request eshop/fe_service_ebtp_frontend!5
2022-09-23 07:54:57 +00:00
4e880a4c9b Merge branch '20220613-将PUT和DELETE请求更改成POST请求' into 'release_20220923'
9.23 1、将PUT和DELETE请求更改成POST请求 2、重评点击保存一直转圈

See merge request eshop/fe_service_ebtp_frontend!4
2022-09-23 07:54:45 +00:00
6bf0a0e7f6 Merge branch '20220907-异议投诉名称修改为异议回复' into 'release_20220923'
9.23 异议投诉名称修改为异议回复

See merge request eshop/fe_service_ebtp_frontend!3
2022-09-23 07:54:33 +00:00
618a9fbca5 Merge branch '20220815-登录过程中用户信息错误导致登录失败的业务处理' into 'release_20220923'
9.23 登录过程中用户信息错误导致登录失败的业务处理

See merge request eshop/fe_service_ebtp_frontend!2
2022-09-23 07:54:21 +00:00
f06b9858e4 Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-23 11:21:59 +08:00
28cdf9a6d2 评标场所、区域开发完成 2022-09-23 11:21:45 +08:00
9720880a1c 9.22 大屏部分样式修改并增加滚动条 2022-09-22 13:37:42 +08:00
fce96cf10e 9.20 多轮招募 购买招募文件状态缺失4 2022-09-20 18:29:10 +08:00
e164d0e0a3 提交评标场所和区域管理部分代码 2022-09-20 15:28:52 +08:00
2f1be12fa5 9.20 首页样式修改 2022-09-20 09:24:03 +08:00
09136ad2ca 9.16 评委会自动获取照片 2022-09-16 08:25:54 +08:00
7e0882210a Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-15 15:27:03 +08:00
e4aa7d9ffb 9.15 大屏详情页改造 2022-09-15 15:26:49 +08:00
f55a532839 根据是否预约电子评标室是否显示报道状态时间字段 2022-09-15 14:09:29 +08:00
e27b34d2bc Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-14 17:07:38 +08:00
af2a801580 9.14 首页饼图修改 2022-09-14 17:07:24 +08:00
a8ddeccf90 在线监督/事后监督,分页请求参数修正 2022-09-14 14:40:30 +08:00
26451ba595 Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-14 10:43:28 +08:00
5b9d7be50c 取消预约判断当前时间 2022-09-14 10:43:04 +08:00
84fd5af936 Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-14 10:34:16 +08:00
1e483afbd7 9.14 修改9.9问题 2022-09-14 10:34:01 +08:00
8f1cbece22 Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-13 10:52:41 +08:00
72d8f6d52d 异常告警增加处理状态 2022-09-13 10:52:27 +08:00
349eb61436 修改设备类型 2022-09-13 10:29:38 +08:00
0c8dfcc992 Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-09 17:02:21 +08:00
306cfc15eb 9.9 预约修改 2022-09-09 17:02:10 +08:00
a7b26dd54d 修改照片提示 2022-09-09 16:26:50 +08:00
980ba956fd 9.9 loading 2022-09-09 16:06:09 +08:00
92a759bc48 9.9 修改预约管理页面 2022-09-09 16:02:19 +08:00
22647199ea Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room 2022-09-09 09:17:45 +08:00
4be33fee2b 9.9 重评预约评标室,地图轮播tooltip 2022-09-09 09:17:17 +08:00
430b579f7b 查看详情增加关闭按钮 2022-09-08 09:48:00 +08:00
47c996265a 修正判断https 2022-09-08 09:38:55 +08:00
744978b25f 在线监督和事后监督,查看详情,增加签到状态和签到时间 2022-09-08 09:36:35 +08:00
bc922ae577 Merge branch '20220829-更换userInfo服务' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into uat-export-face-recog 2022-09-07 17:30:17 +08:00
393af37221 Merge branch '20220815-登录过程中用户信息错误导致登录失败的业务处理' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into uat-export-face-recog 2022-09-07 17:29:09 +08:00
e0333ac75b Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into uat-export-face-recog 2022-09-07 17:09:36 +08:00
5710e80cde 9.7 还原重评,多轮招募 2022-09-07 17:07:08 +08:00
b477fc9f53 修改提交人脸登录中,登录按钮的文字 2022-09-07 16:47:12 +08:00
aabb2c13fc 取消多余路由 2022-09-07 16:28:06 +08:00
12b4460923 专家人脸登录开发完成 2022-09-07 16:20:59 +08:00
e0f3fd574b 9.7 同步master版本,解决冲突 2022-09-07 14:03:12 +08:00
b70292882a 9.7 专家算数价格修正提示系统异常 2022-09-07 13:31:29 +08:00
e6bce30308 9.7 异议投诉名称修改为异议回复 2022-09-07 11:00:03 +08:00
90c5085fc8 9.7 增加首页照片检测 2022-09-07 10:51:30 +08:00