Commit Graph

156 Commits (f2c03e879e825a883a4d290860f04ae0798310b6)

Author SHA1 Message Date
tangjie 30d4caa034 Merge branch 'dev' into dev_1.0.1 2026-07-16 11:28:01 +08:00
tangjie dacae8af48 feat 2026-07-16 11:27:49 +08:00
tangjie f5bfa06e0b 修护bug 2026-07-15 16:35:04 +08:00
tangjie 1d5d508292 feat 2026-07-15 14:26:05 +08:00
tangjie 502c9051df fix 2026-07-15 10:12:45 +08:00
tangjie 4f883a176b fix 2026-07-15 09:54:47 +08:00
tangjie ed9cef3c35 Merge branch 'dev_1.0.1' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev_1.0.1 2026-07-15 09:27:28 +08:00
tangjie 90533bef45 fix 2026-07-14 16:51:18 +08:00
tangjie 4b0678087e fix 2026-07-14 16:38:57 +08:00
tangjie fb650b07cc feat 2026-07-14 11:57:53 +08:00
tangjie 832266252a fix 2026-07-14 11:29:29 +08:00
tangjie 9c8e386773 feat 2026-07-14 10:09:08 +08:00
tangjie 0a0d207409 fix 2026-07-13 16:07:51 +08:00
tangjie b32d56fc97 fix 2026-07-13 15:57:17 +08:00
tangjie 994b24a8c3 fix 2026-07-13 15:31:49 +08:00
tangjie 72396972a5 fix 2026-07-13 13:50:51 +08:00
tangjie 96d5ae9458 fix 2026-07-10 17:11:22 +08:00
tangjie 7847679bf8 fix 2026-07-10 16:37:58 +08:00
tangjie c94f43e877 fix 2026-07-10 16:08:16 +08:00
tangjie 68182377e0 fix 2026-07-10 14:38:17 +08:00
tangjie bfaadb2d9f fix 2026-07-10 13:43:58 +08:00
tangjie c4ed635cbd Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-10 10:39:23 +08:00
tangjie 4fb5866543 fix 2026-07-10 10:38:16 +08:00
huwei 95224ffa84 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev
# Conflicts:
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
2026-07-10 10:12:45 +08:00
huwei 85120fcf75 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	jjb.config.js
2026-07-10 10:03:10 +08:00
tangjie e0866b7ed1 fix 2026-07-10 10:03:03 +08:00
huwei bff50093d1 bug修护 2026-07-10 10:02:53 +08:00
tangjie ffd0d68cce fix 2026-07-10 09:46:46 +08:00
tangjie bc292b63ab fix 2026-07-09 18:03:32 +08:00
huwei 6f76b42841 Merge remote-tracking branch 'origin/dev' into dev 2026-07-09 17:20:42 +08:00
huwei 53f903e633 bug修护 2026-07-09 17:20:35 +08:00
luotaiqian 17106eec15 Merge remote-tracking branch 'origin/dev' into dev 2026-07-09 17:16:46 +08:00
luotaiqian a347a89ba6 bug fix 2026-07-09 17:16:40 +08:00
huwei 0819789efc Merge remote-tracking branch 'origin/dev' into dev 2026-07-09 17:13:04 +08:00
huwei c5218e1d0c bug修护 2026-07-09 17:12:54 +08:00
tangjie f14bd082c8 feat 2026-07-09 17:00:19 +08:00
tangjie 2c4344b69a fix 2026-07-09 13:15:13 +08:00
tangjie b573b0947f fix 2026-07-09 11:21:39 +08:00
tangjie 7cba6bcaa8 fix 2026-07-09 10:03:36 +08:00
tangjie 5fc1a9c8e4 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-09 09:52:05 +08:00
tangjie a495eb3f83 feat 2026-07-09 09:52:04 +08:00
huwei 213224cf83 bug修护 2026-07-09 09:43:00 +08:00
tangjie 1c55fce948 feat 2026-07-09 09:23:22 +08:00
tangjie 3460e81ea4 fix 2026-07-08 22:33:22 +08:00
tangjie c0dbf43805 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-08 20:55:24 +08:00
tangjie 467251bbcf fix 2026-07-08 20:55:23 +08:00
luotaiqian 67a82667f2 bug fix 2026-07-08 20:31:28 +08:00
tangjie 34a4eb6a93 fix 2026-07-08 18:14:50 +08:00
tangjie fe284f6333 fix 2026-07-08 15:38:45 +08:00
tangjie fe3c730afc feat 2026-07-08 15:23:50 +08:00
tangjie 353e40b31a fix 2026-07-08 14:44:41 +08:00
tangjie bb5ec8bb67 fix 2026-07-08 12:59:15 +08:00
tangjie ae8137b045 fix 2026-07-08 11:22:19 +08:00
tangjie c8fd19b3b8 feat 2026-07-08 09:37:21 +08:00
tangjie 1b0c0ba9b5 feat 2026-07-07 18:13:58 +08:00
tangjie c941f07c5e feat 2026-07-07 18:12:10 +08:00
huwei aca99c5f66 Merge remote-tracking branch 'origin/dev' into dev 2026-07-07 17:13:42 +08:00
huwei 8129caaef3 bug修护 2026-07-07 17:13:33 +08:00
tangjie 5ff8d437b1 feat 2026-07-07 17:08:17 +08:00
tangjie f279702782 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-07 16:57:41 +08:00
tangjie d0396a0b01 feat 2026-07-07 16:57:40 +08:00
huwei 3d637b6592 bug修护 2026-07-07 16:50:31 +08:00
huwei 8d08ce35fc bug修护 2026-07-07 16:47:44 +08:00
huwei c4861a858d bug修护 2026-07-07 16:46:27 +08:00
huwei a2dc77d99c Merge remote-tracking branch 'origin/dev' into dev 2026-07-07 16:32:07 +08:00
huwei 7f73eae341 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
2026-07-07 16:31:50 +08:00
tangjie f70bd6afc3 fix 2026-07-07 16:30:35 +08:00
huwei 412b8479c0 修护,人员重置密码、删除等提示错误 2026-07-07 16:30:26 +08:00
tangjie 039423bd6c fix 2026-07-07 16:20:22 +08:00
huwei 7121437b4d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
#	src/pages/Container/EnterpriseInfo/ResignationApply/index.js
2026-07-07 16:03:09 +08:00
huwei 862b434777 bug修护 2026-07-07 15:58:05 +08:00
tangjie 2ef8e75130 feat 2026-07-07 15:45:52 +08:00
tangjie 716da66338 feat 2026-07-07 15:27:25 +08:00
tangjie 3aefacff95 feat 2026-07-07 14:32:37 +08:00
tangjie 4b2483fd3a feat 2026-07-07 13:59:46 +08:00
tangjie 4950605bff Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-07 13:54:56 +08:00
tangjie db9dfb2c29 feat 2026-07-07 13:54:55 +08:00
luotaiqian 9073e492bc 新增 2026-07-07 13:38:33 +08:00
luotaiqian 02ddc49c19 Merge remote-tracking branch 'origin/dev' into dev 2026-07-07 11:52:27 +08:00
luotaiqian fedf1ce360 新增 2026-07-07 11:52:21 +08:00
tangjie 97883dbec3 feat 2026-07-07 11:39:02 +08:00
tangjie b60243f58e feat 2026-07-07 11:30:42 +08:00
tangjie d343838f4d feat 2026-07-07 11:18:00 +08:00
tangjie 2d812ec4fd feat 2026-07-07 10:49:43 +08:00
luotaiqian 3b287bd363 新增人员 2026-07-07 10:40:47 +08:00
tangjie 950980d48b feat 2026-07-07 09:07:19 +08:00
tangjie 0c9e2d62d3 feat 2026-07-06 18:06:49 +08:00
tangjie 19e4771369 feat 2026-07-06 16:49:57 +08:00
tangjie 8e6c5c1b69 feat 2026-07-06 16:22:51 +08:00
tangjie eb144fef1c feat 2026-07-02 16:58:07 +08:00
tangjie 65abc7ee66 feat 2026-07-02 11:00:31 +08:00
tangjie 8ec2de142b 修改历史代码 2026-07-01 10:10:11 +08:00
tangjie 62db095eb5 feat 2026-06-30 18:30:30 +08:00
tangjie 51bea3ca02 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-06-30 17:43:26 +08:00
tangjie 9d40688f4e feat 2026-06-30 17:43:05 +08:00
huwei 3547165386 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/pages/Container/Layout/menuConfig.js
2026-06-30 15:58:31 +08:00
huwei 2af100fc98 新增:监管端首页、驾驶舱;机构端首页,资料填报。 2026-06-30 15:56:53 +08:00
tangjie 05f6342321 加上title 2026-06-29 17:21:30 +08:00
122778500@qq.com a7425c8913 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-06-29 16:48:16 +08:00
122778500@qq.com 14c454d416 feat 2026-06-29 16:45:58 +08:00