0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,167 Commits 1 Branch 0 Tags 33 MiB
Commit Graph

1899 Commits

Author SHA1 Message Date
XieYongHong eb96f5afe4 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 17:54:48 +08:00
leiqiaochu 68fabed9b4 fix: 修复bug 2023-07-15 17:52:25 +08:00
XieYongHong 26502e78a5 fix: bug#16114 2023-07-15 17:52:15 +08:00
leiqiaochu 09471aebec Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 17:50:46 +08:00
leiqiaochu ce0d23d07d fix: 修改bug 2023-07-15 17:50:16 +08:00
100011797 430abd8c6d fix: 修改bug 2023-07-15 17:44:44 +08:00
XieYongHong 0d26cdbd93 fix: bug#16325 2023-07-15 17:37:44 +08:00
XieYongHong 07d6499b03 fix: bug#16423 2023-07-15 17:22:19 +08:00
XieYongHong 0f36d7fa60 fix: bug#16417 2023-07-15 16:52:36 +08:00
leiqiaochu ae12ae34ec Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 16:24:49 +08:00
leiqiaochu b9850e79b9 fix: 修改bug 2023-07-15 16:24:21 +08:00
XieYongHong e2e9e3f702 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 16:23:21 +08:00
100011797 439ac44e7e fix: 修改bug 2023-07-15 16:22:51 +08:00
XieYongHong 0e83e706fa fix: bug#16351 2023-07-15 16:21:29 +08:00
leiqiaochu e0c9fa623a fix: 修改bug 2023-07-15 16:18:05 +08:00
XieYongHong 291b65ba19 fix: bug#16382、16381、16384 2023-07-15 16:09:30 +08:00
XieYongHong 37868fd908 fix: bug#16326 2023-07-15 14:37:54 +08:00
XieYongHong 9755d174fe Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 14:20:35 +08:00
XieYongHong 48e2b3a320 fix: bug#16395 2023-07-15 14:15:08 +08:00
100011797 9ec6732b0d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 14:11:55 +08:00
100011797 488921d021 fix: 修改bug 2023-07-15 14:11:44 +08:00
leiqiaochu 108eb5f9b7 fix: 修改bug 2023-07-15 14:05:46 +08:00
XieYongHong 6ccdd9b7d3 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 14:03:50 +08:00
leiqiaochu 20337c378d fix: 修改bug 2023-07-15 13:51:43 +08:00
XieYongHong 6bfba98db6 fix: bug#16404 2023-07-15 13:51:28 +08:00
XieYongHong 1baa346733 fix: bug#10823 2023-07-15 11:42:26 +08:00
XieYongHong 4e46571076 fix: 优化物模型重置 2023-07-15 11:20:36 +08:00
XieYongHong 8b74fc76fc Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 10:51:40 +08:00
XieYongHong 6415602c0c fix: bug#16355、16323、16349 2023-07-15 10:47:17 +08:00
100011797 9c5baf9a7f fix: 修改bug 2023-07-15 10:18:31 +08:00
leiqiaochu 6bbd698bb5 fix: 修改bug 2023-07-14 18:19:10 +08:00
XieYongHong 6d34772678 Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 18:16:58 +08:00
XieYongHong c941c8361c fix: bug#16322 2023-07-14 18:16:39 +08:00
leiqiaochu 711fc9f668 fix: 修复bug 2023-07-14 17:43:47 +08:00
XieYongHong bf5016fca2 Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 16:52:27 +08:00
XieYongHong 58091038b2 fix: bug#16373 2023-07-14 16:52:12 +08:00
leiqiaochu b0e83e7074 fix: bug#16386 2023-07-14 16:51:20 +08:00
XieYongHong d58353a939 fix: bug#16382 2023-07-14 16:43:49 +08:00
100011797 135f1626f7 fix: 修改bug 2023-07-14 16:42:37 +08:00
leiqiaochu 5998fe7409 fix: bug#16358、16366、16374、16375、16379、16385 2023-07-14 16:21:43 +08:00
XieYongHong 6dd7f7e387 fix: bug#16362 2023-07-14 15:27:53 +08:00
XieYongHong b1b09150ff Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 14:29:33 +08:00
XieYongHong 05844474a4 fix: bug#16365 2023-07-14 14:29:15 +08:00
XieYongHong 93182fbe10 fix: bug#16365 2023-07-14 14:28:48 +08:00
leiqiaochu cb314ecad8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-14 14:26:10 +08:00
leiqiaochu b583e70165 fix: bug#16356 2023-07-14 14:25:47 +08:00
XieYongHong 051a5082f3 Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 14:25:22 +08:00
100011797 c017f82c36 fix: 数据采集 2023-07-14 14:24:35 +08:00
XieYongHong 10bed5a3e0 fix: bug#16279 2023-07-14 14:21:48 +08:00
leiqiaochu 94e92acfdf fix: bug#16356 2023-07-14 14:11:36 +08:00
100011797 c0bcccbfaf fix: 修改bug 2023-07-14 14:00:14 +08:00
XieYongHong 82a4e14963 fix: 修复物模型属性-规则窗口回显 2023-07-14 13:54:11 +08:00
100011797 30de9c322a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-14 13:51:43 +08:00
100011797 82089fb0a6 fix: 修改bug 2023-07-14 13:51:26 +08:00
leiqiaochu 9bd3a53b7f fix: bug#16329 2023-07-14 13:47:38 +08:00
XieYongHong 0cb8b8bb21 fix: bug#16364 2023-07-14 11:59:13 +08:00
100011797 a8c1bfb0ff fix: 修改调试 2023-07-14 11:05:46 +08:00
XieYongHong 75098a4388 fix: bug#16301 2023-07-14 10:32:09 +08:00
XieYongHong 3e354f1a21 Merge remote-tracking branch 'origin/dev' into dev 2023-07-13 20:19:15 +08:00
XieYongHong 4eb7d061e1 fix: bug#16301 2023-07-13 20:18:12 +08:00
100011797 9b465d8271 fix: 修改bug 2023-07-13 19:57:04 +08:00
haodd f7eef5e61a Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 19:46:48 +08:00
haodd bf94914248 fix: bug#16325 2023-07-13 18:43:23 +08:00
leiqiaochu f5bb758dca Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-13 17:52:50 +08:00
leiqiaochu 65df271660 fix: bug#16337、16338 2023-07-13 17:52:30 +08:00
XieYongHong da7ec5332c Merge remote-tracking branch 'origin/dev' into dev 2023-07-13 17:04:34 +08:00
XieYongHong 37267ae6d4 fix: bug#16279 2023-07-13 17:04:05 +08:00
leiqiaochu 8da129e6ca fix: bug#16333 2023-07-13 17:01:08 +08:00
haodd d4a5783555 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 16:55:12 +08:00
haodd 151ecb9fa7 fix: 根据协议列表展示数据采集菜单 2023-07-13 16:54:32 +08:00
leiqiaochu 6fee10c352 fix: bug#16263 2023-07-13 16:05:27 +08:00
haodd 1ce92713c1 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 15:39:26 +08:00
haodd afdbd3a3b4 fix: bug#16316、#16314 2023-07-13 15:36:59 +08:00
leiqiaochu cecbc3a78b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-13 14:44:34 +08:00
leiqiaochu fbc0381151 fix: bug#16329、16310、16287、16234、16135 2023-07-13 14:43:48 +08:00
XieYongHong f7310c0e9e Merge remote-tracking branch 'origin/dev' into dev 2023-07-13 14:04:23 +08:00
XieYongHong 816551c394 fix: 优化物模型保存多次提交 2023-07-13 14:03:56 +08:00
haodd aba42ad1aa Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 14:03:10 +08:00
haodd d1bbdef021 fix: bug#15871、#16254、#16317 2023-07-13 14:02:45 +08:00
100011797 f6ebb44f90 fix: 修改bug 2023-07-13 13:57:24 +08:00
XieYongHong 5a845a0e1a fix: 优化视频回放进度无法显示 2023-07-13 13:42:08 +08:00
haodd 1d60415203 fix: bug#16312 2023-07-13 11:57:57 +08:00
haodd 089a7efbd7 fix: bug#16280 2023-07-13 11:54:06 +08:00
XieYongHong d99a07d1a4 fix: bug#16232 2023-07-13 11:34:46 +08:00
haodd 7e3a5c57f7 fix: 角色管理编辑时新增用户表格增加筛选条件，过滤超级管理员 2023-07-13 11:17:32 +08:00
leiqiaochu d63766fef6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-13 09:29:30 +08:00
leiqiaochu 3a90a25f3e fix: bug#16275、16087 2023-07-13 09:29:01 +08:00
100011797 3a46d3e979 fix: 修改bug 2023-07-12 20:56:13 +08:00
XieYongHong 8aeed477a9 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 17:01:38 +08:00
XieYongHong 2cefab5f60 fix: 修复物模型无法新增 2023-07-12 17:01:14 +08:00
leiqiaochu 42970df453 fix: bug#16277、16265 2023-07-12 17:00:19 +08:00
100011797 f35fd74006 fix: 修改bug 2023-07-12 16:57:10 +08:00
XieYongHong af6f78ebb2 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 15:51:09 +08:00
leiqiaochu 8e42e9e1d9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-12 15:50:35 +08:00
leiqiaochu 8956f8eae8 fix: bug#16267 2023-07-12 15:49:50 +08:00
XieYongHong 1d84c517d5 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 15:47:13 +08:00
XieYongHong 22888abd5f fix: bug#16210 2023-07-12 15:45:29 +08:00
100011797 84c743ac23 fix: 修改bug 2023-07-12 15:43:34 +08:00
100011797 a15b036639 fix: 修改bug 2023-07-12 13:49:08 +08:00
100011797 e4f97010cb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-12 11:58:15 +08:00