Commit Graph

1656 Commits

Author SHA1 Message Date
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
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