Commit Graph

1341 Commits

Author SHA1 Message Date
xieyonghong 6eadc45786 fix: bug#10396 2023-03-28 08:51:28 +08:00
xieyonghong c34647fad5 fix: bug#10824 2023-03-28 08:51:27 +08:00
jackhoo_98 c366f4a2cc fix: bug#11010、11021、11029、11031、11032 修复通道管理部分bug 2023-03-27 21:59:12 +08:00
jackhoo_98 7b17adc477 fix: bug#11023 修复采集器点位新增无反应 2023-03-27 21:39:36 +08:00
jackhoo_98 facafcfae6 fix: 修复采集器仪表盘 时间计算问题 2023-03-27 21:02:34 +08:00
jackhoo_98 45f634b37c Merge branch 'dev' into dev-hub 2023-03-27 20:34:08 +08:00
jackhoo_98 4a561741c8 fix: bug#11004 2023-03-27 20:33:27 +08:00
JiangQiming f6947dd3e5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 20:00:36 +08:00
JiangQiming 1aae61582e fix: bug#10766 2023-03-27 20:00:18 +08:00
jackhoo_98 5f5b3e5b41 fix: bug#10945 修复菜单管理部分bug 2023-03-27 19:45:28 +08:00
jackhoo_98 478fac0cac fix: 修复网络组件 编辑查看页面空白问题 2023-03-27 19:10:56 +08:00
xieyonghong 9da664cf34 update: 更新组件库 2023-03-27 18:51:19 +08:00
xieyonghong 4778b558d7 fix: bug#10822 2023-03-27 18:51:19 +08:00
leiqiaochu 4e8c6dfe9d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:58:39 +08:00
leiqiaochu ace81f616d fix: bug#11037 11041 11051 11066 2023-03-27 17:56:47 +08:00
100011797 324d78a213 fix: 北向输出 2023-03-27 17:48:47 +08:00
100011797 9b32fbd21d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:47:34 +08:00
胡彪 0b800b712b
Merge pull request #71 from jetlinks/dev-hub
Dev hub
2023-03-27 17:25:47 +08:00
jackhoo_98 e2bcffe771 Merge branch 'dev' into dev-hub 2023-03-27 17:24:37 +08:00
jackhoo_98 bc95eda133 fix: bug#11026、11048、11046、11049、11045、11039 采集器解决部分bug 2023-03-27 17:23:35 +08:00
wangshuaiswim 4d41f82b75 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:15:01 +08:00
wangshuaiswim 3fc1e30027 fix: 修改物模型属性提交时添加type默认值 2023-03-27 17:14:42 +08:00
100011797 9fb80e4123 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:05:09 +08:00
100011797 ee7c4e11f7 fix: 修改场景联动 2023-03-27 17:04:08 +08:00
JiangQiming f54b498053 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 16:11:23 +08:00
JiangQiming dbd14ce4d6 fix: bug#10924、11001 2023-03-27 16:11:06 +08:00
xieyonghong a887be421e update: 更新组件库 2023-03-27 15:59:04 +08:00
xieyonghong 2cad9d7f4e update: 替换Ellipsis为组件库中的Ellipsis组件 2023-03-27 15:59:04 +08:00
xieyonghong ffdee18c34 fix: bug#10833 2023-03-27 15:59:03 +08:00
xieyonghong c0d72a3863 update: 补全数据权限 2023-03-27 15:59:02 +08:00
xieyonghong 8b9330a58d style: 优化场景联动回显校验 2023-03-27 15:59:02 +08:00
JiangQiming 9594893a50 fix: bug#10909、10912 2023-03-27 15:44:48 +08:00
JiangQiming d58bef5897 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 15:29:39 +08:00
JiangQiming 6c47f20f9d fix: bug#10892、10953 2023-03-27 15:29:23 +08:00
胡彪 607eefd5f7
Merge pull request #70 from jetlinks/dev-hub
Dev hub
2023-03-27 15:28:56 +08:00
jackhoo_98 414a9987d2 Merge branch 'dev' into dev-hub 2023-03-27 15:27:01 +08:00
jackhoo_98 049bf99395 fix: 菜单管理 完成菜单配置 2023-03-27 15:25:53 +08:00
leiqiaochu b8dac68cfa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 14:20:25 +08:00
leiqiaochu 5ac6df4ffb fix: bug#11022 2023-03-27 14:20:04 +08:00
JiangQiming 5d19f58f59 fix: bug#10967、10974 2023-03-27 14:13:52 +08:00
leiqiaochu ca9f2a66c0 fix: bug#10999 10977 10964 10957 10951 10940 10868 2023-03-27 11:16:20 +08:00
wangshuaiswim 1afe27ca91 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 11:08:38 +08:00
wangshuaiswim 38a0bc418a fix: 修改布尔类型组件在chrome浏览器下的排版问题 2023-03-27 11:07:59 +08:00
JiangQiming 71fe3f81bd fix: bug#10894 2023-03-27 10:47:50 +08:00
xieyonghong fed5c348e0 style: 优化场景联动卡片的省略内容显示样式 2023-03-27 09:24:45 +08:00
xieyonghong 9b459f2507 update: 优化useParams 2023-03-27 09:22:24 +08:00
xieyonghong 6919d41b93 Merge remote-tracking branch 'origin/dev' into dev 2023-03-26 22:27:49 +08:00
xieyonghong 0dfbac22c5 fix: bug#10937 2023-03-26 22:20:01 +08:00
xieyonghong dcd584c9c7 fix: bug#10946 2023-03-26 21:42:23 +08:00
xieyonghong 3810046bee fix: bug#10947 2023-03-26 21:18:03 +08:00