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

2170 Commits

Author SHA1 Message Date
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 493c0abe7f
Revert "feat: fix:15071" 
* feat: fix:15071

* feat: fix#15077

* feat: 修复组织管理树搜索
 2023-06-07 18:26:36 +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
XieYongHong 820ca7330e Merge branch 'dev' 
# Conflicts:
#	src/views/system/Menu/Setting/utils.ts
 2023-06-05 15:32:12 +08:00