Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 448c05b295 Merge pull request 'dev' (#428) from dev into master master odjbin 2025-11-08 08:15:40 +00:00
• 38f05c4c6e Merge pull request 'ddj' (#427) from ddj into dev odjbin 2025-09-17 02:16:10 +00:00
• 8220ca9f41 feat(tunnel): 优化隧道区域热点功能 dj 2025-09-16 23:05:08 +08:00
• feddf9d1e5 feat(tunnel): 优化隧道区域热点功能 dj 2025-09-16 22:56:28 +08:00
• 5c2492c501 refactor(tunnel): 优化 polygon-demo 鼠标事件处理 - 为 polygon 元素添加防抖处理，避免鼠标快速进出导致的闪烁问题 - 修改鼠标事件处理逻辑，确保鼠标在区域内移动时保持显示状态 -优化 mouseleave 事件处理，添加延迟隐藏效果，避免快速切换- 调整 polygon 元素的点击事件处理，修改点击参数 dj 2025-09-16 22:32:12 +08:00
• 5362a88721 feat(tunnel): 添加热点区域悬浮显示功能 dj 2025-09-16 22:09:38 +08:00
• c0746afeaa fix: 修改文件名大小写 dj 2025-09-13 11:57:44 +08:00
• 047238c942 Merge pull request 'dev' (#426) from dev into master odjbin 2025-09-13 03:50:55 +00:00
• fe6b7a7027 Merge pull request 'ddj' (#425) from ddj into dev odjbin 2025-09-13 03:38:13 +00:00
• 1e86ea4323 fix(tunnel): 修复隧道场景点击热区后按钮未同步激活的问题 dj 2025-09-13 11:37:23 +08:00
• f2b590ee0b refactor(tunnel): 重构隧道页面 dj 2025-09-13 11:35:14 +08:00
• 28a03009c5 refactor(tunnel): 优化隧道图像展示和热点区域设置 dj 2025-09-13 11:09:30 +08:00
• d224a261dd feat(tunnel): 添加图片热区功能 dj 2025-09-12 17:31:30 +08:00
• 49b4c733a3 style(tunnel): 优化隧道页面样式 dj 2025-09-12 16:45:39 +08:00
• 4df0976f73 refactor(tunnel): 优化隧道页面布局和图片显示 dj 2025-09-12 12:42:42 +08:00
• 11368af120 feat(tunnel): 添加隧道热区点击功能 dj 2025-09-12 00:04:25 +08:00
• 57fad6a2e5 Merge remote-tracking branch 'origin/master' dj 2025-09-11 23:34:12 +08:00
• b6f8f20511 Merge pull request 'dev' (#423) from dev into master odjbin 2025-09-11 15:33:55 +00:00
• 57ea2b8a30 feat(tunnel): 隧道页面添加 logo 展示并优化背景 dj 2025-09-11 23:32:00 +08:00
• 3a28ecedfc Merge pull request '更新 deployment.yml' (#422) from zhangkaihuai-patch-4 into dev zhangkaihuai 2025-06-18 11:02:38 +00:00
• 68abd31b9f 更新 deployment.yml zhangkaihuai 2025-06-18 11:02:30 +00:00
• 8e75f73b7c Merge pull request 'dj' (#421) from dj into dev odjbin 2025-06-18 02:45:07 +00:00
• d17bdf02dd style(tunnel): 优化隧道页面样式 dj 2025-06-18 10:26:32 +08:00
• 4d82dd04f9 Merge pull request '添加 default.conf' (#419) from zhangkaihuai-patch-3 into dev zhangkaihuai 2025-03-20 14:26:29 +00:00
• 8092661991 添加 default.conf zhangkaihuai 2025-03-20 14:23:05 +00:00
• 3968156194 Merge pull request '更新 .drone.yml' (#418) from zhangkaihuai-patch-3 into dev zhangkaihuai 2025-03-20 14:13:59 +00:00
• 1c29fa9557 更新 .drone.yml zhangkaihuai 2025-03-20 14:13:42 +00:00
• 00683f1d71 Merge pull request '更新 .drone.yml' (#417) from zhangkaihuai-patch-3 into dev zhangkaihuai 2025-03-01 09:19:50 +00:00
• 5bb5e2ef6d 更新 .drone.yml zhangkaihuai 2025-03-01 09:17:37 +00:00
• dac763d8b5 Merge pull request '更新 .drone.yml' (#416) from zhangkaihuai-patch-3 into dev zhangkaihuai 2025-03-01 09:14:57 +00:00
• 16f0fea099 更新 .drone.yml zhangkaihuai 2025-03-01 09:14:44 +00:00
• 36ac10f0a3 Merge pull request '更新 .drone.yml' (#415) from zhangkaihuai-patch-3 into dev zhangkaihuai 2025-03-01 08:30:37 +00:00
• 8738d493d6 更新 .drone.yml zhangkaihuai 2025-03-01 08:30:21 +00:00
• 65b2e47fb7 Merge pull request '更新 .drone.yml' (#414) from zhangkaihuai-patch-3 into dev zhangkaihuai 2025-03-01 08:28:51 +00:00
• af7b4f8231 更新 .drone.yml zhangkaihuai 2025-03-01 08:28:42 +00:00
• a3d469308e Merge pull request 'dengjie' (#413) from dengjie into dev odjbin 2025-02-25 13:22:11 +00:00
• ad1aaea302 Merge pull request 'trp_dev' (#412) from trp_dev into dengjie odjbin 2025-02-25 13:10:24 +00:00
• 3b538ee6d2 trp:修复隧道编辑模式下不能hover和设备编辑情况 trp 2025-02-25 20:55:24 +08:00
• c9ed05b975 Merge pull request 'fix : 修复bug' (#411) from dengjie into dev odjbin 2025-02-24 15:08:50 +00:00
• d6c898dea5 fix : 修复bug dj 2025-02-24 23:07:57 +08:00
• d07b6e42d1 Merge pull request 'fix : 修复用电量弹窗' (#410) from dengjie into dev odjbin 2025-02-24 14:17:47 +00:00
• 6e8adb7757 fix : 修复用电量弹窗 dj 2025-02-24 22:16:54 +08:00
• 3a5bfb94f6 Merge pull request 'fix : 隧道模拟功能初步完成' (#409) from dengjie into dev odjbin 2025-01-08 02:45:44 +00:00
• d3466fbb8d fix : 隧道模拟功能初步完成 dj 2025-01-08 10:45:21 +08:00
• 37e32189d6 Merge pull request '更新 nginx.conf' (#408) from zhangkaihuai-patch-2 into dev zhangkaihuai 2025-01-03 16:28:44 +00:00
• 62c8da2ea2 更新 nginx.conf zhangkaihuai 2025-01-03 16:28:17 +00:00
• 88448a88f9 Merge pull request '更新 nginx.conf' (#407) from zhangkaihuai-patch-2 into dev zhangkaihuai 2025-01-03 16:21:11 +00:00
• e0a92b51f3 更新 nginx.conf zhangkaihuai 2025-01-03 16:21:02 +00:00
• a68c362490 Merge pull request 'fix : 隧道模拟功能初步完成' (#406) from dengjie into dev odjbin 2025-01-03 13:41:32 +00:00
• 2dd7bcffca fix : 隧道模拟功能初步完成 dj 2025-01-03 21:22:08 +08:00
• 031d6337f3 Merge pull request 'dev' (#405) from dev into master odjbin 2025-01-03 13:18:02 +00:00
• de8820bf11 Merge pull request 'dengjie' (#404) from dengjie into dev odjbin 2025-01-03 13:16:50 +00:00
• 56bdf6ee1e fix : 隧道模拟功能初步完成 dj 2025-01-03 21:14:54 +08:00
• 472bc3cb83 fix : 隧道模拟功能初步完成 dj 2025-01-03 20:39:42 +08:00
• 16df648f2b Merge pull request 'trp_dev' (#403) from trp_dev into dengjie odjbin 2025-01-03 06:15:27 +00:00
• 661b28c879 trp:修复仿真设备重新渲染数量不一致问题、标签异常回显问题 trp 2025-01-03 14:13:43 +08:00
• 30825ce06a Merge branch 'dengjie' of http://git.feashow.cn/clay/tunnel-cloud-web into trp_dev trp 2025-01-03 11:15:45 +08:00
• 4293418c35 trp:合并分支 trp 2025-01-03 11:15:23 +08:00
• 8460c52d76 fix : 隧道ws数据 dj 2025-01-02 23:33:37 +08:00
• 3a2bd596a9 trp:本地提交测试 trp 2025-01-02 21:45:33 +08:00
• 1f83ddfa8e fix : 优化隧道模拟 dj 2025-01-02 21:35:33 +08:00
• 923ee4a81b fix : 优化隧道模拟 dj 2025-01-02 21:31:46 +08:00
• 5cb6960dfd Merge pull request 'trp:修复重新渲染设备时设备数量不一致问题' (#402) from trp_dev into dengjie odjbin 2025-01-02 13:09:15 +00:00
• 2c42edc16f trp:修复重新渲染设备时设备数量不一致问题 trp 2025-01-02 13:00:28 +08:00
• f5c3cbbbb6 Merge pull request 'trp:隧道场景仿真修改完成，待接口调试' (#401) from trp_dev into dengjie odjbin 2025-01-01 15:29:46 +00:00
• 41cc1b4edd trp:隧道场景仿真修改完成，待接口调试 trp 2025-01-01 23:24:59 +08:00
• 8af7a35c69 fix : 优化隧道模拟首页 dj 2024-12-30 22:31:37 +08:00
• 890c8028ab Merge pull request 'trp:隧道仿真页面，去除标签回显和隐藏附着点' (#400) from trp_dev into dengjie odjbin 2024-12-29 11:28:42 +00:00
• bfbf1b5116 fix : 优化隧道模拟首页的隧道预览模式 dj 2024-12-29 19:28:12 +08:00
• b64d943a5e trp:隧道仿真页面，去除标签回显和隐藏附着点 trp 2024-12-29 19:12:05 +08:00
• 824ab5e65c fix : 优化隧道模拟首页的隧道预览模式 dj 2024-12-29 18:50:22 +08:00
• 58206a89c8 Merge pull request 'trp_dev' (#398) from trp_dev into dengjie odjbin 2024-12-29 06:53:03 +00:00
• aefdd23925 解决隧道仿真数据在隧道中没有渲染问题 trp 2024-12-29 14:50:59 +08:00
• 833318dceb 本地提交，远程忽略 trp 2024-12-29 10:34:38 +08:00
• e111b10806 feat : 隧道模拟 dj 2024-12-29 00:48:25 +08:00
• f57023a509 feat : 隧道模拟 dj 2024-12-07 23:04:42 +08:00
• 375d6719d8 备份 dj 2024-12-07 22:35:22 +08:00
• 54a1eebb17 Merge pull request 'dev' (#397) from dev into master odjbin 2024-12-07 13:44:23 +00:00
• c3109bbdad Merge pull request '更新 .drone.yml' (#396) from zhangkaihuai-patch-1 into dev zhangkaihuai 2024-10-26 08:57:05 +00:00
• 1c762b052a 更新 .drone.yml zhangkaihuai 2024-10-26 08:56:55 +00:00
• 53777c71a6 Merge pull request 'fix : 修改设备管理-序列号选择框箭头' (#395) from dengjie into dev odjbin 2024-09-19 08:30:59 +00:00
• dbe77b134c fix : 修改设备管理-序列号选择框箭头 odjbin 2024-09-19 16:30:38 +08:00
• 645f4d241b Merge pull request 'dev' (#394) from dev into master odjbin 2024-09-19 08:23:36 +00:00
• 0722b29bca Merge pull request 'fix : 修改设备管理-序列号宽度' (#393) from dengjie into dev odjbin 2024-09-19 08:23:24 +00:00
• 91b3fc90c2 fix : 修改设备管理-序列号宽度 odjbin 2024-09-19 16:19:23 +08:00
• 40b0562908 Merge pull request 'fix : 修复隧道编辑bug,注释log' (#392) from dengjie into dev odjbin 2024-09-18 11:52:52 +00:00
• 6dcbd23ef4 fix : 修复隧道编辑bug,注释log odjbin 2024-09-18 19:52:38 +08:00
• f2780fe7cd Merge pull request 'fix : 修复首页切换bug' (#391) from dengjie into dev odjbin 2024-09-18 11:14:13 +00:00
• 2dc7844688 fix : 修复首页切换bug odjbin 2024-09-18 19:13:44 +08:00
• b12938c99f Merge pull request 'master' (#390) from master into dev clay 2024-09-18 10:20:35 +00:00
• eb5f2eabd7 Merge pull request '更新 .drone.yml' (#389) from clay-patch-4 into master clay 2024-09-18 10:19:37 +00:00
• a44e237e7e 更新 .drone.yml clay 2024-09-18 10:19:12 +00:00
• e5ed49cb21 Merge pull request 'fix : 修复变量使用错误' (#387) from dengjie into dev odjbin 2024-09-18 04:00:00 +00:00
• 1ac4b4d82d fix : 修复变量使用错误 odjbin 2024-09-18 11:59:33 +08:00
• a041a9d99d Merge pull request 'dengjie' (#386) from dengjie into dev odjbin 2024-09-03 10:50:27 +00:00
• 4235e5f472 fix :drone.yml odjbin 2024-09-03 18:50:01 +08:00
• 2f4b2bca15 Merge pull request 'fix :drone.yml' (#385) from dengjie into dev odjbin 2024-09-03 10:48:51 +00:00
• 0aa521a2c8 Merge remote-tracking branch 'origin/dev' into dev odjbin 2024-09-03 18:48:11 +08:00
• 7081dbb18c fix :drone.yml odjbin 2024-09-03 18:47:59 +08:00
• a859b01252 Merge pull request 'trp:从场景保存的设备模型数据中获取设备名称' (#384) from trp_dev into dev trp-ironman 2024-09-03 06:42:55 +00:00