Commit Graph

1237 Commits

Author SHA1 Message Date
JiangQiming b8a587fd00 fix: bug#10540、10885、10818、10566、10418 2023-03-24 16:31:24 +08:00
JiangQiming 8c2af7fe76 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 15:22:19 +08:00
JiangQiming 8d35495808 fix: bug#10863、10816、10739、10746、10749 2023-03-24 15:22:02 +08:00
xieyonghong 01fc5b13a0 fix: bug#10393 2023-03-24 14:56:37 +08:00
xieyonghong 4112313953 fix: bug#10559 2023-03-24 14:56:37 +08:00
wangshuaiswim 17510b998f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 14:06:24 +08:00
wangshuaiswim f4b3ae8626 fix: 修改导入物模型产品可筛选 2023-03-24 14:05:44 +08:00
xieyonghong 570950c4e3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 13:51:09 +08:00
xieyonghong 01d3a0939d fix: 修复二次确认按钮换行 2023-03-24 13:34:42 +08:00
JiangQiming f55bf06297 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 11:50:15 +08:00
JiangQiming 62f8061e3b fix: bug#10742、10828、10827、10657 2023-03-24 11:49:58 +08:00
100011797 5fd68c3da7 fix: 标签值修改 2023-03-24 11:16:03 +08:00
100011797 b70e5549f0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 11:00:10 +08:00
100011797 19684721e2 fix: 数据源bug 2023-03-24 10:59:11 +08:00
wangshuaiswim 0c4c93c386 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 09:52:06 +08:00
wangshuaiswim 140465a61e fix: 修改导入阿里云物模型时提示报错信息 2023-03-24 09:51:46 +08:00
xieyonghong 5eccbc9758 fix: 修复场景联动数据结构 2023-03-24 09:13:12 +08:00
JiangQiming 4578810ab9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 21:00:30 +08:00
JiangQiming 004eb1fb2f fix: bug#10816、10814、10812、10789、10780、10775、等 2023-03-23 21:00:09 +08:00
xieyonghong 96c6b69aef fix: bug#10782 2023-03-23 18:43:29 +08:00
leiqiaochu cb035bce38 fix: bug#10817 2023-03-23 18:17:11 +08:00
胡彪 7c7a585c43
Merge pull request #68 from jetlinks/dev-hub
fix: 运维管理修复部分bug
2023-03-23 18:03:37 +08:00
JiangQiming f3c3ffe291 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 18:02:43 +08:00
jackhoo_98 ef9cfc902c Merge branch 'dev' into dev-hub 2023-03-23 18:02:33 +08:00
JiangQiming f00d69d30e fix: bug#10841、10838、10835、10834、10828、10827 2023-03-23 18:02:27 +08:00
jackhoo_98 f75e9303d4 fix: 修复运维管理、数据采集卡片跳转 2023-03-23 18:01:37 +08:00
jackhoo_98 0671e2d357 fix: 修复协议管理、远程升级上传文件获取base-path方式 2023-03-23 17:41:27 +08:00
jackhoo_98 4b84614f82 fix: 修复运维管理 数据采集 删除按钮样式优化 2023-03-23 17:18:01 +08:00
leiqiaochu 0e26f1e638 fix: 样式优化 2023-03-23 17:03:03 +08:00
jackhoo_98 dcf41b4c2c fix: bug#10707 修复运维管理日志说明查询 2023-03-23 16:54:26 +08:00
JiangQiming 6d0e50a203 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 16:46:19 +08:00
JiangQiming 9c9ee029e6 fix: bug#10773、10772、10829、10826 2023-03-23 16:46:02 +08:00
jackhoo_98 a511dd5972 fix: bug#10743 修复远程升级选择设备多选取消问题 2023-03-23 16:37:39 +08:00
jackhoo_98 a4b79f2b8f fix: bug#10702、10703 修复网络组件、流媒体服务域名校验 2023-03-23 16:02:22 +08:00
xieyonghong 1a91967f02 update: 更新组件库 2023-03-23 15:46:28 +08:00
xieyonghong cb91ec58ac fix: bug#10787、10786 2023-03-23 15:46:27 +08:00
100011797 8c97f0e441 fix: 批量操作按钮 2023-03-23 15:44:58 +08:00
JiangQiming 1f6f7d23b4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 15:36:46 +08:00
JiangQiming b4734056d8 fix: bug#10609-1 2023-03-23 15:36:31 +08:00
100011797 0e56cadb12 fix: 修改同步设备状态 2023-03-23 15:35:57 +08:00
100011797 dead9c5b46 fix: 运行状态播放组件添加 2023-03-23 15:27:59 +08:00
leiqiaochu 83284569aa fix: bug#9308 2023-03-23 15:21:33 +08:00
100011797 73351235ce fix: 修改bug 2023-03-23 15:08:36 +08:00
jackhoo_98 d04e69ba1b fix: 设备接入网关 屏蔽插件接入 2023-03-23 14:54:44 +08:00
jackhoo_98 e97255d088 fix: bug#10721、10714 修复证书管理部分bug 2023-03-23 14:41:35 +08:00
jackhoo_98 0a33ca67ab fix: bug#10802、10799、10798、10796、10791 修复设备接入网关国标接入部分bug 2023-03-23 14:33:17 +08:00
JiangQiming e9d5c8e9c3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 11:48:46 +08:00
JiangQiming 0e09858d38 fix: bug#10706、10678 2023-03-23 11:47:58 +08:00
wangshuaiswim 588cad1cd5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 11:39:23 +08:00
wangshuaiswim e278ae3ebc fix: 修改物模型BUG 2023-03-23 11:38:34 +08:00