Commit Graph

1647 Commits

Author SHA1 Message Date
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
JiangQiming ee323a1a7d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:52:50 +08:00
JiangQiming 95c0409c21 fix: bug#11157 2023-03-29 20:52:33 +08:00
leiqiaochu 382f0bff44 fix: bug#11195 2023-03-29 20:45:34 +08:00
100011797 ecd956b4fd fix: 修改场景联动执行动作设备查询排序 2023-03-29 20:38:24 +08:00
leiqiaochu 8187e27a43 fix: bug#11128 2023-03-29 20:24:43 +08:00
xieyonghong 8566c3e74c update: 升级组件库 2023-03-29 20:22:54 +08:00
xieyonghong b283c729d9 fix: bug#10938 2023-03-29 20:22:54 +08:00
xieyonghong 81f7e58c01 fix: bug#11087 2023-03-29 20:22:54 +08:00
xieyonghong 5cf8ce8aff fix: bug#11191 2023-03-29 20:22:53 +08:00
xieyonghong 09267955f5 fix: bug#11193、11190、11189 2023-03-29 20:22:53 +08:00
xieyonghong c6717f6be0 fix: bug#11035 2023-03-29 20:22:52 +08:00
xieyonghong 2588145b96 fix: bug#11138 2023-03-29 20:22:51 +08:00
jackhoo_98 a1affe20a8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:21:15 +08:00
jackhoo_98 384930fa4e fix: bug#11006、11093 2023-03-29 20:20:54 +08:00
100011797 542f201175 fix: 物联网卡导入 2023-03-29 20:20:24 +08:00
100011797 43a8d39655 fix: 物联网卡 2023-03-29 20:15:11 +08:00
JiangQiming 9f0bc42fb9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:01:36 +08:00
JiangQiming 16dc7b7aa7 fix: bug#10762 2023-03-29 20:01:18 +08:00
jackhoo_98 18abd85100 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 19:16:08 +08:00
jackhoo_98 2c46649750 fix: bug#11008、11180、11184、11198、11097 2023-03-29 19:15:48 +08:00
100011797 d4dbc450ea fix: 修改场景联动 2023-03-29 18:56:23 +08:00
leiqiaochu ad64371a04 fix: bug#11199 2023-03-29 17:59:17 +08:00
JiangQiming 0ce7fd5a59 fix: bug#11062、11139 2023-03-29 17:54:23 +08:00
JiangQiming 22d326337b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 16:34:27 +08:00
JiangQiming b676b2bba3 fix: bug#11187 2023-03-29 16:34:12 +08:00
100011797 6abbe34663 fix: 修改场景联动 2023-03-29 16:16:06 +08:00
jackhoo_98 6d4a442ee8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 16:15:04 +08:00
jackhoo_98 227eaae3a2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 16:14:34 +08:00