|
|
f895b3ce54
|
flx：考勤加上秒
|
2024-07-25 21:04:36 +08:00 |
|
|
|
624e57f2af
|
flx：修改辅助考勤字段
|
2024-07-25 19:03:12 +08:00 |
|
|
|
88a4f6538e
|
flx：合并冲突
|
2024-07-25 16:13:32 +08:00 |
|
|
|
4f0c973c05
|
feat：新增辅助考勤页面
|
2024-07-25 16:04:56 +08:00 |
|
|
|
1171ed3f3b
|
bug修复
|
2024-07-25 13:33:22 +08:00 |
|
|
|
812182fa37
|
巡检模块剩余部分
|
2024-07-24 17:27:13 +08:00 |
|
|
|
139ffe2037
|
Merge branch 'jiayu-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into jiayu-dev
|
2024-07-24 15:51:04 +08:00 |
|
|
|
875a803f60
|
巡检任务详情
|
2024-07-24 15:50:56 +08:00 |
|
|
|
147fd71fc4
|
flx：新增按钮权限 上传图标
|
2024-07-24 13:50:16 +08:00 |
|
|
|
4390535436
|
巡检计划编辑
|
2024-07-24 11:41:45 +08:00 |
|
|
|
f39f1c04e6
|
合并冲突
|
2024-07-24 11:07:10 +08:00 |
|
|
|
90b4c2b210
|
添加巡检计划
|
2024-07-24 11:05:08 +08:00 |
|
|
|
4e71ad6799
|
flx：提交巡检路线计划 查看详情
|
2024-07-24 10:59:04 +08:00 |
|
|
|
20f0604e39
|
Merge branch 'jiayu-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into jiayu-dev
# Conflicts:
# unpackage/dist/dev/app-plus/app-service.js
|
2024-07-23 18:13:43 +08:00 |
|
|
|
ba745a36d2
|
巡检点编辑
|
2024-07-23 18:05:18 +08:00 |
|
|
|
3587deb0c1
|
flx：冲突
|
2024-07-23 17:58:27 +08:00 |
|
|
|
056f955e5c
|
巡检点模块
|
2024-07-23 16:01:34 +08:00 |
|
|
|
ebf1f6960e
|
flx：应急报警用户也加上详情 进度的图片放大 课程视频修改为任意文件的兼容
|
2024-07-22 18:54:16 +08:00 |
|
|
|
15436558de
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-07-04 14:10:04 +08:00 |
|
|
|
78053b8f7e
|
flx：危大工程 修改施工状态
|
2024-07-04 14:09:33 +08:00 |
|
kun
|
61e65aef50
|
fix: 修改人员管理以及进度管理模块中的样式问题以及交互BUG
|
2024-07-03 17:56:30 +08:00 |
|
kun
|
c275f70bc3
|
fix: 项目资料添加权限以及修改查人员页面中的样式问题
|
2024-06-29 20:03:02 +08:00 |
|
kun
|
5bd84a5692
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-06-27 18:51:32 +08:00 |
|
kun
|
8cf07f81c9
|
feat: 新项目环境、内容添加
|
2024-06-27 18:51:28 +08:00 |
|
Vce
|
b3a25d8b91
|
Merge branch 'bjxz-cjw' into bjxz-dev
|
2024-06-27 18:27:55 +08:00 |
|
Vce
|
253f114023
|
feat：完成app承包商管理模块的页面开发与接口对接
|
2024-06-27 16:35:13 +08:00 |
|
kun
|
f3e54fc053
|
fix: 考试成绩合格结果规则修改
|
2024-06-27 16:02:59 +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 |
|
|
|
006a5f9ea1
|
flx：修改安全编辑问题
|
2024-06-12 21:32:18 +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 |
|
|
|
a6dece2a07
|
修改质量安全 视频列表
|
2024-06-12 14:57:29 +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 |
|
|
|
162b5b8561
|
提交
|
2024-06-11 21:27:01 +08:00 |
|
Vce
|
3865cb3afd
|
固定tabBar
|
2024-06-11 18:46:40 +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 |
|
|
|
e64e784d70
|
提交
|
2024-06-08 00:07:12 +08:00 |
|
Vce
|
1589c22fc0
|
修改bug
|
2024-06-07 19:31:21 +08:00 |
|
|
|
135d48ce46
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain
|
2024-06-07 18:35:14 +08:00 |
|
Vce
|
c6dae01dd0
|
修改安全质量复查人显示
|
2024-06-07 18:25:51 +08:00 |
|
