579 Commits

Author SHA1 Message Date
2b77d82b9b 修复bug 2024-07-26 17:57:58 +08:00
425eabfdde 修复巡检点多选框滚动问题 2024-07-26 10:41:21 +08:00
1660d759fe 修复接口参数少传 2024-07-25 21:02:39 +08:00
0d613e2a6a Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into jiayu-dev 2024-07-25 18:34:18 +08:00
0ada43986d 修复bug 2024-07-25 18:29:07 +08:00
638a9881f2 巡检点bug修复 2024-07-25 18:07:45 +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
5f3d4fd7cb flx:修改app无法使用instanceof问题 2024-07-25 11:10:14 +08:00
812182fa37 巡检模块剩余部分 2024-07-24 17:27:13 +08:00
aa9fe0be1c flx:修改样式问题 2024-07-24 17:24:21 +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
df4253ace2 Merge branch 'jiayu-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-07-24 11:48:10 +08:00
4465ead6d8 flx:修改配置 2024-07-24 11:47:51 +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
698f4cfc0b flx:提交安全考试系统bug 资料只需要学习一遍 2024-07-23 15:53:49 +08:00
ebf1f6960e flx:应急报警用户也加上详情 进度的图片放大 课程视频修改为任意文件的兼容 2024-07-22 18:54:16 +08:00
7b4efba994 flx:调整承包商入场 2024-07-19 19:39:33 +08:00
7ce5a6a4a9 flx:合并冲突 2024-07-19 14:16:36 +08:00
4ea559f518 flx:修改承包商样式 2024-07-19 14:15:28 +08:00
41d22399bd Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-07-19 11:25:09 +08:00
e6424d387b flx:修改承包商格式 2024-07-19 11:24:03 +08:00
Vce
69b796de23 fix:修改APP承包商模块中文件根据后缀名显示常见的文件、修改承包商详情中基本信息的项目信息布局 2024-07-17 16:55:26 +08:00
d5714d7c6e Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-07-04 14:15:58 +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
c757ce183c flx:修改承包商资质文件下载展示问题 2024-06-28 18:15:14 +08:00
Vce
47a50563a5 Merge branch 'bjxz-cjw' into bjxz-dev 2024-06-28 16:32:34 +08:00
Vce
120d6bf612 fix:修改承包商搜索框字体颜色 2024-06-28 16:31:55 +08:00
Vce
c0a5c0bd65 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-28 16:07:16 +08:00
Vce
34b601dffa fix:修改暂无数据提示信息、修改无数据时保留搜索框 2024-06-28 15:59:10 +08:00
997e528d5f flx:冲突 2024-06-27 21:17:28 +08:00
e79f0c25ee flx: 杂 2024-06-27 21:15:57 +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
08440fedde fix:添加供应商管理模块中无数据时显示暂无数据 2024-06-27 18:27:26 +08:00
Vce
253f114023 feat:完成app承包商管理模块的页面开发与接口对接 2024-06-27 16:35:13 +08:00