Commit Graph

105 Commits

Author SHA1 Message Date
BianLzhaoMin 189c97843b Merge branch 'master' of http://192.168.0.75:3000/liux/nxdt-web 2025-02-14 16:31:10 +08:00
BianLzhaoMin 0de27cb8b7 球机播放关闭以及选择播放功能优化 2025-02-14 16:31:08 +08:00
liang.chao a11d0bd9b8 监理人员删除代码提交 2025-02-14 15:49:05 +08:00
BianLzhaoMin db50e1f9d9 审批状态问题优化 2025-02-14 15:06:42 +08:00
haozq 72aaf46383 Merge remote-tracking branch 'origin/master' 2025-02-14 09:21:25 +08:00
BianLzhaoMin ff18473509 Merge branch 'master' of http://192.168.0.75:3000/liux/nxdt-web 2025-02-14 08:31:38 +08:00
BianLzhaoMin dc78c42495 审核流程显示问题调试 2025-02-14 08:31:31 +08:00
liang.chao 185cc868a7 分包商入场申请代码提交 2025-02-13 18:50:16 +08:00
liang.chao b9811b286d 分包商入场申请代码提交 2025-02-13 18:44:07 +08:00
liang.chao 9d05cdaf88 分包商入场申请代码提交 2025-02-13 18:43:25 +08:00
liang.chao a0e56c5024 Merge remote-tracking branch 'origin/master' 2025-02-13 18:29:51 +08:00
liang.chao 5ecd807748 分包商入场申请代码提交 2025-02-13 18:29:38 +08:00
liang.chao 1b8cad613b 分包商入场申请代码提交 2025-02-13 18:15:34 +08:00
BianLzhaoMin 4ee7ac5f93 修改审核时 审核状态显示问题 2025-02-13 17:11:46 +08:00
haozq 98011a4e98 修改bug 2025-02-13 16:26:06 +08:00
BianLzhaoMin e197795cae 禅道bug修复 2025-02-13 15:47:39 +08:00
liang.chao 6eb212ae28 分包商入场申请代码提交 2025-02-13 09:11:01 +08:00
BianLzhaoMin be9c863f3b 审核预览文件时增加意见输入框 2025-02-12 09:42:51 +08:00
BianLzhaoMin 8d5ca641b1 审核预览文件时增加输入框 初步调试 2025-02-11 17:39:37 +08:00
BianLzhaoMin de3a1dd6ed 监理单位管理页面优化 2025-02-11 16:21:19 +08:00
haozq 5fb0b44b28 修改二级页面接口对接 2025-02-11 16:07:11 +08:00
BianLzhaoMin 3967e0e333 增加批量审核按钮 2025-02-11 15:17:24 +08:00
BianLzhaoMin b674045ca3 冲突合并 2025-02-11 12:28:00 +08:00
BianLzhaoMin e6805d40f0 增加监理单位管理页面二级弹框 2025-02-11 12:24:03 +08:00
haozq 9ce9c39cbd 文件预览加解密默认修改 2025-02-11 11:16:41 +08:00
haozq 59a9cd2f90 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/utils/aescbc.js
2025-02-11 11:15:28 +08:00
haozq 8135b9c086 文件预览加解密默认修改 2025-02-11 11:14:50 +08:00
BianLzhaoMin 854a972e89 统计分析页面完善 2025-02-11 11:02:30 +08:00
haozq f55e78ae82 添加错误提示 2025-02-11 10:46:35 +08:00
BianLzhaoMin 46009c889d Merge branch 'master' into sy-dev 2025-02-11 10:14:23 +08:00
BianLzhaoMin dec9b1ee43 增加学员管理下菜单--统计分析页面 2025-02-11 10:13:57 +08:00
haozq a7ef63481d 工程添加总监人员校验 2025-02-10 15:54:50 +08:00
haozq 20a349e47b 工程添加总监人员 2025-02-10 15:46:49 +08:00
liang.chao 20c048c2dd Merge remote-tracking branch 'origin/master' 2025-02-08 18:39:18 +08:00
liang.chao 4be0635a39 性别字段不展示 2025-02-08 18:39:07 +08:00
haozq ab8842345f 修改bug 2025-02-08 18:17:21 +08:00
BianLzhaoMin 7e7c68e78d Merge branch 'sy-dev' 2025-02-08 17:56:37 +08:00
BianLzhaoMin 1835d65c97 禅道bug修复 2025-02-08 17:54:48 +08:00
BianLzhaoMin 585bc69ae4 Merge branch 'sy-dev' 2025-02-08 14:45:35 +08:00
BianLzhaoMin 7d5250225f 修复终端设备巡检问题 2025-02-08 14:45:10 +08:00
BianLzhaoMin 38b15c7597 Merge branch 'sy-dev' 2025-02-08 13:39:28 +08:00
BianLzhaoMin 51a8f78477 删除废弃文件 2025-02-08 13:39:02 +08:00
BianLzhaoMin 1005cb8eb6 增加固定球机h265格式视频播放问题 2025-02-08 13:38:18 +08:00
haozq acd31de922 修改bug 2025-02-07 14:54:45 +08:00
haozq b01a4678da 设备模块bug修改 2025-02-07 14:16:45 +08:00
tqzhang 96116f4c87 审核驳回带入审批信息 2025-01-22 15:09:04 +08:00
tqzhang c2114f9122 全空格问题优化 2025-01-21 10:12:15 +08:00
tqzhang 0366391848 treeselect搜搜索结果提示修改 2025-01-21 09:44:15 +08:00
tqzhang 8f1f86caff 输入框输入全空问题修改 2025-01-20 18:33:46 +08:00
liux 6a01ef7872 删除 dist.zipcahkup 2025-01-20 13:45:12 +08:00