Commit Graph

Select branches

Hide Pull Requests

deploy-dev

main

temp

Mono Color

• 36575339c5 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp temp zhaohy 2024-09-03 17:30:29 +08:00
• 4145353928 fix:修改单位 zhaohy 2024-09-03 17:30:26 +08:00
• 3d08f22562 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-xuxinyue 2024-09-03 17:25:17 +08:00
• c2ff0238d9 优化echarts fks-xuxinyue 2024-09-03 17:25:06 +08:00
• 8ec8bcd494 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-03 17:25:05 +08:00
• 308fa1e14f fix:修改单位 zhaohy 2024-09-03 17:25:01 +08:00
• 75dbd0641e 优化碳排管理 fks-xuxinyue 2024-09-03 17:23:47 +08:00
• 190ec589ce 监控中心添加loading fks-yangshouda 2024-09-03 17:22:50 +08:00
• 360ec9e6e8 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-03 17:21:55 +08:00
• 91b0ca9fb8 fix:修改单位 zhaohy 2024-09-03 17:21:52 +08:00
• 87243b212d 修改组件 fks-xuxinyue 2024-09-03 17:04:29 +08:00
• bbb77faa8a Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-yangshouda 2024-09-03 17:02:44 +08:00
• 2a8eeb657c Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-yangshouda 2024-09-03 17:02:25 +08:00
• 3fa3655200 修改监控中心样式 fks-yangshouda 2024-09-03 17:02:14 +08:00
• 7a7e2bb968 fix:群控系统弹出框样式调整 chenpingsen 2024-09-03 17:02:13 +08:00
• 117db1c400 对碳排管理进行优化 fks-xuxinyue 2024-09-03 17:01:10 +08:00
• 0c822e6d29 修改监控中心样式 fks-yangshouda 2024-09-03 15:46:57 +08:00
• 0b9ae9dcd3 fix:样式修改 chenpingsen 2024-09-03 15:45:44 +08:00
• e4d54f411a fix:修改位置信息 zhaohy 2024-09-03 15:39:44 +08:00
• 3a4f4505dc fix:修改图片位置 zhaohy 2024-09-03 15:37:44 +08:00
• 6b03be0119 fix:修改告警设置问题 zhaohy 2024-09-03 14:52:43 +08:00
• 0698847543 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-03 14:45:08 +08:00
• 7c09cbc83b fix:修改公共组件树为255px zhaohy 2024-09-03 14:45:05 +08:00
• a648d043ee 修改监控中心前台样式 修改分组管理前台样式 fks-yangshouda 2024-09-03 14:26:26 +08:00
• 7eae05f6fb Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-03 13:39:36 +08:00
• d94a29e9de fix:修改table鼠标指上颜色 zhaohy 2024-09-03 13:39:25 +08:00
• 378baaefe2 fix:空调、照明系统背景图&点阵修改 样式补充 图像素材补充 通风系统增加电动窗效果 chenpingsen 2024-09-03 13:27:13 +08:00
• 758a5718de fix:修改查询标题与底部距离 zhaohy 2024-09-03 11:56:11 +08:00
• 1d7eee538f fix:修改按钮排不开问题 zhaohy 2024-09-03 11:44:54 +08:00
• cc80c3155a fix:超出两行显示省略号 zhaohy 2024-09-03 09:48:24 +08:00
• 7096e692ee fix:修改表格宽度 zhaohy 2024-09-03 09:44:00 +08:00
• f4d7076a08 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-03 09:13:42 +08:00
• a28c331c10 fix:修改table zhaohy 2024-09-03 09:13:38 +08:00
• c4548fc81d 优化碳排管理 fks-xuxinyue 2024-09-02 17:30:19 +08:00
• a0809e12f0 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-02 16:24:11 +08:00
• ba778bc0cf fix:修改收起 展示图标颜色 zhaohy 2024-09-02 16:24:08 +08:00
• c9b67317a3 修改 监控中心 树结构滚动条样式 fks-yangshouda 2024-09-02 16:23:21 +08:00
• b41ac8dcbe Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-02 16:03:51 +08:00
• 0627ba2cb2 fix:告警管理ui调整 zhaohy 2024-09-02 16:03:47 +08:00
• 88a8837876 优化监控中心前台样式 fks-yangshouda 2024-09-02 15:49:37 +08:00
• 3aca13f9bb fix:修改参数为空判断 zhaohy 2024-09-02 15:22:34 +08:00
• 52fa3ff491 fix:修改页面 zhaohy 2024-09-02 15:16:45 +08:00
• 5ddc013f38 fix:修改公共组件位置 zhaohy 2024-09-02 15:13:02 +08:00
• 9124c37650 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-02 14:40:56 +08:00
• 0e632c962a fix:修改冷热源样式 zhaohy 2024-09-02 14:40:51 +08:00
• b54a785891 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp duyufeng 2024-09-02 14:26:54 +08:00
• 228f13d037 密码加密暂时屏蔽 duyufeng 2024-09-02 14:26:41 +08:00
• cd112d5981 fix:按照ui修改新风系统 zhaohy 2024-09-02 14:22:35 +08:00
• 63a5c3ff0e fix:修改页面样式 字段 zhaohy 2024-09-02 14:05:59 +08:00
• 01745cea42 系统菜单编辑优化 duyufeng 2024-09-02 13:57:05 +08:00
• 572cdc60b3 系统菜单添加编辑时增加防重复点击 duyufeng 2024-09-02 13:41:32 +08:00
• ed7194e253 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-09-02 11:31:19 +08:00
• 6851afdee6 fix:按照需要修改样式 zhaohy 2024-09-02 11:31:15 +08:00
• e8253be8ca 登录接口参数加密 duyufeng 2024-09-02 11:04:43 +08:00
• 0cb7edaa7e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-xuxinyue 2024-08-30 17:23:27 +08:00
• c6b4895b67 根据文档进行优化 fks-xuxinyue 2024-08-30 17:23:14 +08:00
• 84ed95512f 修改监控中心样式 修改分组管理样式 fks-yangshouda 2024-08-30 17:22:49 +08:00
• b36081126f 根据文档优化 fks-xuxinyue 2024-08-30 15:27:54 +08:00
• 93f2869a5b fix:字段修改/交互逻辑修改 chenpingsen 2024-08-30 14:03:31 +08:00
• f8eda43169 fix:返回按钮样式 zhaohy 2024-08-30 11:58:16 +08:00
• 1102e8ac3a fix:修改状态间距 zhaohy 2024-08-30 11:54:48 +08:00
• dc3d0a59ba fix:修改展示 zhaohy 2024-08-30 11:48:37 +08:00
• 915358dbec fix:修改计划添加问题 zhaohy 2024-08-30 11:38:11 +08:00
• a7400bae18 fix:修改告警总览样式问题 zhaohy 2024-08-30 11:34:06 +08:00
• 0db717594d fix:修改计划添加 zhaohy 2024-08-30 11:19:00 +08:00
• cfba387285 优化 fks-xuxinyue 2024-08-30 11:12:06 +08:00
• 15e6e51f1b fix:修改告警总览字体 zhaohy 2024-08-30 11:10:45 +08:00
• 0c146d17ca fix:删除多余文件 zhaohy 2024-08-30 10:48:29 +08:00
• e1ea9e56cd Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-30 10:31:44 +08:00
• 12a9040ee5 fix:修改页面错误 zhaohy 2024-08-30 10:31:40 +08:00
• d1189bcae9 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp duyufeng 2024-08-30 10:28:44 +08:00
• 699754c902 菜单动态路由及头部角色切换修改 duyufeng 2024-08-30 10:25:42 +08:00
• 6ba03df551 根据文档进行优化 fks-xuxinyue 2024-08-29 17:27:01 +08:00
• 474d0cd916 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-29 17:06:13 +08:00
• 695ec5f4a0 fix:冷热源对接接口 直接展示图片 zhaohy 2024-08-29 17:06:10 +08:00
• 3cf535351e add:新增给排水页面/接口及功能 chenpingsen 2024-08-29 16:05:58 +08:00
• ffd7be94f6 fix:部分原有功能的属性补充 chenpingsen 2024-08-29 16:04:10 +08:00
• 5803e3cdd9 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-29 15:41:56 +08:00
• 1051e09a7c fix:冷热源对接接口 zhaohy 2024-08-29 15:41:52 +08:00
• 583347ba70 监控中心各页面导出表格 fks-yangshouda 2024-08-29 15:26:37 +08:00
• c76dcaa7c5 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp duyufeng 2024-08-29 08:31:51 +08:00
• ce97741978 1. 新增 监控中心 - 环境监测 - 历史数据 导出功能 2. 新增 监控中心 - 环境监测 - 平均数据 导出功能 3. 修改 分组管理 左侧树图表 fks-yangshouda 2024-08-28 17:38:27 +08:00
• 06e0ec7425 修改测试问题及优化项 fks-xuxinyue 2024-08-28 17:34:54 +08:00
• c21a79da87 fix:修改计划添加页面 zhaohy 2024-08-28 17:33:53 +08:00
• d31cc213cb 冲突的一个文件修改 duyufeng 2024-08-28 17:13:49 +08:00
• ef6f59a1c6 op端服务操作权限树不选择时传值全部变成空值bug修改 duyufeng 2024-08-28 17:04:21 +08:00
• cac9355b04 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-28 14:48:39 +08:00
• fad5398292 add:冷热源静态页面 zhaohy 2024-08-28 14:48:35 +08:00
• 06706da713 add:注释内容修改 / 增加给排水图片素材 chenpingsen 2024-08-28 09:24:22 +08:00
• 029d665c0f op端企业管理服务权限树修改 duyufeng 2024-08-28 08:57:32 +08:00
• e07cfd4664 1.修改 监控中心 - 环境监测 - 配置监测点位 表格字段显示样式 2.新增 监控中心 - 环境监测 - 历史数据 导出功能 fks-yangshouda 2024-08-28 08:45:34 +08:00
• 440b43ba42 修改测试问题 fks-xuxinyue 2024-08-27 17:32:31 +08:00
• 30a76a5cc3 1.修改 设备管理 - 分组管理 页面 2.修改 监控中心 - 能耗监测 初始化时间bug fks-yangshouda 2024-08-27 13:53:56 +08:00
• 15811933c3 优化碳排管理 fks-xuxinyue 2024-08-26 16:12:26 +08:00
• 6695790805 fix:修改新风系统 zhaohy 2024-08-26 15:35:34 +08:00
• 81fc1ed71a Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-26 15:12:26 +08:00
• 2524367eb5 fix:新风系统范围 zhaohy 2024-08-26 15:12:22 +08:00
• 968bade95e fix:通风系统抽屉控制面板改进 chenpingsen 2024-08-26 11:53:26 +08:00
• 169ee2f432 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp duyufeng 2024-08-26 11:39:57 +08:00
• 32706e348e fix:修改新风系统范围 zhaohy 2024-08-26 11:37:06 +08:00