jackhoo_98
|
de0159ab2e
|
fix: 合并冲突
|
2023-02-22 19:21:47 +08:00 |
|
jackhoo_98
|
906bc836ca
|
feat: 远程升级 列表/新增/编辑
|
2023-02-22 19:14:15 +08:00 |
100011797
|
474bc29aab
|
feat: 设备详情modbus和opcua
|
2023-02-22 18:09:48 +08:00 |
JiangQiming
|
693c9d3311
|
feat: 视频中心-视频设备列表开发
|
2023-02-16 16:13:23 +08:00 |
|
100011797
|
68eaa0ac76
|
feat: 运行状态
|
2023-02-01 17:46:25 +08:00 |
|
JiangQiming
|
0189595c99
|
fix: 通知配置, 卡片按钮插槽
|
2023-01-31 10:40:28 +08:00 |
|
JiangQiming
|
c1adddbb3b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:08:46 +08:00 |
|
JiangQiming
|
05e1281728
|
feat: 同步用户接口
|
2023-01-30 17:06:50 +08:00 |
xieyonghong
|
e6c2a0875a
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/router/menu.ts
# src/utils/comm.ts
|
2023-01-30 16:57:51 +08:00 |
|
100011797
|
2b6048707b
|
fix: 合并代码
|
2023-01-30 09:35:56 +08:00 |
|
100011797
|
c5bc7e7f6a
|
fix: 新增设备
|
2023-01-30 09:34:04 +08:00 |
blp
|
96963c5c81
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-29 18:07:19 +08:00 |
|
blp
|
8c66f9a319
|
feat: 新增物联卡管理列表
|
2023-01-29 18:05:25 +08:00 |
|
xieyonghong
|
92c4901750
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-29 17:43:05 +08:00 |
|
xieyonghong
|
f3bc5740af
|
feat: 优化Layout组件，添加动态路由
|
2023-01-29 17:16:16 +08:00 |
|
JiangQiming
|
c71328aab9
|
feat: 通知配置列表
|
2023-01-29 14:45:03 +08:00 |
|
xieyonghong
|
f66e483f18
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-29 09:08:40 +08:00 |
xiongqian
|
1efe058322
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-28 21:57:44 +08:00 |
|
xiongqian
|
37c4e654ee
|
feat: 新增产品分类模块
|
2023-01-28 21:56:11 +08:00 |
|
xieyonghong
|
11fc6fa4f7
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-28 18:12:43 +08:00 |
|
xieyonghong
|
3e42721d31
|
feat: 新增Layout组件，优化部分配置文件
|
2023-01-28 18:11:30 +08:00 |
|
JiangQiming
|
3383183e3b
|
feat: 通知模板,新增变量列表组件
|
2023-01-28 16:06:33 +08:00 |
|
100011797
|
5e5087602c
|
feat: 设备管理批量操作
|
2023-01-17 18:04:42 +08:00 |
|
100011797
|
eb7eaef064
|
fix: 刷新表格
|
2023-01-17 11:34:38 +08:00 |
|
100011797
|
e3ddbbd3c4
|
fix: 更新AIcon
|
2023-01-16 15:19:41 +08:00 |