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

Commit Graph

  • 9afb0f7f28 Merge pull request '邓洁: 修改用电量' (#185) from dengjie into dev odjbin 2023-12-24 10:09:07 +00:00
  • 73a8e809d9 邓洁: 修改用电量 邓洁 2023-12-24 18:08:09 +08:00
  • bd25780f46 Merge pull request 'LJ' (#183) from LJ into dev liaojie 2023-12-23 07:16:20 +00:00
  • c27f1a5652 廖杰：风压阀动态添加墙壁功能大致完成 Hcat 2023-12-23 15:13:44 +08:00
  • 7684e21d33 分压阀功能大致完成 Hcat 2023-12-23 14:56:04 +08:00
  • 7e5f00e0cf Merge pull request '邓洁: 用电量框样式' (#182) from dengjie into dev odjbin 2023-12-23 04:23:31 +00:00
  • 94db596da6 邓洁: 用电量框样式 邓洁 2023-12-23 12:23:08 +08:00
  • 6e58ac3d65 Merge pull request '邓洁: 分流器设备管理样式' (#181) from dengjie into dev odjbin 2023-12-22 16:00:51 +00:00
  • 06b12297d1 邓洁: 分流器设备管理样式 邓洁 2023-12-22 23:59:51 +08:00
  • a2d64b6538 Merge pull request 'dengjie' (#180) from dengjie into dev odjbin 2023-12-22 15:37:03 +00:00
  • 5b2441d585 邓洁: 修改左侧布局 邓洁 2023-12-22 23:36:02 +08:00
  • e2b1ef3845 邓洁: 传感器数据监控 邓洁 2023-12-22 23:33:48 +08:00
  • 267ef35001 Merge remote-tracking branch 'origin/dev' into dev 邓洁 2023-12-22 23:11:15 +08:00
  • 56f954e354 邓洁: 用户管理接口 邓洁 2023-12-22 23:11:01 +08:00
  • 6fa0de9886 Merge pull request 'LJ' (#179) from LJ into dev liaojie 2023-12-22 10:10:02 +00:00
  • 73fc7557a7 初始化接口对齐了 Hcat 2023-12-22 18:08:59 +08:00
  • 2eeba5ee7e 初始化接口绑定完全完成 Hcat 2023-12-22 18:04:05 +08:00
  • fb3a060010 Merge pull request 'dengjie' (#177) from dengjie into dev odjbin 2023-12-22 08:09:25 +00:00
  • 1cb5c6c258 邓洁: 合并代码 邓洁 2023-12-22 16:08:49 +08:00
  • b090604c70 Merge remote-tracking branch 'origin/dev' into dev 邓洁 2023-12-22 16:08:34 +08:00
  • 43c4aaa21d 邓洁: 完善首页数据 邓洁 2023-12-22 16:07:06 +08:00
  • 6e8d651b52 更新 Hcat 2023-12-22 15:50:14 +08:00
  • ffcaa5b715 Merge pull request 'LJ' (#176) from LJ into dev liaojie 2023-12-22 07:00:01 +00:00
  • 65510ce59d 合并 Hcat 2023-12-22 14:55:05 +08:00
  • 68d121091f 修改初始化 Hcat 2023-12-22 13:56:41 +08:00
  • efa6d5b8c1 更新一点点 Hcat 2023-12-22 13:40:46 +08:00
  • 3907f39b7f Merge pull request '邓洁: 修改首页风机样式' (#175) from dengjie into dev odjbin 2023-12-21 12:13:37 +00:00
  • f178bc80cd 邓洁: 修改首页风机样式 邓洁 2023-12-21 20:13:11 +08:00
  • 9d90ad9dd1 Merge pull request '邓洁: 站点接口及修改细节' (#174) from dengjie into dev odjbin 2023-12-20 13:25:14 +00:00
  • 30384547af 邓洁: 站点接口及修改细节 邓洁 2023-12-20 21:24:52 +08:00
  • a404f99385 Merge pull request '邓洁 : 修改隧道管理鼠标悬浮背景及跳转' (#173) from dengjie into dev odjbin 2023-12-20 09:54:36 +00:00
  • fdf4f79445 邓洁 : 修改隧道管理鼠标悬浮背景及跳转 dengj 2023-12-20 17:49:55 +08:00
  • 45387294d1 Merge pull request '解决alert' (#172) from LJ into dev liaojie 2023-12-20 09:26:26 +00:00
  • 12a76a5af0 解决alert Hcat1314 2023-12-20 17:25:33 +08:00
  • c1cae50edc Merge pull request '冲突修复' (#171) from LJ into dev liaojie 2023-12-20 04:56:22 +00:00
  • 0e16b255dd 冲突修复 Hcat1314 2023-12-20 12:55:35 +08:00
  • b1033ba03b Merge pull request 'LJ' (#170) from LJ into dev liaojie 2023-12-20 04:45:06 +00:00
  • a850d9af78 预览模式和编辑模式大致完成 Hcat1314 2023-12-20 12:21:42 +08:00
  • 0341e93686 优化promise+第一次进入模型不加载 Hcat1314 2023-12-19 10:12:07 +08:00
  • 7314add404 Merge pull request 'dev' (#169) from dev into master odjbin 2023-12-18 15:24:18 +00:00
  • 3558d6830f Merge pull request '邓洁: 用户管理修改细节' (#168) from dengjie into dev odjbin 2023-12-18 15:23:55 +00:00
  • e828ded44f 邓洁: 用户管理修改细节 邓洁 2023-12-18 23:23:27 +08:00
  • eef2986d1c Merge pull request '邓洁: 用户管理及全选功能字体更改' (#167) from dengjie into dev odjbin 2023-12-18 15:05:57 +00:00
  • e4fada8d75 邓洁: 用户管理及全选功能字体更改 邓洁 2023-12-18 23:04:20 +08:00
  • 75a24b31d1 Merge pull request 'dengjie' (#166) from dengjie into dev odjbin 2023-12-18 10:03:03 +00:00
  • ccdf5cc8e9 邓洁 : 用户管理雏形及checkbox样式更改 dengj 2023-12-18 18:02:17 +08:00
  • 1c9c3c3e4f 邓洁 : 切换站点样式更改 dengj 2023-12-18 16:17:45 +08:00
  • c018e50062 Merge pull request '邓洁 : 修复有害气体弹窗问题' (#165) from dengjie into dev odjbin 2023-12-18 07:11:54 +00:00
  • 3457084db9 邓洁 : 修复有害气体弹窗问题 dengj 2023-12-18 15:10:28 +08:00
  • aa56be825e Merge pull request '邓洁 : 有害气体echarts数据,切换站点与隧道数据渲染' (#164) from dengjie into dev odjbin 2023-12-18 06:39:22 +00:00
  • 24c54caca7 邓洁 : 有害气体echarts数据,切换站点与隧道数据渲染 dengj 2023-12-18 14:38:40 +08:00
  • 61261eeee1 Merge pull request '邓洁: 切换隧道,数据渲染' (#163) from dengjie into dev odjbin 2023-12-18 05:33:25 +00:00
  • d883e56771 邓洁: 切换隧道,数据渲染 邓洁 2023-12-18 13:32:11 +08:00
  • 39e33b1de3 Merge pull request '邓洁: 切换隧道,数据渲染' (#162) from dengjie into dev odjbin 2023-12-18 04:07:59 +00:00
  • 8304eaa726 邓洁: 切换隧道,数据渲染 邓洁 2023-12-18 12:07:36 +08:00
  • 02bfcc068b Merge pull request '邓洁: 登录框大小' (#161) from dengjie into dev odjbin 2023-12-18 03:09:57 +00:00
  • c9c0c88b3e 邓洁: 登录框大小 邓洁 2023-12-18 11:09:24 +08:00
  • 692acee3a7 Merge pull request '邓洁 : 弹窗提示框样式' (#160) from dengjie into dev odjbin 2023-12-18 02:47:58 +00:00
  • 48d2004472 邓洁 : 弹窗提示框样式 dengj 2023-12-18 10:46:55 +08:00
  • 806c0b1db5 Merge pull request '邓洁 : 修改弹窗缩放' (#159) from dengjie into dev odjbin 2023-12-17 16:33:37 +00:00
  • e8cd871447 邓洁 : 修改弹窗缩放 邓洁 2023-12-18 00:33:07 +08:00
  • ecfca1e0a0 Merge pull request '邓洁 : 修改弹窗x大小' (#158) from dengjie into dev odjbin 2023-12-17 15:28:47 +00:00
  • f996b35a64 邓洁 : 修改弹窗x大小 邓洁 2023-12-17 23:28:25 +08:00
  • 144c2175e2 Merge pull request '邓洁 : 修改细节' (#157) from dengjie into dev odjbin 2023-12-17 15:21:45 +00:00
  • a5e2df0deb 邓洁 : 修改细节 邓洁 2023-12-17 23:21:21 +08:00
  • c0c9248e78 Merge pull request 'LJ' (#156) from LJ into dev liaojie 2023-12-17 14:02:56 +00:00
  • 8b7dae11af Merge branch 'dev' into LJ liaojie 2023-12-17 13:58:12 +00:00
  • bfccd7a0a9 Merge pull request '邓洁 : 站点静态数据' (#154) from dengjie into dev odjbin 2023-12-17 13:56:57 +00:00
  • f4d2eaeaa0 邓洁 : 站点静态数据 邓洁 2023-12-17 21:56:29 +08:00
  • d769d353be 加了路由，简单预览模式实现 Hcat1314 2023-12-17 21:55:54 +08:00
  • 1c3243bf7b Merge pull request 'dengjie' (#153) from dengjie into dev odjbin 2023-12-17 13:27:58 +00:00
  • 0d53e11ceb 邓洁 : 页面调整 邓洁 2023-12-17 21:25:17 +08:00
  • a472bfe1d4 Merge remote-tracking branch 'origin/dev' into dev 邓洁 2023-12-17 21:18:49 +08:00
  • b81aeedf4c Merge pull request 'LJ' (#152) from LJ into dev liaojie 2023-12-17 10:36:22 +00:00
  • ca51f5d789 合并dev Hcat1314 2023-12-17 18:32:13 +08:00
  • 946fe551a1 初始化功能大致完成 Hcat1314 2023-12-17 18:20:07 +08:00
  • fe61dd717e Merge pull request '邓洁 : 修改监控数据弹窗' (#151) from dengjie into dev odjbin 2023-12-16 18:48:07 +00:00
  • 8834134664 Merge remote-tracking branch 'origin/dev' into dev 邓洁 2023-12-17 02:47:48 +08:00
  • c25aaa9ec8 邓洁 : 修改监控数据弹窗 邓洁 2023-12-17 02:47:11 +08:00
  • 4057623133 Merge pull request '邓洁 : 大屏信息接口对接' (#150) from dengjie into dev odjbin 2023-12-16 17:47:34 +00:00
  • 2d413876d4 邓洁 : 大屏信息接口对接 邓洁 2023-12-17 01:47:13 +08:00
  • 907f4cc220 初始化功能还在做 Hcat1314 2023-12-17 00:25:10 +08:00
  • 13e232d6f6 Merge pull request '邓洁 : 设备管理及修复' (#149) from dengjie into dev odjbin 2023-12-16 15:38:40 +00:00
  • 1a934eaf7e 邓洁 : 设备管理及修复 邓洁 2023-12-16 23:38:13 +08:00
  • fdecc480ec Merge pull request 'trp_dev' (#148) from trp_dev into dev trp-ironman 2023-12-16 09:36:23 +00:00
  • 8c0b322cf4 唐润平：增加和删除后的提示信息框-提交 trp 2023-12-16 17:34:57 +08:00
  • 5a29a9d445 Merge branch 'dev' into trp_dev trp 2023-12-16 17:29:58 +08:00
  • b2422e5899 唐润平：增加和删除后的提示信息框 trp 2023-12-16 17:28:18 +08:00
  • a88ac35221 Merge pull request 'dev' (#147) from dev into master odjbin 2023-12-16 08:35:10 +00:00
  • da34dbb986 Merge pull request 'dengjie' (#146) from dengjie into dev odjbin 2023-12-16 08:34:55 +00:00
  • 0c45d3df93 邓洁 : 设备管理雏形 邓洁 2023-12-16 16:34:30 +08:00
  • d0d907f91a Merge remote-tracking branch 'origin/dev' into dev 邓洁 2023-12-16 16:34:01 +08:00
  • a45afb9e6f 邓洁 : 设备管理雏形 邓洁 2023-12-16 16:33:54 +08:00
  • 0e781957af Merge pull request '唐润平：风机旋转' (#145) from trp_dev into dev trp-ironman 2023-12-16 08:04:57 +00:00
  • 236ed18fd5 唐润平：风机旋转 trp 2023-12-16 16:00:04 +08:00
  • 3e69f20271 Merge pull request '邓洁 : 修改下拉框样式' (#144) from dengjie into dev odjbin 2023-12-16 07:21:17 +00:00
  • e8ac21d5be 邓洁 : 修改下拉框样式 邓洁 2023-12-16 15:20:49 +08:00
  • ae7d15d22b Merge pull request 'trp_dev' (#143) from trp_dev into dev trp-ironman 2023-12-15 20:32:38 +00:00
  • 9ff76d31db 唐润平: 传感器添加删除、标签文字设置、双击进入视角、双击空白回退视角、角度和缩放限制、细节修改 trp 2023-12-16 04:30:44 +08:00
  • d322949598 唐润平: 传感器添加删除、标签文字设置、双击进入视角、双击空白回退视角-提交 trp 2023-12-16 04:08:02 +08:00