|
|
4465ead6d8
|
flx：修改配置
|
2024-07-24 11:47:51 +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 |
|
kun
|
f3e54fc053
|
fix: 考试成绩合格结果规则修改
|
2024-06-27 16:02:59 +08:00 |
|
kun
|
6f080102cc
|
fix: 注释项目资料权限功能
|
2024-06-26 20:17:01 +08:00 |
|
kun
|
14e05951be
|
fix: 项目资料添加模块权限
|
2024-06-26 19:06:21 +08:00 |
|
kun
|
3489576e6a
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-06-26 14:10:04 +08:00 |
|
kun
|
734fb7ff4e
|
fix: 环境更换以及代码合并
|
2024-06-26 14:09:58 +08:00 |
|
|
|
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 |
|
