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

2291 Commits

Author SHA1 Message Date
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 f7a29fcbb4 Revert "feat: 登录密码加密" 
This reverts commit 5bd178f909.
 2023-07-14 10:46:29 +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
leiqiaochu e9df2bffd0 fix: bug 2023-07-13 19:39:15 +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
haodd d9c6dc02a9 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 17:12:21 +08:00
haodd ff3a38880a fix: 协议列表提出公共变量 2023-07-13 17:12:05 +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
haodd 8240776b24 fix: bug#16315 2023-07-13 13:48:15 +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
胡彪 8048e80aa6
feat: 更新README 
* feat: 更改顶部以及侧边菜单配置到store\system.ts

* feat: 新增README 更改配置 内容

* feat: 新增README 新增/编辑菜单

* feat: 新增README 去掉导航栏右上角jetlinks文档
 2023-07-11 11:14:01 +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
100011797 65e1249104 fix: 修改bug 2023-07-06 16:11:12 +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
XieYongHong aaa8c1498f fix: 修复物模型-功能无法编辑问题 2023-07-03 20:01:13 +08:00
XieYongHong d1ff921f6f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	vite.config.ts
 2023-07-03 18:09:21 +08:00
XieYongHong f5bfd8ee3a fix: 修复权限导入无法编辑问题 2023-07-03 18:05:46 +08:00
100011797 a455fc6232 fix: 修改bug 2023-07-03 18:00:05 +08:00
XieYongHong 90a38268b9 Merge remote-tracking branch 'origin/dev' into dev 2023-07-03 16:10:12 +08:00
XieYongHong 2f1463163c feat: 优化物模型-标签去掉详情 2023-07-03 16:09:24 +08:00
100011797 0b3454c225 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-03 15:42:25 +08:00
XieYongHong 40d4f7eb3c
fix: 应用管理赋权接口报错 
* fix: 修改登录后跳转方式

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

* feat: 登录密码加密

* fix: 应用管理赋权接口报错
 2023-07-03 15:42:02 +08:00
100011797 1e70899bf1 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-03 15:41:55 +08:00
100011797 0f140b568e fix: 修改bug 2023-07-03 15:41:21 +08:00
XieYongHong 176f1dc211 feat: 优化物模型单个拷贝、新增编辑逻辑 2023-07-03 15:26:45 +08:00
XieYongHong a6b82b8f46 Merge remote-tracking branch 'origin/dev' into dev 2023-07-03 14:54:54 +08:00
XieYongHong dbbcc37636 feat: 优化物模型单个拷贝 2023-07-03 14:53:55 +08:00
100011797 a9e4f9d0af fix: 修改bug 2023-07-03 11:57:58 +08:00
XieYongHong 74747cd966
refactor: 重构物模型操作 
* feat: 添加读写类型插件

* feat: 添加读写类型插件

* feat: 优化规则

* feat: 抽离属性来源

* fix: 修改物模型

* feat: 属性来源

* feat: 物模型数据类型

* feat: 事件定义和标签定义

* fix: 物模型数据回显

* feat: 添加DataTable和CheckButton的按需引入

* feat: 添加指标配置

* feat: 添加指标配置和存储配置

* update: 功能定义组件抽离

* update: 事件定义组件抽离

* update: object其他配置

* feat: 添加物模型操作

* update: 修改物模型属性、功能、事件

* feat: 优化物模型操作

* feat: 优化物模型操作

* feat: 优化物模型Object类型

* feat: 优化物模型Object操作以及显示

* feat: 添加属性规则接口
 2023-07-03 10:54:37 +08:00
100011797 41daa5ea2a fix: 修改bug 2023-07-03 10:44:51 +08:00
100011797 560de3c4dd fix: 修改bug 2023-06-30 15:09:42 +08:00
100011797 683d3e20e8 fix: 修改bug 2023-06-30 14:37:11 +08:00
XieYongHong 6ff2f9ebad
feat: 登录密码加密 
* fix: 修改登录后跳转方式

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

* feat: 登录密码加密
 2023-06-30 09:56:50 +08:00
XieYongHong 5bd178f909
feat: 登录密码加密 
* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置
 2023-06-30 09:39:56 +08:00
100011797 bcdd56b510 fix: 修改我的订阅 2023-06-29 18:15:47 +08:00
100011797 f616ada3a6 feat: 修改bug 2023-06-29 18:05:18 +08:00
100011797 0bd4dec42e fix: 修改样式 2023-06-29 15:09:43 +08:00
100011797 5f15f21ff2 feat: 设备导入 2023-06-29 09:54:17 +08:00
XieYongHong 8307a1353e
fix: 修改物模型的其他配置按照类型配置 
* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置
 2023-06-28 09:42:31 +08:00
100011797 8fb5d479ee fix: 修改密码按钮权限 2023-06-27 18:05:03 +08:00
100011797 e117787fa0 fix: 未订阅弹窗修改 2023-06-21 15:00:17 +08:00
100011797 21ea5b26d8 fix: 修改通知订阅的样式 2023-06-21 14:32:32 +08:00
100011797 02b2ce66a9 fix: 订阅管理修改 2023-06-21 11:16:43 +08:00
100011797 71ffdc13fe fix: 修改密码权限 2023-06-20 18:27:15 +08:00
100011797 7b6684a9f4 fix: 通知订阅 2023-06-20 16:54:15 +08:00
XieYongHong 0edeb9804a
fix: 还原登录后跳转方式 2023-06-20 15:52:43 +08:00
XieYongHong 3ff87e2ff4
fix: 还原登录后跳转方式 2023-06-20 15:45:34 +08:00
100011797 2b740da418 feat: 订阅管理 2023-06-16 10:24:44 +08:00
XieYongHong 0a479ee058 Merge branch 'bug-fix' into dev 
# Conflicts:
#	src/store/system.ts
 2023-06-15 20:43:24 +08:00
XieYongHong 06d8c03dd0 fix: 优化登录页图片替换 2023-06-15 20:15:13 +08:00
XieYongHong 215bcd7ef5
fix: 放开社区办设备管理-仪表盘 
fix: 放开社区办设备管理-仪表盘
 2023-06-15 15:51:58 +08:00
XieYongHong f3b8068044 fix: 放开社区办设备管理-仪表盘 2023-06-15 14:34:21 +08:00
100011797 c8751bb8ad feat: 应用管理和物模型映射2.1 2023-06-13 09:40:36 +08:00
100011797 299f624658 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-06-12 10:25:52 +08:00
XieYongHong 43aa4bc16e
fix: 优化标签保存ico回显 
* feat: fix:15071

* feat: fix#15077

* feat: 修复组织管理树搜索

* Revert "feat: fix:15071"

This reverts commit 7a8340d3e8.

* fix: 修改告警配置卡顿

* fix: 产品新增分类搜索

* fix: string错误

* fix: 优化标签title，ico

* fix: 优化标签保存ico回显
 2023-06-09 17:54:00 +08:00
XieYongHong 0fb6960cd3 Merge remote-tracking branch 'origin/bug-fix' into bug-fix 2023-06-09 17:52:07 +08:00
XieYongHong 16a748b67c fix: 优化标签保存ico回显 2023-06-09 17:51:55 +08:00
XieYongHong 3e6eac1bfa fix: 优化标签title，ico 2023-06-09 17:49:07 +08:00
100011797 9d727ec094 fix: string错误 2023-06-09 17:33:41 +08:00
100011797 49ff08f502 fix: 修改设备导入 2023-06-09 17:31:38 +08:00
100011797 1dd119144a feat: 应用管理修改 2023-06-09 15:47:49 +08:00
100011797 b0a9a13491 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-06-09 11:11:46 +08:00
100011797 ab79402dc9 fix: 产品新增分类搜索 2023-06-09 10:09:29 +08:00
XieYongHong 93aed922bc feat: 修改图片裁剪中选择图片最大为2M 2023-06-08 17:10:10 +08:00
XieYongHong 98214420cb
fix: 修改告警配置卡顿 
fix: 修改告警配置卡顿
 2023-06-08 16:24:52 +08:00
XieYongHong b3e10b1781 feat: 添加图片裁剪组件 2023-06-08 16:20:51 +08:00
100011797 e5988d2b92 fix: 修改告警配置卡顿 2023-06-08 15:20:24 +08:00
100011797 4aa8a2dbe6 feat: 订阅管理+个人中心 2023-06-08 15:06:42 +08:00
XieYongHong bb62983d6e fix: bug#15071 2023-06-08 11:12:46 +08:00
XieYongHong 93bfeb3a89 Revert "feat: fix:15071" 
This reverts commit 7a8340d3e8.
 2023-06-07 18:21:50 +08:00
XieYongHong f94055d226 Merge branch 'master' into dev 
# Conflicts:
#	src/views/system/Department/components/LeftTree.vue
 2023-06-07 18:03:18 +08:00
XieYongHong df30632e1a
fix: bug#15071 
* feat: fix:15071

* feat: fix#15077

* feat: 修复组织管理树搜索
 2023-06-07 17:49:22 +08:00
XieYongHong 462e9f150a feat: 修复组织管理树搜索 2023-06-07 17:48:14 +08:00
XieYongHong d50c028de6 feat: fix#15077 2023-06-07 17:46:43 +08:00
XieYongHong 7a8340d3e8 feat: fix:15071 2023-06-07 17:46:12 +08:00
100011797 5aa484f22a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-06-07 16:39:10 +08:00
100011797 6de9833302 fix: 修改组织管理的搜索问题 2023-06-07 16:39:01 +08:00
XieYongHong f898477556 feat: task#2375 2023-06-07 15:53:56 +08:00
XieYongHong 5efd20a863
feat: task#2060 
* fix: 15017

* fix: 修改bug(13663、15022、13672)

* fix: 修改操作栏的距离

* fix: bug#15019

* fix: 修改菜单配置

* fix: 修改网络组件的集群控制

* fix: 修改用户管理的类型展示问题

* fix:修改15034

* feat: 优化社区版运维管理-仪表盘-数据加载

* feat: task#2060
 2023-06-07 10:57:37 +08:00
XieYongHong 10a59c318b feat: task#2060 2023-06-07 10:56:22 +08:00
XieYongHong e39c4aaf76 feat: 优化社区版运维管理-仪表盘-数据加载 2023-06-07 10:44:46 +08:00
100011797 fb93db1fa5 fix:修改15034 2023-06-07 09:29:45 +08:00
XieYongHong 099c6fa32a
fix: 修改用户管理的类型展示问题；修改网络组件的集群控制； 
* fix: 15017

* fix: 修改bug(13663、15022、13672)

* fix: 修改操作栏的距离

* fix: bug#15019

* fix: 修改菜单配置

* fix: 修改网络组件的集群控制

* fix: 修改用户管理的类型展示问题
 2023-06-06 15:40:37 +08:00
100011797 795c3b7909 fix: 修改用户管理的类型展示问题 2023-06-06 15:26:31 +08:00
100011797 fa7b64093d fix: 修改网络组件的集群控制 2023-06-06 14:48:22 +08:00
100011797 be1f0b3a48 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-06-06 14:35:20 +08:00
100011797 b3995ec81e fix: 修改菜单配置 2023-06-06 14:35:08 +08:00
XieYongHong df4f552860 Merge remote-tracking branch 'origin/dev' into dev 2023-06-06 14:09:59 +08:00
XieYongHong 1900a34175 fix: bug#15019 2023-06-06 14:09:14 +08:00
100011797 b1a7188a48 fix: 修改操作栏的距离 2023-06-06 14:04:03 +08:00
100011797 c42a5139d5 fix: 修改bug(13663、15022、13672) 2023-06-06 13:32:13 +08:00
100011797 743f5b3fd7 fix: 15017 2023-06-05 18:29:46 +08:00
100011797 462916918c fix: 运行状态卡顿处理+1 2023-06-05 14:58:27 +08:00
100011797 9ff650d76c fix: 运行状态卡顿问题 2023-06-05 14:52:45 +08:00
100011797 a02e4efa51 fix: 运行状态修改 2023-06-05 11:29:10 +08:00
100011797 89458dbf96 fix: 场景联动内置参数校验 2023-06-02 11:17:48 +08:00
100011797 af5d2e08f6 fix: 修改运行状态写入bool下拉显示问题 2023-06-02 10:04:20 +08:00
100011797 f0d7cbddc5 fix: 数据解析报错 2023-06-01 16:27:25 +08:00
100011797 243966ad95 fix: 修改设备功能length报错 2023-06-01 14:37:40 +08:00
100011797 6750e77872 fix: 修改opc_ua写入失败 2023-06-01 10:49:23 +08:00
XieYongHong b7419bebe6 fix: 修改查询组件引入方式 2023-06-01 10:01:32 +08:00
100011797 33a866a569 fix: 修改场景联动关系用户名称回显的问题 2023-05-31 17:58:57 +08:00
100011797 573e42724d fix: 修改opc_ua写入 2023-05-31 16:09:49 +08:00
100011797 5e0ca4e2aa fix: 修改物模型映射样式 2023-05-31 14:50:02 +08:00
100011797 e0ada7d6e0 fix: 修改bug(14733、14793、13672、11767) 2023-05-31 14:06:50 +08:00
100011797 ef8dc58ac4 fix: 14203、14491、9658、13663、14207、14226、14493 2023-05-30 18:21:34 +08:00
XieYongHong c669985f54 fix: 修复设备-物模型中展示其它配置 2023-05-29 18:22:46 +08:00
xieyonghong 457a097ac3 Merge branch 'dev' 2023-05-26 10:54:55 +08:00
xieyonghong 0ce3a5adb5 fix: bug#12031 2023-05-26 10:52:34 +08:00
xieyonghong 67f5678198 Merge branch 'dev' 
# Conflicts:
#	src/views/media/Device/Channel/Live/index.vue
 2023-05-26 10:33:04 +08:00
xieyonghong b734f86450 fix: bug#12031 2023-05-26 10:24:40 +08:00
xieyonghong 58a0695fff fix: bug#13956,12031 2023-05-26 10:20:26 +08:00
XieYongHong ac45596551
fix: bug#14090 
* style: 更换首页图片

* fix: bug#12031

* fix: 修复产品跳转设备列表，查询显示错误问题

* fix: 修复修改密码错误提示

* fix: bug#14088

* fix: bug#14090
 2023-05-23 10:15:25 +08:00
xieyonghong b14c121b72 fix: bug#14090 2023-05-22 17:35:55 +08:00
xieyonghong 82e1b0c347 fix: bug#14088 2023-05-22 17:17:37 +08:00
xieyonghong ce0233e2e0 fix: 修复修改密码错误提示 2023-05-22 16:34:39 +08:00
xieyonghong 06512ea6ea fix: 修复产品跳转设备列表，查询显示错误问题 2023-05-22 16:14:01 +08:00
xieyonghong 01cf4fb82d fix: bug#12031 2023-05-22 11:17:43 +08:00
xieyonghong 6be3ee10b8 style: 更换首页图片 2023-05-22 09:43:12 +08:00
xieyonghong 23becbc2f1 Merge branch 'dev' 
# Conflicts:
#	package.json
 2023-05-19 17:59:23 +08:00
xieyonghong 08d9280fec fix: bug#13846.13671,13974,13188,13222,13639,13975,13668 2023-05-19 17:57:47 +08:00
xieyonghong fc2e324c2f fix: bug#13188 2023-05-18 16:42:35 +08:00
XieYongHong 73e527f12c
fix: 修复设备接入更换接入方式，参数名称未发生变化问题 2023-05-18 16:20:20 +08:00
xieyonghong 8753862d96 fix: bug#13946 2023-05-18 16:19:02 +08:00
xieyonghong 33a70b8c79 fix: bug#13946 2023-05-18 15:36:45 +08:00
xieyonghong 1645f608b6 fix: bug#13749 2023-05-18 14:37:55 +08:00
xieyonghong eae23b5021 fix: 修复设备接入更换接入方式，参数名称未发生变化问题 2023-05-18 14:33:46 +08:00
xieyonghong 6c8498ab44 fix: bug#13841 2023-05-18 13:59:30 +08:00
xieyonghong ed0f992ad1 fix: bug#13222 2023-05-18 13:38:36 +08:00
xieyonghong 1dc0722b65 fix: bug#13639、13188 2023-05-18 13:38:35 +08:00
xieyonghong 7b05778587 fix: bug#13162 2023-05-18 13:38:35 +08:00
xieyonghong 83d95bd9c9 fix: bug#12259 2023-05-18 13:38:34 +08:00
100011797 5a0d709154 fix: 修改场景联动-通知方式的时间选择问题 2023-05-18 11:12:30 +08:00
100011797 189381c5fa fix: 场景联动-收信人结构修改 2023-05-18 10:59:32 +08:00
100011797 8e890e89fd fix: 13662、13673、13173 2023-05-17 18:08:25 +08:00
xieyonghong 5dcbf2d28f feat: 修改文字 2023-05-17 14:43:54 +08:00
xieyonghong fe291a1ca0 feat: 完善场景联动-触发规则-数据发生变化进行提示 2023-05-17 14:42:57 +08:00
xieyonghong 92530b6b88 feat: 优化场景联动-执行动作-数据发生变化时触发校验 2023-05-16 18:06:39 +08:00
xieyonghong 7b4fb484bf fix: 修复https下无法访问网关远程控制 2023-05-15 15:40:59 +08:00
xieyonghong 19d7fadfbe fix: bug#12259 2023-05-15 13:57:58 +08:00
xieyonghong 372ec43eb8 fix: bug#13644 2023-05-15 11:55:17 +08:00
xieyonghong 617cd8b76b fix: bug#13648 2023-05-15 10:43:22 +08:00
xieyonghong 4bb50a9ebc fix: bug#13670 2023-05-15 09:49:37 +08:00
xieyonghong 0618f613ba fix: bug#13738 2023-05-15 09:36:21 +08:00
XieYongHong 285d108bbc
fix: 修复场景联动关系用户显示 
* fix: 优化采集器无数据时页面卡死问题

* fix: 修复场景联动关系用户显示
 2023-05-11 18:47:34 +08:00
xieyonghong 33910ab38a fix: 修复场景联动关系用户显示 2023-05-11 18:11:51 +08:00
XieYongHong 26f63b7abe
fix: 优化采集器无数据时页面卡死问题 2023-05-11 17:10:51 +08:00
xieyonghong 1cb1241c14 fix: 优化采集器无数据时页面卡死问题 2023-05-11 15:22:56 +08:00
xieyonghong 7aac9cfce6 fix: 优化license保存接口参数类型 2023-05-10 13:54:04 +08:00
100011797 6253aa5c32 fix: 修改bug 2023-05-09 23:22:54 +08:00
xieyonghong 618309d7b0 fix: bug#13489 2023-05-09 11:30:52 +08:00
xieyonghong 8339b37b2c fix: bug#13455 2023-05-09 09:28:39 +08:00
xieyonghong d9ac1d456c fix: 优化场景联动-执行动作删除校验 2023-05-08 18:01:19 +08:00
xieyonghong 07c249fdf4 fix: 优化license页面 2023-05-08 18:00:16 +08:00
xieyonghong 16960ea287 fix: 优化设备批量启动请求参数处理 2023-05-08 16:05:55 +08:00
xieyonghong 436ae6cf54 fix: 修复license页面无法访问问题 2023-05-08 14:33:20 +08:00
xieyonghong 35270e4a26 fix: 修复采集器编无法修改数据类型 2023-05-05 16:34:04 +08:00
xieyonghong b79e447279 fix: 优化采集器-modbus新增节点数据类型 2023-05-05 15:14:56 +08:00
xieyonghong 9c0e91b57b fix: 优化设备接入操作 2023-05-05 14:38:48 +08:00
xieyonghong bf5afde34e Merge branch '2.0-bugfix' into dev 
# Conflicts:
#	src/views/oauth/index.vue
 2023-05-04 18:08:28 +08:00
xieyonghong 030c6b7921 fix: 完善执行动作联级查询 2023-05-04 18:06:46 +08:00
xieyonghong 0fca64771a fix: 修复执行动作无法添加问题 2023-05-04 16:48:04 +08:00
xieyonghong 4200ea9711 fix: 优化首页背景图 2023-05-04 16:40:49 +08:00
xieyonghong 69a9ce0866 fix: bug#11981 2023-05-04 16:31:39 +08:00
xieyonghong 2a4ba56ce4 fix: bug#12884 2023-05-04 15:38:32 +08:00
xieyonghong d66ea9c8a8 fix: bug#12763 2023-05-04 15:30:13 +08:00
XieYongHong baea9bd5aa
fix: 修复菜单配置无法调整顺序的问题 2023-04-28 17:23:44 +08:00
xieyonghong 3fb2b4b956 fix: 修复菜单配置无法调整顺序的问题 2023-04-28 17:20:18 +08:00
xieyonghong a0e46a7dff fix: 修复设备接入使用插件无效问题 2023-04-28 15:45:25 +08:00
XieYongHong 66bfd6bae8
fix: 优化接口超时文案提示 2023-04-28 15:10:40 +08:00
xieyonghong 7ae187ba63 fix: 优化接口超时文案提示 2023-04-28 15:08:01 +08:00
XieYongHong 056c694a92
fix: 修复iot账号无法登录可视化 
* fix: 优化oauth页面

* fix: 修复iot账号无法登录可视化
 2023-04-27 17:57:19 +08:00
xieyonghong b59ad04c37 fix: 修复iot账号无法登录可视化 2023-04-27 17:51:44 +08:00
xieyonghong ce4d63be55 fix: 优化oauth页面 2023-04-27 16:25:08 +08:00
xieyonghong 9b138b0e6c fix: 删除多余代码 2023-04-27 15:45:17 +08:00
xieyonghong f6659da1b8 fix: 修复插件管理新增id校验失败 2023-04-27 14:54:27 +08:00