|
|
fc924c59f7
|
flx：修改校验
|
2024-06-28 11:27:11 +08:00 |
|
|
|
b418037907
|
flx：修改校验
|
2024-06-27 21:09:13 +08:00 |
|
|
|
9f00cae69b
|
flx：提交效验局部刷新
|
2024-06-27 20:46:08 +08:00 |
|
|
|
f98e41e2c5
|
flx:冲突
|
2024-06-27 14:35:05 +08:00 |
|
|
|
00b886c096
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-27 14:33:42 +08:00 |
|
|
|
3afea7cb1f
|
flx：修改配置
|
2024-06-27 14:33:22 +08:00 |
|
kun
|
ee705bd043
|
fix: 注释资料中心权限功能
|
2024-06-26 20:18:18 +08:00 |
|
kun
|
285de8c23a
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-26 15:46:27 +08:00 |
|
kun
|
61c01a9476
|
fix: 资料中心添加权限功能以及修改劳务管理模块中的表格多选功能
|
2024-06-26 15:46:23 +08:00 |
|
Vce
|
1b9d3bb187
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-25 19:10:38 +08:00 |
|
Vce
|
4382d9e0b2
|
fix：修改承包商管理中企业详情的纬度位置文字
|
2024-06-25 19:10:32 +08:00 |
|
kun
|
a750bd4983
|
fix: 雨量监测系统筛选功能修改
|
2024-06-25 18:27:01 +08:00 |
|
|
|
77efebf4b7
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-25 18:15:46 +08:00 |
|
|
|
ce076cd6bc
|
flx：冲突
|
2024-06-25 18:14:56 +08:00 |
|
kun
|
1a8d01b208
|
feat: 添加完善邮箱标识判断(登录时)
|
2024-06-25 18:10:33 +08:00 |
|
kun
|
431c08645d
|
fix: 雨量监测系统模块的页面BUG修改
|
2024-06-25 17:34:45 +08:00 |
|
|
|
03f8de0bbc
|
flx：新增雨量监测模块 设备中后台
|
2024-06-25 15:10:40 +08:00 |
|
Vce
|
27f553fd77
|
fix：给车辆黑白名单中的黑白名单按钮加上权限
|
2024-06-25 15:01:21 +08:00 |
|
|
|
bd093bbdff
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-25 09:15:53 +08:00 |
|
|
|
b37a486a1f
|
flx：防止连续点击登录
|
2024-06-24 15:05:55 +08:00 |
|
|
|
2f5f2f7c89
|
flx：修改 ai预警责任人和项目账号能处置 消息列表样式问题
|
2024-06-24 14:16:32 +08:00 |
|
Vce
|
d18297a6e9
|
fix:添加人员管理中编辑裁剪照片时判断是否为海康设备，是的话调用人脸评分
|
2024-06-24 11:14:51 +08:00 |
|
|
|
131ee75ea1
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-21 18:49:38 +08:00 |
|
|
|
77c081861f
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-21 18:49:10 +08:00 |
|
|
|
18cb9669cf
|
flx：修改ai预警已处置
|
2024-06-21 18:48:52 +08:00 |
|
Vce
|
1ead631c5a
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-21 18:19:15 +08:00 |
|
Vce
|
08df5e5c81
|
fix：在人员管理中人员二维码录入中的vueCropper裁剪后添加图片是否为10-200kb内的判断
|
2024-06-21 18:18:15 +08:00 |
|
|
|
99cddfbf2a
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-20 19:06:19 +08:00 |
|
|
|
597402c6f4
|
flx：修改基础模块 项目扩展信息 编辑 时间样式问题 修改消息列表删除消息提示问题
|
2024-06-20 18:15:41 +08:00 |
|
|
|
2a2a66e08c
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-20 18:04:55 +08:00 |
|
|
|
fcd77ab949
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-20 17:53:12 +08:00 |
|
Vce
|
188f2214a0
|
fix:添加配置现场大屏时可以切换雄本地、鞍钢测试和鞍钢生产环境
|
2024-06-20 14:07:15 +08:00 |
|
Vce
|
f060f0e3fb
|
fix：添加现场大屏配置视频按钮，projectSn暂时写死，部署时需要切换相应的projectSn
|
2024-06-20 00:42:27 +08:00 |
|
|
|
0330317612
|
flx：冲突
|
2024-06-19 21:18:21 +08:00 |
|
|
|
7b1c746b8e
|
flx：冲突
|
2024-06-19 21:16:03 +08:00 |
|
|
|
956bdf925d
|
flx：修改质量安全样式问题 应急展示问题
|
2024-06-19 19:34:55 +08:00 |
|
|
|
379a8f34c8
|
flx：劳务 人员登记培训新增身份证号查询
|
2024-06-19 17:57:30 +08:00 |
|
kun
|
5fa165ddac
|
fix: 中科佳成环境添加
|
2024-06-18 20:17:08 +08:00 |
|
kun
|
c98b4c79fd
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-18 18:36:38 +08:00 |
|
kun
|
c33a119c89
|
fix: 添加鞍钢类型判断
|
2024-06-18 18:36:35 +08:00 |
|
|
|
adfd004aa2
|
flx：修改消息列表样式
|
2024-06-18 18:03:12 +08:00 |
|
|
|
ace8365895
|
flx：消息推送列表状态同步更新
|
2024-06-18 17:39:56 +08:00 |
|
|
|
89fd6c488c
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-18 17:27:39 +08:00 |
|
|
|
16e71311e7
|
flx：消息列表 超出内容加滚动条
|
2024-06-18 17:06:28 +08:00 |
|
Vce
|
87ab2edd6f
|
Merge branch 'bjxz-cjw' into bjxz-dev
|
2024-06-18 16:04:02 +08:00 |
|
Vce
|
b713e9faef
|
fix：修改花名册临时人员上传现场采集照片时不弹出裁剪的bug
|
2024-06-18 16:02:19 +08:00 |
|
|
|
e6a5c74ff3
|
flx：修改特殊作业时间问题 app下载命名规范问题 安全履职修改为查所有子账号
|
2024-06-18 15:47:09 +08:00 |
|
Vce
|
2d62c3e8e7
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-18 15:28:54 +08:00 |
|
Vce
|
33dc504ffb
|
fix：调整劳务管理模块中人员录入的vueCropper以及添加管理人员和临时人员的海康设备判断以及
|
2024-06-18 15:28:05 +08:00 |
|
kun
|
1cdbd6c928
|
fix: 合并代码以及解决冲突
|
2024-06-18 15:22:18 +08:00 |
|
