odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 814c28b908 Merge branch 'dev' into trp_dev trp 2023-12-16 04:01:43 +08:00
  • ae6a305515 唐润平: 传感器添加删除、标签文字设置、双击进入视角、双击空白回退视角 trp 2023-12-16 03:58:36 +08:00
  • 828a4fca82 Merge pull request '邓洁 : 修改细节' (#142) from dengjie into dev odjbin 2023-12-15 17:18:09 +00:00
  • fc68b62555 邓洁 : 修改细节 邓洁 2023-12-16 01:17:38 +08:00
  • 141e134dbd Merge pull request '邓洁 : 站点管理修改细节' (#141) from dengjie into dev odjbin 2023-12-15 17:12:31 +00:00
  • 41bfdd5194 邓洁 : 站点管理修改细节 邓洁 2023-12-16 01:12:10 +08:00
  • 02ff5125fe Merge pull request '添加视角限制' (#140) from LJ into dev liaojie 2023-12-15 16:39:20 +00:00
  • b2a4ef158e 添加视角限制 Hcat1314 2023-12-16 00:34:46 +08:00
  • 3db123a884 Merge pull request '邓洁 : 站点管理接口对接' (#139) from dengjie into dev odjbin 2023-12-15 13:50:28 +00:00
  • f94b84fe2e 邓洁 : 站点管理接口对接 邓洁 2023-12-15 21:50:04 +08:00
  • 0bed2e5cec Merge pull request '邓洁 : 退出登录提示' (#138) from dengjie into dev odjbin 2023-12-15 13:19:47 +00:00
  • a1597159c9 邓洁 : 退出登录提示 邓洁 2023-12-15 21:19:10 +08:00
  • be70d9929f Merge pull request '邓洁 : 修改隧道管理间距' (#137) from dengjie into dev odjbin 2023-12-15 12:02:02 +00:00
  • d42fabc37f 邓洁 : 修改隧道管理间距 邓洁 2023-12-15 20:01:30 +08:00
  • f633e50b9f Merge pull request 'dengjie' (#136) from dengjie into dev odjbin 2023-12-15 10:08:14 +00:00
  • 9afee1a588 邓洁 : 解决冲突 dengj 2023-12-15 18:07:44 +08:00
  • bf9dc9530a Merge remote-tracking branch 'origin/dev' into dev dengj 2023-12-15 18:07:24 +08:00
  • 1168c9eb13 邓洁 : 隧道管理界面 dengj 2023-12-15 18:00:40 +08:00
  • dcc92b3c77 唐润平：传感器添加功能 trp 2023-12-15 17:02:23 +08:00
  • 37b16633cf 邓洁 : 修改弹窗样式 dengj 2023-12-15 15:04:04 +08:00
  • ca3fbc2602 Merge pull request 'trp_dev' (#134) from trp_dev into dev trp-ironman 2023-12-15 06:25:26 +00:00
  • c91d93b24b 唐润平：视角切换修改版-重新提交 trp 2023-12-15 14:17:56 +08:00
  • 077ff6a074 Merge pull request '邓洁 : 修改首屏弹窗样式' (#133) from dengjie into dev odjbin 2023-12-15 04:58:59 +00:00
  • 32e425a926 邓洁 : 修改首屏弹窗样式 dengj 2023-12-15 12:58:24 +08:00
  • 15bb5c40e1 Merge pull request '邓洁 : 用电量弹窗大小' (#131) from dengjie into dev odjbin 2023-12-15 03:19:24 +00:00
  • dcf3b540ca 邓洁 : 用电量弹窗大小 admin 2023-12-15 11:18:00 +08:00
  • 0ba608bf29 Merge pull request 'dengjie' (#130) from dengjie into dev odjbin 2023-12-15 03:11:35 +00:00
  • f238a475e9 邓洁 : 风机接口对接及用电量弹窗大小 admin 2023-12-15 11:10:38 +08:00
  • c984f7be5b 邓洁 : 风机接口对接 admin 2023-12-15 10:10:11 +08:00
  • 02d9ba3ef1 唐润平：修改视角变换 trp 2023-12-15 02:43:19 +08:00
  • 549b0f30c8 Merge pull request '邓洁 : 首屏修改' (#128) from dengjie into dev odjbin 2023-12-14 15:33:08 +00:00
  • 8c655e1d23 邓洁 : 首屏修改 邓洁 2023-12-14 23:32:56 +08:00
  • 1884ad3db6 唐润平：下拉框优化，编辑视角调整 trp 2023-12-14 23:08:38 +08:00
  • d39dbce992 Merge pull request '邓洁 : 风压监控弹窗' (#127) from dengjie into dev odjbin 2023-12-14 09:58:16 +00:00
  • 3efec39f4e 邓洁 : 风压监控弹窗 admin 2023-12-14 17:57:44 +08:00
  • aab82210d4 Merge pull request '邓洁 : 打开弹窗时背景更改' (#126) from dengjie into dev odjbin 2023-12-14 08:42:52 +00:00
  • c70dd888fd 邓洁 : 打开弹窗时背景更改 admin 2023-12-14 16:41:51 +08:00
  • c0527690ca Merge pull request 'dev' (#125) from dev into master odjbin 2023-12-14 08:16:53 +00:00
  • 4cb9954b15 Merge pull request '邓洁 : 用电量弹窗及样式修改' (#124) from dengjie into dev odjbin 2023-12-14 08:09:49 +00:00
  • d6661dc5fd 邓洁 : 用电量弹窗及样式修改 admin 2023-12-14 16:08:15 +08:00
  • 5987c8cfe5 Merge pull request '邓洁 : 首页修改' (#123) from dengjie into dev odjbin 2023-12-14 06:05:20 +00:00
  • 38c3a34a9c 邓洁 : 首页修改 admin 2023-12-14 14:04:03 +08:00
  • aae8ac8438 Merge pull request 'dengjie' (#122) from dengjie into dev odjbin 2023-12-14 03:45:23 +00:00
  • 8b3f36f5c9 邓洁 : 折线图渲染 dengj 2023-12-14 11:44:07 +08:00
  • aa64923d81 Merge pull request 'dev' (#121) from dev into master odjbin 2023-12-14 02:44:04 +00:00
  • 8ab097f31d Merge pull request '唐润平：上线版,功能为待完善' (#120) from trp_dev_v2.0 into dev odjbin 2023-12-14 02:40:23 +00:00
  • 2805974591 Merge pull request 'dev' (#118) from dev into master odjbin 2023-12-14 02:30:31 +00:00
  • dc1871fd80 Merge pull request 'dengjie' (#117) from dengjie into dev odjbin 2023-12-14 02:30:17 +00:00
  • ed05635852 邓洁 : 更换隧道icon dengj 2023-12-14 10:29:04 +08:00
  • fb9dfb37a2 唐润平：上线版,功能为待完善 trp 2023-12-14 10:26:29 +08:00
  • e95c24befe Merge pull request 'dev' (#115) from dev into master odjbin 2023-12-13 15:04:27 +00:00
  • 6912132e36 Merge pull request '邓洁 : 首屏修改' (#114) from dengjie into dev odjbin 2023-12-13 15:02:29 +00:00
  • ecead4aa09 邓洁 : 首屏修改 邓洁 2023-12-13 23:02:01 +08:00
  • 5823484bde Merge pull request 'dengjie' (#113) from dengjie into dev odjbin 2023-12-13 12:52:20 +00:00
  • bb94d4b2a8 Merge pull request '邓洁 : 修改细节' (#112) from dengjie into master odjbin 2023-12-13 12:51:46 +00:00
  • 0360c8c928 邓洁 : 修改细节 邓洁 2023-12-13 20:51:14 +08:00
  • 4043ec4704 Merge pull request 'dev' (#111) from dev into master odjbin 2023-12-13 12:49:50 +00:00
  • b13ba91442 Merge pull request '邓洁 : 弹窗雏形' (#110) from dengjie into dev odjbin 2023-12-13 12:49:38 +00:00
  • f7c9ceb631 邓洁 : 弹窗雏形 dengj 2023-12-13 17:39:31 +08:00
  • 1d2a5c4c42 Merge pull request 'dev' (#109) from dev into master odjbin 2023-12-13 09:01:19 +00:00
  • 76f9c64850 Merge pull request '邓洁 : 风机接口部分数据' (#108) from dengjie into dev odjbin 2023-12-13 08:58:37 +00:00
  • 43c5532866 邓洁 : 风机接口部分数据 dengj 2023-12-13 16:57:53 +08:00
  • a174713b29 Merge pull request '邓洁 : 大屏左侧变频器阀值判断' (#107) from dengjie into dev odjbin 2023-12-13 08:05:45 +00:00
  • 5e1eb2712f 邓洁 : 大屏左侧变频器阀值判断 dengj 2023-12-13 16:01:48 +08:00
  • 1605eb67a6 Merge pull request 'dev' (#106) from dev into master odjbin 2023-12-13 07:34:38 +00:00
  • d20e082eb6 Merge pull request '邓洁 : 大屏左侧接口对接' (#105) from dengjie into dev odjbin 2023-12-13 07:31:26 +00:00
  • 0dadb58f16 邓洁 : 大屏左侧接口对接 dengj 2023-12-13 15:28:58 +08:00
  • 52809c03be Merge pull request 'dengjie' (#104) from dengjie into dev odjbin 2023-12-13 05:16:06 +00:00
  • 0b0c5f22a1 邓洁 : 传感器接口对接 dengj 2023-12-13 13:13:33 +08:00
  • 2d1fbb27ca 邓洁 : 传感器接口对接 dengj 2023-12-13 12:52:59 +08:00
  • 241a031cc5 邓洁 : 首屏风压接口对接 dengj 2023-12-13 11:02:41 +08:00
  • 1af465a435 Merge pull request 'dev' (#103) from dev into master odjbin 2023-12-13 02:39:55 +00:00
  • df208e2d7a Merge pull request '邓洁 : 修改细节' (#102) from dengjie into dev odjbin 2023-12-13 02:37:55 +00:00
  • f188bdf574 邓洁 : 修改细节 邓洁 2023-12-13 10:37:13 +08:00
  • 54f9b63f48 Merge pull request 'dev' (#101) from dev into master odjbin 2023-12-13 02:29:48 +00:00
  • db89c75db5 Merge pull request 'dengjie' (#100) from dengjie into dev odjbin 2023-12-13 02:20:34 +00:00
  • 6de7384566 邓洁 : 合并代码 邓洁 2023-12-13 10:20:10 +08:00
  • 5243d89213 Merge remote-tracking branch 'origin/master' 邓洁 2023-12-13 09:58:17 +08:00
  • 944c727cc5 邓洁 : 风压风速接口 邓洁 2023-12-13 09:43:53 +08:00
  • e9dfbf149f Merge pull request 'dev' (#99) from dev into master odjbin 2023-12-13 00:26:53 +00:00
  • 0eed48dfda Merge pull request '解决变量问题' (#98) from LJ into dev liaojie 2023-12-12 16:38:35 +00:00
  • a93be12f0a 解决变量问题 Hcat1314 2023-12-13 00:35:56 +08:00
  • 1c421fbbd6 Merge pull request 'LJ' (#96) from LJ into dev liaojie 2023-12-12 16:25:59 +00:00
  • 45ac8aadf2 解决冲突 Hcat1314 2023-12-13 00:17:36 +08:00
  • 454ebd3d72 完成了下拉框 Hcat1314 2023-12-13 00:04:20 +08:00
  • d919252bc3 Merge pull request 'dev' (#93) from dev into master odjbin 2023-12-12 13:34:00 +00:00
  • bf36d8434d Merge pull request 'dengjie' (#92) from dengjie into dev odjbin 2023-12-12 13:33:44 +00:00
  • 16e68e8609 邓洁 : 修改站点管理样式 邓洁 2023-12-12 21:33:06 +08:00
  • 66ed4aaa81 Merge pull request 'dev' (#91) from dev into master odjbin 2023-12-12 09:34:20 +00:00
  • 7b499e901f Merge pull request '邓洁 : 修改样式' (#90) from dengjie into dev odjbin 2023-12-12 09:34:07 +00:00
  • c7d0f7c17e 邓洁 : 修改样式 dengj 2023-12-12 17:32:22 +08:00
  • ec373a568a Merge pull request 'master' (#89) from master into dev odjbin 2023-12-12 09:27:45 +00:00
  • 0ed985bf49 Merge pull request '邓洁 : 站点管理' (#88) from dengjie into master odjbin 2023-12-12 09:27:17 +00:00
  • 59e49eda5a 邓洁 : 站点管理 dengj 2023-12-12 17:26:49 +08:00
  • a0820989fc Merge pull request 'dev' (#87) from dev into master odjbin 2023-12-12 01:54:12 +00:00
  • 0cc53c1a61 Merge pull request 'dengjie' (#86) from dengjie into dev odjbin 2023-12-12 01:32:14 +00:00
  • 4e934637d2 邓洁 : 1 邓洁 2023-12-12 09:31:11 +08:00
  • 8f7d25a59e 邓洁 : 1 邓洁 2023-12-12 00:33:46 +08:00
  • bbe600a3bc 邓洁 : 站点管理查/改 邓洁 2023-12-12 00:32:40 +08:00
  • 54a4b0f6f7 Merge pull request 'dev' (#85) from dev into master odjbin 2023-12-11 16:15:05 +00:00