Commit Graph

1360 Commits

Author SHA1 Message Date
JiangQiming 4b2439374a fix: bug#10740、11100 2023-03-28 10:07:17 +08:00
xieyonghong f44985ba3f fix: 修复场景联动标签误删 2023-03-28 09:35:47 +08:00
leiqiaochu 838987b9da Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 09:28:36 +08:00
leiqiaochu 0ca94c11eb fix: #bug11090 2023-03-28 09:28:07 +08:00
JiangQiming ffff3debad Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 09:27:31 +08:00
JiangQiming 067e471b4c fix: bug#11028、11030、11068、10924、11056、10941 2023-03-28 09:27:12 +08:00
xieyonghong f920b55436 fix: bug#11042 2023-03-28 09:25:15 +08:00
xieyonghong 89e6a348e2 fix: bug#11076 2023-03-28 09:25:14 +08:00
xieyonghong 2a3e5c1e02 fix: bug#11038 2023-03-28 09:25:13 +08:00
xieyonghong 1497d1e1de fix: bug#11035 2023-03-28 09:25:13 +08:00
100011797 0b126ad548 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 09:20:46 +08:00
xieyonghong 300a09a7a1 fix: bug#10880 2023-03-28 08:51:30 +08:00
xieyonghong 042d07f61f fix: bug#10879 2023-03-28 08:51:29 +08:00
xieyonghong ba326d6532 fix: bug#10872、10854 2023-03-28 08:51:29 +08:00
xieyonghong de51d8a0eb fix: bug#10839 2023-03-28 08:51:29 +08:00
xieyonghong fb1478a181 fix: bug#10839 2023-03-28 08:51:29 +08:00
xieyonghong b6bf92a577 fix: bug#10785 2023-03-28 08:51:28 +08:00
xieyonghong a33e3dd3f9 fix: bug#10767 2023-03-28 08:51:28 +08:00
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
100011797 7b83732170 fix: 边缘网关和设备诊断 2023-03-27 20:30:07 +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