JiangQiming
|
0b9b78ca40
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 14:13:03 +08:00 |
|
JiangQiming
|
7c42ebc587
|
fix: bug#10618、10608
|
2023-03-21 14:11:52 +08:00 |
leiqiaochu
|
6c2cd40b56
|
fix: bug#10450
|
2023-03-21 13:53:02 +08:00 |
jackhoo_98
|
3bb63f3d41
|
fix: bug#10610 修复仪表盘日期变化问题
|
2023-03-21 13:50:46 +08:00 |
|
leiqiaochu
|
a49e7858ee
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 11:39:18 +08:00 |
|
leiqiaochu
|
2a51e49b61
|
fix: #bug10635 10631
|
2023-03-21 11:37:30 +08:00 |
|
JiangQiming
|
5abfe399e2
|
update: 通知管理, 视频中心, 系统管理message引入方式改为jetlinks组件库
|
2023-03-21 11:08:09 +08:00 |
胡彪
|
acae0936dc
|
Merge pull request #65 from jetlinks/dev-hub
style: 设备接入网关、网络组件以及详情样式微调
|
2023-03-21 10:23:30 +08:00 |
|
jackhoo_98
|
d9c2da7f4e
|
fix: 合并冲突
|
2023-03-21 10:20:57 +08:00 |
|
jackhoo_98
|
2da39a3370
|
style: 网络组件以及详情样式微调
|
2023-03-21 10:18:10 +08:00 |
100011797
|
64dba9f0b1
|
fix: 修改后端地址
|
2023-03-21 10:10:00 +08:00 |
xieyonghong
|
a2a52aaf66
|
update: 优化场景联动样式
|
2023-03-21 09:57:43 +08:00 |
|
JiangQiming
|
995eca23cb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 09:39:38 +08:00 |
|
JiangQiming
|
552af71c39
|
update: 按钮新增danger属性
|
2023-03-21 09:39:20 +08:00 |
|
100011797
|
85dd902ed7
|
fix: 修复10401
|
2023-03-21 09:38:34 +08:00 |
wangshuaiswim
|
8cd2b8644e
|
fix: 修改物模型BUG
|
2023-03-20 21:14:49 +08:00 |
|
wangshuaiswim
|
6c9322ed70
|
fix: 修改物模型BUG
|
2023-03-20 21:02:58 +08:00 |
|
wangshuaiswim
|
27e5d320d4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 20:40:51 +08:00 |
|
wangshuaiswim
|
2511baf944
|
fix: 修改物模型BUG
|
2023-03-20 20:40:30 +08:00 |
|
xieyonghong
|
8811173b66
|
update: 优化场景联动-执行动作、过滤条件校验
|
2023-03-20 20:18:11 +08:00 |
|
JiangQiming
|
d5876a0ed1
|
fix: bug#10561、10630
|
2023-03-20 18:31:46 +08:00 |
|
JiangQiming
|
7173dd7c5c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 18:24:22 +08:00 |
|
JiangQiming
|
d79a1f7402
|
fix: bug#10561
|
2023-03-20 18:24:01 +08:00 |
|
100011797
|
6c3b76b486
|
fix: 物联网卡卡片展示
|
2023-03-20 18:13:42 +08:00 |
|
leiqiaochu
|
010d91d8e5
|
fix: bug#10454
|
2023-03-20 17:59:41 +08:00 |
|
wangshuaiswim
|
d8bc599164
|
fix: 修改物模型导入BUG
|
2023-03-20 17:48:20 +08:00 |
|
JiangQiming
|
6485265e3d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 17:36:48 +08:00 |
|
JiangQiming
|
c08f29d4da
|
fix: bug#10561
|
2023-03-20 17:36:33 +08:00 |
|
xieyonghong
|
faccbc53f7
|
update: 优化场景联动-执行动作、过滤条件校验
|
2023-03-20 17:32:34 +08:00 |
|
100011797
|
a094b9b093
|
fix: 设备详情报错
|
2023-03-20 17:02:43 +08:00 |
|
jackhoo_98
|
c61eb1771e
|
style: 设备接入网关样式微调
|
2023-03-20 17:01:43 +08:00 |
|
JiangQiming
|
48b6bbc0a7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 16:47:13 +08:00 |
|
JiangQiming
|
3181027490
|
fix: bug#10564、10618、10619、10605、10606、10604、10608
|
2023-03-20 16:46:59 +08:00 |
|
leiqiaochu
|
189f056c22
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 16:19:31 +08:00 |
|
leiqiaochu
|
5f9c8fded4
|
fix: message组件替换
|
2023-03-20 16:19:20 +08:00 |
|
wangshuaiswim
|
2a7eeccdb2
|
fix: 物模型BUG解决
|
2023-03-20 16:17:06 +08:00 |
|
JiangQiming
|
5d27993d0f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 15:53:24 +08:00 |
|
JiangQiming
|
fd3064dd90
|
fix: bug#10602、10525、10599、10601、10603
|
2023-03-20 15:53:07 +08:00 |
|
100011797
|
f9d72619b0
|
fix: 修改北向输出bug
|
2023-03-20 15:21:31 +08:00 |
|
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 |