Commit Graph

1198 Commits

Author SHA1 Message Date
胡彪 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
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