Commit Graph

1683 Commits

Author SHA1 Message Date
wangshuaiswim e17ead51c3 fix: 删除多余代码 2023-03-31 16:07:47 +08:00
wangshuaiswim a286a1e222 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 16:06:37 +08:00
wangshuaiswim ad14ce0242 fix: 修复物模型导入问题 2023-03-31 16:06:15 +08:00
JiangQiming 25046ad8d0 fix: 登录页三方登录方式logo 2023-03-31 15:57:40 +08:00
jackhoo_98 0ec07a4d73 fix: bug#10847 修复菜单管理部分bug 2023-03-31 15:55:12 +08:00
JiangQiming 1beaab1732 fix: bug#11309 2023-03-31 15:52:20 +08:00
JiangQiming 9a8a0d2410 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 15:08:20 +08:00
JiangQiming 348ef4570c fix: 11216 2023-03-31 15:08:05 +08:00
jackhoo_98 11cf92b90e fix: bug#11233、11276 2023-03-31 14:33:58 +08:00
jackhoo_98 63ec13e49b fix: 视频设备新增 快速接入网关,修改浏览器tab关闭时的参数 2023-03-31 14:27:28 +08:00
leiqiaochu 39d6a156a8 feat: license页面 2023-03-31 14:19:10 +08:00
JiangQiming f2b1b6250e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 14:02:18 +08:00
JiangQiming 497ac1f4ca fix: bug#11274、11273、11272 2023-03-31 14:02:03 +08:00
xieyonghong f5ef19817b fix: bug#10943 2023-03-31 13:55:27 +08:00
xieyonghong e56be3212a fix: bug#11261、10943、10942 2023-03-31 13:55:27 +08:00
100011797 4b08712c61 fix: 修改应用管理的状态展示 2023-03-31 13:52:41 +08:00
jackhoo_98 008cd45ce7 fix: 采集器状态组件引入 2023-03-31 13:51:03 +08:00
jackhoo_98 0998f4bc79 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 12:40:02 +08:00
jackhoo_98 e7be6d4770 update: 统一修改浏览器标签跳转、设备接入网关新增快速添加 2023-03-31 12:39:44 +08:00
JiangQiming 7223ec88b9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 11:51:44 +08:00
JiangQiming efded0457b fix: bug#11227、11266、11260 2023-03-31 11:51:27 +08:00
100011797 e510380bde fix: 修改场景联动 2023-03-31 11:49:13 +08:00
100011797 74c0b9fc0a fix: 修改设备网关的样式 2023-03-31 10:42:33 +08:00
jackhoo_98 ef6c66600f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 10:24:59 +08:00
jackhoo_98 6a60407e9f fix: bug#11256 2023-03-31 10:24:39 +08:00
JiangQiming 12c12a08fc Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 10:09:22 +08:00
JiangQiming f4770bc03f fix: bug#11260 2023-03-31 10:09:04 +08:00
leiqiaochu d483ea15cf fix: bug#11210 2023-03-31 10:05:38 +08:00
xieyonghong e48a9ba24f fix: bug#10975 2023-03-31 09:12:53 +08:00
xieyonghong 73828ec03a fix: bug#11235、11234 2023-03-31 09:12:53 +08:00
xieyonghong 3e268404a9 update: 优化基本设置创建时间显示 2023-03-31 09:12:52 +08:00
xieyonghong 6224bf81ec fix: bug#11224 2023-03-31 09:12:52 +08:00
xieyonghong 79c280cece fix: bug#11218 2023-03-31 09:12:51 +08:00
xieyonghong cf06b77fe1 fix: bug#11087 2023-03-31 09:12:51 +08:00
xieyonghong cf6b40f438 fix: 修改分屏展示的间接支持 2023-03-31 09:12:51 +08:00
JiangQiming d3af662267 fix: bug#11249、11247、10637、11250 2023-03-30 20:24:05 +08:00
JiangQiming f25468066b fix: bug#11223 2023-03-30 19:58:28 +08:00
JiangQiming 735994f12f fix: bug#11223 2023-03-30 19:24:00 +08:00
JiangQiming 4767863dda Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 19:16:01 +08:00
JiangQiming a87a8d813b fix: bug#11254 2023-03-30 19:15:46 +08:00
100011797 4e540b022d fix: 资源库跳转 2023-03-30 18:24:03 +08:00
JiangQiming d53f487d2c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 18:12:56 +08:00
JiangQiming a3951bf202 fix: bug#11258 2023-03-30 18:12:40 +08:00
jackhoo_98 db06aa023b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 18:10:34 +08:00
jackhoo_98 74abf49b1e fix: bug#11242 2023-03-30 18:09:37 +08:00
xieyonghong 84e5a57c67 fix: 优化场景联动布尔值 2023-03-30 18:08:49 +08:00
xieyonghong 683751af53 fix: 优化物联布局 2023-03-30 18:08:49 +08:00
jackhoo_98 f878cffe82 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 18:02:26 +08:00
jackhoo_98 f4f190fa01 fix: bug#11233、11240、11236 2023-03-30 18:01:58 +08:00
leiqiaochu 1826574d41 fix: bug 产品按钮权限 2023-03-30 18:01:00 +08:00