Commit Graph

1647 Commits

Author SHA1 Message Date
JiangQiming 2013ecbddd fix: bug#11223 2023-03-31 19:54:53 +08:00
JiangQiming 19944afb8b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 18:56:06 +08:00
JiangQiming d58ec295a9 fix: bug#11269 2023-03-31 18:55:45 +08:00
leiqiaochu 1fae2c24f7 fix: bug管理员初始化取消 2023-03-31 18:05:16 +08:00
jackhoo_98 ae2758b5ba Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 18:03:18 +08:00
wangshuaiswim 767501ec11 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 17:57:18 +08:00
wangshuaiswim 09e56c4d0c fix: 修复布尔类型值类型是布尔的情况下不能编辑 2023-03-31 17:56:51 +08:00
leiqiaochu 7f0625fbca Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 17:44:04 +08:00
100011797 f6f99efe2b fix: 修改判断产品修改后数据变化的问题 2023-03-31 17:19:17 +08:00
jackhoo_98 bcf1f60ec3 fix: bug#11300、11289 2023-03-31 17:03:55 +08:00
JiangQiming c178d22691 fix: bug#11251 2023-03-31 17:01:39 +08:00
JiangQiming 53971eca2c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 16:18:14 +08:00
JiangQiming 492bc33c00 fix: bug#11316 2023-03-31 16:17:59 +08:00
leiqiaochu d7198a7ad1 fix: bug菜单管理按钮样式 2023-03-31 16:16:18 +08:00
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