jackhoo_98
|
414a9987d2
|
Merge branch 'dev' into dev-hub
|
2023-03-27 15:27:01 +08:00 |
|
jackhoo_98
|
049bf99395
|
fix: 菜单管理 完成菜单配置
|
2023-03-27 15:25:53 +08:00 |
leiqiaochu
|
b8dac68cfa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 14:20:25 +08:00 |
|
leiqiaochu
|
5ac6df4ffb
|
fix: bug#11022
|
2023-03-27 14:20:04 +08:00 |
JiangQiming
|
5d19f58f59
|
fix: bug#10967、10974
|
2023-03-27 14:13:52 +08:00 |
|
leiqiaochu
|
ca9f2a66c0
|
fix: bug#10999 10977 10964 10957 10951 10940 10868
|
2023-03-27 11:16:20 +08:00 |
wangshuaiswim
|
1afe27ca91
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 11:08:38 +08:00 |
|
wangshuaiswim
|
38a0bc418a
|
fix: 修改布尔类型组件在chrome浏览器下的排版问题
|
2023-03-27 11:07:59 +08:00 |
|
JiangQiming
|
71fe3f81bd
|
fix: bug#10894
|
2023-03-27 10:47:50 +08:00 |
xieyonghong
|
fed5c348e0
|
style: 优化场景联动卡片的省略内容显示样式
|
2023-03-27 09:24:45 +08:00 |
|
xieyonghong
|
9b459f2507
|
update: 优化useParams
|
2023-03-27 09:22:24 +08:00 |
|
xieyonghong
|
6919d41b93
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-26 22:27:49 +08:00 |
|
xieyonghong
|
0dfbac22c5
|
fix: bug#10937
|
2023-03-26 22:20:01 +08:00 |
|
xieyonghong
|
dcd584c9c7
|
fix: bug#10946
|
2023-03-26 21:42:23 +08:00 |
|
xieyonghong
|
3810046bee
|
fix: bug#10947
|
2023-03-26 21:18:03 +08:00 |
|
xieyonghong
|
1d782a1231
|
fix: bug#10956
|
2023-03-26 21:14:17 +08:00 |
|
jackhoo_98
|
05776bd630
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-26 19:13:34 +08:00 |
|
jackhoo_98
|
0f6f2cccb6
|
feat: 菜单管理 重构菜单配置 完成交互逻辑
|
2023-03-26 19:12:01 +08:00 |
|
xieyonghong
|
6f8f77bcd6
|
fix: bug#10958
|
2023-03-26 17:15:05 +08:00 |
|
xieyonghong
|
065cf055f9
|
fix: bug#10959
|
2023-03-26 17:04:34 +08:00 |
|
xieyonghong
|
cc84a2a54c
|
fix: bug#10962、10791
|
2023-03-26 00:34:45 +08:00 |
|
xieyonghong
|
ec7ad63f89
|
style: 优化首页样式
|
2023-03-26 00:24:33 +08:00 |
|
xieyonghong
|
b9e332447e
|
fix: bug#10979
|
2023-03-26 00:05:03 +08:00 |
|
xieyonghong
|
3dd39c5279
|
fix: bug#10983
|
2023-03-25 23:22:15 +08:00 |
|
xieyonghong
|
8370f863bb
|
fix: bug#10984
|
2023-03-25 23:17:54 +08:00 |
|
xieyonghong
|
8c66b348a3
|
fix: bug#10986
|
2023-03-25 23:12:14 +08:00 |
|
xieyonghong
|
1f16b4e827
|
fix: 修复错误校验
|
2023-03-25 23:00:46 +08:00 |
|
xieyonghong
|
783010bcb1
|
fix: bug#10987
|
2023-03-25 22:55:18 +08:00 |
|
xieyonghong
|
9dab329841
|
fix: bug#10989
|
2023-03-25 22:49:18 +08:00 |
|
xieyonghong
|
5c6c8dbed4
|
fix: bug#10990
|
2023-03-25 22:40:24 +08:00 |
|
xieyonghong
|
b8d0fd5bcf
|
fix: bug#10992
|
2023-03-25 22:32:53 +08:00 |
|
xieyonghong
|
1455fe8141
|
fix: bug#10994
|
2023-03-25 22:26:49 +08:00 |
|
xieyonghong
|
9fb9571699
|
fix: bug#10995
|
2023-03-25 21:22:50 +08:00 |
|
xieyonghong
|
4445e81ceb
|
fix: bug#10996
|
2023-03-25 21:12:19 +08:00 |
|
xieyonghong
|
0f17aee1ab
|
fix: 删除错误引入AIcon
|
2023-03-25 18:45:38 +08:00 |
|
xieyonghong
|
6549c98605
|
fix: bug#10837
|
2023-03-25 18:09:52 +08:00 |
|
xieyonghong
|
7f9cf53dd0
|
fix: bug#10873
|
2023-03-25 18:09:51 +08:00 |
|
xieyonghong
|
d34af0aeb4
|
fix: bug#10930
|
2023-03-25 18:09:51 +08:00 |
|
xieyonghong
|
dce719c9d3
|
fix: bug#10922
|
2023-03-25 18:09:50 +08:00 |
|
xieyonghong
|
1c0812f8d5
|
fix: bug#10821
|
2023-03-25 18:09:50 +08:00 |
|
xieyonghong
|
dc0fc31503
|
fix: bug#10867
|
2023-03-25 18:09:49 +08:00 |
|
xieyonghong
|
75d748a416
|
fix: bug#10559
|
2023-03-25 18:09:49 +08:00 |
|
xieyonghong
|
605466c482
|
fix: 修复BadgeStatus中status类型
|
2023-03-25 18:09:48 +08:00 |
|
xieyonghong
|
620a3a4ae8
|
fix: bug#10514
|
2023-03-25 18:09:48 +08:00 |
|
JiangQiming
|
532c82afe6
|
fix: bug#10905、10895、10912、10926、10927、10886
|
2023-03-25 15:56:11 +08:00 |
|
JiangQiming
|
32f49d95b8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-25 14:44:22 +08:00 |
|
JiangQiming
|
934200dfcd
|
fix: bug#10914、10888
|
2023-03-25 14:44:07 +08:00 |
|
xieyonghong
|
e969b3911f
|
fix: 优化面包屑跳转
|
2023-03-25 10:06:37 +08:00 |
|
JiangQiming
|
582ebddd21
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 18:48:10 +08:00 |
|
JiangQiming
|
07510a272e
|
fix: bug#10891、10890、10893、10894、10905、10901
|
2023-03-24 18:47:55 +08:00 |
100011797
|
5fbbaa5f83
|
fix: 修改执行动作
|
2023-03-24 18:20:21 +08:00 |
|
wangshuaiswim
|
daf0597526
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 18:07:42 +08:00 |
|
wangshuaiswim
|
bba4650fc8
|
fix: 查询存储策略增加防抖节流
|
2023-03-24 18:07:23 +08:00 |
|
jackhoo_98
|
af8f951ed8
|
Merge branch 'dev' into dev-hub
|
2023-03-24 18:05:22 +08:00 |
|
jackhoo_98
|
1c23a544fe
|
fix: 菜单管理 菜单配置todo
|
2023-03-24 18:04:13 +08:00 |
|
JiangQiming
|
ebd304fdba
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 17:05:19 +08:00 |
|
JiangQiming
|
0a7cb746ab
|
fix: bug#10904
|
2023-03-24 17:05:05 +08:00 |
|
xieyonghong
|
739a044823
|
fix: bug#10363
|
2023-03-24 17:00:08 +08:00 |
|
xieyonghong
|
12e3bf620b
|
fix: bug#10667
|
2023-03-24 17:00:08 +08:00 |
|
JiangQiming
|
58e01fe28e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 16:31:40 +08:00 |
|
JiangQiming
|
b8a587fd00
|
fix: bug#10540、10885、10818、10566、10418
|
2023-03-24 16:31:24 +08:00 |
|
100011797
|
cfa898e12b
|
fix: 数据源修改
|
2023-03-24 16:17:40 +08:00 |
|
100011797
|
d45ff4431b
|
fix: 修改执行动作
|
2023-03-24 16:01:52 +08:00 |
|
jackhoo_98
|
32e78e9fc0
|
fix: 修复采集器断开文案以及PLC地址回显
|
2023-03-24 15:36:25 +08:00 |
|
jackhoo_98
|
62bd45e624
|
fix: bug#10844
|
2023-03-24 15:34:04 +08:00 |
|
xieyonghong
|
00ca314972
|
update: geoComponent添加change事件
|
2023-03-24 15:26:59 +08:00 |
|
JiangQiming
|
8c2af7fe76
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 15:22:19 +08:00 |
|
JiangQiming
|
8d35495808
|
fix: bug#10863、10816、10739、10746、10749
|
2023-03-24 15:22:02 +08:00 |
|
xieyonghong
|
01fc5b13a0
|
fix: bug#10393
|
2023-03-24 14:56:37 +08:00 |
|
xieyonghong
|
4112313953
|
fix: bug#10559
|
2023-03-24 14:56:37 +08:00 |
|
wangshuaiswim
|
17510b998f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 14:06:24 +08:00 |
|
wangshuaiswim
|
f4b3ae8626
|
fix: 修改导入物模型产品可筛选
|
2023-03-24 14:05:44 +08:00 |
|
xieyonghong
|
570950c4e3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 13:51:09 +08:00 |
|
xieyonghong
|
01d3a0939d
|
fix: 修复二次确认按钮换行
|
2023-03-24 13:34:42 +08:00 |
|
JiangQiming
|
f55bf06297
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 11:50:15 +08:00 |
|
JiangQiming
|
62f8061e3b
|
fix: bug#10742、10828、10827、10657
|
2023-03-24 11:49:58 +08:00 |
|
100011797
|
5fd68c3da7
|
fix: 标签值修改
|
2023-03-24 11:16:03 +08:00 |
|
100011797
|
b70e5549f0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 11:00:10 +08:00 |
|
100011797
|
19684721e2
|
fix: 数据源bug
|
2023-03-24 10:59:11 +08:00 |
|
jackhoo_98
|
3f075e6f24
|
fix: 修复网络组件 流媒体服务 域名ip校验问题
|
2023-03-24 10:06:51 +08:00 |
|
jackhoo_98
|
06139305eb
|
fix: bug#10779 修复采集器新增时通道不完整问题
|
2023-03-24 09:56:39 +08:00 |
|
wangshuaiswim
|
0c4c93c386
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-24 09:52:06 +08:00 |
|
wangshuaiswim
|
140465a61e
|
fix: 修改导入阿里云物模型时提示报错信息
|
2023-03-24 09:51:46 +08:00 |
|
xieyonghong
|
5eccbc9758
|
fix: 修复场景联动数据结构
|
2023-03-24 09:13:12 +08:00 |
|
JiangQiming
|
4578810ab9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-23 21:00:30 +08:00 |
|
JiangQiming
|
004eb1fb2f
|
fix: bug#10816、10814、10812、10789、10780、10775、等
|
2023-03-23 21:00:09 +08:00 |
|
xieyonghong
|
96c6b69aef
|
fix: bug#10782
|
2023-03-23 18:43:29 +08:00 |
|
leiqiaochu
|
cb035bce38
|
fix: bug#10817
|
2023-03-23 18:17:11 +08:00 |
胡彪
|
7c7a585c43
|
Merge pull request #68 from jetlinks/dev-hub
fix: 运维管理修复部分bug
|
2023-03-23 18:03:37 +08:00 |
|
JiangQiming
|
f3c3ffe291
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-23 18:02:43 +08:00 |
|
jackhoo_98
|
ef9cfc902c
|
Merge branch 'dev' into dev-hub
|
2023-03-23 18:02:33 +08:00 |
|
JiangQiming
|
f00d69d30e
|
fix: bug#10841、10838、10835、10834、10828、10827
|
2023-03-23 18:02:27 +08:00 |
|
jackhoo_98
|
f75e9303d4
|
fix: 修复运维管理、数据采集卡片跳转
|
2023-03-23 18:01:37 +08:00 |
|
jackhoo_98
|
0671e2d357
|
fix: 修复协议管理、远程升级上传文件获取base-path方式
|
2023-03-23 17:41:27 +08:00 |
|
jackhoo_98
|
4b84614f82
|
fix: 修复运维管理 数据采集 删除按钮样式优化
|
2023-03-23 17:18:01 +08:00 |
|
leiqiaochu
|
0e26f1e638
|
fix: 样式优化
|
2023-03-23 17:03:03 +08:00 |
|
jackhoo_98
|
dcf41b4c2c
|
fix: bug#10707 修复运维管理日志说明查询
|
2023-03-23 16:54:26 +08:00 |
|
JiangQiming
|
6d0e50a203
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-23 16:46:19 +08:00 |
|
JiangQiming
|
9c9ee029e6
|
fix: bug#10773、10772、10829、10826
|
2023-03-23 16:46:02 +08:00 |
|
jackhoo_98
|
a511dd5972
|
fix: bug#10743 修复远程升级选择设备多选取消问题
|
2023-03-23 16:37:39 +08:00 |