leiqiaochu
|
5e705a0592
|
fix: #10725 10733
|
2023-03-22 17:10:05 +08:00 |
JiangQiming
|
bccff19042
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 16:39:48 +08:00 |
|
JiangQiming
|
17fea0efac
|
fix: bug#10681
|
2023-03-22 16:39:32 +08:00 |
jackhoo_98
|
a3ac144a72
|
fix: bug#10677、10687、10688、10693、10701、10720修复设备接入网关部分bug
|
2023-03-22 16:00:07 +08:00 |
wangshuaiswim
|
93f56a6441
|
fix: 修改物模型事件回显BUG
|
2023-03-22 15:50:14 +08:00 |
|
JiangQiming
|
e1e6bea2a7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 15:36:31 +08:00 |
|
JiangQiming
|
b6b4677367
|
fix: bug#10550
|
2023-03-22 15:36:16 +08:00 |
|
leiqiaochu
|
7754814afe
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 14:44:14 +08:00 |
|
leiqiaochu
|
47c3d7533e
|
fix: bug#10726 10718
|
2023-03-22 14:43:41 +08:00 |
|
wangshuaiswim
|
b0e5654ad1
|
fix: 增加通讯异常catch
|
2023-03-22 14:33:25 +08:00 |
|
jackhoo_98
|
ad89d1fbc2
|
fix: bug#10719 修复设备接入网关 底部滚动条样式
|
2023-03-22 14:18:57 +08:00 |
100011797
|
f495834dd5
|
fix: douros功能
|
2023-03-22 14:15:11 +08:00 |
|
JiangQiming
|
ba8bbc9896
|
fix: bug#10540
|
2023-03-22 13:48:29 +08:00 |
|
jackhoo_98
|
eb43a5f5b2
|
fix: bug#10676 修复设备接入网关 AccessCard组件背景图
|
2023-03-22 12:20:45 +08:00 |
|
JiangQiming
|
835874604d
|
fix: bug#10711、10600、10681
|
2023-03-22 11:49:02 +08:00 |
|
leiqiaochu
|
0aac4de410
|
fix: bug#10467
|
2023-03-22 09:38:01 +08:00 |
|
wangshuaiswim
|
026d9dd914
|
fix: 修改物模型BUG
|
2023-03-21 21:18:51 +08:00 |
xieyonghong
|
1f1d81c767
|
update: 完善场景联动
|
2023-03-21 19:16:01 +08:00 |
|
JiangQiming
|
352c4d263b
|
fix: bug#10675、10674、10663
|
2023-03-21 18:33:55 +08:00 |
|
JiangQiming
|
8583d968c3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 18:16:16 +08:00 |
|
JiangQiming
|
c70dcf6f62
|
fix: bug#10669、10679、10680
|
2023-03-21 18:15:59 +08:00 |
|
100011797
|
219444d566
|
fix: 修改批量操作功能
|
2023-03-21 18:09:35 +08:00 |
胡彪
|
0f796972f4
|
Merge pull request #66 from jetlinks/dev-hub
fix: 修复网络组件、设备接入网关、协议管理部分bug
|
2023-03-21 18:08:45 +08:00 |
|
jackhoo_98
|
d5b0a2b4d8
|
Merge branch 'dev' into dev-hub
|
2023-03-21 18:07:11 +08:00 |
|
jackhoo_98
|
2cb4bcc86f
|
fix: bug#10666、10672、10673、10676 修复协议管理部分bug
|
2023-03-21 18:04:13 +08:00 |
|
jackhoo_98
|
0b83a9c4df
|
fix: bug#10614、10617、10620、10623、10624、10627、10645、10648、10652、10656、10661、10664、10665 修复网络组件部分bug
|
2023-03-21 17:43:50 +08:00 |
|
JiangQiming
|
7e2ea45ad8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 17:27:20 +08:00 |
|
JiangQiming
|
b78aa24b8e
|
fix: bug#10653、10654
|
2023-03-21 17:26:03 +08:00 |
|
leiqiaochu
|
42cd5f69ae
|
fix: 仪表盘样式更改
|
2023-03-21 16:56:24 +08:00 |
|
JiangQiming
|
b65302e1c6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 16:45:04 +08:00 |
|
JiangQiming
|
9759fea2cc
|
fix: bug#10647、10644、10640
|
2023-03-21 16:43:09 +08:00 |
|
leiqiaochu
|
4c58bf1c31
|
fix: dayjs替换moment
|
2023-03-21 16:14:16 +08:00 |
|
JiangQiming
|
cc879c1731
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 16:07:59 +08:00 |
|
JiangQiming
|
c71a38d424
|
fix: bug#10618、10608、10671、10532、10530、10649
|
2023-03-21 16:07:38 +08:00 |
|
leiqiaochu
|
e53c573e6d
|
fix: 产品特殊协议回显问题
|
2023-03-21 15:45:18 +08:00 |
|
leiqiaochu
|
4d6896a4a2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 14:24:29 +08:00 |
|
leiqiaochu
|
c7a417c82c
|
fix: bug#10668
|
2023-03-21 14:23:39 +08:00 |
|
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 |