Commit Graph

556 Commits

Author SHA1 Message Date
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
8cc259751b 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-07 08:28:51 +08:00
b98142f7fc 9.7 大屏修改 2022-09-07 08:28:12 +08:00
d49a7644d5 删除现场人员表格人脸照片字段 2022-09-06 16:54:35 +08:00
6fbdeec3c0 专家人脸登录后台接口联调完成 2022-09-05 17:28:35 +08:00
f98cf790b8 优化表格样式 2022-09-05 11:14:01 +08:00
53940f64ce Merge branch 'release_20220902' into 'master'
【生产】9.2版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!279
2022-09-05 08:33:54 +08:00
9b1066f204 Merge branch 'master_jnryy_customerservice' into 'release_20220902'
9.2 智慧客服

See merge request eshop/fe_service_ebtp_frontend!278
2022-09-02 21:41:41 +08:00
31a7029be8 风险点展示-评标现场异常无数据不展示 2022-09-02 17:28:12 +08:00
f2af275824 风险点展示-评标现场异常情况无数据不显示 2022-09-02 17:19:57 +08:00
28b6756648 现场人员,人员报道情况 2022-09-02 17:04:37 +08:00
b64dce6ce4 专家人脸集成后台方法 2022-09-02 16:10:56 +08:00
424711f3c6 9.2 增加电子评标室菜单icon,修改回放 2022-09-02 10:40:26 +08:00
44f2b35998 9.1 公共组件整理 2022-09-01 15:18:49 +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
06691a8250 Merge branch '20220802-评标室预约情况' into 'release_electronic_bid_evaluation_room'
9.1 评标室预约情况

See merge request eshop/fe_service_ebtp_frontend!273
2022-09-01 13:16:27 +08:00
9620f587ee Merge branch 'master-电子评标室-预约管理-liuh' into 'release_electronic_bid_evaluation_room'
9.1 增加新建按钮

See merge request eshop/fe_service_ebtp_frontend!271
2022-09-01 13:13:50 +08:00
e9a1ceec31 9.1 增加新建按钮 2022-09-01 13:08:40 +08:00
96d7406055 生产网关地址 2022-09-01 10:47:14 +08:00
49c37c91db 9.1 预约修改 2022-09-01 10:30:39 +08:00
f72dd51a9f package.json 2022-09-01 09:42:24 +08:00
286e3f1840 9.1 评标室预约上传照片 2022-09-01 09:38:29 +08:00
1c2c6a0d8d 评标现场管理 2022-09-01 09:22:51 +08:00
f01afc1528 Merge branch 'master_jnryy_customerservice' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice 2022-08-31 15:52:37 +08:00