Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 89c4027cd8 Merge pull request 'dev' (#276) from dev into master odjbin 2024-02-27 09:08:25 +00:00
• e8b097a4ab Merge pull request 'fix : 切换站点当无隧道时提示' (#275) from dengjie into dev odjbin 2024-02-27 09:08:05 +00:00
• 59aa2a92d1 fix : 切换站点当无隧道时提示 odjbin 2024-02-27 17:07:47 +08:00
• 3260325edb Merge pull request 'dev' (#274) from dev into master odjbin 2024-02-27 08:59:59 +00:00
• 53264551cd Merge pull request 'feat : 新增echarts(折线图)下方滚动条型缩放组件' (#273) from dengjie into dev odjbin 2024-02-27 08:59:43 +00:00
• 2a8cb0d389 feat : 新增echarts(折线图)下方滚动条型缩放组件 odjbin 2024-02-27 16:59:15 +08:00
• f1ae3537ba Merge pull request 'fix : 风机区域细节优化' (#272) from dengjie into dev odjbin 2024-02-27 08:09:34 +00:00
• bc3e7ddaea fix : 风机区域细节优化 odjbin 2024-02-27 16:09:03 +08:00
• 7a51c8bbc9 Merge pull request 'dev' (#271) from dev into master odjbin 2024-02-26 09:47:55 +00:00
• e2afbbc011 Merge pull request 'fix : 风机区域细节优化' (#270) from dengjie into dev odjbin 2024-02-26 09:47:35 +00:00
• 0301aa79bc fix : 风机区域细节优化 odjbin 2024-02-26 17:47:15 +08:00
• ae15ba62b5 Merge pull request 'fix : 细节优化' (#269) from dengjie into dev odjbin 2024-02-22 13:34:21 +00:00
• 97787def33 fix : 细节优化 odjbin 2024-02-22 21:33:35 +08:00
• 87c4238e84 Merge pull request 'feat : 风机启停' (#268) from dengjie into dev odjbin 2024-02-22 12:08:56 +00:00
• 02af5f6508 feat : 风机启停 odjbin 2024-02-22 20:08:35 +08:00
• f648711e0d Merge pull request 'feat : 风压echarts按日月年监控数据' (#267) from dengjie into dev odjbin 2024-02-22 09:31:40 +00:00
• 5a711436b8 feat : 风压echarts按日月年监控数据 odjbin 2024-02-22 17:31:16 +08:00
• 4a4683c7a4 Merge pull request 'master' (#266) from master into dev odjbin 2024-02-22 09:11:00 +00:00
• 8952952519 Merge pull request 'feat : 电流、有毒气体和传感器echarts按日月年监控数据' (#265) from dengjie into master odjbin 2024-02-22 09:10:48 +00:00
• 3a23b467ec feat : 电流、有毒气体和传感器echarts按日月年监控数据 odjbin 2024-02-22 17:10:06 +08:00
• 99d384a847 Merge pull request 'master' (#264) from master into dev clay 2024-02-22 01:04:38 +00:00
• 6a13b324bd Merge pull request '更新 .drone.yml' (#263) from clay-patch-2 into master clay 2024-02-22 01:04:16 +00:00
• e3070840b5 更新 .drone.yml clay 2024-02-22 01:04:03 +00:00
• 9034f2c37b Merge pull request 'master' (#262) from master into dev clay 2024-02-21 14:56:50 +00:00
• 3f4e6939ac Merge pull request '更新 .drone.yml' (#261) from clay-patch-1 into master clay 2024-02-21 14:56:37 +00:00
• 647dd53c4e 更新 .drone.yml clay 2024-02-21 14:56:29 +00:00
• 18e6b20414 Merge pull request 'master' (#259) from master into dev odjbin 2024-02-21 13:45:38 +00:00
• 7f28038261 Merge pull request 'fix: 修改风向bug' (#258) from dengjie into master odjbin 2024-02-21 13:45:19 +00:00
• 98799e8bcc fix: 修改风向bug odjbin 2024-02-21 21:44:59 +08:00
• 0747a6e177 Merge pull request 'dev' (#257) from dev into master odjbin 2024-02-18 08:01:24 +00:00
• 0443e72a38 Merge pull request '邓洁: 修改用电量阈值' (#256) from dengjie into dev odjbin 2024-02-18 08:01:00 +00:00
• 85dfecff84 邓洁: 修改用电量阈值 邓洁 2024-02-18 16:00:13 +08:00
• 20788c6b65 Merge pull request '小的细节优化' (#255) from LJ into dev liaojie 2024-01-26 16:18:06 +00:00
• c29b14d968 小的细节优化 Hcat 2024-01-27 00:16:55 +08:00
• 3e9c18f648 Merge pull request '邓洁: 测试select样式' (#254) from dengjie into dev odjbin 2024-01-25 15:23:29 +00:00
• b7695d11d4 邓洁: 测试select样式 邓洁 2024-01-25 23:23:11 +08:00
• b8a13612b4 Merge pull request '邓洁: 测试select样式' (#253) from dengjie into dev odjbin 2024-01-25 15:14:58 +00:00
• 00257537a2 邓洁: 测试select样式 邓洁 2024-01-25 23:14:34 +08:00
• 8292f250a5 Merge pull request '邓洁: 测试select样式' (#252) from dengjie into dev odjbin 2024-01-25 14:59:20 +00:00
• 56d25805e1 邓洁: 测试select样式 邓洁 2024-01-25 22:58:46 +08:00
• 27da5fa649 Merge pull request '邓洁: 屏蔽风机模式接口操作' (#251) from dengjie into dev odjbin 2024-01-23 13:24:06 +00:00
• b663fc9ea2 邓洁: 屏蔽风机模式接口操作 邓洁 2024-01-23 21:23:38 +08:00
• c6d95b5927 Merge pull request '邓洁: 设备信息修改' (#250) from dengjie into dev odjbin 2024-01-23 13:17:40 +00:00
• 6f254aabfe 邓洁: 设备信息修改 邓洁 2024-01-23 21:15:56 +08:00
• bb111af19f Merge pull request '邓洁: 接口及细节优化' (#249) from dengjie into dev odjbin 2024-01-21 15:14:03 +00:00
• 99d89d6a2b 邓洁: 接口及细节优化 邓洁 2024-01-21 23:13:51 +08:00
• 58ef00be98 Merge pull request 'LJ' (#248) from LJ into dev liaojie 2024-01-21 13:50:09 +00:00
• 7521824078 Merge branch 'dev' into LJ liaojie 2024-01-21 13:49:17 +00:00
• 18bc20666f Merge branch 'LJ' of http://git.feashow.cn/clay/tunnel-cloud-web into LJ Hcat 2024-01-21 21:47:31 +08:00
• 98b28eccbd 更新路牌 Hcat 2024-01-21 21:46:58 +08:00
• afcc63aa17 路牌更新 Hcat 2024-01-21 21:30:06 +08:00
• 25828f823f 路牌更新 Hcat 2024-01-21 21:28:46 +08:00
• 18d2d52b5e 廖杰：路牌更新 Hcat 2024-01-21 21:14:20 +08:00
• 853ddfba3f 廖杰：路牌更新 Hcat 2024-01-21 21:10:21 +08:00
• 70f4332546 Merge pull request '廖杰：路牌更新' (#247) from LJ into dev liaojie 2024-01-21 13:05:46 +00:00
• f1ea5bb17a Merge branch 'dev' into LJ liaojie 2024-01-21 13:05:33 +00:00
• feb0b3821f 廖杰：路牌更新 Hcat 2024-01-21 21:04:50 +08:00
• f0517c3206 Merge pull request '更新路牌显示' (#246) from LJ into dev liaojie 2024-01-21 12:57:51 +00:00
• d68795a4e3 更新路牌显示 Hcat 2024-01-21 20:56:22 +08:00
• 3e58763c33 Merge pull request '邓洁: 1' (#245) from dengjie into dev odjbin 2024-01-17 08:09:43 +00:00
• 872395fce1 邓洁: 1 邓洁 2024-01-17 16:09:31 +08:00
• 294fafae83 Merge pull request '邓洁: 分流阀值样式及设备接口对接' (#244) from dengjie into dev odjbin 2024-01-17 08:08:20 +00:00
• 2fce431c43 邓洁: 分流阀值样式及设备接口对接 邓洁 2024-01-17 16:08:06 +08:00
• be85ce6ecb Merge pull request 'dengjie' (#243) from dengjie into dev odjbin 2024-01-17 07:20:02 +00:00
• e5e7ed3412 邓洁: 注释log 邓洁 2024-01-17 15:19:29 +08:00
• 9a8e70b425 Merge remote-tracking branch 'origin/dev' into dev 邓洁 2024-01-17 15:18:50 +08:00
• 797cf8371e 邓洁: 设备修改接口对接 邓洁 2024-01-17 15:17:59 +08:00
• 30b007ff9d Merge pull request '邓洁: test' (#242) from dengjie into dev odjbin 2024-01-16 13:10:14 +00:00
• 84786e404b 邓洁: test 邓洁 2024-01-16 21:10:01 +08:00
• 1a4905db8f Merge pull request '邓洁: test' (#241) from dengjie into dev odjbin 2024-01-16 13:08:00 +00:00
• 45446b10d2 邓洁: test 邓洁 2024-01-16 21:07:22 +08:00
• a935dd555c Merge pull request 'dengjie' (#240) from dengjie into dev odjbin 2024-01-16 12:58:40 +00:00
• 92e64fc81f 邓洁: 1 邓洁 2024-01-16 20:58:31 +08:00
• 10e7aa5299 邓洁: 1 邓洁 2024-01-16 20:54:38 +08:00
• 01b261be42 Merge pull request '邓洁: 1' (#239) from dengjie into dev odjbin 2024-01-16 12:53:31 +00:00
• c1b2cb1874 邓洁: 1 邓洁 2024-01-16 20:53:19 +08:00
• 99639356fc Merge pull request '更新修改和视角' (#238) from LJ into dev liaojie 2024-01-16 09:44:25 +00:00
• 6fec36965e 更新修改和视角 Hcat 2024-01-16 17:43:20 +08:00
• e1d557aff8 Merge pull request '邓洁: 优化界面' (#237) from dengjie into dev odjbin 2024-01-16 08:03:33 +00:00
• 5a0f1997e3 邓洁: 优化界面 邓洁 2024-01-16 16:03:01 +08:00
• 75929dcb77 Merge pull request '邓洁: 修改细节' (#236) from dengjie into dev odjbin 2024-01-14 13:53:47 +00:00
• e4a9aad91b 邓洁: 修改细节 邓洁 2024-01-14 21:53:19 +08:00
• df6ebb843f Merge pull request '邓洁: 1' (#235) from dengjie into dev odjbin 2024-01-14 13:24:47 +00:00
• c50d41eb7e 邓洁: 1 邓洁 2024-01-14 21:24:33 +08:00
• 68d76e56b3 Merge pull request '修复点击设备卡墙视角中间' (#234) from LJ into dev liaojie 2024-01-14 13:19:58 +00:00
• 305c944f35 修复点击设备卡墙视角中间 Hcat 2024-01-14 21:17:50 +08:00
• 20c7c764ff Merge pull request '邓洁: 修改细节' (#233) from dengjie into dev odjbin 2024-01-12 06:52:37 +00:00
• 9b5ca77651 邓洁: 修改细节 邓洁 2024-01-12 14:51:06 +08:00
• 959944e819 Merge pull request '预览模式修复+模型颜色更改' (#232) from LJ into dev liaojie 2024-01-11 15:17:50 +00:00
• 4e143dfe53 Merge branch 'dev' into LJ liaojie 2024-01-11 15:17:09 +00:00
• 6b8dd71c9d 预览模式修复+模型颜色更改 Hcat 2024-01-11 23:16:16 +08:00
• 7f41fd0747 Merge pull request '修改隧道颜色+预览模式的附着点距离显示' (#231) from LJ into dev liaojie 2024-01-11 15:09:15 +00:00
• 41e6c78d1e 修改隧道颜色+预览模式的附着点距离显示 Hcat 2024-01-11 23:03:04 +08:00
• 0c87cb520a Merge pull request '邓洁: 修改bug' (#230) from dengjie into dev odjbin 2024-01-09 13:32:29 +00:00
• 2926e46351 邓洁: 修改bug 邓洁 2024-01-09 21:32:17 +08:00
• 621a3779b4 Merge pull request '邓洁: 修改电流echarts提示框' (#229) from dengjie into dev odjbin 2024-01-09 12:30:51 +00:00
• c3090fbfd7 邓洁: 修改电流echarts提示框 邓洁 2024-01-09 20:30:24 +08:00
• f6f928cf20 Merge pull request 'dev' (#228) from dev into master odjbin 2024-01-09 08:46:29 +00:00
• e795a9c7be Merge pull request '邓洁: 修改bug' (#227) from dengjie into dev odjbin 2024-01-09 08:46:10 +00:00
• f4a478fb00 邓洁: 修改bug 邓洁 2024-01-09 16:45:55 +08:00