Commit Graph

Select branches

Hide Pull Requests

deploy-dev

main

temp

Mono Color

• 0214356cbb Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-15 16:00:15 +08:00
• 098b4f29fd fix:配置设备告警 联系方式 zhaohy 2024-07-15 16:00:08 +08:00
• 3598e3d887 add:增加照明系统前端交互 chenpingsen 2024-07-15 15:56:31 +08:00
• 4869fd4d16 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-xuxinyue 2024-07-15 15:54:21 +08:00
• b41caf9320 taskid:084 remark:'commit' fks-xuxinyue 2024-07-15 15:54:07 +08:00
• 8603732377 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-15 15:53:55 +08:00
• 32d1a633b1 feat: 查询补充 xuziqiang 2024-07-15 15:53:54 +08:00
• 5deff41679 1.能耗监测 - 分析 下载图表 2.环境监测 - 综合数据 前台页面 fks-yangshouda 2024-07-15 15:38:28 +08:00
• 0681836c02 fix: 设备台账调整搜索 xuziqiang 2024-07-15 10:22:51 +08:00
• 4526da936e fix: 代码逻辑调整 xuziqiang 2024-07-12 17:39:31 +08:00
• c31b5468c7 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-12 17:17:33 +08:00
• e0206a228b feat: 分组管理批量分组，公式编辑 xuziqiang 2024-07-12 17:17:32 +08:00
• 7802223799 Merge branch 'temp' into deploy-dev wangyan 2024-07-12 17:07:16 +08:00
• 47614e12ed Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-xuxinyue 2024-07-12 17:06:35 +08:00
• d8cc8293bc taskid:083 remark:'commit' fks-xuxinyue 2024-07-12 17:06:23 +08:00
• 141f2a3e6f Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-yangshouda 2024-07-12 17:05:57 +08:00
• 4fcdae08de 能耗监测 分析 右侧图 fks-yangshouda 2024-07-12 17:05:41 +08:00
• 93d5959334 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-12 17:04:56 +08:00
• 042fc8f16f fix:能源告警配置 zhaohy 2024-07-12 17:04:51 +08:00
• 0282d2d1aa taskId:083 remark:'commit' fks-xuxinyue 2024-07-12 16:59:33 +08:00
• 97c3945848 add:增加两个用于获取枚举的公共方法 chenpingsen 2024-07-11 17:35:02 +08:00
• 37b877b220 1. 监控中心 - 能耗监测 - 分析 表格 前端页面 2. 监控中心 - 能耗监测 - 分析 图表 前台页面 fks-yangshouda 2024-07-11 17:29:23 +08:00
• 4dea1ff14d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-11 16:45:44 +08:00
• de7a0ab88a add:配置设备告警对接接口 对接告警配置 里面的数据来源 设备节点 zhaohy 2024-07-11 16:45:42 +08:00
• 533f0cc633 taskid:083 remark:commit fks-xuxinyue 2024-07-11 16:23:42 +08:00
• 0cac402bd1 fix:照明系统修改 chenpingsen 2024-07-11 16:20:15 +08:00
• e648da4b6e fix: 开启权限 xuziqiang 2024-07-11 15:55:25 +08:00
• 6137aaa4b6 fix: 修改同项目登录信息污染 xuziqiang 2024-07-11 15:53:41 +08:00
• 4d49ef4e42 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-11 11:55:53 +08:00
• 131913e52d fix: 调整验证码校验 xuziqiang 2024-07-11 11:55:52 +08:00
• 5ed7449392 taskId:083 remark:"commit" fks-xuxinyue 2024-07-11 09:17:20 +08:00
• a698c69b7c 设备中心 - 能耗监测 - 图表 左侧树和右侧组件联动 fks-yangshouda 2024-07-11 08:45:20 +08:00
• 5fde3175f1 fix: tree组件显示异常 xuziqiang 2024-07-10 15:17:14 +08:00
• 149f44a8dd feat: 调整树样式 xuziqiang 2024-07-10 14:51:42 +08:00
• 060ac6d486 taskid:067 remark:commit fks-xuxinyue 2024-07-10 11:01:46 +08:00
• 7b624f6549 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-09 18:04:10 +08:00
• 717b2aad72 feat: 分组管理设备树 xuziqiang 2024-07-09 18:04:09 +08:00
• f98a8be0b9 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-yangshouda 2024-07-09 17:35:59 +08:00
• de2202e360 1.监控中心 - 设备监测 对接接口 fks-yangshouda 2024-07-09 17:35:45 +08:00
• 6b93422b08 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-09 16:27:22 +08:00
• 30286253e7 feat: 分组管理 xuziqiang 2024-07-09 16:27:21 +08:00
• a0d928feaa 1.监控中心 - 设备监测 左侧树与右侧组件联动 2.对接设备类型接口 fks-yangshouda 2024-07-09 16:08:31 +08:00
• 50ca1daca4 add:对接设备告警 对接设备告警 设备类型 设备名称 设备点位 zhaohy 2024-07-09 15:56:18 +08:00
• fb1980d73a 1.设备监控 图表下载 时间选择改为三天 2.能耗监控 - 图表前台页面 fks-yangshouda 2024-07-09 10:10:17 +08:00
• ab17c4a1f9 fix: 获取字典数据方法 xuziqiang 2024-07-08 17:44:07 +08:00
• aab4c9a600 fix: 高度调整 xuziqiang 2024-07-08 17:32:10 +08:00
• 0855659d74 taskId:067 remark:"commit" fks-xuxinyue 2024-07-08 11:45:01 +08:00
• 3abdde797b fix: 还原工作组件 修改告警设置页面 zhaohy 2024-07-08 11:24:24 +08:00
• d004a06ec1 fix:修改样式 zhaohy 2024-07-08 10:53:27 +08:00
• 76248c0f70 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-yangshouda 2024-07-08 10:42:46 +08:00
• 6e294e13eb 注释环境监测路由 fks-yangshouda 2024-07-08 10:42:35 +08:00
• 7a9bea2f8e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-08 10:40:28 +08:00
• 77052ae284 fix:还原工作组件 zhaohy 2024-07-08 10:40:26 +08:00
• 33eb153885 add:照明系统页面修改/修改中 chenpingsen 2024-07-08 10:34:43 +08:00
• a3a5b63ea5 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 28723 2024-07-08 10:32:55 +08:00
• 7a20eb8603 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp chenpingsen 2024-07-08 10:19:53 +08:00
• dc29be2718 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 28723 2024-07-08 10:13:13 +08:00
• f28b224c91 taskId:067 remark:"commit" 28723 2024-07-08 10:13:07 +08:00
• bfd6282a99 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-yangshouda 2024-07-08 10:09:33 +08:00
• 64cfd47d50 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 28723 2024-07-08 10:05:22 +08:00
• 796d2fcf63 碳排因子库页面代码提交 28723 2024-07-08 10:04:04 +08:00
• 287dc9262b * add: 添加监控中心-设备监测页面 fks-yangshouda 2024-07-08 10:03:22 +08:00
• f39fb299c4 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-08 10:02:30 +08:00
• 9ad9446cae add:照明系统样式 chenpingsen 2024-07-08 10:02:05 +08:00
• 1d4b76492d 碳排因子库页面 28723 2024-07-08 09:48:44 +08:00
• a16b26370f add:添加告警管理内容 告警统揽和告警设置 修改公共组件 适配多种情况 zhaohy 2024-07-08 08:24:18 +08:00
• 9316629faa fix: 登录校验调整 main xuziqiang 2024-07-05 18:19:03 +08:00
• c7bbc1f003 fix: 角色新增同级 xuziqiang 2024-07-05 17:36:24 +08:00
• da80693704 fix: bug修改 xuziqiang 2024-07-05 17:29:34 +08:00
• 40d93e74aa fix: bug修改 xuziqiang 2024-07-05 17:26:31 +08:00
• b2a200486f fix: hx-op路由调整 xuziqiang 2024-07-05 14:12:53 +08:00
• 228f420bd4 fix: 项目图标调整 xuziqiang 2024-07-05 13:51:28 +08:00
• 78d49ff16e fix: 设备联调 xuziqiang 2024-07-05 12:04:17 +08:00
• 4bbb5c5133 fix: 组件调整 xuziqiang 2024-07-04 11:19:38 +08:00
• d294c3f07a feat: 设备台账联调 xuziqiang 2024-07-03 18:08:02 +08:00
• fba16c75b9 feat: 设备台账联调 xuziqiang 2024-07-03 18:07:52 +08:00
• e5cd75c845 feat: 设备台账联调 xuziqiang 2024-07-03 17:58:39 +08:00
• be09e531b9 fix：调整路由 xuziqiang 2024-07-03 10:50:16 +08:00
• 45908dd5c1 fix: 部门角色编辑调整 xuziqiang 2024-07-02 14:52:12 +08:00
• 7fd1733872 fix: remove useless console xuziqiang 2024-07-01 16:37:37 +08:00
• 2d9fc62d86 feat: 解决批量删除之后选中数据清除问题 xuziqiang 2024-07-01 16:04:12 +08:00
• 7eb8ba79f8 feat: 树loading样式调整 xuziqiang 2024-07-01 15:03:45 +08:00
• ef782e90b6 feat: ns-tree-api补充粘性定位 xuziqiang 2024-06-28 16:46:07 +08:00
• 46398fda22 fix: 抽离接口异常code xuziqiang 2024-06-28 16:07:37 +08:00
• edfc11825d feat: 补充全局自定义权限指令 xuziqiang 2024-06-28 14:49:40 +08:00
• 9f1620c9f8 fix: 调整placeholder xuziqiang 2024-06-28 11:45:29 +08:00
• 9ddeaa59eb fix: childform 警告调整 xuziqiang 2024-06-27 17:08:58 +08:00
• 8f25d2293c feat: 分组切换 xuziqiang 2024-06-27 15:21:14 +08:00
• 7c64a6b231 fix: 修改tag右键操作异常 xuziqiang 2024-06-27 14:27:04 +08:00
• d6865544d8 fix: 补充超出滚动 xuziqiang 2024-06-27 10:59:05 +08:00
• 3d2d777644 fix: bug修复 xuziqiang 2024-06-26 16:57:42 +08:00
• 613e7feaf4 fix: 样式细节调整 xuziqiang 2024-06-26 14:58:23 +08:00
• b55ab2353e feat: 部门样式调整 xuziqiang 2024-06-26 10:32:45 +08:00
• d654588e65 feat: 用户管理样式调整 xuziqiang 2024-06-25 14:52:13 +08:00
• 15fce86265 feat: form 组件样式调整 xuziqiang 2024-06-25 11:21:35 +08:00
• cecd3a0325 feat；sider样式补充 xuziqiang 2024-06-24 15:24:21 +08:00
• 0c291263cd feat: 样式调整 xuziqiang 2024-06-21 18:15:32 +08:00
• d4f17c4c02 feat: 树搜索调整 xuziqiang 2024-06-21 15:56:21 +08:00
• e16ad610e7 feat: table cancel sticky xuziqiang 2024-06-21 15:45:35 +08:00
• fea7abd476 feat: 样式调整 xuziqiang 2024-06-21 15:19:28 +08:00