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

2247 Commits

Author SHA1 Message Date
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
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
XieYongHong fbc902aa14
fix: 修改查询组件引入方式;修改opc_ua写入失败 
* fix: 14203、14491、9658、13663、14207、14226、14493

* fix: 修改bug(14733、14793、13672、11767)

* fix: 修改物模型映射样式

* fix: 修改opc_ua写入

* fix: 修改场景联动关系用户名称回显的问题

* fix: 修改查询组件引入方式

* fix: 修改opc_ua写入失败
 2023-06-01 11:58:02 +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