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 |
|
easy
|
b81e8af1e4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 14:33:00 +08:00 |
|
easy
|
0b99ea0096
|
fix: bug#10532、10531、10530、10527、10534、10529
|
2023-03-17 14:32:43 +08:00 |
|
JiangQiming
|
a553cdd191
|
fix: bug#10526
|
2023-03-17 14:25:22 +08:00 |
|
JiangQiming
|
af4752e349
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 14:09:37 +08:00 |
|
JiangQiming
|
a260146ad4
|
fix: bug#10528
|
2023-03-17 14:09:23 +08:00 |
|
jackhoo_98
|
d6207f30e0
|
fix: 数据采集更换a-组件
|
2023-03-17 14:05:41 +08:00 |
|
easy
|
8dd84e062d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 11:51:18 +08:00 |
|
easy
|
f45cc4da61
|
fix: bug#10532、10531、10530、10527
|
2023-03-17 11:51:02 +08:00 |
|
JiangQiming
|
f79f511557
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 11:49:19 +08:00 |
|
JiangQiming
|
c4d33d56e3
|
fix: bug#10196、10500、10524、10525
|
2023-03-17 11:48:56 +08:00 |
|
jackhoo_98
|
fb51bda318
|
update: 运维管理、数据采集 更换message组件
|
2023-03-17 11:42:56 +08:00 |
|
leiqiaochu
|
404506a37f
|
fix: #bug10506 10509 10512
|
2023-03-17 11:33:21 +08:00 |
|
JiangQiming
|
7a0796668f
|
fix: bug#10196
|
2023-03-17 11:29:21 +08:00 |
|
jackhoo_98
|
e74f8fa7aa
|
fix: 运维管理 远程升级修复部分bug
|
2023-03-17 11:16:29 +08:00 |
|
leiqiaochu
|
86b4cc2ba4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-17 10:21:56 +08:00 |
|
xieyonghong
|
e79ae13bf5
|
update: 优化场景联动自适应样式宽度
|
2023-03-17 10:11:30 +08:00 |
|
leiqiaochu
|
4a72c05b12
|
fix: bug#10482 10490 10444 10443
|
2023-03-17 09:59:46 +08:00 |
|
jackhoo_98
|
343d88209e
|
Merge branch 'dev' into dev-hub
|
2023-03-17 09:56:09 +08:00 |
|
jackhoo_98
|
f85bb9fc82
|
fix: 运维管理 证书管理修复部分bug，远程升级修复部分bug
|
2023-03-17 09:54:52 +08:00 |
|
xieyonghong
|
e9e7431dd8
|
update: 优化场景联动自适应样式
|
2023-03-17 09:37:37 +08:00 |
|
xieyonghong
|
a277fe1cb6
|
update: 优化场景联动过滤条件中的columns
|
2023-03-16 20:15:31 +08:00 |
|
JiangQiming
|
f8fb98df44
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 18:38:53 +08:00 |
|
JiangQiming
|
8b9b67fd53
|
fix: bug#10479、10473、10478、10491
|
2023-03-16 18:38:38 +08:00 |
|
jackhoo_98
|
b11d8eaa0d
|
Merge branch 'dev' into dev-hub
|
2023-03-16 18:19:47 +08:00 |
|
jackhoo_98
|
8167603fae
|
fix: 运维管理 远程升级修复部分bug
|
2023-03-16 18:17:43 +08:00 |
|
100011797
|
6e5817a27e
|
fix: 修改执行动作设备输出-内置参数
|
2023-03-16 17:53:26 +08:00 |
|
xieyonghong
|
51fa8e6b5e
|
update: 优化场景联动过滤条件
|
2023-03-16 17:40:48 +08:00 |
|
xieyonghong
|
91f00210fe
|
update: 优化菜单遍历
|
2023-03-16 17:40:47 +08:00 |
|
leiqiaochu
|
da755bc13b
|
fix: bug#10455 10451 10448 10446 10449 10452 10488
|
2023-03-16 17:19:46 +08:00 |
|
JiangQiming
|
ea48417454
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 17:18:16 +08:00 |
|
JiangQiming
|
5670470fcf
|
fix: bug#10481、10480、10471、10487、10477
|
2023-03-16 17:17:56 +08:00 |
|
xieyonghong
|
eb91910a5e
|
update: 优化场景联动过滤条件
|
2023-03-16 16:54:20 +08:00 |
|
easy
|
2eeaddb08d
|
update: 更新校验规则
|
2023-03-16 16:42:03 +08:00 |
|
jackhoo_98
|
90d33baffd
|
fix: 运维管理 流媒体服务修复部分bug
|
2023-03-16 16:39:30 +08:00 |
|
jackhoo_98
|
05045768d2
|
fix: 运维管理 设备接入网关修复部分bug
|
2023-03-16 15:59:01 +08:00 |
|
easy
|
1fd9a0cc93
|
update: 个人中心图标替换
|
2023-03-16 15:45:11 +08:00 |
|
easy
|
137018753c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 15:34:41 +08:00 |
|
easy
|
2f7a4f718b
|
update: 首页代码优化
|
2023-03-16 15:34:24 +08:00 |
|
leiqiaochu
|
1a3c10b18d
|
fix: bug#10455 10451 10448
|
2023-03-16 15:29:13 +08:00 |
|
JiangQiming
|
914e495f2e
|
fix: bug#10387
|
2023-03-16 15:19:10 +08:00 |
|
JiangQiming
|
e919fd6bef
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 11:50:25 +08:00 |
|
JiangQiming
|
cf36e34e4f
|
fix: bug#10389、10421
|
2023-03-16 11:50:12 +08:00 |
|
easy
|
db3c66d3b7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 11:19:55 +08:00 |
|
easy
|
dee82d2115
|
update: api配置-调试 请求参数表格
|
2023-03-16 11:19:38 +08:00 |
|
100011797
|
60751783c2
|
fix: 边缘端映射组件替换
|
2023-03-16 11:00:04 +08:00 |
wzyyy
|
7d10dc3e6e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 10:44:27 +08:00 |
|
wzyyy
|
da47dcb028
|
fix: 数据解析代码优化
|
2023-03-16 10:43:53 +08:00 |
|
easy
|
6c4da9db2f
|
update: 代码编辑器更换
|
2023-03-16 10:43:12 +08:00 |
|
JiangQiming
|
5604c8bd35
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 10:39:51 +08:00 |
|
JiangQiming
|
1b046f96d2
|
update: 编辑器替换
|
2023-03-16 10:39:38 +08:00 |
|
xieyonghong
|
2507618860
|
update: 优化过滤条件回显
|
2023-03-16 10:21:25 +08:00 |
|
JiangQiming
|
e9d3546197
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 10:20:58 +08:00 |
|
JiangQiming
|
83a9f9f0cb
|
fix: bug#10439
|
2023-03-16 10:20:45 +08:00 |
|
easy
|
e70b8d7812
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-16 10:19:04 +08:00 |
|
easy
|
c25562adfb
|
fix: #10442、#10441
|
2023-03-16 10:18:45 +08:00 |
|
leiqiaochu
|
708f93dc28
|
fix: 产品仪表盘新增上传详情更改数据回显
|
2023-03-16 10:15:56 +08:00 |
|
jackhoo_98
|
62592b6e83
|
Merge branch 'dev' into dev-hub
|
2023-03-16 09:56:14 +08:00 |
|
jackhoo_98
|
7e83d5bdc2
|
fix: 运维管理 设备接入网关自测todo
|
2023-03-16 09:54:48 +08:00 |
|
JiangQiming
|
0200d1d419
|
update: 新增注释
|
2023-03-15 18:22:59 +08:00 |
|
JiangQiming
|
39c58b8e35
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 18:09:58 +08:00 |
|
JiangQiming
|
54493d025f
|
fix: bug#10433、10428、10426
|
2023-03-15 18:09:44 +08:00 |
|
jackhoo_98
|
d8ca8ce212
|
fix: 运维管理 日志管理修复部分bug
|
2023-03-15 17:55:13 +08:00 |
|
easy
|
62a405b8cd
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:44:52 +08:00 |
|
JiangQiming
|
f8906faa11
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:42:58 +08:00 |
|
JiangQiming
|
42df14d815
|
fix: bug#10406、10399、10390、10391、10410、10387、10392、10425、10415、10416、10417、10412、10409、10405
|
2023-03-15 17:42:42 +08:00 |
|
easy
|
46df7d35c5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:41:45 +08:00 |
|
easy
|
174cf36d09
|
update: 用户管理
|
2023-03-15 17:41:22 +08:00 |
|
jackhoo_98
|
ea8620278a
|
update: 采集器 点位新增 更新数据类型
|
2023-03-15 17:31:36 +08:00 |
|
leiqiaochu
|
bebb4b8d45
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 17:10:31 +08:00 |
|
leiqiaochu
|
27cd241bee
|
fix: 产品仪表盘和上传bug
|
2023-03-15 17:09:38 +08:00 |
|
jackhoo_98
|
8051989d2c
|
fix: 运维管理 协议管理修复部分bug
|
2023-03-15 17:03:47 +08:00 |
|
xieyonghong
|
2cd4d7ddb1
|
feat: 场景联动新增过滤条件组件
|
2023-03-15 16:33:01 +08:00 |
|
xieyonghong
|
a28f46e01c
|
update: 更新场景联动ParamsDropdown中的属性
|
2023-03-15 16:33:00 +08:00 |
|
xieyonghong
|
2f964837b9
|
update: 场景联动集成执行动作
|
2023-03-15 16:33:00 +08:00 |
|
jackhoo_98
|
87824d39bd
|
fix: 运维管理 网络组件及详情修复部分bug
|
2023-03-15 16:16:02 +08:00 |
|
leiqiaochu
|
c830357640
|
fix: 规则编排自测与组件替换
|
2023-03-15 15:51:55 +08:00 |
|
JiangQiming
|
2aeaae3a50
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 15:46:03 +08:00 |
|
JiangQiming
|
599311631d
|
update: 初始值改为undefined, 解决placeholder无效的问题
|
2023-03-15 15:45:47 +08:00 |
|
easy
|
ce02e2de1b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 15:05:51 +08:00 |
|
easy
|
f13ebbc16c
|
update: 应用管理权限完善
|
2023-03-15 15:05:36 +08:00 |
|
JiangQiming
|
471b12a2fa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 14:55:51 +08:00 |
|
JiangQiming
|
71187fcf85
|
update: 通知记录弹窗分页尺码大小优化
|
2023-03-15 14:55:30 +08:00 |
|
leiqiaochu
|
4a4123b2e7
|
fix: 子设备修改和新增绑定自测
|
2023-03-15 14:36:14 +08:00 |
|
easy
|
8a811aad25
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 14:27:05 +08:00 |
|
easy
|
c0f9b249e9
|
update: uhasPermission属性更正
|
2023-03-15 14:26:49 +08:00 |
|
jackhoo_98
|
0879a35eeb
|
fix: 运维管理 仪表盘修复部分bug
|
2023-03-15 13:54:00 +08:00 |
|
JiangQiming
|
f4a0cc77b6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 11:41:46 +08:00 |
|
JiangQiming
|
03436802b9
|
fix: bug#10232
|
2023-03-15 11:40:23 +08:00 |
|
100011797
|
2b18323745
|
fix: 场景联动-通知配置-options处理
|
2023-03-15 11:39:00 +08:00 |
|
jackhoo_98
|
30b97ca3cb
|
fix: 数据采集 通道管理代码优化
|
2023-03-15 11:29:57 +08:00 |
|
xieyonghong
|
d7f3ba6317
|
update: 场景联动条件优化
|
2023-03-15 10:20:43 +08:00 |
|
easy
|
0011e85de9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 09:52:22 +08:00 |
|
easy
|
8576a18ec5
|
update: <a-upload>组件替换
|
2023-03-15 09:52:02 +08:00 |
|
JiangQiming
|
81590a0af3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-15 09:50:28 +08:00 |
|
JiangQiming
|
cdd755a369
|
update: upload组件替换
|
2023-03-15 09:50:10 +08:00 |
|
jackhoo_98
|
9736d6e954
|
Merge branch 'dev' into dev-hub
|
2023-03-15 09:40:10 +08:00 |
|
jackhoo_98
|
dcf6aef0e6
|
fix: 数据采集 更换组件，修复部分bug
|
2023-03-15 09:38:32 +08:00 |
|
leiqiaochu
|
fa5e34a77e
|
fix: 组件替换
|
2023-03-14 17:51:51 +08:00 |
|
leiqiaochu
|
ea5761846e
|
fix: 组件替换
|
2023-03-14 17:48:24 +08:00 |
|
easy
|
9dff4d7a95
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 17:34:48 +08:00 |
|
JiangQiming
|
1cfb9edc35
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 17:31:44 +08:00 |
|
JiangQiming
|
670ea4de15
|
update: 通知配置-同步 用户前端分页
|
2023-03-14 17:31:30 +08:00 |
|
leiqiaochu
|
2559138a4a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 17:28:18 +08:00 |
|
leiqiaochu
|
02cb643d8c
|
feat: 新增子设备绑定
|
2023-03-14 17:25:56 +08:00 |
|
easy
|
8b86084d82
|
update: 图标组件替换
|
2023-03-14 17:13:09 +08:00 |
|
xieyonghong
|
67739f0714
|
update: proSearch添加class
|
2023-03-14 17:06:29 +08:00 |
|
xieyonghong
|
ce9ce6ff4a
|
update: 修改Upload文件名;优化CardBox样式
|
2023-03-14 17:06:29 +08:00 |
|
easy
|
5352ef782a
|
fix: 组件更换、首页跳转完善
|
2023-03-14 16:56:20 +08:00 |
|
easy
|
73bb4bbc5f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 16:04:42 +08:00 |
|
easy
|
557c41afb6
|
fix: api配置、应用管理
|
2023-03-14 16:04:23 +08:00 |
|
JiangQiming
|
cfab80094e
|
update: 组件更换测试
|
2023-03-14 16:01:55 +08:00 |
|
JiangQiming
|
bd688acb11
|
update: 组件更换测试
|
2023-03-14 15:48:31 +08:00 |
|
JiangQiming
|
05c83c2d4c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 14:54:35 +08:00 |
|
JiangQiming
|
4331a273c6
|
update: 组件更换测试
|
2023-03-14 14:54:19 +08:00 |
|
100011797
|
899d88b3eb
|
fix: feat
|
2023-03-14 14:35:17 +08:00 |
|
JiangQiming
|
529d7cf927
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-14 14:33:03 +08:00 |
|
JiangQiming
|
b66d48e626
|
update: 组件更换测试
|
2023-03-14 14:32:48 +08:00 |
|
100011797
|
d488752e20
|
fix: merge
|
2023-03-14 13:44:11 +08:00 |
|
100011797
|
2fee7a95cc
|
feat: 边缘网关
|
2023-03-14 13:43:45 +08:00 |
|
leiqiaochu
|
a8fd7232eb
|
fix: 告警中心组件替换及自测
|
2023-03-14 13:39:49 +08:00 |
|
JiangQiming
|
351e4f35ab
|
update: 组件更换测试
|
2023-03-14 11:38:21 +08:00 |
|
JiangQiming
|
f584141950
|
update: 组件更换测试
|
2023-03-14 10:47:43 +08:00 |
|
easy
|
0103cba6f7
|
update: 搜索组件替换
|
2023-03-14 10:19:58 +08:00 |
|
xieyonghong
|
3b04286842
|
update: 优化ProLayout
|
2023-03-13 19:34:58 +08:00 |
|
leiqiaochu
|
34d3ff7419
|
fix: 告警中心自测与组件替换
|
2023-03-13 18:13:28 +08:00 |
|
JiangQiming
|
977b68473a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 18:06:11 +08:00 |
|
JiangQiming
|
91380ecdfa
|
update: 组件更换测试
|
2023-03-13 18:05:32 +08:00 |
|
easy
|
bd1c5e5a8d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 18:01:57 +08:00 |
|
easy
|
10522b0e24
|
fix: 通知完善
|
2023-03-13 18:01:39 +08:00 |
|
JiangQiming
|
204a15ebb3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 17:47:20 +08:00 |
|
JiangQiming
|
f202e16401
|
update: 组件更换测试
|
2023-03-13 17:47:01 +08:00 |
|
easy
|
6dfc0cb1db
|
fix: 数据源管理 删除行
|
2023-03-13 17:05:16 +08:00 |
|
leiqiaochu
|
add3a9a5f3
|
fix: 产品分类组件替换自测
|
2023-03-13 16:39:55 +08:00 |
|
easy
|
e121ae9a81
|
fix: 关系配置
|
2023-03-13 16:27:34 +08:00 |
|
easy
|
4b63114795
|
fix: 权限管理
|
2023-03-13 16:03:14 +08:00 |
|
100011797
|
9e7e82b358
|
fix: 搜索换成pro-search
|
2023-03-13 15:52:25 +08:00 |
|
JiangQiming
|
f693ba926e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 15:40:45 +08:00 |
|
JiangQiming
|
4d916fe438
|
update: 组件替换测试
|
2023-03-13 15:40:31 +08:00 |
|
easy
|
5c65ca9c50
|
fix: 菜单管理
|
2023-03-13 15:36:24 +08:00 |
|
xieyonghong
|
d2bcc3e32e
|
update: 更新物联网卡下所有的查询组件
|
2023-03-13 15:18:52 +08:00 |
|
leiqiaochu
|
ebaf89a8f0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 15:15:23 +08:00 |
|
leiqiaochu
|
3c16469ea4
|
fix: 引导页定位
|
2023-03-13 15:15:00 +08:00 |
|
wangshuaiswim
|
58ba145a0e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 15:12:18 +08:00 |
|
wangshuaiswim
|
fc53dae724
|
fix: 删除调试日志
|
2023-03-13 15:11:57 +08:00 |
|
leiqiaochu
|
cccdf73d54
|
fix: 路由跳转
|
2023-03-13 14:49:36 +08:00 |
|
easy
|
7c86bdc569
|
fix: 角色管理
|
2023-03-13 14:48:13 +08:00 |
|
jackhoo_98
|
aecf2cec61
|
Merge branch 'dev' into dev-hub
|
2023-03-13 14:47:41 +08:00 |
|
JiangQiming
|
14fe181736
|
update: 搜索组件更换为pro-search
|
2023-03-13 14:31:04 +08:00 |
|
easy
|
2340964514
|
fix: 部门管理
|
2023-03-13 14:11:31 +08:00 |
|
jackhoo_98
|
0d749d6867
|
update: 采集器 右侧卡片新增websocket
|
2023-03-13 14:00:49 +08:00 |
|
xieyonghong
|
8c7295b074
|
update: 优化Search组件
|
2023-03-13 14:00:48 +08:00 |
|
leiqiaochu
|
bfa2f21160
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 13:54:55 +08:00 |
|
easy
|
2315a05224
|
fix: 首页、部门
|
2023-03-13 11:21:17 +08:00 |
|
leiqiaochu
|
afd27100cd
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-13 10:55:46 +08:00 |
|
leiqiaochu
|
f4baea0f8f
|
fix: 产品自测与bug修改
|
2023-03-13 10:55:00 +08:00 |
|
jackhoo_98
|
08ca907b99
|
Merge branch 'dev' into dev-hub
|
2023-03-12 15:47:21 +08:00 |
|
jackhoo_98
|
92590869b7
|
style: 调整TitleComponent组件样式
|
2023-03-12 15:45:41 +08:00 |
|
jackhoo_98
|
721409dfb0
|
feat: 采集器 OPCUA扫描全部功能
|
2023-03-12 15:27:39 +08:00 |
|
easy
|
c4e66cc414
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-10 18:09:30 +08:00 |
|
easy
|
df1fe4bd0f
|
fix: 组织管理自测及优化
|
2023-03-10 18:08:29 +08:00 |
|
100011797
|
db5514d27f
|
fix: 自测修改设备管理
|
2023-03-10 16:52:05 +08:00 |
|
JiangQiming
|
0589ea17ed
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-10 16:25:55 +08:00 |
|
JiangQiming
|
26eee3c169
|
fix: bug#10242 #10245
|
2023-03-10 16:25:38 +08:00 |
|
wangshuaiswim
|
c160e2d0e2
|
fix: 修改物模型校验
|
2023-03-10 15:19:28 +08:00 |
|
wangshuaiswim
|
772b71206d
|
fix: 修改测试物模型问题
|
2023-03-10 15:16:47 +08:00 |
|
easy
|
8e92b62c5c
|
fix: 用户管理自测及优化
|
2023-03-10 14:12:28 +08:00 |
|
JiangQiming
|
fbbeb1df6d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-10 11:29:33 +08:00 |
|
JiangQiming
|
f5aae8528f
|
update: 组件更换测试
|
2023-03-10 11:29:18 +08:00 |
|
leiqiaochu
|
ff52a91888
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-10 11:00:15 +08:00 |
|
leiqiaochu
|
d45af8a1bf
|
feat: 子组件绑定和产品仪表盘
|
2023-03-10 10:59:39 +08:00 |
|
easy
|
0c80efe6d2
|
fix: 基础配置自测及优化
|
2023-03-10 10:49:13 +08:00 |
|
xieyonghong
|
7427301495
|
update: 优化场景联动 DropdownMenus布尔值
|
2023-03-10 10:27:07 +08:00 |
|
xieyonghong
|
b583fa77a9
|
update: 场景联动ParamsDropdown 添加插槽
|
2023-03-10 10:27:06 +08:00 |
|
JiangQiming
|
7f3978fe17
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 20:01:09 +08:00 |
|
JiangQiming
|
cfff69bd43
|
update: 组件更换测试
|
2023-03-09 20:00:52 +08:00 |
|
easy
|
f245461c68
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 19:52:18 +08:00 |
|
easy
|
d2e7a410b7
|
fix: 个人中心自测、优化
|
2023-03-09 19:52:00 +08:00 |
|
JiangQiming
|
204a916e48
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 19:38:30 +08:00 |
|
JiangQiming
|
c97571e5cf
|
update: 组件更换测试
|
2023-03-09 19:38:03 +08:00 |
|
100011797
|
0330a7702f
|
fix: 场景联动-执行动作-设备输出
|
2023-03-09 18:25:10 +08:00 |
|
wangshuaiswim
|
9cd78db1f6
|
fix: 修改物模型规则调试
|
2023-03-09 17:40:13 +08:00 |
|
easy
|
d650757dc2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 17:29:05 +08:00 |
|
easy
|
37e381f961
|
fix: 个人中心
|
2023-03-09 17:28:35 +08:00 |
|
jackhoo_98
|
4e51d021eb
|
feat: 采集器 MODBUS、OPCUA表单，读写以及批量操作
|
2023-03-09 16:57:11 +08:00 |
|
wangshuaiswim
|
e7630bc7e2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 16:05:07 +08:00 |
|
wangshuaiswim
|
1642290608
|
fix: 修改物模型规则属性
|
2023-03-09 16:04:20 +08:00 |
|
JiangQiming
|
a5d7c228c2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 16:02:53 +08:00 |
|
JiangQiming
|
57a2aceaa9
|
update: 视频中心组件替换测试
|
2023-03-09 16:02:39 +08:00 |
|
leiqiaochu
|
d527cc09fe
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 15:57:30 +08:00 |
|
leiqiaochu
|
c9b56626d5
|
feat: 子设备新增并绑定
|
2023-03-09 15:56:55 +08:00 |
|
xieyonghong
|
75eca7d0dc
|
feat: 场景联动添加ParamsDropdown组件
|
2023-03-09 15:22:20 +08:00 |
|
JiangQiming
|
c5018e631a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-09 15:16:53 +08:00 |
|
JiangQiming
|
257765cb50
|
update: 组件替换自测优化
|
2023-03-09 15:16:22 +08:00 |
|
easy
|
80faeb5f0f
|
fix: 首页自测 优化
|
2023-03-09 15:05:05 +08:00 |
|
easy
|
4dcbf18939
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-08 19:43:58 +08:00 |
|
easy
|
58106e9fe4
|
update: 应用管理组件替换、弹窗优化
|
2023-03-08 19:43:36 +08:00 |
|
easy
|
68720f668c
|
update: api配置组件替换、逻辑优化
|
2023-03-08 19:07:34 +08:00 |
|
100011797
|
d70956e1e1
|
fix: 修改北向输出
|
2023-03-08 18:16:59 +08:00 |
|
wangshuaiswim
|
23aff419a3
|
fix: 物模型组件修改
|
2023-03-08 18:00:07 +08:00 |
|
JiangQiming
|
56122ac90c
|
update: 设备功能组件替换
|
2023-03-08 16:11:45 +08:00 |