Commit Graph

Select branches

Hide Pull Requests

baotou

dameng

desensitize

dunhuan_jdk8

dunhuang

guangshengaosu

hole_jdk17

mod_security

prod

uat

angang-deploy

angang-deploy-new

angang-two

duhaipeng

guoshengxiong

jihe_dust_0618

jiuzhu

master

mulei

ocr

pengjdev

shenzhendev

wangcheng

Mono Color

• 0a5fb20365 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong pengjie 2024-07-12 18:31:44 +08:00
• ad7431583a 车辆修改 pengjie 2024-07-12 18:31:31 +08:00
• 23cf70adb1 恢复修改或新增人员时候下发权限 guoshengxiong 2024-07-12 18:27:05 +08:00
• 5f10511b14 增加质量和安全的用时和是否超期 guoshengxiong 2024-07-12 17:10:53 +08:00
• 0728d04cca 车辆修改 pengjie 2024-07-12 11:50:44 +08:00
• a56d4ba7c4 车辆修改 pengjie 2024-07-12 11:50:13 +08:00
• fcb51e52ba 现场大屏弹幕和现场大屏节目单管理 guoshengxiong 2024-07-11 18:27:36 +08:00
• 6f1b7030c8 代码规范 guoshengxiong 2024-07-11 16:18:15 +08:00
• d379b76f14 代码规范 guoshengxiong 2024-07-11 11:56:16 +08:00
• 369143d68b 雨量设备在线离线 guoshengxiong 2024-07-11 10:26:50 +08:00
• 0ec791e703 代码规范 guoshengxiong 2024-07-11 09:26:35 +08:00
• 4dce052b86 代码规范 guoshengxiong 2024-07-10 15:47:30 +08:00
• 1c0d937465 新增的时候，原本是黑名单车，新增白名单车，提示“此车辆已被拉黑，无法再进行新增”。 新增的时候，原本是白名单车，新增黑名单车，提示“此车辆是白名单，无法新增为黑名单，若需要拉黑车辆，可编辑或点击拉入黑名单按钮”。 新增的时候，原本是黑名单车，新增黑名单车，提示“此车辆已被拉黑”。 guoshengxiong 2024-07-10 14:50:32 +08:00
• 043a91a360 代码规范 guoshengxiong 2024-07-10 12:01:55 +08:00
• 021a87fabf 代码加注释 guoshengxiong 2024-07-10 09:41:45 +08:00
• 9587eb2d59 操作日志bug修改 guoshengxiong 2024-07-09 17:41:58 +08:00
• e8838e22f3 代码规范 guoshengxiong 2024-07-09 17:39:31 +08:00
• dcd8fffe09 代码规范 guoshengxiong 2024-07-09 16:42:03 +08:00
• 86e8761cf5 bug修改和代码规范 guoshengxiong 2024-07-09 11:07:16 +08:00
• 8a827ecd50 bug修改和代码规范 guoshengxiong 2024-07-08 19:06:04 +08:00
• a02b582806 日志bug修改和代码规范 guoshengxiong 2024-07-08 14:27:32 +08:00
• 52d417c11b ai的bug修改 guoshengxiong 2024-07-08 14:26:16 +08:00
• 9bc1a5870a 车辆bug修改 guoshengxiong 2024-07-05 19:31:06 +08:00
• b160b71b0f 代码规范 guoshengxiong 2024-07-05 19:07:36 +08:00
• fb78cde154 记录人改成劳务名称 guoshengxiong 2024-07-05 18:34:30 +08:00
• b144036dda 危险特殊作业统计危大工程数量+特殊作业数量 安全教育统计入场安全教育+培训计划数量 guoshengxiong 2024-07-05 16:17:25 +08:00
• 151b71a930 修改提交 pengjie 2024-07-05 15:51:39 +08:00
• f69d4a8a53 统计危大类别情况 guoshengxiong 2024-07-05 15:35:48 +08:00
• 93162da5b0 删除危大和特种作业，把关联的四个东西也删除 guoshengxiong 2024-07-05 14:40:49 +08:00
• 503c6f3aa2 修改提交 pengjie 2024-07-05 14:35:03 +08:00
• 388665b8ee 质量和安全增加已撤回的筛选 guoshengxiong 2024-07-05 14:27:29 +08:00
• 711cebe20d 代码添加注释 guoshengxiong 2024-07-05 12:00:55 +08:00
• 4ea93fdacb 修改提交 pengjie 2024-07-05 10:01:02 +08:00
• f761561ec6 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-07-05 09:13:46 +08:00
• 4d2954f3a1 大屏质量的数量统计 guoshengxiong 2024-07-05 09:11:51 +08:00
• d8cf513d66 BUG修复 pengjie 2024-07-05 00:47:16 +08:00
• de15f8aaef BUG修复 pengjie 2024-07-05 00:33:50 +08:00
• 9b289bc7dd Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong pengjie 2024-07-04 18:59:56 +08:00
• eb7e05c5e9 BUG修复 pengjie 2024-07-04 18:57:23 +08:00
• 95fdd8b9ff 设备表修改合作单位字段名 guoshengxiong 2024-07-04 17:37:39 +08:00
• 0e97dbc626 bug修改 guoshengxiong 2024-07-04 17:36:40 +08:00
• 5d46436ae7 设备表修改合作单位字段名 guoshengxiong 2024-07-04 17:36:23 +08:00
• 7552196ae4 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-07-04 16:20:06 +08:00
• 78786d99b2 设备表增加合作单位字段 guoshengxiong 2024-07-04 16:19:59 +08:00
• 783f5019e8 BUG修复 pengjie 2024-07-04 16:14:23 +08:00
• c8dafceaff bug修改 guoshengxiong 2024-07-04 15:06:49 +08:00
• 3d95bb3c91 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-07-04 14:29:56 +08:00
• 74d330af5b 大屏特种作业的4个接口和bug修改 guoshengxiong 2024-07-04 14:29:25 +08:00
• 9026eecb1a BUG修复 pengjie 2024-07-04 13:58:05 +08:00
• 4b3694d149 BUG修复 pengjie 2024-07-04 10:15:44 +08:00
• 2bb87b2aa7 BUG修复 pengjie 2024-07-04 10:14:32 +08:00
• f9a37ced5e Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-07-03 18:19:03 +08:00
• 980f56d7e6 代码规范和bug修复 guoshengxiong 2024-07-03 18:16:59 +08:00
• 1b4f5ab9e0 进度修改 guoshengxiong 2024-07-03 16:54:37 +08:00
• 3313af7390 BUG修复 pengjie 2024-07-03 16:34:20 +08:00
• 8c4e820c73 代码规范 guoshengxiong 2024-07-03 16:11:21 +08:00
• 5dc18dd22a 功能-质量-按周统计 guoshengxiong 2024-07-03 11:58:27 +08:00
• 9c31326994 雨量bug修改 guoshengxiong 2024-07-03 10:59:26 +08:00
• b5f945faa5 Merge branch 'guoshengxiong' into guoshengxiongtemp guoshengxiong 2024-07-03 10:11:14 +08:00
• 77f915e849 雨量bug修改 guoshengxiong 2024-07-03 10:10:52 +08:00
• 020206a10f bug修改 guoshengxiong 2024-07-02 18:59:47 +08:00
• f49f586297 Merge branch 'guoshengxiong' into guoshengxiongtemp guoshengxiong 2024-07-02 17:08:09 +08:00
• d929e896c4 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-07-02 17:04:08 +08:00
• d09fb2ff7d bug修改 guoshengxiong 2024-07-02 17:03:28 +08:00
• 5d80626d9b 工作流日志 pengjie 2024-07-02 16:20:29 +08:00
• 7102984088 正式环境bug修改 guoshengxiong 2024-07-02 14:33:02 +08:00
• 16c9a9e4c7 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-07-02 14:19:52 +08:00
• a83c2103b3 正式环境bug修改 guoshengxiong 2024-07-02 14:19:35 +08:00
• 8536616ae0 工作流日志 pengjie 2024-07-02 11:32:53 +08:00
• 83353faa56 进度bug修改 guoshengxiong 2024-07-02 11:26:14 +08:00
• ef02864567 进度审批修改监理 guoshengxiong 2024-07-02 11:18:28 +08:00
• ab2b00e645 大屏算总分 guoshengxiong 2024-07-01 20:14:23 +08:00
• 6440b9d422 bug修复和代码规范 guoshengxiong 2024-07-01 17:38:31 +08:00
• 9764cb50e7 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-07-01 16:16:30 +08:00
• d814d56a00 代码规范 guoshengxiong 2024-07-01 14:18:33 +08:00
• 968ab5da60 代码规范 guoshengxiong 2024-07-01 14:17:43 +08:00
• 62e3e5b5e1 代码规范 guoshengxiong 2024-07-01 14:15:37 +08:00
• ed46097103 教育记录bug修复 guoshengxiong 2024-07-01 11:45:55 +08:00
• 160d52d662 代码规范 guoshengxiong 2024-07-01 11:29:08 +08:00
• 7223e7c05a 代码规范 guoshengxiong 2024-07-01 11:22:28 +08:00
• 2f855d3d1e 代码规范 guoshengxiong 2024-07-01 09:51:07 +08:00
• b8a3fd258a 甘特图bug修复 guoshengxiong 2024-07-01 09:08:35 +08:00
• e099a6d971 安全教育bug修复 guoshengxiong 2024-07-01 09:07:44 +08:00
• a37f302fd1 bug修复 guoshengxiong 2024-06-29 18:24:21 +08:00
• 2a34ba4ebe bug优化 guoshengxiong 2024-06-29 16:49:17 +08:00
• 0d61795a3c 雨量大屏接口 guoshengxiong 2024-06-29 16:14:13 +08:00
• 3587197e44 雨量大屏接口 guoshengxiong 2024-06-29 16:13:03 +08:00
• 4aad451bed bug修改 guoshengxiong 2024-06-29 11:53:14 +08:00
• 55992c0937 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-06-29 10:21:05 +08:00
• 00b00aea64 bug修改 guoshengxiong 2024-06-29 10:18:47 +08:00
• 46a72bf3ae 工作流日志 pengjie 2024-06-29 10:00:31 +08:00
• 17753dfa8c Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong GUO 2024-06-28 21:43:31 +08:00
• 6a166cce8f bug修复 GUO 2024-06-28 21:43:25 +08:00
• b70e769018 bug修改 guoshengxiong 2024-06-28 20:54:54 +08:00
• af7fb6c80a bug修复 GUO 2024-06-28 20:51:36 +08:00
• f35059b460 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-06-28 17:54:04 +08:00
• 8f20420f9e ai修改 guoshengxiong 2024-06-28 17:53:47 +08:00
• eaedd9df33 土石方运输 pengjie 2024-06-28 17:30:11 +08:00
• 5272425cad 添加操作注解 guoshengxiong 2024-06-28 16:26:52 +08:00
• abcd3f871e bug修改 guoshengxiong 2024-06-28 16:21:44 +08:00