Commit Graph

1675 Commits

Author SHA1 Message Date
leiqiaochu e98f168b20 fix: bug#11226 样式铺满 2023-03-30 17:07:33 +08:00
JiangQiming 881cc39e9b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 17:06:46 +08:00
JiangQiming f960e2df76 update: 通知管理,视频中心所有页面表格撑满屏幕 2023-03-30 17:06:04 +08:00
100011797 c38923f468 fix: 加fullpage 2023-03-30 17:01:58 +08:00
JiangQiming 8239b2c308 fix: bug#11174、11227 2023-03-30 16:36:11 +08:00
JiangQiming 6c24474de2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 16:21:26 +08:00
JiangQiming 09544943f2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 16:20:55 +08:00
JiangQiming a75f2a3fd6 fix: bug#11106 2023-03-30 16:20:16 +08:00
leiqiaochu c694bf8222 fix: bug 设备接入权限 2023-03-30 16:19:41 +08:00
xieyonghong 7f4d01f2c0 fix: 优化FullPage取值 2023-03-30 16:14:56 +08:00
jackhoo_98 1b7a8a1b21 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 16:07:37 +08:00
xieyonghong 57e107c588 update: 新增FullPage组件 2023-03-30 16:05:18 +08:00
xieyonghong a1b67ce45c fix: 优化跳转初始化页面 2023-03-30 16:05:17 +08:00
leiqiaochu ea4cb2492b fix: bug#11226 2023-03-30 15:55:57 +08:00
JiangQiming 2bccd21378 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 15:51:41 +08:00
JiangQiming c88706282f fix: bug#11106 2023-03-30 15:51:16 +08:00
leiqiaochu 2dbd7e31b6 fix: bug路由校验 初始化跳转 2023-03-30 15:39:04 +08:00
jackhoo_98 7c1376f0ce fix: 采集器 新增请求超时时间配置 2023-03-30 15:28:27 +08:00
jackhoo_98 3ea80b89c6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 15:17:50 +08:00
jackhoo_98 2fbcc606e9 fix: 采集器 新增离散输入寄存器、单双高低位切换 2023-03-30 15:17:17 +08:00
100011797 04ad3d4689 fix: 修改按标签 2023-03-30 14:24:22 +08:00
100011797 048d8508a6 fix: 修改场景联动数据显示 2023-03-30 14:19:50 +08:00
leiqiaochu 7ab063a790 fix: bug初始化页面跳转 2023-03-30 14:18:12 +08:00
jackhoo_98 fc3d0d2d12 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 13:47:16 +08:00
jackhoo_98 bf4b1d9c13 fix: bug#11205、11211 2023-03-30 13:46:46 +08:00
xieyonghong 947f34bed5 fix: bug#11218 2023-03-30 13:42:18 +08:00
xieyonghong 9b7b78fe33 fix: bug#11191 2023-03-30 13:42:17 +08:00
xieyonghong d3ea02c0f6 style: 优化组织管理样式 2023-03-30 13:42:16 +08:00
xieyonghong a3cb28ed5b fix: bug#11192 2023-03-30 13:42:15 +08:00
xieyonghong e3c9884606 fix: 修复触发规则-功能调用验证失败 2023-03-30 13:42:14 +08:00
JiangQiming 57af547bfb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:50:49 +08:00
JiangQiming c6ec16350e fix: bug#11221 2023-03-30 11:50:32 +08:00
leiqiaochu 92315c3c39 fix: bug#10777 2023-03-30 11:45:09 +08:00
leiqiaochu 77d8044cf2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:32:46 +08:00
leiqiaochu 18d950d63f fix: bug#10777 11128 11212 2023-03-30 11:32:15 +08:00
JiangQiming de904854e5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:27:28 +08:00
JiangQiming ceec8a65e3 fix: bug#10954 2023-03-30 11:27:09 +08:00
100011797 0675fcff7b fix: 修改设备功能 2023-03-30 11:22:52 +08:00
JiangQiming d7790f203f fix: bug#11139、11214 2023-03-30 10:56:51 +08:00
xieyonghong 4447e11d7c update: 优化数据权限 2023-03-29 23:01:55 +08:00
jackhoo_98 d0c53252ec Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 22:08:54 +08:00
JiangQiming e61efa5832 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 22:06:43 +08:00
JiangQiming cea070b35c fix: bug#10766 2023-03-29 22:06:27 +08:00
100011797 55cd57269d fix: ico改变 2023-03-29 22:04:09 +08:00
leiqiaochu 922624cbc2 fix: bug#10781 2023-03-29 21:57:36 +08:00
jackhoo_98 a422769c2f fix: bug#11200、11201、11206、11207 2023-03-29 21:49:50 +08:00
JiangQiming e9f84f959a fix: bug#10803 2023-03-29 21:39:39 +08:00
JiangQiming 4424b56d4c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 21:29:46 +08:00
JiangQiming b7034c5ca4 fix: bug#11037、11057 2023-03-29 21:29:30 +08:00
leiqiaochu 3aa73c4f08 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:55:07 +08:00