jackhoo_98
|
fec6852bc4
|
Merge branch 'dev' into dev-hub
|
2023-03-20 15:11:18 +08:00 |
|
jackhoo_98
|
1e6504b5f3
|
style: 更改设备接入网关部分样式todo
|
2023-03-20 15:10:05 +08:00 |
leiqiaochu
|
14aeec4178
|
fix: 状态组件替换告警中心优化
|
2023-03-20 15:05:34 +08:00 |
JiangQiming
|
30e98f69af
|
fix: 1.bug#10597、10533; 2.系统基础配置优化
|
2023-03-20 14:57:19 +08:00 |
|
leiqiaochu
|
430a8c7dc8
|
fix: 组件替换
|
2023-03-20 11:18:36 +08:00 |
|
leiqiaochu
|
96dce7a98a
|
fix: 告警配置场景联动组件替换
|
2023-03-20 11:17:28 +08:00 |
xieyonghong
|
8aaa9418bd
|
update: 优化场景联动-新增校验
|
2023-03-20 11:08:20 +08:00 |
|
leiqiaochu
|
6df60ea7e8
|
fix: bug#10609
|
2023-03-20 11:02:15 +08:00 |
|
leiqiaochu
|
7da98bff35
|
fix: 按钮颜色卡片更换
|
2023-03-20 10:55:28 +08:00 |
|
leiqiaochu
|
84db55b690
|
fix: 删除按钮颜色告警卡片
|
2023-03-20 10:54:42 +08:00 |
100011797
|
f88a3d22aa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 10:44:55 +08:00 |
|
100011797
|
edb7f4ce5d
|
fix: 删除变红
|
2023-03-20 10:44:48 +08:00 |
|
jackhoo_98
|
878e36a4a7
|
style: 更改TitleComponent组件样式
|
2023-03-20 10:33:54 +08:00 |
|
leiqiaochu
|
fd603c250d
|
fix: bug#10557
|
2023-03-20 10:32:26 +08:00 |
|
JiangQiming
|
2963118753
|
update: 说明文档提取为公共样式
|
2023-03-20 10:18:01 +08:00 |
|
JiangQiming
|
f1d3942416
|
fix: bug#10597
|
2023-03-20 09:57:23 +08:00 |
胡彪
|
6f9db383be
|
Merge pull request #64 from jetlinks/dev-hub
style: 更改TitleComponent组件样式
|
2023-03-20 09:29:03 +08:00 |
|
jackhoo_98
|
865c9e989c
|
Merge branch 'dev' into dev-hub
|
2023-03-20 09:27:01 +08:00 |
wangshuaiswim
|
6fff6f737e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-19 21:49:43 +08:00 |
|
wangshuaiswim
|
9837a6a588
|
fix: 修改物模型BUG
|
2023-03-19 21:49:13 +08:00 |
|
xieyonghong
|
2659c70804
|
feat: 新增场景联动-定时触发
|
2023-03-19 21:09:53 +08:00 |
|
JiangQiming
|
084c43cf76
|
fix: bug#10475、10549、10545、10543、10541
|
2023-03-17 22:04:41 +08:00 |
|
JiangQiming
|
27f392dda8
|
fix: 表格卡片必须传statusNames, 解决报错问题
|
2023-03-17 21:12:04 +08:00 |
|
xieyonghong
|
4494727311
|
update: 优化产品-设备接入
|
2023-03-17 20:33:24 +08:00 |
|
xieyonghong
|
8cc721b790
|
update: 删除demo
|
2023-03-17 18:50:57 +08:00 |
|
xieyonghong
|
232c844080
|
update: 替换场景联动中的组件
|
2023-03-17 18:50:55 +08:00 |
|
JiangQiming
|
3b7a412411
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 18:20:37 +08:00 |
|
JiangQiming
|
efcfa42adb
|
fix: bug#10540、10542
|
2023-03-17 18:20:22 +08:00 |
easy
|
d1a9854831
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 17:44:22 +08:00 |
|
easy
|
d29346248e
|
fix: bug#10537
|
2023-03-17 17:43:58 +08:00 |
|
100011797
|
dc486af223
|
fix: 卡片背景颜色
|
2023-03-17 16:32:30 +08:00 |
|
jackhoo_98
|
a07196de3d
|
style: 更改TitleComponent组件样式
|
2023-03-17 16:22:17 +08:00 |
|
jackhoo_98
|
c0f2ebfa47
|
update: 运维管理、数据采集卡片列表去掉背景图片
|
2023-03-17 15:55:33 +08:00 |
|
leiqiaochu
|
34bff0ecb4
|
fix: bug#10505 10443
|
2023-03-17 15:48:50 +08:00 |
|
JiangQiming
|
7c9028dab4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 15:44:28 +08:00 |
|
JiangQiming
|
94e0e9ff2e
|
fix: bug#10404
|
2023-03-17 15:44:15 +08:00 |
|
easy
|
dd4f921df4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 15:19:37 +08:00 |
|
easy
|
3794849946
|
update: api配置优化
|
2023-03-17 15:18:32 +08:00 |
|
JiangQiming
|
6a9e08e7a7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 15:01:30 +08:00 |
|
JiangQiming
|
2050990998
|
fix: bug#10538
|
2023-03-17 15:01:16 +08:00 |
|
胡彪
|
e89595c017
|
Merge pull request #63 from jetlinks/dev-hub
fix: 运维管理更换部分组件，修复部分bug
|
2023-03-17 15:00:34 +08:00 |
|
jackhoo_98
|
2e0b45b444
|
Merge branch 'dev' into dev-hub
|
2023-03-17 14:58:13 +08:00 |
|
jackhoo_98
|
dda768e3bf
|
update: 协议管理、通道管理 上传文件获取base-path,todo
|
2023-03-17 14:56:07 +08:00 |
|
jackhoo_98
|
61b48b50ca
|
update: 运维管理 数据采集 更换卡片标题省略组件
|
2023-03-17 14:48:59 +08:00 |
|
easy
|
b81e8af1e4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 14:33:00 +08:00 |
|
easy
|
0b99ea0096
|
fix: bug#10532、10531、10530、10527、10534、10529
|
2023-03-17 14:32:43 +08:00 |
|
JiangQiming
|
a553cdd191
|
fix: bug#10526
|
2023-03-17 14:25:22 +08:00 |
|
JiangQiming
|
af4752e349
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 14:09:37 +08:00 |
|
JiangQiming
|
a260146ad4
|
fix: bug#10528
|
2023-03-17 14:09:23 +08:00 |
|
jackhoo_98
|
d6207f30e0
|
fix: 数据采集更换a-组件
|
2023-03-17 14:05:41 +08:00 |