|
|
d7d173eca5
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-24 14:43:02 +08:00 |
|
|
|
3f2cc39715
|
flx：ai预警已处置项目账号 负责人能进行处置
|
2024-06-24 14:41:56 +08:00 |
|
|
|
1ea4b6f14e
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-21 18:55:06 +08:00 |
|
|
|
218aa2caac
|
1
|
2024-06-21 18:54:54 +08:00 |
|
|
|
93d72170d8
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-21 18:53:48 +08:00 |
|
|
|
34bab49c5f
|
flx：提交ai预警 已处置按钮权限
|
2024-06-21 18:53:01 +08:00 |
|
Vce
|
0c73a6c6a6
|
fix：执行npm i产生的差异
|
2024-06-19 21:16:30 +08:00 |
|
|
|
363c692653
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-18 23:28:12 +08:00 |
|
|
|
2c6181a07f
|
flx：冲突
|
2024-06-18 22:32:59 +08:00 |
|
|
|
ba4f0da525
|
flx：无
|
2024-06-18 22:30:17 +08:00 |
|
|
|
c84ce2e7a9
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-18 18:38:38 +08:00 |
|
kun
|
4b9f369edd
|
fix: 合并代码
|
2024-06-15 18:57:48 +08:00 |
|
|
|
5677f1bb34
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-15 17:18:53 +08:00 |
|
kun
|
545f44b991
|
fix: 解决冲突
|
2024-06-14 20:06:39 +08:00 |
|
kun
|
2ce7d9ee28
|
fix: 修改页面中顶部导航栏固定的样式以及合并代码
|
2024-06-14 20:05:51 +08:00 |
|
|
|
6f9c0c9e38
|
flx：修改盲板抽堵时间
|
2024-06-14 19:28:53 +08:00 |
|
|
|
871a99cabc
|
flx：解决冲突 提交盲板作业
|
2024-06-13 20:39:21 +08:00 |
|
|
|
f69bb50fc2
|
flx：提交盲板作业的时间
|
2024-06-13 20:37:00 +08:00 |
|
kun
|
f118f42212
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-06-13 11:13:42 +08:00 |
|
kun
|
b784bd3c86
|
fix: BUG修改
|
2024-06-13 11:13:39 +08:00 |
|
|
|
c3ba907724
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-12 21:34:21 +08:00 |
|
|
|
247b5ded8f
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-12 21:32:43 +08:00 |
|
|
|
006a5f9ea1
|
flx：修改安全编辑问题
|
2024-06-12 21:32:18 +08:00 |
|
kun
|
280d833280
|
fix: 合并代码
|
2024-06-12 21:27:27 +08:00 |
|
kun
|
73de670cf9
|
fix: 合并代码
|
2024-06-12 21:27:16 +08:00 |
|
kun
|
085f84cf75
|
fix: BUG修改
|
2024-06-12 21:25:10 +08:00 |
|
kun
|
ba7b0e85cd
|
fix: 合并代码
|
2024-06-12 21:24:20 +08:00 |
|
kun
|
72733ac959
|
fix: 修改了特种作业的文字显示问题
|
2024-06-12 21:24:03 +08:00 |
|
kun
|
d844f35ba8
|
fix: BUG修改
|
2024-06-12 21:22:52 +08:00 |
|
|
|
189e578c77
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-12 14:59:36 +08:00 |
|
|
|
0a85dce921
|
1
|
2024-06-12 14:59:29 +08:00 |
|
|
|
a6dece2a07
|
修改质量安全 视频列表
|
2024-06-12 14:57:29 +08:00 |
|
|
|
39750af51b
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-11 21:47:58 +08:00 |
|
|
|
973fb5af09
|
1
|
2024-06-11 21:47:48 +08:00 |
|
|
|
3c9a91b10d
|
提交视频
|
2024-06-11 21:44:26 +08:00 |
|
|
|
679c9afca1
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-11 21:31:42 +08:00 |
|
|
|
1e43792ba8
|
flx：冲突
|
2024-06-11 21:28:37 +08:00 |
|
|
|
162b5b8561
|
提交
|
2024-06-11 21:27:01 +08:00 |
|
Vce
|
3865cb3afd
|
固定tabBar
|
2024-06-11 18:46:40 +08:00 |
|
|
|
0480f5a5cf
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-11 15:14:38 +08:00 |
|
|
|
c559459be6
|
冲突
|
2024-06-11 15:09:48 +08:00 |
|
|
|
0df979f099
|
1
|
2024-06-11 15:08:24 +08:00 |
|
Vce
|
7cbde72cea
|
修改bug
|
2024-06-11 13:12:20 +08:00 |
|
kun
|
ade59383b6
|
fix: BUG修改
|
2024-06-08 15:40:06 +08:00 |
|
kun
|
35023f20e7
|
fix: 冲突解决
|
2024-06-08 00:49:00 +08:00 |
|
kun
|
c76ff18adb
|
fix: BUG修改
|
2024-06-08 00:48:04 +08:00 |
|
|
|
6a5a61a8ef
|
冲突
|
2024-06-08 00:13:08 +08:00 |
|
|
|
bc855e6c89
|
冲突
|
2024-06-08 00:08:51 +08:00 |
|
|
|
e64e784d70
|
提交
|
2024-06-08 00:07:12 +08:00 |
|
kun
|
1c3857d376
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-06-07 23:48:20 +08:00 |
|
