XieYongHong
|
94069da4b1
|
Merge branch 'dev' into dev-dictionary
|
2023-10-18 18:14:58 +08:00 |
|
XieYongHong
|
6f59a150d3
|
fix: bug#19130
|
2023-10-18 18:13:30 +08:00 |
|
XieYongHong
|
fe080130b8
|
Merge branch 'dev' into dev-dictionary
|
2023-10-17 15:31:41 +08:00 |
leiqiaochu
|
329ec037d2
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-10-17 15:29:13 +08:00 |
|
leiqiaochu
|
c0bb93b2f7
|
fix: 获取菜单
|
2023-10-17 15:28:21 +08:00 |
|
XieYongHong
|
2c891e7f49
|
fix: 优化设备批量导出查询条件
|
2023-10-16 15:45:31 +08:00 |
|
XieYongHong
|
c4ddde59ab
|
fix: 优化设备批量导出查询条件
|
2023-10-16 15:32:50 +08:00 |
|
XieYongHong
|
18433ef6e3
|
fix: 删除多余无效引入
|
2023-10-16 09:42:42 +08:00 |
qiaochuLei
|
ad04405afb
|
fix: bug#18784
* fix: bug#18784
|
2023-10-12 18:00:27 +08:00 |
|
XieYongHong
|
940be8e53b
|
Merge branch 'dev' into dev-dictionary
|
2023-10-12 17:56:03 +08:00 |
|
qiaochuLei
|
e6205e6602
|
fix: bug#18996
* fix: bug#16956
* fix: bug#18996
|
2023-10-11 17:34:25 +08:00 |
|
leiqiaochu
|
54a9c3382f
|
feat: 删除关系配置
|
2023-10-11 16:03:47 +08:00 |
|
leiqiaochu
|
700aa9a5d5
|
feat: 关系配置组件
|
2023-10-11 15:45:38 +08:00 |
|
XieYongHong
|
8ffb079c62
|
Merge branch 'dev' into dev-dictionary
|
2023-10-10 11:53:12 +08:00 |
|
leiqiaochu
|
3be96fca1c
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-10-10 11:05:22 +08:00 |
|
leiqiaochu
|
dca46aeb43
|
feat: 关系组件
|
2023-10-10 11:04:32 +08:00 |
|
XieYongHong
|
5f41a9a125
|
fix: 优化查询条件；合并dev部分代码
|
2023-10-10 10:25:30 +08:00 |
|
XieYongHong
|
035281ba06
|
fix: 优化查询条件
|
2023-10-10 10:20:15 +08:00 |
|
XieYongHong
|
8f69ac098e
|
Merge branch 'dev' into dev-dictionary
|
2023-10-10 09:53:17 +08:00 |
|
qiaochuLei
|
3b3f379c03
|
fix: bug#18975、18961、16956
* fix: bug#16958
* fix: bug#18961、18962、18872
* fix: bug#18961、16956
* fix: bug#18975
|
2023-10-10 09:50:25 +08:00 |
|
leiqiaochu
|
406101c134
|
feat: 初始化角色组接口变更
|
2023-10-09 15:56:47 +08:00 |
|
leiqiaochu
|
637a1b0bd4
|
feat: 初始化角色分组
|
2023-10-09 15:44:02 +08:00 |
|
leiqiaochu
|
acb7826d91
|
feat: 初始化分组
|
2023-10-09 15:22:48 +08:00 |
|
leiqiaochu
|
09c0cee3bb
|
fix: 修复菜单相关bug
|
2023-10-09 10:33:15 +08:00 |
|
leiqiaochu
|
dbdb044075
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-10-09 10:01:59 +08:00 |
|
leiqiaochu
|
83594756ea
|
fix: 初始化
|
2023-10-09 10:01:18 +08:00 |
|
XieYongHong
|
8b7e6e2931
|
Merge branch 'dev' into dev-dictionary
|
2023-10-08 18:32:57 +08:00 |
|
qiaochuLei
|
1e80c57181
|
fix: bug#18961、18962、18872
* fix: bug#18772
* fix: bug#16958
* fix: bug#18961、18962、18872
|
2023-10-08 18:31:01 +08:00 |
|
XieYongHong
|
fe31c775f5
|
Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
|
2023-10-08 16:42:43 +08:00 |
|
XieYongHong
|
5b0a9fe9ae
|
Merge branch 'dev' into dev-dictionary
|
2023-10-08 16:41:21 +08:00 |
|
leiqiaochu
|
6533b5ec00
|
fix: bug#18951
|
2023-10-08 16:35:51 +08:00 |
|
XieYongHong
|
ac074990cb
|
fix: bug#16958、18772、系统菜单非选中状态不显示
* fix: bug#视频回放加载bug
* fix: bug#18502
* fix: bug#视频回放加载bug
* fix: bug#18156
* fix: bug#16958、18772
* fix: bug#18674
* feat: 系统菜单非选中状态不显示bug
* fix: bug#18772
* fix: bug#16958
|
2023-10-08 11:22:06 +08:00 |
|
leiqiaochu
|
da55dc1020
|
fix: 修改数据字典
|
2023-10-08 10:42:37 +08:00 |
|
qiaochuLei
|
f55df1e8ca
|
fix: bug#16958、18772
* fix: bug#18674
* feat: 系统菜单非选中状态不显示bug
* fix: bug#18772
* fix: bug#16958
|
2023-10-08 09:50:10 +08:00 |
|
XieYongHong
|
88996cbdfb
|
Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
|
2023-10-07 17:22:02 +08:00 |
|
XieYongHong
|
7fe91c7dcc
|
fix: bug#18886
|
2023-10-07 17:21:48 +08:00 |
|
leiqiaochu
|
2f107adde3
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-10-07 17:15:27 +08:00 |
|
leiqiaochu
|
21925700a5
|
fix: bug#18920
|
2023-10-07 17:14:56 +08:00 |
|
XieYongHong
|
24a669adc6
|
fix: bug#18886
|
2023-10-07 17:14:43 +08:00 |
|
XieYongHong
|
14bc5cf16f
|
Merge branch 'dev' into dev-dictionary
|
2023-10-07 15:25:48 +08:00 |
|
XieYongHong
|
90104848c1
|
fix: bug#18156
|
2023-10-07 15:11:39 +08:00 |
|
leiqiaochu
|
189c88aa92
|
fix: bug#18766
|
2023-10-07 14:03:21 +08:00 |
|
leiqiaochu
|
06f128bd0b
|
fix: bug#18898
|
2023-10-07 13:36:48 +08:00 |
|
leiqiaochu
|
9d4177e1c9
|
fix: 修改请求菜单接口参数
|
2023-09-27 17:21:52 +08:00 |
|
leiqiaochu
|
c8717c6f0c
|
fix: bug#18850
|
2023-09-27 17:18:44 +08:00 |
|
leiqiaochu
|
3afcac7c71
|
feat: 新增用户角色展示
|
2023-09-27 16:31:31 +08:00 |
|
leiqiaochu
|
c46122d08a
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-09-27 15:05:56 +08:00 |
|
leiqiaochu
|
a55e7d2af1
|
fix: bug#18805
|
2023-09-27 15:05:35 +08:00 |
|
XieYongHong
|
7c75248aae
|
Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
|
2023-09-27 13:58:12 +08:00 |
|
leiqiaochu
|
490f34b215
|
feat: 关系改造
|
2023-09-27 13:42:24 +08:00 |