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
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
100011797 760d08ec45 fix: 修改bug 2023-07-12 11:58:07 +08:00
XieYongHong 5832c94fde fix: 删除多余showSizeChanger 2023-07-12 11:34:57 +08:00
100011797 0a80fd716c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-12 11:27:17 +08:00
100011797 47e11c4c26 fix: 修改bug 2023-07-12 11:27:09 +08:00
XieYongHong 763f9bbb93 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 11:25:13 +08:00
XieYongHong 29b6f02b73 fix: 优化设备物模型属性保存 2023-07-12 11:23:33 +08:00
leiqiaochu 6a1badafe6 fix: bug#15649、16087、16231、16254 2023-07-12 10:38:46 +08:00
XieYongHong 4da460a703 fix: 优化物模型属性-指标值 2023-07-12 10:14:45 +08:00
XieYongHong 1e71f066cc fix: bug#15933 2023-07-12 09:44:58 +08:00
leiqiaochu 4213e55996 fix: bug#15649 2023-07-12 09:28:27 +08:00
XieYongHong 7c978f31a7 fix: bug#16233 2023-07-11 18:16:23 +08:00
XieYongHong b73c9fdf92 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/media/Device/Channel/index.vue
 2023-07-11 18:09:00 +08:00
XieYongHong f4cf58d1e5 fix: bug#16092 2023-07-11 18:08:00 +08:00
100011797 57b5a08365 fix: 修改dueros 2023-07-11 18:05:24 +08:00
leiqiaochu 3dedcb8a5c fix: bug#16212、16217、16223 2023-07-11 17:45:15 +08:00
XieYongHong 42c8dfd695 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 17:40:23 +08:00
XieYongHong fa6bb1527f fix: bug#16077 2023-07-11 17:22:07 +08:00
leiqiaochu 5f680d23b9 fix: bug#15420、16072、16195、16208、16218、16220、16222 2023-07-11 16:52:07 +08:00
XieYongHong e8946b1aae fix: bug#11093 2023-07-11 16:50:28 +08:00
XieYongHong 54e5688309 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 16:32:04 +08:00
haodd 80651c4df8 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-11 16:28:36 +08:00
haodd 530ac0421d fix: 边缘网关绑定子设备 2023-07-11 16:28:14 +08:00
XieYongHong f832e842db fix: bug#11076 2023-07-11 15:56:11 +08:00
XieYongHong 4f3099cc50 fix: bug#10750 2023-07-11 15:53:01 +08:00
XieYongHong bd34de8642 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 14:22:11 +08:00
leiqiaochu 4357cb93fa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-11 14:18:25 +08:00
leiqiaochu 41e7e842af fix: bug#16195 2023-07-11 14:17:42 +08:00
100011797 8db22171a3 fix: 修改bug 2023-07-11 14:12:56 +08:00
XieYongHong 0b961e49e3 fix: bug#16097 2023-07-11 13:46:23 +08:00
XieYongHong 1e3324859a fix: bug#10551 2023-07-11 13:32:41 +08:00
leiqiaochu 2f073b0413 fix: bug#16191、16070、16087、15717、15420 2023-07-11 11:53:42 +08:00
100011797 e4191da93e fix: 修改bug 2023-07-11 11:51:43 +08:00
XieYongHong cd4ce56618
fix: 修复边缘端映射bug 
* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置

* feat: 登录密码加密

* fix: 应用管理赋权接口报错

* fix: 修复边缘端映射bug
 2023-07-11 11:26:10 +08:00
XieYongHong 86be3af92e fix: 撤销bug#11210修改 2023-07-11 11:11:29 +08:00
XieYongHong 87709f67bb fix: bug#15718 2023-07-11 11:10:09 +08:00
XieYongHong 035d311e07 fix: bug#11210 2023-07-11 10:09:55 +08:00
XieYongHong 19706fec7b Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 20:12:20 +08:00
leiqiaochu 8ec0b5a020 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 20:11:28 +08:00
XieYongHong 153c8c3556 Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 20:11:16 +08:00
leiqiaochu f8b6a610e3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 20:11:04 +08:00
100011797 d4f10e639f fix: 修改bug 2023-07-10 20:10:41 +08:00
leiqiaochu dbe58704d8 fix: bug#10080 2023-07-10 20:09:03 +08:00
leiqiaochu 4aa06e4ad1 fix: 10080 2023-07-10 20:08:31 +08:00
XieYongHong ce20383f7d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	yarn.lock
 2023-07-10 20:08:09 +08:00
XieYongHong d7d0329477 fix: bug#16110 2023-07-10 20:04:15 +08:00
100011797 91e6f1b8ab fix: 去掉cancelSelect 2023-07-10 19:56:54 +08:00
100011797 e42c6b34d1 fix: 修改bug 2023-07-10 19:46:43 +08:00
100011797 71af134d09 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 19:45:58 +08:00
leiqiaochu 458b5dd8f9 fix: bug#16173、16172、16138、15092 2023-07-10 19:25:44 +08:00
XieYongHong a9188563b7 fix: bug#15531 2023-07-10 19:10:46 +08:00
XieYongHong c0a7d9ce91 fix: bug#15155 2023-07-10 19:01:00 +08:00
XieYongHong 6596016642 Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 18:56:57 +08:00
XieYongHong 9b00ebcc25 fix: 优化产品物模型编辑状态 2023-07-10 18:53:33 +08:00
100011797 7504dc3f88 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 17:55:44 +08:00
100011797 bd42cdd3fb fix: 修改bug 2023-07-10 17:55:36 +08:00
leiqiaochu 56b3b0acfb fix: bug#16085、16024、15967、15924、16072、16070、16067 2023-07-10 17:01:50 +08:00
100011797 a4aa193781 fix: 修改message 2023-07-10 15:42:28 +08:00
100011797 b3f194675b fix: 修改bug 2023-07-10 11:57:08 +08:00
100011797 fe9fe82e20 fix: 修改bug 2023-07-10 11:42:37 +08:00
XieYongHong cf4806738f fix: 优化设备物模型 2023-07-10 10:39:04 +08:00
100011797 7daaa88407 fix: allow-scripts 2023-07-10 10:19:51 +08:00
100011797 bee1c13d94 fix: 修改bug 2023-07-10 09:43:00 +08:00
xieyonghong a8338a5981 fix: 优化设备物模型 2023-07-09 19:34:16 +08:00
XieYongHong c8fa001655 fix: 优化物模型-标签定义 2023-07-08 18:13:47 +08:00
xieyonghong 3231c7ea12 fix: 优化物模型-编辑表格标识校验 2023-07-07 21:57:12 +08:00
100011797 2e50b866f0 fix: 修改bug 2023-07-07 18:29:47 +08:00
XieYongHong 9eacdb2687 fix: 优化物模型-功能定义-(输入、输出) 2023-07-07 18:21:17 +08:00
XieYongHong 7c2f4c410c Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 17:25:00 +08:00
XieYongHong 4d995d98ed fix: 优化物模型-功能定义-输出 2023-07-07 17:22:46 +08:00
100011797 ddcc8db097 fix: 修改bug 2023-07-07 17:22:29 +08:00
100011797 5af3624676 fix: 修改bug 2023-07-07 15:00:00 +08:00
100011797 daef6b7f1f fix: 修改bug 2023-07-07 14:04:51 +08:00
XieYongHong e103369689 Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 11:09:50 +08:00
XieYongHong 90df330400 fix: 优化物模型-功能定义-输出 2023-07-07 11:09:28 +08:00
100011797 c43e5a162a fix: 修改bug 2023-07-07 10:44:03 +08:00
xieyonghong d76aa3f65c fix: 优化物模型-事件定义 2023-07-06 22:33:29 +08:00
XieYongHong a869162799 fix: 优化物模型-功能定义-输入 2023-07-06 20:53:48 +08:00
XieYongHong c56dbff80b Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 18:16:11 +08:00
100011797 42745b19a1 fix: 修改bug 2023-07-06 18:15:40 +08:00
XieYongHong 1622206283 fix: 优化物模型-功能定义(输入、输出) 2023-07-06 18:15:19 +08:00
XieYongHong c4faec62c1 Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 16:50:29 +08:00
XieYongHong 09d1d388b8 fix: 优化物模型-功能定义(输入、输出) 2023-07-06 16:49:48 +08:00
100011797 56d56af3f1 fix: 修改bug 2023-07-06 16:33:38 +08:00
XieYongHong 5912ebd703 Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 16:02:07 +08:00
XieYongHong 1ceb3bb925 fix: 优化物模型-功能定义 2023-07-06 16:01:38 +08:00
100011797 76f22d8503 fix: 修改bug 2023-07-06 15:59:49 +08:00
XieYongHong 3065cd88c2 fix: 优化物模型-规则 2023-07-06 15:59:10 +08:00
XieYongHong 590a82b156 Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 15:01:02 +08:00
XieYongHong bb602aecd2 fix: 优化物模型-详情 2023-07-06 15:00:16 +08:00
100011797 99637f0938 fix: 物模型映射搜索 2023-07-06 14:56:31 +08:00
100011797 9acec4efa1 fix: 修改bug 2023-07-06 14:21:36 +08:00
100011797 8fc0d9f6d4 fix: 修改bug 2023-07-06 14:03:34 +08:00
xieyonghong 7f75c05f79 fix: 优化物模型必填校验 2023-07-05 22:27:36 +08:00
100011797 be0aeb9a0a fix: 修改bug 2023-07-05 18:29:24 +08:00
XieYongHong 6651e75930 fix: 优化物模型-编辑表格-时间、枚举 2023-07-05 18:27:41 +08:00
XieYongHong c27757aea8 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	yarn.lock
 2023-07-05 15:08:33 +08:00
XieYongHong e6b10a75f2 fix: 修复物模型-编辑表格 2023-07-05 15:06:27 +08:00
100011797 268745ff1d fix: 修改bug 2023-07-05 15:04:12 +08:00
100011797 f295104d8e fix: 修改ui 2023-07-04 18:25:04 +08:00
XieYongHong 0d6e9d8ae8 fix: 修复物模型-功能详情 2023-07-04 18:19:33 +08:00