0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 82089fb0a6 fix: 修改bug 100011797 2023-07-14 13:51:26 +0800
  • 9bd3a53b7f fix: bug#16329 leiqiaochu 2023-07-14 13:47:38 +0800
  • 0cb8b8bb21 fix: bug#16364 XieYongHong 2023-07-14 11:59:13 +0800
  • a8c1bfb0ff fix: 修改调试 100011797 2023-07-14 11:05:46 +0800
  • f7a29fcbb4 Revert "feat: 登录密码加密" XieYongHong 2023-07-14 10:46:29 +0800
  • 75098a4388 fix: bug#16301 XieYongHong 2023-07-14 10:32:09 +0800
  • 3e354f1a21 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-13 20:19:15 +0800
  • 4eb7d061e1 fix: bug#16301 XieYongHong 2023-07-13 20:18:12 +0800
  • 9b465d8271 fix: 修改bug 100011797 2023-07-13 19:57:04 +0800
  • f7eef5e61a Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev haodd 2023-07-13 19:46:48 +0800
  • e9df2bffd0 fix: bug leiqiaochu 2023-07-13 19:39:15 +0800
  • bf94914248 fix: bug#16325 haodd 2023-07-13 18:43:23 +0800
  • f5bb758dca Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-07-13 17:52:50 +0800
  • 65df271660 fix: bug#16337、16338 leiqiaochu 2023-07-13 17:52:30 +0800
  • d9c6dc02a9 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev haodd 2023-07-13 17:12:21 +0800
  • ff3a38880a fix: 协议列表提出公共变量 haodd 2023-07-13 17:12:05 +0800
  • da7ec5332c Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-13 17:04:34 +0800
  • 37267ae6d4 fix: bug#16279 XieYongHong 2023-07-13 17:04:05 +0800
  • 8da129e6ca fix: bug#16333 leiqiaochu 2023-07-13 17:01:08 +0800
  • d4a5783555 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev haodd 2023-07-13 16:55:12 +0800
  • 151ecb9fa7 fix: 根据协议列表展示数据采集菜单 haodd 2023-07-13 16:54:32 +0800
  • 6fee10c352 fix: bug#16263 leiqiaochu 2023-07-13 16:05:27 +0800
  • 1ce92713c1 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev haodd 2023-07-13 15:39:26 +0800
  • afdbd3a3b4 fix: bug#16316、#16314 haodd 2023-07-13 15:36:59 +0800
  • cecbc3a78b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-07-13 14:44:34 +0800
  • fbc0381151 fix: bug#16329、16310、16287、16234、16135 leiqiaochu 2023-07-13 14:43:48 +0800
  • f7310c0e9e Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-13 14:04:23 +0800
  • 816551c394 fix: 优化物模型保存多次提交 XieYongHong 2023-07-13 14:03:56 +0800
  • aba42ad1aa Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev haodd 2023-07-13 14:03:10 +0800
  • d1bbdef021 fix: bug#15871、#16254、#16317 haodd 2023-07-13 14:02:45 +0800
  • f6ebb44f90 fix: 修改bug 100011797 2023-07-13 13:57:24 +0800
  • 8240776b24 fix: bug#16315 haodd 2023-07-13 13:48:15 +0800
  • 5a845a0e1a fix: 优化视频回放进度无法显示 XieYongHong 2023-07-13 13:42:08 +0800
  • 1d60415203 fix: bug#16312 haodd 2023-07-13 11:57:57 +0800
  • 089a7efbd7 fix: bug#16280 haodd 2023-07-13 11:54:06 +0800
  • d99a07d1a4 fix: bug#16232 XieYongHong 2023-07-13 11:34:46 +0800
  • 7e3a5c57f7 fix: 角色管理编辑时新增用户表格增加筛选条件，过滤超级管理员 haodd 2023-07-13 11:17:32 +0800
  • d63766fef6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-07-13 09:29:30 +0800
  • 3a90a25f3e fix: bug#16275、16087 leiqiaochu 2023-07-13 09:29:01 +0800
  • 3a46d3e979 fix: 修改bug 100011797 2023-07-12 20:56:13 +0800
  • 8aeed477a9 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-12 17:01:38 +0800
  • 2cefab5f60 fix: 修复物模型无法新增 XieYongHong 2023-07-12 17:01:14 +0800
  • 42970df453 fix: bug#16277、16265 leiqiaochu 2023-07-12 17:00:19 +0800
  • f35fd74006 fix: 修改bug 100011797 2023-07-12 16:57:10 +0800
  • af6f78ebb2 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-12 15:51:09 +0800
  • 8e42e9e1d9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-07-12 15:50:35 +0800
  • 8956f8eae8 fix: bug#16267 leiqiaochu 2023-07-12 15:49:50 +0800
  • 1d84c517d5 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-12 15:47:13 +0800
  • 22888abd5f fix: bug#16210 XieYongHong 2023-07-12 15:45:29 +0800
  • 84c743ac23 fix: 修改bug 100011797 2023-07-12 15:43:34 +0800
  • a15b036639 fix: 修改bug 100011797 2023-07-12 13:49:08 +0800
  • e4f97010cb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-07-12 11:58:15 +0800
  • 760d08ec45 fix: 修改bug 100011797 2023-07-12 11:58:07 +0800
  • 5832c94fde fix: 删除多余showSizeChanger XieYongHong 2023-07-12 11:34:57 +0800
  • 0a80fd716c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-07-12 11:27:17 +0800
  • 47e11c4c26 fix: 修改bug 100011797 2023-07-12 11:27:09 +0800
  • 763f9bbb93 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-12 11:25:13 +0800
  • 29b6f02b73 fix: 优化设备物模型属性保存 XieYongHong 2023-07-12 11:23:33 +0800
  • 6a1badafe6 fix: bug#15649、16087、16231、16254 leiqiaochu 2023-07-12 10:38:46 +0800
  • 4da460a703 fix: 优化物模型属性-指标值 XieYongHong 2023-07-12 10:14:45 +0800
  • 1e71f066cc fix: bug#15933 XieYongHong 2023-07-12 09:44:58 +0800
  • 4213e55996 fix: bug#15649 leiqiaochu 2023-07-12 09:28:27 +0800
  • 7c978f31a7 fix: bug#16233 XieYongHong 2023-07-11 18:16:23 +0800
  • b73c9fdf92 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-11 18:09:00 +0800
  • f4cf58d1e5 fix: bug#16092 XieYongHong 2023-07-11 18:08:00 +0800
  • 57b5a08365 fix: 修改dueros 100011797 2023-07-11 18:05:24 +0800
  • 3dedcb8a5c fix: bug#16212、16217、16223 leiqiaochu 2023-07-11 17:45:15 +0800
  • 42c8dfd695 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-11 17:40:23 +0800
  • fa6bb1527f fix: bug#16077 XieYongHong 2023-07-11 17:22:07 +0800
  • 5f680d23b9 fix: bug#15420、16072、16195、16208、16218、16220、16222 leiqiaochu 2023-07-11 16:52:07 +0800
  • e8946b1aae fix: bug#11093 XieYongHong 2023-07-11 16:50:28 +0800
  • 54e5688309 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-11 16:32:04 +0800
  • 80651c4df8 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev haodd 2023-07-11 16:28:36 +0800
  • 530ac0421d fix: 边缘网关绑定子设备 haodd 2023-07-11 16:28:14 +0800
  • f832e842db fix: bug#11076 XieYongHong 2023-07-11 15:56:11 +0800
  • 4f3099cc50 fix: bug#10750 XieYongHong 2023-07-11 15:53:01 +0800
  • bd34de8642 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-11 14:22:11 +0800
  • 4357cb93fa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-07-11 14:18:25 +0800
  • 41e7e842af fix: bug#16195 leiqiaochu 2023-07-11 14:17:42 +0800
  • 8db22171a3 fix: 修改bug 100011797 2023-07-11 14:12:56 +0800
  • 0b961e49e3 fix: bug#16097 XieYongHong 2023-07-11 13:46:23 +0800
  • 1e3324859a fix: bug#10551 XieYongHong 2023-07-11 13:32:41 +0800
  • 2f073b0413 fix: bug#16191、16070、16087、15717、15420 leiqiaochu 2023-07-11 11:53:42 +0800
  • e4191da93e fix: 修改bug 100011797 2023-07-11 11:51:43 +0800
  • cd4ce56618
         fix: 修复边缘端映射bug XieYongHong 2023-07-11 11:26:10 +0800
  • 8048e80aa6
         feat: 更新README 胡彪 2023-07-11 11:14:01 +0800
  • 86be3af92e fix: 撤销bug#11210修改 XieYongHong 2023-07-11 11:11:29 +0800
  • 87709f67bb fix: bug#15718 XieYongHong 2023-07-11 11:10:09 +0800
  • 035d311e07 fix: bug#11210 XieYongHong 2023-07-11 10:09:55 +0800
  • 19706fec7b Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-10 20:12:20 +0800
  • 8ec0b5a020 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-07-10 20:11:28 +0800
  • 153c8c3556 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-10 20:11:16 +0800
  • f8b6a610e3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-07-10 20:11:04 +0800
  • d4f10e639f fix: 修改bug 100011797 2023-07-10 20:10:41 +0800
  • dbe58704d8 fix: bug#10080 leiqiaochu 2023-07-10 20:09:03 +0800
  • 4aa06e4ad1 fix: 10080 leiqiaochu 2023-07-10 20:08:31 +0800
  • ce20383f7d Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-10 20:08:09 +0800
  • d7d0329477 fix: bug#16110 XieYongHong 2023-07-10 20:04:15 +0800
  • 91e6f1b8ab fix: 去掉cancelSelect 100011797 2023-07-10 19:56:54 +0800
  • e42c6b34d1 fix: 修改bug 100011797 2023-07-10 19:46:43 +0800