Commit Graph

1647 Commits

Author SHA1 Message Date
JiangQiming d0c7f9dc9c fix: 解决冲突 2023-03-29 16:14:24 +08:00
jackhoo_98 51da808ae7 fix: bug#10965 2023-03-29 16:14:16 +08:00
JiangQiming ba3661ae49 fix: 解决冲突 2023-03-29 16:12:10 +08:00
jackhoo_98 f41fa6d279 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 16:09:17 +08:00
jackhoo_98 f2899f5782 fix: bug#10715、10884、11178 2023-03-29 16:08:48 +08:00
xieyonghong 64a19a4bc1 update: 优化数据隔离间接控制 2023-03-29 16:07:22 +08:00
xieyonghong 6d04a6445f fix: bug#10987 2023-03-29 16:07:22 +08:00
xieyonghong 21f3d7cb9a fix: bug#10971、11141 2023-03-29 16:07:21 +08:00
xieyonghong a9537163ae fix: bug#10997 2023-03-29 16:07:21 +08:00
JiangQiming f9271d4f99 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 16:04:20 +08:00
JiangQiming 4611f83841 fix: bug#11174 2023-03-29 16:02:12 +08:00
leiqiaochu 3ae54f459d fix: bug#11125 2023-03-29 15:51:44 +08:00
100011797 b21e055746 fix: 启用全部设备 2023-03-29 15:22:10 +08:00
jackhoo_98 1b596d4599 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 15:14:24 +08:00
jackhoo_98 162b7596da fix: bug#10715、10884 2023-03-29 15:14:05 +08:00
100011797 fdc09d73d3 fix: 边缘端映射 2023-03-29 15:01:25 +08:00
leiqiaochu 00f7ca8824 fix: bug#11171 11169 2023-03-29 14:55:04 +08:00
JiangQiming d690240184 fix: bug#10692 2023-03-29 14:47:58 +08:00
JiangQiming 0e5ba309fc Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 14:43:15 +08:00
JiangQiming ac63d41f0b fix: bug#10776、10778 2023-03-29 14:42:55 +08:00
leiqiaochu 78c5fb941d fix: bug告警配置卡片跳转 设备禁用选择 2023-03-29 13:36:32 +08:00
jackhoo_98 14634e0fec Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 12:30:01 +08:00
jackhoo_98 f1f4b697a7 fix: bug#11091、11167、11166、11026 2023-03-29 12:29:44 +08:00
JiangQiming 6cb8e67da2 fix: bug#11071、11075、11058、11062、11151 2023-03-29 10:53:16 +08:00
xieyonghong a5189bd29e update: 添加node版本控制器 2023-03-29 09:11:22 +08:00
xieyonghong 381ea887e8 fix: bug#11035 2023-03-28 22:14:39 +08:00
xieyonghong 43edb14f16 fix: 修复图片引入路径 2023-03-28 22:14:39 +08:00
xieyonghong ad14983d9c fix: bug#10985 2023-03-28 22:14:38 +08:00
jackhoo_98 d93504a59b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 22:07:02 +08:00
jackhoo_98 a70749f5e9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 22:06:32 +08:00
100011797 c73e9746b1 fix: running的loading 2023-03-28 22:06:30 +08:00
jackhoo_98 9e7242c27d fix: bug#11161 修复采集器扫描table样式异常 2023-03-28 22:06:04 +08:00
100011797 f9d5a017f9 fix: 运行状态bug 2023-03-28 22:02:53 +08:00
jackhoo_98 f16bc40373 fix: bug#10884 修复设备接入网关 国标视频编辑问题 2023-03-28 21:26:43 +08:00
jackhoo_98 60edb1d11b fix: bug#11085、11130、11081、11078、11162 采集器修复部分bug 2023-03-28 21:05:15 +08:00
leiqiaochu 29adc3c207 fix: 设备诊断跳转bug 2023-03-28 20:55:16 +08:00
JiangQiming dd8d6c1820 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 20:53:59 +08:00
JiangQiming 6583d268b0 fix: bug#11153 2023-03-28 20:53:43 +08:00
leiqiaochu 5fabc8272f fix: bug#11154 2023-03-28 20:30:36 +08:00
JiangQiming d8f19671c2 fix: bug#10953 2023-03-28 19:45:37 +08:00
JiangQiming ae1754fa94 fix: 文件名空格删除 2023-03-28 19:07:08 +08:00
JiangQiming 4dd6e5bffa fix: bug#11155 2023-03-28 18:59:48 +08:00
JiangQiming dfa9a5ac63 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 18:53:19 +08:00
JiangQiming 4db5abc096 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 18:52:54 +08:00
jackhoo_98 c98d22977a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 18:52:47 +08:00
JiangQiming ca901b45a0 fix: bug#11102 2023-03-28 18:52:39 +08:00
jackhoo_98 9a5436c94d fix: bug#11082 2023-03-28 18:52:02 +08:00
leiqiaochu 3d8e55623d fix: bug#11125 2023-03-28 18:00:33 +08:00
100011797 e3bcf52641 fix: 修改边缘网关 2023-03-28 17:59:40 +08:00
JiangQiming 7da4678231 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 17:52:26 +08:00