Commit Graph

Select branches

Hide Pull Requests

bjxz-dev

chaozhou-dev

dunhuang-cs

dunhuang-dev

gsgs-dev

prod

uat

bjxz-cjw

bjxz-lk

bjxz-rain

bjxz-wz

bthg-dev

cpgs-dev

dev-Lucky

dev-cjw

dev-shenzhen

dev-xiaole

gmj_dev

jiayu-dev

master

shenzhen-dev

xjml-dev

yanyan_dev

yjl_dev

Mono Color

• 992746d399 flx：修改应急 X_Rian 2024-08-07 18:27:20 +08:00
• c49e68242b flx：应急报警新增回退 X_Rian 2024-08-07 18:26:49 +08:00
• e549e90fdc flx：巡检点新增导航 新增默认展示 X_Rian 2024-08-07 18:25:58 +08:00
• 01446e4790 Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain Rain 2024-08-01 16:29:34 +08:00
• 6740bc5d25 flx：修改样式对齐 X_Rian 2024-08-01 16:19:50 +08:00
• 77540e3fc6 flx：修改密码新增显示隐藏 X_Rian 2024-08-01 11:56:36 +08:00
• 776f2140e4 flx：整合材料进出场 密码超过三个月弹窗修改密码 X_Rian 2024-07-29 16:24:12 +08:00
• aee3dee65e Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev jiayu 2024-07-29 09:11:13 +08:00
• 3dab11f4c3 巡检点地图样式优化 jiayu 2024-07-27 19:17:55 +08:00
• 1d2c7bd183 flx：提交安全打印问题 X_Rian 2024-07-27 19:04:44 +08:00
• 63e3445ca9 巡检点定位需求修改 jiayu 2024-07-27 16:22:10 +08:00
• f0039b39c1 flx：修复安全质量选择bug X_Rian 2024-07-27 15:58:03 +08:00
• ce31a336e7 修复bug jiayu 2024-07-27 15:09:10 +08:00
• f6797a6cb3 flx：修改承包商管理样式问题 X_Rian 2024-07-27 14:10:07 +08:00
• 04bbfdc5e6 flx：考试培训下载预览增加下载中提示 X_Rian 2024-07-27 13:59:17 +08:00
• 020ec20812 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain Rain 2024-07-27 11:07:21 +08:00
• e9e3ec3264 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain X_Rian 2024-07-26 18:36:10 +08:00
• 98d726df9b 修复bug jiayu 2024-07-26 18:20:49 +08:00
• af9261c3c7 Merge branch 'jiayu-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain X_Rian 2024-07-26 18:13:08 +08:00
• 683b590254 flx：提交 X_Rian 2024-07-26 18:12:42 +08:00
• f0cdf2ddf2 Merge branch 'jiayu-dev' into bjxz-dev jiayu 2024-07-26 18:08:59 +08:00
• 2b77d82b9b 修复bug jiayu 2024-07-26 17:57:58 +08:00
• 425eabfdde 修复巡检点多选框滚动问题 jiayu 2024-07-26 10:41:21 +08:00
• f895b3ce54 flx：考勤加上秒 X_Rian 2024-07-25 21:04:36 +08:00
• 1660d759fe 修复接口参数少传 jiayu 2024-07-25 21:02:39 +08:00
• 624e57f2af flx：修改辅助考勤字段 X_Rian 2024-07-25 19:03:12 +08:00
• 0d613e2a6a Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into jiayu-dev jiayu 2024-07-25 18:34:18 +08:00
• 0ada43986d 修复bug jiayu 2024-07-25 18:29:07 +08:00
• 638a9881f2 巡检点bug修复 jiayu 2024-07-25 18:07:45 +08:00
• 88a4f6538e flx：合并冲突 X_Rian 2024-07-25 16:13:32 +08:00
• 4f0c973c05 feat：新增辅助考勤页面 X_Rian 2024-07-25 16:04:56 +08:00
• 1171ed3f3b bug修复 jiayu 2024-07-25 13:33:22 +08:00
• 5f3d4fd7cb flx：修改app无法使用instanceof问题 X_Rian 2024-07-25 11:10:14 +08:00
• 812182fa37 巡检模块剩余部分 jiayu 2024-07-24 17:27:13 +08:00
• aa9fe0be1c flx：修改样式问题 X_Rian 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 jiayu 2024-07-24 15:51:04 +08:00
• 875a803f60 巡检任务详情 jiayu 2024-07-24 15:50:56 +08:00
• 147fd71fc4 flx：新增按钮权限 上传图标 X_Rian 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 X_Rian 2024-07-24 11:48:10 +08:00
• 4465ead6d8 flx：修改配置 X_Rian 2024-07-24 11:47:51 +08:00
• 4390535436 巡检计划编辑 jiayu 2024-07-24 11:41:45 +08:00
• f39f1c04e6 合并冲突 jiayu 2024-07-24 11:07:10 +08:00
• 90b4c2b210 添加巡检计划 jiayu 2024-07-24 11:05:08 +08:00
• 4e71ad6799 flx：提交巡检路线计划 查看详情 X_Rian 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 jiayu 2024-07-23 18:13:43 +08:00
• ba745a36d2 巡检点编辑 jiayu 2024-07-23 18:05:18 +08:00
• 3587deb0c1 flx：冲突 X_Rian 2024-07-23 17:58:27 +08:00
• 056f955e5c 巡检点模块 jiayu 2024-07-23 16:01:34 +08:00
• 698f4cfc0b flx：提交安全考试系统bug 资料只需要学习一遍 X_Rian 2024-07-23 15:53:49 +08:00
• ebf1f6960e flx：应急报警用户也加上详情 进度的图片放大 课程视频修改为任意文件的兼容 X_Rian 2024-07-22 18:54:16 +08:00
• 7b4efba994 flx：调整承包商入场 X_Rian 2024-07-19 19:39:33 +08:00
• 7ce5a6a4a9 flx：合并冲突 X_Rian 2024-07-19 14:16:36 +08:00
• 4ea559f518 flx：修改承包商样式 X_Rian 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 X_Rian 2024-07-19 11:25:09 +08:00
• e6424d387b flx：修改承包商格式 X_Rian 2024-07-19 11:24:03 +08:00
• 69b796de23 fix:修改APP承包商模块中文件根据后缀名显示常见的文件、修改承包商详情中基本信息的项目信息布局 bjxz-cjw Vce 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 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 X_Rian 2024-07-04 14:10:04 +08:00
• 78053b8f7e flx：危大工程 修改施工状态 X_Rian 2024-07-04 14:09:33 +08:00
• 61e65aef50 fix: 修改人员管理以及进度管理模块中的样式问题以及交互BUG kun 2024-07-03 17:56:30 +08:00
• c275f70bc3 fix: 项目资料添加权限以及修改查人员页面中的样式问题 kun 2024-06-29 20:03:02 +08:00
• c757ce183c flx：修改承包商资质文件下载展示问题 X_Rian 2024-06-28 18:15:14 +08:00
• 47a50563a5 Merge branch 'bjxz-cjw' into bjxz-dev Vce 2024-06-28 16:32:34 +08:00
• 120d6bf612 fix：修改承包商搜索框字体颜色 Vce 2024-06-28 16:31:55 +08:00
• c0a5c0bd65 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev Vce 2024-06-28 16:07:16 +08:00
• 34b601dffa fix：修改暂无数据提示信息、修改无数据时保留搜索框 Vce 2024-06-28 15:59:10 +08:00
• 997e528d5f flx：冲突 X_Rian 2024-06-27 21:17:28 +08:00
• e79f0c25ee flx: 杂 X_Rian 2024-06-27 21:15:57 +08:00
• 5bd84a5692 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev kun 2024-06-27 18:51:32 +08:00
• 8cf07f81c9 feat: 新项目环境、内容添加 kun 2024-06-27 18:51:28 +08:00
• b3a25d8b91 Merge branch 'bjxz-cjw' into bjxz-dev Vce 2024-06-27 18:27:55 +08:00
• 08440fedde fix：添加供应商管理模块中无数据时显示暂无数据 Vce 2024-06-27 18:27:26 +08:00
• 253f114023 feat：完成app承包商管理模块的页面开发与接口对接 Vce 2024-06-27 16:35:13 +08:00
• f3e54fc053 fix: 考试成绩合格结果规则修改 kun 2024-06-27 16:02:59 +08:00
• 6f080102cc fix: 注释项目资料权限功能 kun 2024-06-26 20:17:01 +08:00
• 14e05951be fix: 项目资料添加模块权限 kun 2024-06-26 19:06:21 +08:00
• 3489576e6a Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev kun 2024-06-26 14:10:04 +08:00
• 734fb7ff4e fix: 环境更换以及代码合并 kun 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 ”Rain“ 2024-06-24 14:43:02 +08:00
• 3f2cc39715 flx：ai预警已处置项目账号 负责人能进行处置 X_Rian 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 ”Rain“ 2024-06-21 18:55:06 +08:00
• 218aa2caac 1 ”Rain“ 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 X_Rian 2024-06-21 18:53:48 +08:00
• 34bab49c5f flx：提交ai预警 已处置按钮权限 X_Rian 2024-06-21 18:53:01 +08:00
• 0c73a6c6a6 fix：执行npm i产生的差异 Vce 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 ”Rain“ 2024-06-18 23:28:12 +08:00
• 2c6181a07f flx：冲突 X_Rian 2024-06-18 22:32:59 +08:00
• ba4f0da525 flx：无 X_Rian 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 ”Rain“ 2024-06-18 18:38:38 +08:00
• 4b9f369edd fix: 合并代码 kun 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 ”Rain“ 2024-06-15 17:18:53 +08:00
• 545f44b991 fix: 解决冲突 kun 2024-06-14 20:06:39 +08:00
• 2ce7d9ee28 fix: 修改页面中顶部导航栏固定的样式以及合并代码 kun 2024-06-14 20:05:51 +08:00
• 6f9c0c9e38 flx：修改盲板抽堵时间 X_Rian 2024-06-14 19:28:53 +08:00
• 871a99cabc flx：解决冲突 提交盲板作业 X_Rian 2024-06-13 20:39:21 +08:00
• f69bb50fc2 flx：提交盲板作业的时间 X_Rian 2024-06-13 20:37:00 +08:00
• f118f42212 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev kun 2024-06-13 11:13:42 +08:00
• b784bd3c86 fix: BUG修改 kun 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 ”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 X_Rian 2024-06-12 21:32:43 +08:00