Commit Graph

238 Commits

Author SHA1 Message Date
cwchen 8994f3f703 人员管理-出入场记录修改 2024-04-03 17:54:08 +08:00
jjLv 49503d88b4 代码规范修改 2024-04-03 15:49:58 +08:00
cwchen 06c42e5df8 边带设备属性配置 2024-04-03 15:38:34 +08:00
cwchen 4549c553e1 边带设备 2024-04-03 15:15:27 +08:00
haozq fc54729b33 Merge remote-tracking branch 'origin/master' 2024-04-03 11:10:05 +08:00
haozq 26884d96ae 添加人员数据接口 2024-04-03 11:08:35 +08:00
cwchen 5abd69b5b5 登录 2024-04-03 11:02:36 +08:00
cwchen e3ef19c4c9 边带设备 2024-04-03 09:50:00 +08:00
cwchen 2aa25a03b6 施工大屏 2024-04-03 09:28:37 +08:00
sliang a3da38fc42 大屏-出入管理 2024-04-02 19:54:43 +08:00
cwchen d08db9d59b 人员 2024-04-02 18:58:39 +08:00
cwchen b4c4f7b6cd 设备详情 2024-04-02 17:59:07 +08:00
cwchen e3b0fb567b 边带子设备 2024-04-02 16:06:53 +08:00
cwchen 1821429870 标段工程修改 2024-04-02 15:27:36 +08:00
cwchen 0b1705d8b0 项目/单项工程 2024-04-02 14:44:36 +08:00
sliang 3bebc87313 代码规范修改 2024-04-02 09:33:53 +08:00
haozq 1e17f5a78e Merge remote-tracking branch 'origin/master' 2024-04-02 09:31:32 +08:00
haozq 8208c099be 修改报错 2024-04-02 09:31:23 +08:00
cwchen 30ca63b770 边带 2024-04-02 09:24:37 +08:00
haozq cd1e038272 修改报错 2024-04-02 09:19:16 +08:00
jjLv 9d4855b46f Merge remote-tracking branch 'origin/master' 2024-04-02 09:12:23 +08:00
jjLv 0b69e33546 代码规范修改 2024-04-02 09:11:59 +08:00
cwchen 18e6cf813e 项目管理 2024-04-02 09:10:59 +08:00
sliang ac83369cdb 代码规范修改 2024-04-01 19:46:22 +08:00
sliang e20624afe3 大屏-出入管理 2024-04-01 19:45:19 +08:00
cwchen abd1b40a09 工程成本 2024-04-01 19:16:45 +08:00
cwchen 1feb8ab8bc 视频监控 2024-04-01 19:02:08 +08:00
haozq c8492a928a 新增边带数据推送接口 2024-04-01 17:50:50 +08:00
jjLv ba4cfd3732 代码规范修改 2024-04-01 13:50:47 +08:00
jjLv 20b3d50c5e 代码规范修改 2024-04-01 13:05:04 +08:00
jjLv ffdd1a3981 代码规范修改 2024-04-01 12:51:06 +08:00
cwchen d25d38ca39 施工大屏首页 2024-04-01 09:57:11 +08:00
cwchen cd3394233e 工程管理 2024-03-30 20:50:05 +08:00
haozq 3aa0e2adff 安全帽绑定、工程成本维护 2024-03-30 20:30:57 +08:00
haozq a996673914 首页 接口 2024-03-30 18:33:27 +08:00
haozq 9119a1671e 搭配接口开发 2024-03-30 16:40:01 +08:00
cwchen 38d88b175d 工程进度 2024-03-30 13:55:33 +08:00
cwchen a6c466c73d 工序计划 2024-03-30 13:37:44 +08:00
haozq 8e06d16c37 修改bug 2024-03-29 17:38:07 +08:00
cwchen 3a489ac064 首页 2024-03-29 16:26:08 +08:00
sliang bae27c5ea2 大屏 - 组塔检测 2024-03-29 15:39:13 +08:00
cwchen c5ec741499 APP 2024-03-29 15:27:06 +08:00
haozq 6ac961b286 三三维文件修改 2024-03-29 15:22:45 +08:00
cwchen 720223f788 APP 2024-03-28 21:03:15 +08:00
haozq d05efd92f4 Merge remote-tracking branch 'origin/master' 2024-03-28 20:49:58 +08:00
haozq 6250c309c4 新增区域接口 2024-03-28 20:49:45 +08:00
cwchen 7707baaca5 app 2024-03-28 19:36:12 +08:00
cwchen 5ec9e8ab60 边带子设备添加杆塔 2024-03-28 16:45:16 +08:00
cwchen cab920a18c 省侧大屏 2024-03-28 16:36:50 +08:00
cwchen c16ba37ecf 省侧大屏接口 2024-03-28 15:18:49 +08:00
cwchen 41ef871f46 边带设备 2024-03-28 10:20:06 +08:00
sliang d27bcc2824 大屏 - 告警管理 2024-03-28 09:25:29 +08:00
sliang dbef2ee6c5 大屏 - 告警管理 2024-03-27 20:56:35 +08:00
sliang 69efb339c6 Merge remote-tracking branch 'origin/master' 2024-03-27 20:55:34 +08:00
cwchen 8dee899ff4 省侧大屏首页 2024-03-27 20:48:11 +08:00
sliang 1e1ae7947c 大屏 - 告警管理 2024-03-27 20:17:16 +08:00
haozq ab6a0b43df 修改路径 2024-03-27 17:35:22 +08:00
cwchen 35da115d83 施工质量 2024-03-27 16:29:42 +08:00
cwchen 18bbf3aebd 省侧大屏-工程统计 2024-03-27 15:00:59 +08:00
cwchen ba71355b60 工程模板 2024-03-27 12:07:41 +08:00
cwchen 798c5ab7e2 工程 2024-03-27 12:03:18 +08:00
cwchen 2e1fc89d63 大屏 2024-03-27 10:43:46 +08:00
cwchen f63da34fab 省侧大屏 2024-03-27 10:25:04 +08:00
cwchen 8b169cde50 登录 2024-03-27 09:46:47 +08:00
cwchen 597d3f8994 登录 2024-03-27 09:26:34 +08:00
cwchen 16abd9875c 工程修改 2024-03-26 20:55:07 +08:00
cwchen c794562fa4 登录 2024-03-26 20:05:52 +08:00
haozq b46253ddff 修改路径 2024-03-26 18:35:43 +08:00
haozq 4322f829cd 修改路径 2024-03-26 17:25:06 +08:00
haozq 91841998a4 修改路径 2024-03-26 10:50:29 +08:00
haozq 46fde8b0c2 修改路径 2024-03-26 10:48:25 +08:00
cwchen eab077b6ae 用户登录 2024-03-26 10:15:51 +08:00
cwchen 4e97cf0bc6 移除classes文件 2024-03-26 09:53:49 +08:00
haozq 01c63c446c 功能开发 2024-03-25 20:46:57 +08:00
haozq 7b17d84a41 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java
2024-03-25 20:45:59 +08:00
haozq 135c3108bd 功能开发 2024-03-25 20:32:37 +08:00
haozq 06f2ac9bae 功能开发 2024-03-25 20:31:29 +08:00
cwchen 12e3d337a4 边带管理下拉选 2024-03-25 17:51:42 +08:00
cwchen ae0c651bdc 边带 2024-03-25 14:46:31 +08:00
sliang e0356d4004 组塔检测-检测记录,预警记录;施工质量-质量检测记录,预警记录 2024-03-23 18:49:25 +08:00
haozq 76be09c046 Merge remote-tracking branch 'origin/master' 2024-03-23 18:33:04 +08:00
haozq 77a1874f7d 功能开发 2024-03-23 18:26:24 +08:00
haozq 2f81113629 功能开发 2024-03-23 18:21:33 +08:00
cwchen 8c5de362ad 当日任务 2024-03-23 17:06:31 +08:00
cwchen b362feed71 当日站班会 2024-03-23 14:59:17 +08:00
cwchen 635d28025f 图片上传修改 2024-03-23 14:05:35 +08:00
cwchen d64e7e759d 工程图片上传修改 2024-03-23 14:04:19 +08:00
skjia 309b559896 Merge branch 'master' of http://192.168.0.56:3000/haozq/ah_jjzhgd_service 2024-03-22 18:42:27 +08:00
skjia 9a3cac240f 值班计划管理代码上传 --- jsk 2024-03-22 18:38:01 +08:00
cwchen db13547036 工序计划 2024-03-22 18:31:54 +08:00
cwchen c6a424fe54 基础管理 2024-03-22 18:28:30 +08:00
cwchen ad4d37ffe6 Merge remote-tracking branch 'origin/master' 2024-03-22 18:13:29 +08:00
cwchen a7ac882e30 人车管理-修改 2024-03-22 18:13:22 +08:00
sliang 8231c0f2f1 组塔检测-检测记录,预警记录;施工质量-质量检测记录,预警记录 2024-03-22 17:38:40 +08:00
cwchen ee8587d014 Merge remote-tracking branch 'origin/master' 2024-03-22 16:28:20 +08:00
cwchen 347d637be3 区域下拉选 2024-03-22 16:27:58 +08:00
haozq d90cf639df 数据加解密优化 2024-03-22 15:51:26 +08:00
haozq e92552ed8f Merge remote-tracking branch 'origin/master' 2024-03-22 15:34:43 +08:00
haozq f16c58f460 数据加解密 2024-03-22 15:16:34 +08:00
cwchen f921144059 班组管路 2024-03-22 11:14:47 +08:00