胡彪
|
f76f76965d
|
Merge pull request #61 from jetlinks/dev-hub
fix: 运维管理、数据采集修复部分bug
|
2023-03-16 09:58:10 +08:00 |
jackhoo_98
|
62592b6e83
|
Merge branch 'dev' into dev-hub
|
2023-03-16 09:56:14 +08:00 |
|
jackhoo_98
|
7e83d5bdc2
|
fix: 运维管理 设备接入网关自测todo
|
2023-03-16 09:54:48 +08:00 |
JiangQiming
|
0200d1d419
|
update: 新增注释
|
2023-03-15 18:22:59 +08:00 |
|
JiangQiming
|
39c58b8e35
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 18:09:58 +08:00 |
|
JiangQiming
|
54493d025f
|
fix: bug#10433、10428、10426
|
2023-03-15 18:09:44 +08:00 |
|
jackhoo_98
|
d8ca8ce212
|
fix: 运维管理 日志管理修复部分bug
|
2023-03-15 17:55:13 +08:00 |
easy
|
62a405b8cd
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:44:52 +08:00 |
|
JiangQiming
|
f8906faa11
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:42:58 +08:00 |
|
JiangQiming
|
42df14d815
|
fix: bug#10406、10399、10390、10391、10410、10387、10392、10425、10415、10416、10417、10412、10409、10405
|
2023-03-15 17:42:42 +08:00 |
|
easy
|
46df7d35c5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:41:45 +08:00 |
|
easy
|
174cf36d09
|
update: 用户管理
|
2023-03-15 17:41:22 +08:00 |
|
jackhoo_98
|
ea8620278a
|
update: 采集器 点位新增 更新数据类型
|
2023-03-15 17:31:36 +08:00 |
leiqiaochu
|
bebb4b8d45
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:10:31 +08:00 |
|
leiqiaochu
|
27cd241bee
|
fix: 产品仪表盘和上传bug
|
2023-03-15 17:09:38 +08:00 |
|
jackhoo_98
|
8051989d2c
|
fix: 运维管理 协议管理修复部分bug
|
2023-03-15 17:03:47 +08:00 |
xieyonghong
|
2cd4d7ddb1
|
feat: 场景联动新增过滤条件组件
|
2023-03-15 16:33:01 +08:00 |
|
xieyonghong
|
a28f46e01c
|
update: 更新场景联动ParamsDropdown中的属性
|
2023-03-15 16:33:00 +08:00 |
|
xieyonghong
|
2f964837b9
|
update: 场景联动集成执行动作
|
2023-03-15 16:33:00 +08:00 |
|
jackhoo_98
|
87824d39bd
|
fix: 运维管理 网络组件及详情修复部分bug
|
2023-03-15 16:16:02 +08:00 |
|
leiqiaochu
|
c830357640
|
fix: 规则编排自测与组件替换
|
2023-03-15 15:51:55 +08:00 |
|
JiangQiming
|
2aeaae3a50
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 15:46:03 +08:00 |
|
JiangQiming
|
599311631d
|
update: 初始值改为undefined, 解决placeholder无效的问题
|
2023-03-15 15:45:47 +08:00 |
|
easy
|
ce02e2de1b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 15:05:51 +08:00 |
|
easy
|
f13ebbc16c
|
update: 应用管理权限完善
|
2023-03-15 15:05:36 +08:00 |
|
JiangQiming
|
471b12a2fa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 14:55:51 +08:00 |
|
JiangQiming
|
71187fcf85
|
update: 通知记录弹窗分页尺码大小优化
|
2023-03-15 14:55:30 +08:00 |
|
leiqiaochu
|
4a4123b2e7
|
fix: 子设备修改和新增绑定自测
|
2023-03-15 14:36:14 +08:00 |
|
easy
|
8a811aad25
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 14:27:05 +08:00 |
|
easy
|
c0f9b249e9
|
update: uhasPermission属性更正
|
2023-03-15 14:26:49 +08:00 |
|
jackhoo_98
|
0879a35eeb
|
fix: 运维管理 仪表盘修复部分bug
|
2023-03-15 13:54:00 +08:00 |
|
JiangQiming
|
f4a0cc77b6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 11:41:46 +08:00 |
|
JiangQiming
|
03436802b9
|
fix: bug#10232
|
2023-03-15 11:40:23 +08:00 |
100011797
|
2b18323745
|
fix: 场景联动-通知配置-options处理
|
2023-03-15 11:39:00 +08:00 |
|
jackhoo_98
|
30b97ca3cb
|
fix: 数据采集 通道管理代码优化
|
2023-03-15 11:29:57 +08:00 |
|
xieyonghong
|
d7f3ba6317
|
update: 场景联动条件优化
|
2023-03-15 10:20:43 +08:00 |
|
easy
|
0011e85de9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 09:52:22 +08:00 |
|
easy
|
8576a18ec5
|
update: <a-upload>组件替换
|
2023-03-15 09:52:02 +08:00 |
|
JiangQiming
|
81590a0af3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 09:50:28 +08:00 |
|
JiangQiming
|
cdd755a369
|
update: upload组件替换
|
2023-03-15 09:50:10 +08:00 |
|
胡彪
|
eb75286c90
|
Merge pull request #60 from jetlinks/dev-hub
fix: 数据采集 更换组件，修复部分bug
|
2023-03-15 09:41:28 +08:00 |
|
jackhoo_98
|
9736d6e954
|
Merge branch 'dev' into dev-hub
|
2023-03-15 09:40:10 +08:00 |
|
jackhoo_98
|
dcf6aef0e6
|
fix: 数据采集 更换组件，修复部分bug
|
2023-03-15 09:38:32 +08:00 |
|
leiqiaochu
|
fa5e34a77e
|
fix: 组件替换
|
2023-03-14 17:51:51 +08:00 |
|
leiqiaochu
|
ea5761846e
|
fix: 组件替换
|
2023-03-14 17:48:24 +08:00 |
|
easy
|
9dff4d7a95
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 17:34:48 +08:00 |
|
JiangQiming
|
1cfb9edc35
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 17:31:44 +08:00 |
|
JiangQiming
|
670ea4de15
|
update: 通知配置-同步 用户前端分页
|
2023-03-14 17:31:30 +08:00 |
|
leiqiaochu
|
2559138a4a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 17:28:18 +08:00 |
|
leiqiaochu
|
02cb643d8c
|
feat: 新增子设备绑定
|
2023-03-14 17:25:56 +08:00 |