Commit Graph

251 Commits (c912472911765c2782d4dd67f565e32e0b2ae0da)

Author SHA1 Message Date
liujun 9f45352069 Merge remote-tracking branch 'origin/liujun-2023-12-28-监管端地图同步到企业端' into dev 2024-01-09 11:31:54 +08:00
limingyu 7aef14617c Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2024-01-08 13:51:41 +08:00
limingyu f8b2085dd8 受限空间受限空间所属单位 2024-01-08 13:44:09 +08:00
liujun 07b12c3c05 13025 用工形式显示不正确 2024-01-05 09:29:48 +08:00
zhaoyu b5e41c1628 具体位置 2024-01-04 16:51:20 +08:00
liujun c6bacc5cff 13075 未做限制,应该里边的数据删除后才可以删除外边的。 2024-01-04 10:56:23 +08:00
zhaoyu f0777dccbd Merge remote-tracking branch 'origin/dev' into dev 2024-01-03 10:37:38 +08:00
zhaoyu 7b82480f14 Merge branch '地图展示有限空间作业' into dev 2024-01-03 10:37:00 +08:00
zhaoyu 7f775e1286 展示有限空间信息 2024-01-03 10:31:49 +08:00
liujun 993e215991 相关方端bug 2024-01-02 14:12:39 +08:00
liujun ba894bd4f3 bug修复 2023-12-28 14:46:32 +08:00
liujun 61beb0ec93 Merge remote-tracking branch 'origin/1212-八项作业迁移' into dev 2023-12-28 14:10:37 +08:00
guoyuepeng 1764e2668f 添加 更新.md 2023-12-28 10:44:13 +08:00
liujun 883be5690d Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-27 15:14:26 +08:00
liujun ab1cd79df5 相关方端bug 2023-12-27 15:13:47 +08:00
zhaoyu 7da0125aad 必填加*号 2023-12-27 14:23:12 +08:00
zhaoyu b616481ccb Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-27 14:16:58 +08:00
zhaoyu 8b55f34800 批量删除增加提示 2023-12-27 14:16:52 +08:00
liujun fdbb29ccf1 Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移 2023-12-26 13:58:11 +08:00
liujun 53776e2879 bug修复 2023-12-26 12:35:27 +08:00
liujun a1d226aae0 bug修复 2023-12-25 18:17:08 +08:00
limingyu 57389ffb4a Merge branch 'lmy20231113' into 1212-八项作业迁移 2023-12-25 14:28:56 +08:00
zhaoyu c2191b9680 Merge branch 'zy-1219-四色卡' into 1212-八项作业迁移 2023-12-25 14:02:18 +08:00
liujun 206d7bd90c 解决无法多选bug 2023-12-23 15:08:42 +08:00
liujun b1d32efa49 解决无法多选bug 2023-12-23 10:50:36 +08:00
liujun 735338ed11 查看bug修复 2023-12-23 10:27:03 +08:00
zhaoyu b210efdb5c bug处理 2023-12-22 17:48:14 +08:00
liujun 7e0f9d2264 查看bug修复 2023-12-22 17:07:44 +08:00
zhaoyu 30d952c795 搜索名称问题 2023-12-22 16:32:20 +08:00
liujun f361d4558e 查看bug修复 2023-12-22 15:49:12 +08:00
liujun 41fa0b4d39 查看bug修复 2023-12-22 13:53:24 +08:00
liujun 7d18e1bb2a 查看bug修复 2023-12-22 13:39:09 +08:00
liujun f120b93b80 查看bug修复 2023-12-21 19:55:07 +08:00
zhaoyu cb7be7a874 bug处理 2023-12-21 18:01:51 +08:00
zhaoyu 3e0c471877 不展示其他安全措施问题 2023-12-21 17:44:32 +08:00
zhaoyu 0f6286bb82 底部遮挡问题 2023-12-21 17:38:15 +08:00
zhaoyu 37aba6edff 13248 2023-12-21 17:30:24 +08:00
zhaoyu f99e6ef87b 作业票编号右对齐 2023-12-21 17:26:43 +08:00
zhaoyu d3e36f3f8d 13273 2023-12-21 17:02:52 +08:00
liujun 25b9ee7959 相关方查看详情统一格式 2023-12-21 13:58:55 +08:00
liujun 40422a8628 bug修复 2023-12-20 19:51:13 +08:00
liujun 41416cad21 bug修复 2023-12-20 15:57:27 +08:00
liujun d466a36339 bug修复 2023-12-20 15:01:46 +08:00
liujun 0e7c6e0c72 bug修复 2023-12-20 14:49:01 +08:00
liujun d016a52372 bug修复 2023-12-19 20:03:23 +08:00
limingyu bb8fdbd9b7 修改动火作业数据延时监火审核人显示 2023-12-19 17:56:52 +08:00
zhaoyu 755928c217 风险分布图增加三人以上分布图和人员聚集场所分布图 2023-12-19 15:28:10 +08:00
liujun 731986f7da bug修复 2023-12-19 15:01:43 +08:00
liujun b3fae3e234 相关方需求变革 2023-12-18 20:24:01 +08:00
liujun 2b6af35238 相关方需求变革 2023-12-18 18:54:49 +08:00