Commit Graph

  • fb95c1b947 Merge pull request '邓洁 : 修改间距' (#81) from dj into dev odjbin 2023-12-11 13:13:53 +00:00
  • 71897b22d3 邓洁 : 修改间距 邓洁 2023-12-11 21:13:09 +08:00
  • 39c4925e47 Merge pull request 'master' (#80) from master into dev odjbin 2023-12-11 13:09:56 +00:00
  • 8ace4799db Merge pull request 'dev' (#79) from dev into master odjbin 2023-12-11 13:09:35 +00:00
  • 5cec0bb20e Merge pull request '邓洁 : 修改细节' (#78) from dj into dev odjbin 2023-12-11 13:08:28 +00:00
  • a5dbf736e9 Merge pull request '唐润平:添加右下角面板阈值刻度线' (#77) from trp_dev_v2.0 into master odjbin 2023-12-11 13:08:06 +00:00
  • 1559ce25df 邓洁 : 修改细节 邓洁 2023-12-11 19:52:02 +08:00
  • c2ecf55f23 Merge pull request '邓洁 : 完善细节' (#75) from dj into dev odjbin 2023-12-11 11:38:39 +00:00
  • 2f8cb49ac4 邓洁 : 完善细节 dengj 2023-12-11 17:32:37 +08:00
  • 779448b465 唐润平:添加右下角面板阈值刻度线 trp 2023-12-11 14:07:03 +08:00
  • 68cc874e91 Merge pull request 'dev' (#74) from dev into master odjbin 2023-12-11 06:05:03 +00:00
  • cbab0fd43f Merge pull request '邓洁 : 右侧鼠标经过效果' (#73) from dj into dev odjbin 2023-12-11 03:00:15 +00:00
  • 407898dcc4 邓洁 : 右侧鼠标经过效果 dengj 2023-12-11 10:59:44 +08:00
  • cd0a458c3a Merge pull request '邓洁 : 修改细节' (#72) from dj into dev odjbin 2023-12-11 02:06:25 +00:00
  • 07704501be 邓洁 : 修改细节 dengj 2023-12-11 10:04:59 +08:00
  • 15a582dbd0 Merge pull request '邓洁 : 修改细节' (#71) from dj into dev odjbin 2023-12-11 01:55:34 +00:00
  • 51dd0fbd5e 邓洁 : 修改细节 邓洁 2023-12-11 09:50:11 +08:00
  • 04f3ef893f Merge pull request '邓洁 : 绑定首页实时数据' (#69) from dj into dev odjbin 2023-12-10 16:26:08 +00:00
  • 86709fb13d 邓洁 : 绑定首页实时数据 邓洁 2023-12-11 00:25:13 +08:00
  • 6db62afc62 模型添加更新了 Hcat1314 2023-12-10 17:03:43 +08:00
  • ab87b17567 Merge pull request 'master' (#68) from master into dev odjbin 2023-12-09 10:23:16 +00:00
  • 813b854316 Merge pull request '邓洁 : 修改细节' (#66) from dj into master odjbin 2023-12-09 10:22:36 +00:00
  • 10268ab2ba 邓洁 : 修改细节 邓洁 2023-12-09 18:22:10 +08:00
  • b327839389 Merge pull request 'master' (#65) from master into dev odjbin 2023-12-09 10:09:23 +00:00
  • ba66780ff3 Merge pull request '邓洁 : 完善首页' (#64) from dj into master odjbin 2023-12-09 10:08:52 +00:00
  • b66d3ce40f 邓洁 : 完善首页 邓洁 2023-12-09 18:07:52 +08:00
  • db4cf4fd91 Merge pull request 'master' (#63) from master into dev odjbin 2023-12-09 06:23:07 +00:00
  • 61f5381c93 Merge pull request '邓洁 : 完善首页' (#62) from dj into master odjbin 2023-12-09 06:22:46 +00:00
  • cb289963bc 邓洁 : 完善首页 邓洁 2023-12-09 14:22:25 +08:00
  • 07614c00af Merge pull request 'LJ' (#61) from LJ into master odjbin 2023-12-09 05:32:36 +00:00
  • 42916453e0 背景图调整+模型 Hcat1314 2023-12-09 13:29:16 +08:00
  • 66a1246746 Merge pull request 'trp_dev_v2.0' (#60) from trp_dev_v2.0 into master odjbin 2023-12-09 05:06:20 +00:00
  • f0b46b1c24 换模型+背景 Hcat1314 2023-12-09 13:05:10 +08:00
  • 600febc98a 唐润平:名称小修改 trp 2023-12-09 03:24:38 +08:00
  • 305a5f9824 唐润平:显示面板雏形全部完成并优化了第一个风机面板样式 trp 2023-12-09 03:09:53 +08:00
  • 2f06c69384 Merge pull request '邓洁 : 1' (#59) from dj into master odjbin 2023-12-08 17:07:02 +00:00
  • 799107c3cc 邓洁 : 1 邓洁 2023-12-09 01:05:26 +08:00
  • 40124d5813 Merge pull request '邓洁 : 隧道切换效果' (#58) from dj into master odjbin 2023-12-08 17:04:47 +00:00
  • 5663c9338f 邓洁 : 隧道切换效果 邓洁 2023-12-09 01:04:10 +08:00
  • d568440879 Merge pull request 'master' (#57) from master into dev odjbin 2023-12-08 14:47:15 +00:00
  • d494a1e1fe Merge pull request '邓洁 : socket' (#56) from dj into master odjbin 2023-12-08 14:47:03 +00:00
  • e7405fcf00 邓洁 : socket 邓洁 2023-12-08 22:46:41 +08:00
  • 9031e39ff1 Merge pull request 'master' (#55) from master into dev odjbin 2023-12-08 14:38:22 +00:00
  • 64d44f03d2 Merge pull request '邓洁 : socket' (#54) from dj into master odjbin 2023-12-08 14:37:58 +00:00
  • 4afc8552df 邓洁 : socket 邓洁 2023-12-08 22:36:52 +08:00
  • 2a4ef8bed5 Merge pull request 'master' (#53) from master into dev odjbin 2023-12-08 14:13:27 +00:00
  • c3396dddf1 Merge pull request '邓洁 : 修改大屏样式' (#52) from dj into master odjbin 2023-12-08 14:13:14 +00:00
  • a0b12dcbdc 邓洁 : 修改大屏样式 邓洁 2023-12-08 22:12:37 +08:00
  • 28ff50193c Merge pull request '邓洁 : 两侧收缩展开' (#51) from dj into master odjbin 2023-12-08 10:00:00 +00:00
  • b2cc03bbd8 邓洁 : 两侧收缩展开 dengj 2023-12-08 17:58:25 +08:00
  • 0bee4d9e16 Merge pull request '邓洁 : 首页上下方和两侧合并' (#50) from dj into master odjbin 2023-12-08 08:59:30 +00:00
  • ce95bd2fe5 邓洁 : 首页上下方和两侧合并 dengj 2023-12-08 16:59:04 +08:00
  • a59035383e Merge pull request '邓洁 : 首页上下方样式' (#49) from dj into master odjbin 2023-12-08 08:36:12 +00:00
  • 390eaa1116 邓洁 : 首页上下方样式 dengj 2023-12-08 16:35:17 +08:00
  • 1c46679a64 Merge pull request '唐润平:UI显示面板开发起步版' (#48) from trp_dev_v2.0 into master odjbin 2023-12-08 08:16:53 +00:00
  • e20b7c1002 唐润平:UI显示面板开发起步版 trp 2023-12-08 16:12:55 +08:00
  • 818cd0a9bc Merge pull request 'master' (#45) from master into dev odjbin 2023-12-08 01:27:07 +00:00
  • 3040ba062e Merge pull request '邓洁 : 修改细节' (#44) from dj into master odjbin 2023-12-08 01:26:51 +00:00
  • 650d617f30 邓洁 : 修改细节 邓洁 2023-12-08 09:26:25 +08:00
  • 7f4e8b4b22 Merge pull request 'master' (#43) from master into dev odjbin 2023-12-07 15:31:35 +00:00
  • 3edbf7312f Merge pull request '邓洁 : 合并模型代码' (#42) from dj into master odjbin 2023-12-07 15:31:25 +00:00
  • 38820566ec 邓洁 : 合并模型代码 邓洁 2023-12-07 23:30:51 +08:00
  • 2630fb57d0 Merge pull request 'master' (#41) from master into dev odjbin 2023-12-07 14:54:00 +00:00
  • 223ecdbeb9 Merge pull request '邓洁 : 测试模型上线' (#40) from dj into master odjbin 2023-12-07 14:53:34 +00:00
  • b194b07b95 邓洁 : 测试模型上线 邓洁 2023-12-07 22:53:15 +08:00
  • 7eadab6790 Merge pull request '邓洁 : 修改bug' (#39) from dj into master odjbin 2023-12-07 14:50:55 +00:00
  • 56ba5f04a6 邓洁 : 修改bug 邓洁 2023-12-07 22:50:13 +08:00
  • 47deb8a78b Merge pull request '邓洁 : 适配大屏' (#38) from dj into master odjbin 2023-12-07 13:21:48 +00:00
  • bf564e8e9b 邓洁 : 适配大屏 邓洁 2023-12-07 21:21:19 +08:00
  • bc6e289fc6 Merge pull request 'master' (#37) from master into dev odjbin 2023-12-07 08:18:27 +00:00
  • 2b7115d7c1 Merge pull request '邓洁 : 更换路由' (#36) from dj into master odjbin 2023-12-07 08:17:11 +00:00
  • b800228012 邓洁 : 更换路由 dengj 2023-12-07 16:16:09 +08:00
  • 150dde0ddf Merge pull request 'master' (#35) from master into dev odjbin 2023-12-07 07:59:46 +00:00
  • 95aa8000ff Merge pull request '邓洁 : 隧道模型合并' (#34) from dj into master odjbin 2023-12-07 07:59:15 +00:00
  • 5f14289731 邓洁 : 隧道模型合并 dengj 2023-12-07 15:58:43 +08:00
  • fbe76e84ca Merge pull request '邓洁 : 修改冲突' (#30) from dev_dj into dev odjbin 2023-12-07 06:37:44 +00:00
  • 7766cd16ef 邓洁 : 修改冲突 dengj 2023-12-07 14:36:35 +08:00
  • b835976d97 Merge pull request '邓洁 : 修改冲突' (#28) from dev_dj into dev odjbin 2023-12-07 06:36:00 +00:00
  • 36773435c8 邓洁 : 修改冲突 dengj 2023-12-07 14:34:40 +08:00
  • e642f1e4c9 Merge pull request '删除 'src/views/home/index.vue'' (#24) from odjbin-patch-2 into dev odjbin 2023-12-07 06:26:37 +00:00
  • 91bdf8bcec 删除 'src/views/home/index.vue' odjbin 2023-12-07 06:26:28 +00:00
  • 422d8044cd Merge pull request '更新 'src/views/home/index.vue'' (#21) from odjbin-patch-1 into dev odjbin 2023-12-07 06:18:49 +00:00
  • a76f736340 更新 'src/views/home/index.vue' odjbin 2023-12-07 06:18:42 +00:00
  • aaec9d3bfa Merge pull request '邓洁 :socket' (#13) from dj into dev odjbin 2023-12-03 15:07:28 +00:00
  • 42250e4002 邓洁 :socket 邓洁 2023-12-03 23:07:09 +08:00
  • 05fc6b826a Merge pull request '邓洁 :socket' (#12) from dj into dev odjbin 2023-12-03 14:31:40 +00:00
  • c5e1e871ff 邓洁 :socket 邓洁 2023-12-03 22:30:37 +08:00
  • 6374bd5b64 Merge pull request 'master' (#11) from master into dev odjbin 2023-12-03 12:22:30 +00:00
  • 1695095a89 Merge pull request '邓洁 :修改细节' (#10) from dj into master odjbin 2023-12-03 12:21:53 +00:00
  • 15ecdbff4b 邓洁 :修改细节 邓洁 2023-12-03 20:19:07 +08:00
  • 769b8c2976 Merge pull request 'ci/cd : 第4次测试' (#9) from master into dev clay 2023-12-02 08:44:47 +00:00
  • 7f6a39571f Merge pull request 'ci/cd : 第4次测试' (#8) from clay into master clay 2023-12-02 08:44:35 +00:00
  • 3d25d120a7 ci/cd : 第4次测试 clay 2023-12-02 16:44:18 +08:00
  • c574b094c9 Merge pull request 'ci/cd : 第3次测试' (#7) from master into dev clay 2023-12-02 08:38:14 +00:00
  • df192e36bf Merge pull request 'ci/cd : 第3次测试' (#6) from clay into master clay 2023-12-02 08:38:01 +00:00
  • 587938e582 ci/cd : 第3次测试 clay 2023-12-02 16:37:41 +08:00
  • 102072d38d Merge pull request 'ci/cd : 第一次测试' (#5) from master into dev clay 2023-12-02 08:33:34 +00:00
  • a7d72b9225 Merge pull request 'ci/cd : 第一次测试' (#4) from clay into master clay 2023-12-02 08:33:19 +00:00
  • fb3e19e63c ci/cd : 第一次测试 clay 2023-12-02 16:32:42 +08:00
  • cb8e954f8c Merge pull request 'ci/cd : 第一次测试' (#3) from clay into master clay 2023-12-02 08:28:50 +00:00