Commit Graph

Select branches

Hide Pull Requests

deploy-dev

main

temp

Mono Color

• 4205413418 fix:修改滑动块样式 zhaohy 2024-08-14 13:14:36 +08:00
• 2e1b1b8249 fix:修改页面路由 修改echats图 滑块样式 zhaohy 2024-08-14 09:55:56 +08:00
• 1f0eca56ae fix:修改告警总览 滑块样式 zhaohy 2024-08-14 09:24:30 +08:00
• f18dad74e7 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-13 17:30:33 +08:00
• b89794d8be fix:告警设置修改逻辑 zhaohy 2024-08-13 17:30:30 +08:00
• 7799bac74a 监控中心 - 能耗监测 表格字段居中 fks-yangshouda 2024-08-13 17:19:53 +08:00
• 3d9cf0d94c fix:逻辑调整 添加判断 字段显示 zhaohy 2024-08-13 17:16:38 +08:00
• 3b0c02666e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-13 16:21:55 +08:00
• c2fc3c4098 fix:根据UI修改页面 zhaohy 2024-08-13 16:21:50 +08:00
• 7bd8721e32 1.监控中心 - 设备监测  根据UI设计图进行页面优化 2.监控中心 - 能耗监测  根据UI设计图进行页面优化 3.监控中心 - 环境监测  修改bug，添加loading fks-yangshouda 2024-08-13 15:07:46 +08:00
• 56c903ca86 fix:修改页面 zhaohy 2024-08-13 14:49:11 +08:00
• 1a77df6442 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-13 14:43:34 +08:00
• 0ee511e23a fix:修改设备告警逻辑 zhaohy 2024-08-13 14:43:31 +08:00
• 790c8a3962 fix:照明系统设备点阵实现 / 电梯系统悬浮框样式修改 chenpingsen 2024-08-13 14:41:21 +08:00
• fb38527edf Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-13 14:16:39 +08:00
• f1952d7621 fix:修改联系人样式 zhaohy 2024-08-13 14:16:36 +08:00
• ed8d86ab8b 修改bug，优化页面UI fks-xuxinyue 2024-08-13 13:22:13 +08:00
• ca7b5bbede fix:根据ui修改样式 zhaohy 2024-08-13 11:09:06 +08:00
• 0e452ddef2 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-12 15:33:38 +08:00
• e7642fe14c fix:修改计划添加页面 根据ui修改页面 zhaohy 2024-08-12 15:33:23 +08:00
• 55ec21d41c add:照明系统素材/样式/交互修改 chenpingsen 2024-08-12 09:49:06 +08:00
• dbdf3da68a fix:修改计划添加页面 zhaohy 2024-08-12 09:42:01 +08:00
• e4c46d9da3 add:计划添加 zhaohy 2024-08-09 16:23:06 +08:00
• 2eeab1c5a9 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-09 15:44:12 +08:00
• 27732376b0 add:节日计划 zhaohy 2024-08-09 15:44:09 +08:00
• 93cf7ab9fa 修改测试问题 fks-xuxinyue 2024-08-09 15:22:36 +08:00
• cce83ee700 fix:群控系统>控制面板的样式和逻辑修改 chenpingsen 2024-08-09 09:09:57 +08:00
• 4395408f68 修改测试问题 fks-xuxinyue 2024-08-08 15:13:32 +08:00
• 7758049b28 fix:修改页面 添加 计划添加页面 zhaohy 2024-08-08 14:33:33 +08:00
• 5e5bb2f239 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp duyufeng 2024-08-07 16:04:08 +08:00
• 3672d6feb3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-07 15:28:02 +08:00
• 7e50064857 add:对接告警总览 zhaohy 2024-08-07 15:27:58 +08:00
• d583acfb2d 碳排分组设置前台页面 fks-yangshouda 2024-08-07 11:32:44 +08:00
• b079a2b464 taskId:282,remark:'commit' fks-xuxinyue 2024-08-07 10:28:29 +08:00
• 5d7bd5bb19 fix:新风系统 & 通风系统 样式调节/图像素材替换 chenpingsen 2024-08-07 09:27:10 +08:00
• f11a374baa Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-06 15:44:24 +08:00
• 16f3865dbd add:群控电梯系统 zhaohy 2024-08-06 15:44:21 +08:00
• 8b448e9061 “目录结构内容解释” duyufeng 2024-08-06 08:35:09 +08:00
• 5fb7235510 add:空调/照明群控系统交互逻辑增补 接口修改 chenpingsen 2024-08-05 17:28:54 +08:00
• 243aea92bb fix:通风系统 zhaohy 2024-08-05 15:23:28 +08:00
• 5d3eafa417 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-05 15:22:45 +08:00
• c6961fdfa8 add:通风系统功能 zhaohy 2024-08-05 15:22:42 +08:00
• 1990fd11e6 taskid:282,remark:'commit' fks-xuxinyue 2024-08-05 15:20:16 +08:00
• bb9be7b4e0 add:空调系统群控-对接新接口以及逻辑修改 chenpingsen 2024-08-02 16:28:35 +08:00
• ea25c22383 taskid:282 remark:'commit' fks-xuxinyue 2024-08-02 15:11:57 +08:00
• bab2e8def5 fix:修改新风系统弹窗 优化页面展示 zhaohy 2024-08-02 10:45:49 +08:00
• c0fa5ad9be Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-01 17:06:09 +08:00
• bb3c4f1961 add:群控 zhaohy 2024-08-01 17:06:05 +08:00
• e64a3123a2 taskId:280,remark:'commit' fks-xuxinyue 2024-08-01 17:05:29 +08:00
• deba7bddd8 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-08-01 10:34:41 +08:00
• 01fd569185 fix:新风系统 空调箱 zhaohy 2024-08-01 10:34:39 +08:00
• 8a81c3e784 add:增加一个插件引用 chenpingsen 2024-08-01 08:47:29 +08:00
• 55051da8a5 remark:'commit' fks-xuxinyue 2024-07-31 15:52:08 +08:00
• 75df2dfb11 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-31 15:13:39 +08:00
• 67a76481cc add:新风系统 zhaohy 2024-07-31 15:13:37 +08:00
• 3daeea7d3d 1.对接环境监测接口 2.开发环境监测-配置监测点位 2.修改监测中心多个时间筛选逻辑 fks-yangshouda 2024-07-31 14:04:01 +08:00
• d881ac0180 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-30 15:39:04 +08:00
• 9a1298987f fix:修改名称 zhaohy 2024-07-30 15:39:02 +08:00
• 99e2e803ef taskid:114 remark:'commit' fks-xuxinyue 2024-07-30 15:19:19 +08:00
• 180ad4a005 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-30 14:37:41 +08:00
• 05409722ae add:空调系统 zhaohy 2024-07-30 14:37:39 +08:00
• 1cf99afbc3 add:电梯系统新增 chenpingsen 2024-07-30 14:35:40 +08:00
• b55304ef7f fix:照明系统多选功能完善，引入全局变量projectId，部分交互逻辑修改 chenpingsen 2024-07-29 17:03:10 +08:00
• 16d7f81f0e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-29 16:57:42 +08:00
• 3841e2afdd fix:修改bug zhaohy 2024-07-29 16:57:37 +08:00
• 27de4ad24e taskid:111 remark:"commit" fks-xuxinyue 2024-07-29 15:13:30 +08:00
• 3783e9d0d3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-29 15:01:22 +08:00
• 7c1f120182 fix:修改网关告警页面展示 添加电动门 修改页面问题 zhaohy 2024-07-29 15:01:20 +08:00
• e14bd35fac add:照明系统接口与逻辑补充 chenpingsen 2024-07-26 15:15:32 +08:00
• 744aae1bba taskid:110 remark:'commit' fks-xuxinyue 2024-07-26 15:12:56 +08:00
• e05a813a1e fix: 保留选中treenode xuziqiang 2024-07-26 13:56:39 +08:00
• 008f73c706 fix: 节点名称修改长度 xuziqiang 2024-07-26 13:51:45 +08:00
• 6202151242 fix: 节点名称限制长度 deploy-dev xuziqiang 2024-07-26 13:44:40 +08:00
• 06ee0ec6a4 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-26 10:55:00 +08:00
• 979c15eda3 fix:修改组织id的bug zhaohy 2024-07-26 10:54:58 +08:00
• ad9a43a7c6 Merge branch 'temp' into deploy-dev xuziqiang 2024-07-25 15:54:40 +08:00
• 82b0f4cf96 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-25 15:54:17 +08:00
• bbed0e3ff3 fix: bug修改 xuziqiang 2024-07-25 15:54:15 +08:00
• 1790db4595 fix:修改枚举 zhaohy 2024-07-25 15:42:46 +08:00
• 8b40268bd1 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-25 15:39:35 +08:00
• 7aa949bdcf fix:修改枚举 添加数据隔离 zhaohy 2024-07-25 15:39:32 +08:00
• 61dcbfeacd 规范代码 fks-xuxinyue 2024-07-25 15:19:41 +08:00
• 6478070bd8 fix:获得所有枚举方法的请求方式修改 chenpingsen 2024-07-25 14:35:34 +08:00
• a1b3ee2c8c fix:全局枚举请求代码格式修改 chenpingsen 2024-07-25 14:33:49 +08:00
• dd7c417f81 碳排管理 代码规范 fks-xuxinyue 2024-07-25 14:18:37 +08:00
• a9e6998430 fix:电梯系统/照明系统 代码规范 chenpingsen 2024-07-25 14:14:55 +08:00
• 261ad9017d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-25 11:55:35 +08:00
• b8b6a46e7e fix:修改字段 对接设备告警 zhaohy 2024-07-25 11:55:32 +08:00
• ab29f9152d add:照明系统 提交数据功能 chenpingsen 2024-07-25 11:54:47 +08:00
• 2d96bbda3b taskid:099 remark:'commit' fks-xuxinyue 2024-07-24 15:17:34 +08:00
• 7869b083c3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-24 15:13:56 +08:00
• 9637a6f13b fix:修改设备告警 能源告警字段 对接 能碳告警 zhaohy 2024-07-24 15:13:50 +08:00
• ecf6cd38dd add:电梯系统静态页面 chenpingsen 2024-07-24 13:47:15 +08:00
• 84191fe301 add:照明系统修改 chenpingsen 2024-07-24 13:46:24 +08:00
• 7dadb22181 修改测试问题 fks-xuxinyue 2024-07-24 09:12:52 +08:00
• b396c37426 修改测试问题 fks-xuxinyue 2024-07-23 17:11:25 +08:00
• ee99ba7340 taskid:099 remark:'commit' fks-xuxinyue 2024-07-23 15:15:05 +08:00
• c628c10f25 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-yangshouda 2024-07-23 14:42:36 +08:00
• 79c56bb979 1.对接能耗监测接口 2.对接设备监测接口 3.修改设备监测表格序号列显示错误的bug fks-yangshouda 2024-07-23 14:42:17 +08:00
• 9ca6cb83f0 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-23 14:39:56 +08:00