Commit Graph

709 Commits

Author SHA1 Message Date
f0259283dd feat: git忽略target 2023-11-06 10:40:36 +08:00
39fbc9ccec Merge branch 'feature_day_1102' into 'main'
工作许可申请提交工作流管理

See merge request likehai/ytr-god!23
2023-11-02 17:58:40 +08:00
c4e89e751d 工作许可申请提交工作流管理 2023-11-02 17:36:53 +08:00
5352099e59 Merge remote-tracking branch 'origin/main' 2023-11-01 17:37:55 +08:00
5dd23675f9 作业过程安全监管 2023-11-01 17:37:44 +08:00
477b776bbb Merge branch 'feature_day_1101' into 'main'
特殊作业验收、特殊作业归档

See merge request likehai/ytr-god!22
2023-11-01 16:48:34 +08:00
0d0fa0951e 特殊作业验收、特殊作业归档 2023-11-01 16:46:33 +08:00
0ec56f9ad3 作业过程安全监管 2023-10-31 17:42:24 +08:00
d559b9de05 Merge branch 'feature_week_44' into 'main'
特殊作业清单、特殊作业申请

See merge request likehai/ytr-god!21
2023-10-31 17:29:30 +08:00
bac427f280 特殊作业清单、特殊作业申请 2023-10-31 17:28:19 +08:00
11027c0cb3 流程管理 2023-10-31 10:34:44 +08:00
cd396d92f4 Merge branch 'feature_week_44' into 'main'
工作许可报备/清单/申请

See merge request likehai/ytr-god!20
2023-10-30 18:22:21 +08:00
97162028ab 工作许可报备/清单/申请 2023-10-30 18:20:11 +08:00
7e0e7cb2ce 野生动物 页面 2023-10-28 01:49:26 +08:00
b428789628 野生动物 页面 2023-10-27 18:57:06 +08:00
2c7e5527ac 花草植物 2023-10-27 17:37:54 +08:00
c6d6226b2f Merge branch 'feature_day_1027' into 'main'
修改视频弹出框位置

See merge request likehai/ytr-god!19
2023-10-27 17:06:57 +08:00
6737c5d456 修改视频弹出框位置 2023-10-27 17:05:49 +08:00
4a4b647dff 花草植物 2023-10-26 18:39:35 +08:00
20fcd28bb0 权限修改bug 2023-10-26 18:32:11 +08:00
be004e6825 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 18:31:26 +08:00
af436b0499 权限修改bug 2023-10-26 18:30:50 +08:00
6703f82d51 Merge branch 'feature_day_1026' into 'main'
火点坐标在地图上显示

See merge request likehai/ytr-god!18
2023-10-26 17:42:45 +08:00
b78a5db224 火点坐标在地图上显示 2023-10-26 17:41:56 +08:00
562fbadf19 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 17:30:44 +08:00
dbdcedf69f 花草植物 2023-10-26 17:29:14 +08:00
536a75942a 权限修改bug 2023-10-26 17:29:11 +08:00
f0ac99b95b Merge branch 'feature_day_1026' into 'main'
生物多样性修改、视频地址不显示

See merge request likehai/ytr-god!17
2023-10-26 17:15:29 +08:00
5c76ad8f6a 生物多样性修改、视频地址不显示 2023-10-26 17:14:13 +08:00
8bb5bc5733 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 16:04:53 +08:00
208e149228 权限修改bug 2023-10-26 16:04:46 +08:00
c1af8fd92c 权限修改bug 2023-10-26 16:04:21 +08:00
bd603e8735 Merge branch 'feature_day_1026' into 'main'
火情处置追溯、监控设备管理

See merge request likehai/ytr-god!16
2023-10-26 14:42:38 +08:00
a4856fc756 火情处置追溯、监控设备管理 2023-10-26 14:32:01 +08:00
98464ca192 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 11:18:25 +08:00
eae826ee2d fi: BUG 2023-10-26 11:17:35 +08:00
9ac7d48370 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 11:07:16 +08:00
19b2470d84 fix: bUg 2023-10-26 11:06:32 +08:00
ce2937eb69 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 10:48:46 +08:00
90cf4fdf38 权限管理代码 2023-10-26 10:48:38 +08:00
b7509958c0 feat: 登录 2023-10-26 10:47:39 +08:00
35a0ef83bd 权限管理代码 2023-10-26 02:11:57 +08:00
361378885b 权限管理代码 2023-10-25 22:00:41 +08:00
f1ce6f2e57 山林安全巡查 2023-10-25 18:27:32 +08:00
40d5f4c1b3 Merge branch 'feature_day_1025' into 'main'
历史火情查看

See merge request likehai/ytr-god!15
2023-10-25 18:21:11 +08:00
fe6d92fdb1 历史火情查看 2023-10-25 18:20:14 +08:00
4896896343 Merge branch 'feature_day_1025' into 'main'
火情通知、火点定位、周边资源、火情发布

See merge request likehai/ytr-god!14
2023-10-25 17:33:32 +08:00
6b51bee0c3 火情通知、火点定位、周边资源、火情发布 2023-10-25 17:31:22 +08:00
3cd841eb00 feat: 首页数据修改与Logo标题修改 2023-10-25 15:10:32 +08:00
726824570d feat: 大屏路由导航调整 2023-10-25 14:46:51 +08:00