Commit Graph

1647 Commits

Author SHA1 Message Date
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
JiangQiming 8f992dd1f3 fix: bug#11243 2023-03-30 17:57:39 +08:00
JiangQiming c31d38484a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 17:53:37 +08:00
JiangQiming fff3922717 fix: bug#11239 2023-03-30 17:53:20 +08:00
100011797 f1e3c10468 fix: 设备图片显示 2023-03-30 17:45:55 +08:00
leiqiaochu a69adc0033 fix: bug#11230 2023-03-30 17:24:26 +08:00
JiangQiming 352bcfe98f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 17:18:59 +08:00
JiangQiming f08e28560a update: 系统管理列表撑满高度 2023-03-30 17:18:43 +08:00
jackhoo_98 f5afc16a1f update: 运维管理、数据采集添加FullPage组件 2023-03-30 17:08:30 +08:00
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