Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 8689015643 Merge pull request '邓洁: 修改字段' (#226) from dengjie into dev odjbin 2024-01-09 08:34:13 +00:00
• 597ac2cf92 邓洁: 修改字段 邓洁 2024-01-09 16:34:00 +08:00
• 55ab73b189 Merge pull request '邓洁: 修改socket地址' (#225) from dengjie into dev odjbin 2024-01-09 07:56:23 +00:00
• 2e83259025 邓洁: 修改socket地址 邓洁 2024-01-09 15:56:02 +08:00
• 67e6737978 Merge pull request 'dengjie' (#224) from dengjie into dev odjbin 2024-01-08 04:44:39 +00:00
• 4745b8b146 邓洁: 修改阈值颜色 邓洁 2024-01-08 12:44:30 +08:00
• c600454b52 邓洁: 修改阈值颜色 邓洁 2024-01-08 12:42:33 +08:00
• 712ccb9eb1 Merge pull request '邓洁: 修改低报' (#223) from dengjie into dev odjbin 2024-01-08 04:13:38 +00:00
• c9ee853953 邓洁: 修改低报 邓洁 2024-01-08 12:13:25 +08:00
• c44370867a Merge pull request '邓洁: 修改细节' (#222) from dengjie into dev odjbin 2024-01-08 03:31:04 +00:00
• ff7d36077b 邓洁: 修改细节 邓洁 2024-01-08 11:30:44 +08:00
• e932c0e4df Merge pull request '邓洁: 修改细节' (#221) from dengjie into dev odjbin 2024-01-08 02:02:54 +00:00
• de507db057 邓洁: 修改细节 邓洁 2024-01-08 10:02:42 +08:00
• 401f7244df Merge pull request '邓洁: 修改细节' (#220) from dengjie into dev odjbin 2024-01-08 01:39:10 +00:00
• 6edc897439 邓洁: 修改细节 邓洁 2024-01-08 09:38:31 +08:00
• c44dd8e97a Merge pull request '邓洁: 修改细节' (#219) from dengjie into dev odjbin 2024-01-08 01:31:43 +00:00
• 060ff853d4 邓洁: 修改细节 邓洁 2024-01-08 09:31:34 +08:00
• 1ab43e97e3 Merge pull request '邓洁: 1' (#218) from dengjie into dev odjbin 2024-01-07 13:49:01 +00:00
• 1ce24d060b 邓洁: 1 邓洁 2024-01-07 21:48:46 +08:00
• 2e3605e6f7 Merge pull request 'dev' (#217) from dev into master odjbin 2024-01-07 13:48:12 +00:00
• 8f310554d8 Merge pull request 'dengjie' (#216) from dengjie into dev odjbin 2024-01-07 13:47:50 +00:00
• 275db768e2 邓洁: 修改细节 邓洁 2024-01-07 21:47:32 +08:00
• fb80e991c6 Merge pull request 'dev' (#215) from dev into master odjbin 2024-01-03 13:15:36 +00:00
• 5b5a3becf8 邓洁: 修改细节 邓洁 2024-01-03 21:14:52 +08:00
• c9d84979d9 邓洁: 表单校验 邓洁 2024-01-03 21:07:45 +08:00
• 53cdb854a3 邓洁: 隧道管理中点击预览隧道 邓洁 2024-01-03 19:58:32 +08:00
• 5557b7109e 邓洁: 切换隧道面板数据加载 邓洁 2024-01-03 17:47:35 +08:00
• 2298b674f4 邓洁: 修改下拉框样式 邓洁 2024-01-03 17:20:27 +08:00
• 89c137c7b4 邓洁: 修改细节 邓洁 2024-01-03 16:41:44 +08:00
• 317ceacf23 邓洁: 首屏面板的loading 邓洁 2024-01-03 15:24:34 +08:00
• 2d1d42f83a 邓洁: echarts的loading 邓洁 2024-01-03 14:50:59 +08:00
• 073ec5c570 邓洁: 优化界面 邓洁 2024-01-02 22:41:31 +08:00
• c730283e78 Merge pull request 'LJ' (#214) from LJ into dev liaojie 2024-01-01 10:04:47 +00:00
• 6f60b6c098 编辑模式分压阀完成 Hcat 2024-01-01 18:02:13 +08:00
• 589496ea96 分压阀添加墙壁完成 Hcat 2024-01-01 17:49:59 +08:00
• 891f97a6dd Merge pull request '邓洁: 修改bug' (#213) from dengjie into dev odjbin 2023-12-30 13:42:46 +00:00
• 043a22cabb 邓洁: 修改bug 邓洁 2023-12-30 21:42:08 +08:00
• b240206e52 Merge pull request '邓洁: 修改bug' (#212) from dengjie into dev odjbin 2023-12-30 12:39:51 +00:00
• a5602f03cd 邓洁: 修改bug 邓洁 2023-12-30 20:38:27 +08:00
• c66ef0a601 Merge pull request '邓洁: 修改bug' (#211) from dengjie into dev odjbin 2023-12-30 12:19:08 +00:00
• 3150343a40 邓洁: 修改bug 邓洁 2023-12-30 20:11:32 +08:00
• 1dd856e2ca Merge pull request 'LJ' (#210) from LJ into dev liaojie 2023-12-30 08:47:58 +00:00
• c6489313a7 Merge branch 'dev' of http://git.feashow.cn/clay/tunnel-cloud-web into LJ Hcat 2023-12-30 16:42:31 +08:00
• 0e949a65b8 预览模式完成绑定 Hcat 2023-12-30 16:39:48 +08:00
• 957c6274cb Merge pull request '修复提交' (#208) from LJ into dev liaojie 2023-12-30 06:46:31 +00:00
• d0c2648a2e 修复提交 Hcat 2023-12-30 14:37:58 +08:00
• a1e6973193 Merge pull request 'trp_dev' (#207) from trp_dev into dev trp-ironman 2023-12-30 05:39:29 +00:00
• 1d73f0f8b8 唐润平：解决了编辑模式bug(合并后) trp 2023-12-30 13:37:27 +08:00
• 697773bae4 Merge branch 'dev' into trp_dev trp 2023-12-30 13:25:03 +08:00
• 7588c4eda2 Merge branch 'dev' of http://git.feashow.cn/clay/tunnel-cloud-web into dev trp 2023-12-30 13:24:04 +08:00
• 5ac68dca37 唐润平：解决了编辑模式bug trp 2023-12-30 13:23:30 +08:00
• 785d9b8289 Merge pull request 'fix : 菜单显示问题' (#206) from clay into dev odjbin 2023-12-29 15:43:54 +00:00
• 4430b9c651 fix : 菜单显示问题 邓洁 2023-12-29 23:42:53 +08:00
• 4433e5c8f4 唐润平：新版本拉取 trp 2023-12-29 22:22:33 +08:00
• 3ce5582ea3 唐润平：test trp 2023-12-29 22:06:58 +08:00
• 182b29bb17 Merge pull request '邓洁: 修改bug' (#205) from dengjie into dev odjbin 2023-12-29 13:55:59 +00:00
• 7a2a586d67 邓洁: 修改bug 邓洁 2023-12-29 21:54:56 +08:00
• 253a6ed387 Merge pull request 'LJ_dev' (#204) from LJ_dev into dev liaojie 2023-12-29 13:44:05 +00:00
• 3e14bf1ca5 2 Hcat 2023-12-29 21:40:54 +08:00
• a540c433fd 预览模式+切换隧道 Hcat 2023-12-29 21:30:47 +08:00
• 92215c97ef 廖杰：预览初始化+隧道切换 Hcat 2023-12-29 21:28:56 +08:00
• e49c126351 预览初始化+切换隧道 Hcat 2023-12-29 21:18:48 +08:00
• ee07807e9d Merge pull request '邓洁: 修改用户bug' (#203) from dengjie into dev odjbin 2023-12-29 11:01:54 +00:00
• 11f9de9389 邓洁: 修改用户bug 邓洁 2023-12-29 19:00:54 +08:00
• 6eb8d73594 Merge pull request '邓洁 : 修复bug' (#202) from dengjie into dev odjbin 2023-12-29 09:37:50 +00:00
• 051d0bcd6c 邓洁 : 修复bug dengj 2023-12-29 17:36:36 +08:00
• 2664d815ff Merge pull request '邓洁 : 修复bug' (#201) from dengjie into dev odjbin 2023-12-29 08:59:01 +00:00
• 8289274d52 邓洁 : 修复bug dengj 2023-12-29 16:57:29 +08:00
• a3bea157b4 Merge pull request '邓洁 : 修复bug' (#200) from dengjie into dev odjbin 2023-12-29 08:04:00 +00:00
• 101f200a96 邓洁 : 修复bug dengj 2023-12-29 16:03:02 +08:00
• e51fea9d69 Merge pull request 'dengjie' (#199) from dengjie into dev odjbin 2023-12-29 07:22:23 +00:00
• b185a2a651 邓洁 : 修复用户细节 dengj 2023-12-29 15:21:24 +08:00
• a02ecff84f Merge branch 'trp_dev' of http://git.feashow.cn/clay/tunnel-cloud-web Hcat 2023-12-29 14:33:33 +08:00
• a1f31cf3ef 唐润平：设备唯一性 trp 2023-12-29 14:19:42 +08:00
• bc39fcda9e 邓洁 : 修复首屏风机细节 dengj 2023-12-29 14:19:40 +08:00
• 196eac3cee 唐润平：模型接口重写 trp 2023-12-29 13:39:23 +08:00
• 20bfc32d08 唐润平：接口重写 trp 2023-12-29 13:09:46 +08:00
• 7d3aa9ef46 Merge pull request '邓洁 : 修复bug' (#198) from dengjie into dev odjbin 2023-12-29 05:07:28 +00:00
• a473317022 邓洁 : 修复bug dengj 2023-12-29 13:06:35 +08:00
• a87b58bea7 Merge pull request '邓洁: 修复bug' (#197) from dengjie into dev odjbin 2023-12-29 02:33:57 +00:00
• 57b22361dc 邓洁: 修复bug 邓洁 2023-12-29 10:31:46 +08:00
• abdbbbda31 Merge pull request '邓洁: 修复bug' (#196) from dengjie into dev odjbin 2023-12-28 15:09:59 +00:00
• 6dde5ccbc8 邓洁: 修复bug 邓洁 2023-12-28 23:00:52 +08:00
• 50270cddd3 Merge pull request '邓洁 : 隧道接口部分对接' (#195) from dengjie into dev odjbin 2023-12-28 12:53:50 +00:00
• 67f40cd6b1 邓洁 : 隧道接口部分对接 dengj 2023-12-28 18:06:48 +08:00
• 9017465b15 Merge pull request '邓洁: 接口部分对接' (#194) from dengjie into dev odjbin 2023-12-28 08:23:26 +00:00
• 64b3052348 邓洁: 接口部分对接 邓洁 2023-12-28 16:22:53 +08:00
• 452d76f198 Merge pull request 'dengjie' (#193) from dengjie into dev odjbin 2023-12-27 15:53:28 +00:00
• 31428cd640 邓洁: 设备接口部分对接 邓洁 2023-12-27 23:52:10 +08:00
• ac5327e5d8 邓洁: 设备接口部分对接 邓洁 2023-12-27 23:45:44 +08:00
• 976c2f2bad Merge pull request 'LJ' (#192) from LJ into dev liaojie 2023-12-26 15:48:39 +00:00
• 8bae80ce77 解决冲突 Hcat 2023-12-26 23:47:50 +08:00
• e25398db7d 隧道的间隔点动态绑定了 Hcat 2023-12-26 23:31:35 +08:00
• aa7342325f Merge pull request '邓洁: 隧道接口部分对接' (#189) from dengjie into dev odjbin 2023-12-26 14:38:41 +00:00
• 48978b917c 邓洁: 隧道接口部分对接 邓洁 2023-12-26 22:38:10 +08:00
• 49baa25f8a Merge pull request '邓洁 : 隧道接口部分对接' (#188) from dengjie into dev odjbin 2023-12-26 12:30:22 +00:00
• 2ba9e761ab 邓洁 : 隧道接口部分对接 dengj 2023-12-26 17:08:15 +08:00
• dd561f21fc Merge pull request '邓洁: 隧道接口部分对接' (#187) from dengjie into dev odjbin 2023-12-26 01:43:49 +00:00
• b1fde92bbd 邓洁: 隧道接口部分对接 邓洁 2023-12-26 09:41:44 +08:00
• 4a31567ab0 Merge pull request 'dev' (#186) from dev into master odjbin 2023-12-24 10:09:36 +00:00