Commit Graph

354 Commits (3b3784aa37c7d52311acfe98f0354e74f7481f78)

Author SHA1 Message Date
姜玉琦 3b3784aa37 提交代码 2025-04-29 00:39:32 +08:00
姜玉琦 16e131d60e Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-04-28 00:41:11 +08:00
姜玉琦 f6cc1ecbf8 提交代码 2025-04-28 00:41:03 +08:00
haha fc8226e526 修改考勤配置 2025-04-28 00:03:00 +08:00
haha 70ae89dd70 增加dataway框架 2025-04-27 22:36:00 +08:00
姜玉琦 3604154c1c 提交代码 2025-04-27 01:52:47 +08:00
haha f7213542c0 修改绿能小数问题 2025-04-25 23:14:21 +08:00
haha c345857ce7 BIM设置 2025-04-23 23:43:26 +08:00
haha 8c06e14a40 BIM设置 2025-04-22 00:07:38 +08:00
姜玉琦 cdda19bfae 提交代码 2025-04-20 13:36:37 +08:00
姜玉琦 1fda12bdff Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
#	yanzhu-bigscreen/src/components/header.vue
2025-04-20 13:33:30 +08:00
姜玉琦 e23d807e0f 提交代码 2025-04-20 13:32:10 +08:00
haha 73fd57044f BIM 模型上传界面 2025-04-16 23:58:47 +08:00
haha 85e5da3405 大屏问题修复 2025-04-15 00:53:18 +08:00
haha 5e838368cb Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-04-13 23:09:36 +08:00
haha 1b80070208 后台隐藏头部 2025-04-13 23:09:31 +08:00
姜玉琦 6d1663f282 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-04-13 22:40:19 +08:00
姜玉琦 c979a4cd92 提交代码 2025-04-13 22:40:10 +08:00
haha c50517a26c 修改大屏问题 2025-04-13 22:28:19 +08:00
姜玉琦 7c736b0fd5 提交代码 2025-04-12 13:05:24 +08:00
姜玉琦 ba6d050b71 提交代码 2025-04-12 12:46:55 +08:00
haha d280db235a bim 2025-04-09 00:27:01 +08:00
haha c127b5019b 后台问题修复 2025-04-07 23:56:54 +08:00
姜玉琦 3d4515c56f 提交代码 2025-04-07 12:51:37 +08:00
haha e5c06edcee bim+gis 2025-04-07 00:55:58 +08:00
haha c486fd61d9 update code 2025-04-06 22:08:54 +08:00
haha 8f69fc9d45 更新代码 2025-04-06 22:05:16 +08:00
haha d9e6d81393 修改大屏报错 2025-04-06 22:01:25 +08:00
姜玉琦 fbcc9d5b85 init 2025-04-05 16:49:30 +08:00
姜玉琦 0183f4e6fd 提交代码 2025-04-05 12:44:12 +08:00
姜玉琦 28904c6768 提交代码 2025-04-05 01:14:57 +08:00
haha d07e2e8129 bim 模型管理 2025-04-04 00:25:29 +08:00
haha 060632dd82 在系统管理添加用户的时候输入完用户名和手机号点查询,会弹出提示框未找到数据,然后数据被清空了,不应该被清空 2025-04-01 23:50:37 +08:00
haha af47403143 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-04-01 22:33:52 +08:00
haha 3d260f7134 修改大屏考勤人员对话框 2025-04-01 00:14:12 +08:00
haha 40cf397199 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-03-31 23:51:57 +08:00
haha b34bf8bb9e 修改大屏项目详情信息 2025-03-31 23:51:54 +08:00
姜玉琦 6d5be9402c 提交代码 2025-03-31 22:36:03 +08:00
姜玉琦 dd32355b98 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-30 22:04:23 +08:00
姜玉琦 5a580280a7 提交代码 2025-03-30 22:04:15 +08:00
haha 3cdb0d62da 修复塔机大屏 2025-03-26 22:53:46 +08:00
姜玉琦 6443a6e929 提交ok 2025-03-23 00:26:48 +08:00
姜玉琦 871964321d Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-23 00:15:44 +08:00
姜玉琦 3699296e63 提交代码 2025-03-23 00:15:33 +08:00
haha d27ddfe2f8 塔基大屏 2025-03-22 19:04:33 +08:00
姜玉琦 425eca74a2 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-22 18:49:09 +08:00
姜玉琦 8add9bb887 提交代码 2025-03-22 18:49:00 +08:00
haha c372d4a8dd 塔机大屏后台 2025-03-20 23:15:22 +08:00
haha 3bfbc3d61f 塔机碰撞信息 2025-03-20 22:50:40 +08:00
haha ff7b80ddbf 塔机工作循环功能 2025-03-20 22:07:00 +08:00