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 |