Commit Graph

340 Commits

Author SHA1 Message Date
fks-yangshouda
3daeea7d3d 1.对接环境监测接口
2.开发环境监测-配置监测点位
2.修改监测中心多个时间筛选逻辑
2024-07-31 14:04:01 +08:00
zhaohy
d881ac0180 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-30 15:39:04 +08:00
zhaohy
9a1298987f fix:修改名称 2024-07-30 15:39:02 +08:00
fks-xuxinyue
99e2e803ef taskid:114 remark:'commit' 2024-07-30 15:19:19 +08:00
zhaohy
180ad4a005 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-30 14:37:41 +08:00
zhaohy
05409722ae add:空调系统 2024-07-30 14:37:39 +08:00
chenpingsen
1cf99afbc3 add:电梯系统新增 2024-07-30 14:35:40 +08:00
chenpingsen
b55304ef7f fix:照明系统多选功能完善,引入全局变量projectId,部分交互逻辑修改 2024-07-29 17:03:10 +08:00
zhaohy
16d7f81f0e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-29 16:57:42 +08:00
zhaohy
3841e2afdd fix:修改bug 2024-07-29 16:57:37 +08:00
fks-xuxinyue
27de4ad24e taskid:111 remark:"commit" 2024-07-29 15:13:30 +08:00
zhaohy
3783e9d0d3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-29 15:01:22 +08:00
zhaohy
7c1f120182 fix:修改网关告警页面展示 添加电动门 修改页面问题 2024-07-29 15:01:20 +08:00
chenpingsen
e14bd35fac add:照明系统接口与逻辑补充 2024-07-26 15:15:32 +08:00
fks-xuxinyue
744aae1bba taskid:110 remark:'commit' 2024-07-26 15:12:56 +08:00
xuziqiang
e05a813a1e fix: 保留选中treenode 2024-07-26 13:56:39 +08:00
xuziqiang
008f73c706 fix: 节点名称修改长度 2024-07-26 13:51:45 +08:00
zhaohy
06ee0ec6a4 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-26 10:55:00 +08:00
zhaohy
979c15eda3 fix:修改组织id的bug 2024-07-26 10:54:58 +08:00
xuziqiang
82b0f4cf96 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-25 15:54:17 +08:00
xuziqiang
bbed0e3ff3 fix: bug修改 2024-07-25 15:54:15 +08:00
zhaohy
1790db4595 fix:修改枚举 2024-07-25 15:42:46 +08:00
zhaohy
8b40268bd1 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-25 15:39:35 +08:00
zhaohy
7aa949bdcf fix:修改枚举 添加数据隔离 2024-07-25 15:39:32 +08:00
fks-xuxinyue
61dcbfeacd 规范代码 2024-07-25 15:19:41 +08:00
chenpingsen
6478070bd8 fix:获得所有枚举方法的请求方式修改 2024-07-25 14:35:34 +08:00
chenpingsen
a1b3ee2c8c fix:全局枚举请求代码格式修改 2024-07-25 14:33:49 +08:00
fks-xuxinyue
dd7c417f81 碳排管理 代码规范 2024-07-25 14:18:37 +08:00
chenpingsen
a9e6998430 fix:电梯系统/照明系统 代码规范 2024-07-25 14:14:55 +08:00
zhaohy
261ad9017d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-25 11:55:35 +08:00
zhaohy
b8b6a46e7e fix:修改字段 对接设备告警 2024-07-25 11:55:32 +08:00
chenpingsen
ab29f9152d add:照明系统 提交数据功能 2024-07-25 11:54:47 +08:00
fks-xuxinyue
2d96bbda3b taskid:099 remark:'commit' 2024-07-24 15:17:34 +08:00
zhaohy
7869b083c3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-24 15:13:56 +08:00
zhaohy
9637a6f13b fix:修改设备告警 能源告警字段 对接 能碳告警 2024-07-24 15:13:50 +08:00
chenpingsen
ecf6cd38dd add:电梯系统静态页面 2024-07-24 13:47:15 +08:00
chenpingsen
84191fe301 add:照明系统修改 2024-07-24 13:46:24 +08:00
fks-xuxinyue
7dadb22181 修改测试问题 2024-07-24 09:12:52 +08:00
fks-xuxinyue
b396c37426 修改测试问题 2024-07-23 17:11:25 +08:00
fks-xuxinyue
ee99ba7340 taskid:099 remark:'commit' 2024-07-23 15:15:05 +08:00
fks-yangshouda
c628c10f25 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-23 14:42:36 +08:00
fks-yangshouda
79c56bb979 1.对接能耗监测接口
2.对接设备监测接口
3.修改设备监测表格序号列显示错误的bug
2024-07-23 14:42:17 +08:00
xuziqiang
9ca6cb83f0 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-23 14:39:56 +08:00
xuziqiang
a2bfe148d3 feat: 权限补充 2024-07-23 14:39:55 +08:00
zhaohy
9134cf4ac3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-23 14:28:51 +08:00
zhaohy
7b77c3cc88 add:设备告警网关告警对接 接口 2024-07-23 14:28:49 +08:00
xuziqiang
5e2f9cc966 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-23 11:01:10 +08:00
xuziqiang
4dcb8f74ca fix: op侧代码补充 2024-07-23 11:01:09 +08:00
zhaohy
223ceed5eb Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-23 08:35:53 +08:00
zhaohy
5c5acf6942 add:设备告警修改流程对接 2024-07-23 08:35:51 +08:00