Commit Graph

  • 92e419d40f trp:从场景保存的设备模型数据中获取设备名称 trp 2024-09-03 14:41:59 +08:00
  • cae6fc6ed1 Merge pull request 'trp:覆盖远程仓库之前代码' (#383) from trp_dev into dev trp-ironman 2024-09-03 06:27:07 +00:00
  • fd7e1fe015 trp:覆盖远程仓库之前代码 trp 2024-09-03 14:23:09 +08:00
  • d7bcd3d4d6 Merge pull request 'trp_dev' (#382) from trp_dev into dev trp-ironman 2024-09-02 15:59:52 +00:00
  • aadef41fff trp:上一次代码提交冲突解决 trp 2024-09-02 23:58:12 +08:00
  • dcd43ff5da trp:上一次冲突后提交 trp 2024-09-02 23:30:21 +08:00
  • ae1cc159a4 trp:设备hover回显面板数据绑定和模拟模式3d场景添加 trp 2024-09-02 18:43:41 +08:00
  • 6bed6482a2 Merge pull request 'fix : 修复隧道模拟首页,结束模拟之后切换状态' (#380) from dengjie into dev odjbin 2024-09-02 09:54:30 +00:00
  • 20440c1cc1 fix : 修复隧道模拟首页,结束模拟之后切换状态 odjbin 2024-09-02 17:53:59 +08:00
  • b7b4d92f40 Merge pull request 'fix : 修复预览隧道时切换报错bug' (#379) from dengjie into dev odjbin 2024-09-02 07:45:36 +00:00
  • 00a04d0d79 fix : 修复预览隧道时切换报错bug odjbin 2024-09-02 15:45:01 +08:00
  • bd2a57ab69 Merge pull request 'feat : 隧道模拟' (#378) from dengjie into dev odjbin 2024-09-02 05:14:52 +00:00
  • 02194afce4 feat : 隧道模拟 odjbin 2024-09-02 13:13:51 +08:00
  • 832115e958 Merge pull request 'dev' (#377) from dev into master odjbin 2024-08-26 15:37:56 +00:00
  • a4e7bb4460 Merge pull request 'fix : 修复设备管理序列号展示' (#376) from dengjie into dev odjbin 2024-08-26 15:37:42 +00:00
  • f66f9f4fbb fix : 修复设备管理序列号展示 odjbin 2024-08-26 23:36:59 +08:00
  • 7c7e9e9607 Merge pull request 'dev' (#374) from dev into master odjbin 2024-08-26 15:22:50 +00:00
  • c2a5d47506 Merge pull request 'fix : 修复设备管理序列号展示' (#373) from dengjie into dev odjbin 2024-08-26 15:22:36 +00:00
  • e4f8d48838 fix : 修复设备管理序列号展示 odjbin 2024-08-26 23:22:21 +08:00
  • 535b214c40 Merge pull request 'fix : 修复气体展示' (#372) from dengjie into dev odjbin 2024-08-26 15:13:49 +00:00
  • b2fd0bba85 fix : 修复气体展示 odjbin 2024-08-26 23:12:53 +08:00
  • f1425ae60b Merge pull request 'fix : 多序列号功能' (#371) from dengjie into dev odjbin 2024-08-25 16:05:13 +00:00
  • d7378bf0af fix : 多序列号功能 odjbin 2024-08-25 23:00:39 +08:00
  • 4fd4cf4f4c Merge pull request 'fix : 注释序列号' (#370) from de into dev odjbin 2024-08-20 16:21:53 +00:00
  • 4813161c08 fix : 注释序列号 odjbin 2024-08-21 00:21:32 +08:00
  • f38a55f8a3 Merge pull request 'fix : 注释序列号' (#369) from dengjie into dev odjbin 2024-08-20 14:48:53 +00:00
  • 493f816e3c fix : 注释序列号 odjbin 2024-08-20 22:48:08 +08:00
  • 5f9784a374 Merge pull request 'fix : 注释序列号' (#368) from de into dev odjbin 2024-08-20 13:52:30 +00:00
  • 191c7dbbb5 fix : 注释序列号 odjbin 2024-08-20 21:52:11 +08:00
  • 9aef340598 Merge pull request 'de' (#367) from de into dev odjbin 2024-08-20 10:07:52 +00:00
  • 967d603ff2 Merge pull request 'de' (#366) from de into master odjbin 2024-08-20 10:07:33 +00:00
  • 4378ec571c fix : 注释序列号 odjbin 2024-08-20 18:07:12 +08:00
  • 5f86661ec3 fix : 恢复socket odjbin 2024-08-20 18:02:58 +08:00
  • 7bb25958fc fix : 新增隧道时多序列号 odjbin 2024-08-20 00:22:59 +08:00
  • 9e4cee4cae fix : 新增隧道时多序列号 odjbin 2024-08-20 00:21:47 +08:00
  • e6cd9c8836 Merge pull request '唐润平:模型实际数值显示和排版修复' (#365) from trp_dev into dev trp-ironman 2024-08-19 03:37:01 +00:00
  • 3f38516090 唐润平:模型实际数值显示和排版修复 trp 2024-08-19 11:35:55 +08:00
  • 9217ce35da Merge pull request 'dev' (#364) from dev into master odjbin 2024-08-17 07:34:40 +00:00
  • ea01ca3f79 Merge pull request 'fix : websocket代理' (#363) from de into dev odjbin 2024-08-17 07:34:21 +00:00
  • f5f178f2a2 fix : websocket代理 odjbin 2024-08-17 15:33:42 +08:00
  • 6246c4b046 Merge pull request 'fix : 修复设备管理的序列号样式' (#362) from de into dev odjbin 2024-08-15 15:14:53 +00:00
  • aa1eacc423 fix : 修复设备管理的序列号样式 odjbin 2024-08-15 23:14:38 +08:00
  • a41f0bbaba Merge pull request 'fix : 修复设备管理的序列号样式' (#361) from de into dev odjbin 2024-08-15 15:02:12 +00:00
  • d98eaa9368 fix : 修复设备管理的序列号样式 odjbin 2024-08-15 23:01:45 +08:00
  • 8a2a97e936 Merge pull request 'de' (#360) from de into dev odjbin 2024-08-15 14:40:05 +00:00
  • b2c85e4e47 fix : 注释新增/编辑框的序列号 odjbin 2024-08-15 22:39:10 +08:00
  • 3d0e88b315 fix : 修复设备管理序列号样式 odjbin 2024-08-15 22:36:30 +08:00
  • a16b20f62b feat : 新增/编辑隧道新增序列号1,序列号前缀输入框 odjbin 2024-08-08 01:18:22 +08:00
  • 1ff85059b1 Merge pull request 'clay' (#358) from clay into dev odjbin 2024-08-07 11:56:00 +00:00
  • 7120a03b1d feat : bulid odjbin 2024-08-07 19:55:34 +08:00
  • 11b3c82e22 Merge pull request 'dengjie' (#357) from dengjie into master odjbin 2024-08-07 11:48:06 +00:00
  • acb729c8a3 feat : 设备管理新增序列号字段 odjbin 2024-08-07 19:47:36 +08:00
  • f4d6245ecf Merge pull request 'trp_dev' (#356) from trp_dev into dev trp-ironman 2024-08-06 15:16:24 +00:00
  • f91560eaa9 trp: 隧道模型缩放修改完成 trp 2024-08-06 22:42:03 +08:00
  • 23c82eafaf Merge pull request 'dev' (#353) from dev into master odjbin 2024-08-06 14:06:08 +00:00
  • 7d318d2d0c Merge pull request 'fix : 修复echart弹窗默认小屏' (#352) from dengjie into dev odjbin 2024-08-03 07:12:01 +00:00
  • 228687daf1 fix : 修复echart弹窗默认小屏 odjbin 2024-08-03 15:11:39 +08:00
  • 05cf9cb794 Merge pull request '更新 .drone.yml' (#351) from clay-patch-4 into dev clay 2024-07-23 11:06:28 +00:00
  • 5b412a03a9 更新 .drone.yml clay 2024-07-23 11:06:18 +00:00
  • e45d332495 Merge pull request '更新 .drone.yml' (#350) from clay-patch-3 into dev clay 2024-07-23 11:04:28 +00:00
  • 86d0c63dd2 更新 .drone.yml clay 2024-07-23 11:04:21 +00:00
  • c2beac4f6b Merge pull request '更新 .drone.yml' (#348) from dengjie into dev zhangkaihuai 2024-07-23 10:55:17 +00:00
  • 57914d186e 更新 .drone.yml zhangkaihuai 2024-07-23 10:54:38 +00:00
  • 94fe95bbf2 Merge pull request 'fix : 屏蔽文字' (#347) from dengjie into dev odjbin 2024-07-23 10:38:45 +00:00
  • 7edf599cc2 fix : 屏蔽文字 odjbin 2024-07-23 18:38:22 +08:00
  • ef16f0c049 Merge pull request 'fix : 屏蔽文字' (#345) from dengjie into dev odjbin 2024-07-23 09:23:08 +00:00
  • 5521f7db7a Merge pull request 'fix : 屏蔽文字' (#344) from dengjie into master odjbin 2024-07-23 09:22:46 +00:00
  • a0e7b0b177 fix : 屏蔽文字 odjbin 2024-07-23 17:22:23 +08:00
  • a399062d19 Merge pull request 'dev' (#343) from dev into master odjbin 2024-05-23 03:25:34 +00:00
  • 94126fd0a3 Merge pull request 'fix : 修复页面细节' (#342) from dengjie into dev odjbin 2024-05-23 03:25:22 +00:00
  • e09b0b2d52 fix : 修复页面细节 odjbin 2024-05-23 11:24:53 +08:00
  • 49dd6a7ed2 Merge pull request 'dev' (#341) from dev into master odjbin 2024-05-23 03:00:26 +00:00
  • d0dd2d6043 Merge pull request 'fix : 修复页面细节' (#340) from dengjie into dev odjbin 2024-05-23 02:59:23 +00:00
  • a79a381c59 fix : 修复页面细节 odjbin 2024-05-23 10:58:42 +08:00
  • 179be93d48 Merge pull request '廖杰:风机状态颜色修复+修复选中模式多次发送请求' (#339) from liaojie into dev liaojie 2024-03-27 08:11:55 +00:00
  • ea111a186f 廖杰:风机状态颜色修复+修复选中模式多次发送请求 Hcat 2024-03-27 16:10:37 +08:00
  • 3e2f453bde Merge pull request 'fix : 修复气体echarts为空时隐藏' (#338) from dengjie into dev odjbin 2024-03-26 02:34:40 +00:00
  • a200e168bb fix : 修复气体echarts为空时隐藏 odjbin 2024-03-26 10:34:11 +08:00
  • 5318ff1236 Merge pull request 'fix : 修改防抖等待时间' (#337) from dengjie into dev odjbin 2024-03-25 14:45:53 +00:00
  • 054a731435 fix : 修改防抖等待时间 odjbin 2024-03-25 22:45:27 +08:00
  • 4c74715efd Merge pull request 'fix : 1' (#336) from dengjie into dev odjbin 2024-03-25 09:58:55 +00:00
  • 55aa67cd1f fix : 1 odjbin 2024-03-25 17:58:38 +08:00
  • 5cb1e61da4 Merge pull request 'fix : 修复确认按钮防抖' (#335) from dengjie into dev odjbin 2024-03-25 08:31:50 +00:00
  • 1cde879d78 fix : 修复确认按钮防抖 odjbin 2024-03-25 16:31:37 +08:00
  • 475503c81c Merge pull request 'fix : 修改ws切换bug' (#334) from dengjie into dev odjbin 2024-03-25 07:42:45 +00:00
  • ef3bd6a125 fix : 修改ws切换bug odjbin 2024-03-25 15:42:01 +08:00
  • 9cd8734db8 Merge pull request 'fix : 修改ws切换bug' (#333) from dengjie into dev odjbin 2024-03-25 07:19:04 +00:00
  • d73d50f455 fix : 修改ws切换bug odjbin 2024-03-25 15:18:19 +08:00
  • 9461fa0bd2 Merge pull request 'fix : 修改用电量最大值' (#332) from dengjie into dev odjbin 2024-03-24 05:48:43 +00:00
  • 297ecefe42 fix : 修改用电量最大值 odjbin 2024-03-24 13:48:22 +08:00
  • 0e23e31457 Merge pull request '廖杰:完成预览模式下鼠标离开设备,面板自动消失,调整面板字体,设备选中的箭头优化' (#331) from liaojie into dev liaojie 2024-03-18 11:27:45 +00:00
  • 9e3d896259 廖杰:完成预览模式下鼠标离开设备,面板自动消失,调整面板字体,设备选中的箭头优化 Hcat 2024-03-18 19:26:45 +08:00
  • b90d5d5911 Merge pull request 'fix : 修复bug' (#330) from dengjie into dev odjbin 2024-03-15 09:49:26 +00:00
  • bf34ea12b0 fix : 修复bug odjbin 2024-03-15 17:49:04 +08:00
  • 3e0bfe6aaf Merge pull request 'fix : 修复风机bug' (#329) from dengjie into dev odjbin 2024-03-15 08:55:47 +00:00
  • be09956098 fix : 修复风机bug odjbin 2024-03-15 16:55:27 +08:00
  • 44bf1d1857 Merge pull request 'fix : 修复风机启动/停止bug' (#328) from dengjie into dev odjbin 2024-03-14 15:30:03 +00:00
  • 532dd08414 fix : 修复风机启动/停止bug odjbin 2024-03-14 23:29:25 +08:00
  • 5c5a48e083 Merge pull request 'fix : 修复风机启动/停止bug' (#327) from dengjie into dev odjbin 2024-03-14 10:09:20 +00:00
  • b2e0dded31 fix : 修复风机启动/停止bug odjbin 2024-03-14 18:09:00 +08:00