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 |
|
jackhoo_98
|
a4b79f2b8f
|
fix: bug#10702、10703 修复网络组件、流媒体服务域名校验
|
2023-03-23 16:02:22 +08:00 |
xieyonghong
|
cb91ec58ac
|
fix: bug#10787、10786
|
2023-03-23 15:46:27 +08:00 |
100011797
|
8c97f0e441
|
fix: 批量操作按钮
|
2023-03-23 15:44:58 +08:00 |
|
JiangQiming
|
1f6f7d23b4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-23 15:36:46 +08:00 |
|
JiangQiming
|
b4734056d8
|
fix: bug#10609-1
|
2023-03-23 15:36:31 +08:00 |
|
100011797
|
0e56cadb12
|
fix: 修改同步设备状态
|
2023-03-23 15:35:57 +08:00 |
|
100011797
|
dead9c5b46
|
fix: 运行状态播放组件添加
|
2023-03-23 15:27:59 +08:00 |
leiqiaochu
|
83284569aa
|
fix: bug#9308
|
2023-03-23 15:21:33 +08:00 |
|
100011797
|
73351235ce
|
fix: 修改bug
|
2023-03-23 15:08:36 +08:00 |
|
jackhoo_98
|
d04e69ba1b
|
fix: 设备接入网关 屏蔽插件接入
|
2023-03-23 14:54:44 +08:00 |
|
jackhoo_98
|
e97255d088
|
fix: bug#10721、10714 修复证书管理部分bug
|
2023-03-23 14:41:35 +08:00 |
|
jackhoo_98
|
0a33ca67ab
|
fix: bug#10802、10799、10798、10796、10791 修复设备接入网关国标接入部分bug
|
2023-03-23 14:33:17 +08:00 |
|
JiangQiming
|
e9d5c8e9c3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-23 11:48:46 +08:00 |
|
JiangQiming
|
0e09858d38
|
fix: bug#10706、10678
|
2023-03-23 11:47:58 +08:00 |
wangshuaiswim
|
588cad1cd5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-23 11:39:23 +08:00 |
|
wangshuaiswim
|
e278ae3ebc
|
fix: 修改物模型BUG
|
2023-03-23 11:38:34 +08:00 |
|
100011797
|
f8cad6d7b1
|
fix: 详情返回
|
2023-03-23 10:36:22 +08:00 |
|
leiqiaochu
|
49ed583525
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-23 10:33:28 +08:00 |
|
leiqiaochu
|
30c1619f06
|
fix: bug#10769 10765 10760 10459
|
2023-03-23 10:32:42 +08:00 |
|
xieyonghong
|
5600e49b87
|
fix: bug#10787、10786
|
2023-03-23 09:31:29 +08:00 |
|
xieyonghong
|
a8478617cd
|
fix: bug#10763、10750、10732、10686
|
2023-03-23 08:42:31 +08:00 |
|
jackhoo_98
|
3fdfa001bf
|
fix: 运维管理仪表盘 格式化网络流量Y轴展示
|
2023-03-22 21:06:28 +08:00 |
|
jackhoo_98
|
140569c331
|
Merge branch 'dev' into dev-hub
|
2023-03-22 20:41:36 +08:00 |
|
jackhoo_98
|
cde14681e7
|
fix: bug#10729、10738、10745、10734修复远程升级部分bug
|
2023-03-22 20:39:03 +08:00 |
|
JiangQiming
|
d19f39a0ae
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 19:46:12 +08:00 |
|
JiangQiming
|
4e123ac64c
|
fix: bug#10706-1
|
2023-03-22 19:45:54 +08:00 |
|
jackhoo_98
|
470877eac6
|
fix: bug#10722、10723、10728 修复证书管理部分bug
|
2023-03-22 19:08:02 +08:00 |
|
100011797
|
45273951c5
|
fix: 设备导出
|
2023-03-22 18:08:56 +08:00 |
|
jackhoo_98
|
0b32328ce6
|
fix: bug#10080、10705、10707、10713修复日志管理部分bug
|
2023-03-22 17:48:17 +08:00 |
|
jackhoo_98
|
c62c80ebc9
|
fix: bug#10702、10704 修复流媒体服务部分bug
|
2023-03-22 17:30:46 +08:00 |
|
jackhoo_98
|
8606bfdb0b
|
fix: bug#10645、10616 修复网络组件部分bug
|
2023-03-22 17:18:07 +08:00 |
|
leiqiaochu
|
6deb18fc1a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 17:10:48 +08:00 |
|
leiqiaochu
|
5e705a0592
|
fix: #10725 10733
|
2023-03-22 17:10:05 +08:00 |
|
JiangQiming
|
bccff19042
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 16:39:48 +08:00 |
|
JiangQiming
|
17fea0efac
|
fix: bug#10681
|
2023-03-22 16:39:32 +08:00 |
|
jackhoo_98
|
a3ac144a72
|
fix: bug#10677、10687、10688、10693、10701、10720修复设备接入网关部分bug
|
2023-03-22 16:00:07 +08:00 |
|
wangshuaiswim
|
93f56a6441
|
fix: 修改物模型事件回显BUG
|
2023-03-22 15:50:14 +08:00 |
|
JiangQiming
|
e1e6bea2a7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 15:36:31 +08:00 |
|
JiangQiming
|
b6b4677367
|
fix: bug#10550
|
2023-03-22 15:36:16 +08:00 |
|
leiqiaochu
|
7754814afe
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-22 14:44:14 +08:00 |
|
leiqiaochu
|
47c3d7533e
|
fix: bug#10726 10718
|
2023-03-22 14:43:41 +08:00 |
|
wangshuaiswim
|
b0e5654ad1
|
fix: 增加通讯异常catch
|
2023-03-22 14:33:25 +08:00 |
|
jackhoo_98
|
ad89d1fbc2
|
fix: bug#10719 修复设备接入网关 底部滚动条样式
|
2023-03-22 14:18:57 +08:00 |
|
100011797
|
f495834dd5
|
fix: douros功能
|
2023-03-22 14:15:11 +08:00 |
|
JiangQiming
|
ba8bbc9896
|
fix: bug#10540
|
2023-03-22 13:48:29 +08:00 |
|
jackhoo_98
|
eb43a5f5b2
|
fix: bug#10676 修复设备接入网关 AccessCard组件背景图
|
2023-03-22 12:20:45 +08:00 |
|
JiangQiming
|
835874604d
|
fix: bug#10711、10600、10681
|
2023-03-22 11:49:02 +08:00 |
|
leiqiaochu
|
0aac4de410
|
fix: bug#10467
|
2023-03-22 09:38:01 +08:00 |
|
wangshuaiswim
|
026d9dd914
|
fix: 修改物模型BUG
|
2023-03-21 21:18:51 +08:00 |
|
xieyonghong
|
1f1d81c767
|
update: 完善场景联动
|
2023-03-21 19:16:01 +08:00 |
|
JiangQiming
|
352c4d263b
|
fix: bug#10675、10674、10663
|
2023-03-21 18:33:55 +08:00 |
|
JiangQiming
|
8583d968c3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 18:16:16 +08:00 |
|
JiangQiming
|
c70dcf6f62
|
fix: bug#10669、10679、10680
|
2023-03-21 18:15:59 +08:00 |
|
100011797
|
219444d566
|
fix: 修改批量操作功能
|
2023-03-21 18:09:35 +08:00 |
|
jackhoo_98
|
d5b0a2b4d8
|
Merge branch 'dev' into dev-hub
|
2023-03-21 18:07:11 +08:00 |
|
jackhoo_98
|
2cb4bcc86f
|
fix: bug#10666、10672、10673、10676 修复协议管理部分bug
|
2023-03-21 18:04:13 +08:00 |
|
jackhoo_98
|
0b83a9c4df
|
fix: bug#10614、10617、10620、10623、10624、10627、10645、10648、10652、10656、10661、10664、10665 修复网络组件部分bug
|
2023-03-21 17:43:50 +08:00 |
|
JiangQiming
|
7e2ea45ad8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 17:27:20 +08:00 |
|
JiangQiming
|
b78aa24b8e
|
fix: bug#10653、10654
|
2023-03-21 17:26:03 +08:00 |
|
leiqiaochu
|
42cd5f69ae
|
fix: 仪表盘样式更改
|
2023-03-21 16:56:24 +08:00 |
|
JiangQiming
|
b65302e1c6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 16:45:04 +08:00 |
|
JiangQiming
|
9759fea2cc
|
fix: bug#10647、10644、10640
|
2023-03-21 16:43:09 +08:00 |
|
leiqiaochu
|
4c58bf1c31
|
fix: dayjs替换moment
|
2023-03-21 16:14:16 +08:00 |
|
JiangQiming
|
cc879c1731
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 16:07:59 +08:00 |
|
JiangQiming
|
c71a38d424
|
fix: bug#10618、10608、10671、10532、10530、10649
|
2023-03-21 16:07:38 +08:00 |
|
leiqiaochu
|
e53c573e6d
|
fix: 产品特殊协议回显问题
|
2023-03-21 15:45:18 +08:00 |
|
leiqiaochu
|
4d6896a4a2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 14:24:29 +08:00 |
|
leiqiaochu
|
c7a417c82c
|
fix: bug#10668
|
2023-03-21 14:23:39 +08:00 |
|
JiangQiming
|
0b9b78ca40
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 14:13:03 +08:00 |
|
JiangQiming
|
7c42ebc587
|
fix: bug#10618、10608
|
2023-03-21 14:11:52 +08:00 |
|
leiqiaochu
|
6c2cd40b56
|
fix: bug#10450
|
2023-03-21 13:53:02 +08:00 |
|
jackhoo_98
|
3bb63f3d41
|
fix: bug#10610 修复仪表盘日期变化问题
|
2023-03-21 13:50:46 +08:00 |
|
leiqiaochu
|
a49e7858ee
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 11:39:18 +08:00 |
|
leiqiaochu
|
2a51e49b61
|
fix: #bug10635 10631
|
2023-03-21 11:37:30 +08:00 |
|
JiangQiming
|
5abfe399e2
|
update: 通知管理, 视频中心, 系统管理message引入方式改为jetlinks组件库
|
2023-03-21 11:08:09 +08:00 |
|
jackhoo_98
|
d9c2da7f4e
|
fix: 合并冲突
|
2023-03-21 10:20:57 +08:00 |
|
jackhoo_98
|
2da39a3370
|
style: 网络组件以及详情样式微调
|
2023-03-21 10:18:10 +08:00 |
|
xieyonghong
|
a2a52aaf66
|
update: 优化场景联动样式
|
2023-03-21 09:57:43 +08:00 |
|
JiangQiming
|
995eca23cb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-21 09:39:38 +08:00 |
|
JiangQiming
|
552af71c39
|
update: 按钮新增danger属性
|
2023-03-21 09:39:20 +08:00 |
|
100011797
|
85dd902ed7
|
fix: 修复10401
|
2023-03-21 09:38:34 +08:00 |
|
wangshuaiswim
|
8cd2b8644e
|
fix: 修改物模型BUG
|
2023-03-20 21:14:49 +08:00 |
|
wangshuaiswim
|
6c9322ed70
|
fix: 修改物模型BUG
|
2023-03-20 21:02:58 +08:00 |
|
wangshuaiswim
|
27e5d320d4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 20:40:51 +08:00 |
|
wangshuaiswim
|
2511baf944
|
fix: 修改物模型BUG
|
2023-03-20 20:40:30 +08:00 |
|
xieyonghong
|
8811173b66
|
update: 优化场景联动-执行动作、过滤条件校验
|
2023-03-20 20:18:11 +08:00 |
|
JiangQiming
|
d5876a0ed1
|
fix: bug#10561、10630
|
2023-03-20 18:31:46 +08:00 |
|
JiangQiming
|
7173dd7c5c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 18:24:22 +08:00 |
|
JiangQiming
|
d79a1f7402
|
fix: bug#10561
|
2023-03-20 18:24:01 +08:00 |
|
100011797
|
6c3b76b486
|
fix: 物联网卡卡片展示
|
2023-03-20 18:13:42 +08:00 |
|
leiqiaochu
|
010d91d8e5
|
fix: bug#10454
|
2023-03-20 17:59:41 +08:00 |
|
wangshuaiswim
|
d8bc599164
|
fix: 修改物模型导入BUG
|
2023-03-20 17:48:20 +08:00 |
|
JiangQiming
|
6485265e3d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 17:36:48 +08:00 |
|
JiangQiming
|
c08f29d4da
|
fix: bug#10561
|
2023-03-20 17:36:33 +08:00 |
|
xieyonghong
|
faccbc53f7
|
update: 优化场景联动-执行动作、过滤条件校验
|
2023-03-20 17:32:34 +08:00 |
|
100011797
|
a094b9b093
|
fix: 设备详情报错
|
2023-03-20 17:02:43 +08:00 |
|
jackhoo_98
|
c61eb1771e
|
style: 设备接入网关样式微调
|
2023-03-20 17:01:43 +08:00 |
|
JiangQiming
|
48b6bbc0a7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 16:47:13 +08:00 |
|
JiangQiming
|
3181027490
|
fix: bug#10564、10618、10619、10605、10606、10604、10608
|
2023-03-20 16:46:59 +08:00 |
|
leiqiaochu
|
189f056c22
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 16:19:31 +08:00 |
|
leiqiaochu
|
5f9c8fded4
|
fix: message组件替换
|
2023-03-20 16:19:20 +08:00 |
|
wangshuaiswim
|
2a7eeccdb2
|
fix: 物模型BUG解决
|
2023-03-20 16:17:06 +08:00 |
|
JiangQiming
|
5d27993d0f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 15:53:24 +08:00 |
|
JiangQiming
|
fd3064dd90
|
fix: bug#10602、10525、10599、10601、10603
|
2023-03-20 15:53:07 +08:00 |
|
100011797
|
f9d72619b0
|
fix: 修改北向输出bug
|
2023-03-20 15:21:31 +08:00 |
|
jackhoo_98
|
fec6852bc4
|
Merge branch 'dev' into dev-hub
|
2023-03-20 15:11:18 +08:00 |
|
jackhoo_98
|
1e6504b5f3
|
style: 更改设备接入网关部分样式todo
|
2023-03-20 15:10:05 +08:00 |
|
leiqiaochu
|
14aeec4178
|
fix: 状态组件替换告警中心优化
|
2023-03-20 15:05:34 +08:00 |
|
JiangQiming
|
30e98f69af
|
fix: 1.bug#10597、10533; 2.系统基础配置优化
|
2023-03-20 14:57:19 +08:00 |
|
leiqiaochu
|
430a8c7dc8
|
fix: 组件替换
|
2023-03-20 11:18:36 +08:00 |
|
leiqiaochu
|
96dce7a98a
|
fix: 告警配置场景联动组件替换
|
2023-03-20 11:17:28 +08:00 |
|
xieyonghong
|
8aaa9418bd
|
update: 优化场景联动-新增校验
|
2023-03-20 11:08:20 +08:00 |
|
leiqiaochu
|
6df60ea7e8
|
fix: bug#10609
|
2023-03-20 11:02:15 +08:00 |
|
leiqiaochu
|
7da98bff35
|
fix: 按钮颜色卡片更换
|
2023-03-20 10:55:28 +08:00 |
|
leiqiaochu
|
84db55b690
|
fix: 删除按钮颜色告警卡片
|
2023-03-20 10:54:42 +08:00 |
|
100011797
|
f88a3d22aa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-20 10:44:55 +08:00 |
|
100011797
|
edb7f4ce5d
|
fix: 删除变红
|
2023-03-20 10:44:48 +08:00 |
|
jackhoo_98
|
878e36a4a7
|
style: 更改TitleComponent组件样式
|
2023-03-20 10:33:54 +08:00 |
|
leiqiaochu
|
fd603c250d
|
fix: bug#10557
|
2023-03-20 10:32:26 +08:00 |
|
JiangQiming
|
2963118753
|
update: 说明文档提取为公共样式
|
2023-03-20 10:18:01 +08:00 |
|
JiangQiming
|
f1d3942416
|
fix: bug#10597
|
2023-03-20 09:57:23 +08:00 |
|
jackhoo_98
|
865c9e989c
|
Merge branch 'dev' into dev-hub
|
2023-03-20 09:27:01 +08:00 |
|
wangshuaiswim
|
6fff6f737e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-19 21:49:43 +08:00 |
|
wangshuaiswim
|
9837a6a588
|
fix: 修改物模型BUG
|
2023-03-19 21:49:13 +08:00 |
|
xieyonghong
|
2659c70804
|
feat: 新增场景联动-定时触发
|
2023-03-19 21:09:53 +08:00 |
|
JiangQiming
|
084c43cf76
|
fix: bug#10475、10549、10545、10543、10541
|
2023-03-17 22:04:41 +08:00 |
|
JiangQiming
|
27f392dda8
|
fix: 表格卡片必须传statusNames, 解决报错问题
|
2023-03-17 21:12:04 +08:00 |
|
xieyonghong
|
4494727311
|
update: 优化产品-设备接入
|
2023-03-17 20:33:24 +08:00 |
|
xieyonghong
|
8cc721b790
|
update: 删除demo
|
2023-03-17 18:50:57 +08:00 |
|
xieyonghong
|
232c844080
|
update: 替换场景联动中的组件
|
2023-03-17 18:50:55 +08:00 |
|
JiangQiming
|
3b7a412411
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 18:20:37 +08:00 |
|
JiangQiming
|
efcfa42adb
|
fix: bug#10540、10542
|
2023-03-17 18:20:22 +08:00 |
easy
|
d1a9854831
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 17:44:22 +08:00 |
|
easy
|
d29346248e
|
fix: bug#10537
|
2023-03-17 17:43:58 +08:00 |
|
100011797
|
dc486af223
|
fix: 卡片背景颜色
|
2023-03-17 16:32:30 +08:00 |
|
jackhoo_98
|
a07196de3d
|
style: 更改TitleComponent组件样式
|
2023-03-17 16:22:17 +08:00 |
|
jackhoo_98
|
c0f2ebfa47
|
update: 运维管理、数据采集卡片列表去掉背景图片
|
2023-03-17 15:55:33 +08:00 |
|
leiqiaochu
|
34bff0ecb4
|
fix: bug#10505 10443
|
2023-03-17 15:48:50 +08:00 |
|
JiangQiming
|
7c9028dab4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 15:44:28 +08:00 |
|
JiangQiming
|
94e0e9ff2e
|
fix: bug#10404
|
2023-03-17 15:44:15 +08:00 |
|
easy
|
dd4f921df4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 15:19:37 +08:00 |
|
easy
|
3794849946
|
update: api配置优化
|
2023-03-17 15:18:32 +08:00 |
|
JiangQiming
|
6a9e08e7a7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 15:01:30 +08:00 |
|
JiangQiming
|
2050990998
|
fix: bug#10538
|
2023-03-17 15:01:16 +08:00 |
|
jackhoo_98
|
2e0b45b444
|
Merge branch 'dev' into dev-hub
|
2023-03-17 14:58:13 +08:00 |
|
jackhoo_98
|
dda768e3bf
|
update: 协议管理、通道管理 上传文件获取base-path,todo
|
2023-03-17 14:56:07 +08:00 |
|
jackhoo_98
|
61b48b50ca
|
update: 运维管理 数据采集 更换卡片标题省略组件
|
2023-03-17 14:48:59 +08:00 |