xieyonghong
|
2533a1dff7
|
update: 1.优化动态路由；2. PageContainer放开title插槽
|
2023-01-30 17:30:12 +08:00 |
JiangQiming
|
9a82577e9c
|
feat: 绑定用户接口
|
2023-01-30 17:30:12 +08:00 |
xiongqian
|
0a8aab6c8e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/api/device/product.ts
|
2023-01-30 17:22:39 +08:00 |
|
xiongqian
|
9da8599575
|
feat: 添加产品列表模块
|
2023-01-30 17:19:41 +08:00 |
easy
|
fda769acc6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:11:49 +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 |
|
easy
|
4a6b4c6003
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:06:47 +08:00 |
|
xieyonghong
|
96787070ea
|
update: 删除未使用参数
|
2023-01-30 17:06:15 +08:00 |
|
easy
|
b0148bcac6
|
update: 暂存
|
2023-01-30 17:05:27 +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 |
|
xieyonghong
|
6d701c5204
|
feat: 添加PageContainer；完善动态路由
|
2023-01-30 16:52:33 +08:00 |
wangshuaiswim
|
6abc69e1d8
|
fix: 修复权限按钮组件
|
2023-01-30 15:04:46 +08:00 |
jackhoo_98
|
e96a43ad8b
|
Merge branch 'dev' into dev-hub
|
2023-01-30 14:51:21 +08:00 |
|
jackhoo_98
|
9d4ed41193
|
feat: 证书管理 列表
|
2023-01-30 14:49:55 +08:00 |
|
JiangQiming
|
9f0e384be6
|
feat: 通知模板记录
|
2023-01-30 10:55:15 +08:00 |
|
JiangQiming
|
6898913d45
|
feat: 通知模板调试接口
|
2023-01-30 10:47:02 +08:00 |
|
JiangQiming
|
b667574d78
|
fix: 去除card
|
2023-01-30 09:54:18 +08:00 |
100011797
|
2b6048707b
|
fix: 合并代码
|
2023-01-30 09:35:56 +08:00 |
|
100011797
|
c5bc7e7f6a
|
fix: 新增设备
|
2023-01-30 09:34:04 +08:00 |
|
JiangQiming
|
817226e1d5
|
feat: 通知模板页面
|
2023-01-29 18:44:12 +08:00 |
|
JiangQiming
|
cf4314d29c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:41:10 +08:00 |
|
JiangQiming
|
0f773c9aa6
|
feat: 导入导出接口联调
|
2023-01-29 18:40:56 +08:00 |
|
wangshuaiswim
|
f66ee9bdf8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:33:02 +08:00 |
|
wangshuaiswim
|
f5f56a1257
|
fix: 物模型组件开发
|
2023-01-29 18:32:41 +08:00 |
|
easy
|
68e3ae3a5c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:25:13 +08:00 |
|
easy
|
8bdc444957
|
update: 权限管理添加权限
|
2023-01-29 18:24:44 +08:00 |
|
JiangQiming
|
95c01fc7eb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:14:11 +08:00 |
|
JiangQiming
|
7a560e8746
|
feat: 通知配置,通知记录页面+接口联调
|
2023-01-29 18:13:56 +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 |
|
jackhoo_98
|
a3639e8bae
|
Merge branch 'dev-hub' into dev
|
2023-01-29 17:39:23 +08:00 |
|
jackhoo_98
|
35a53fc47c
|
feat: 设备接入网关 云平台接入 Ctwing/OneNet设备接入
|
2023-01-29 17:38:07 +08:00 |
|
xieyonghong
|
f3bc5740af
|
feat: 优化Layout组件，添加动态路由
|
2023-01-29 17:16:16 +08:00 |
|
easy
|
4badeb8d2a
|
update: 首页优化及完善权限
|
2023-01-29 16:08:40 +08:00 |
|
JiangQiming
|
1aa7839a54
|
feat: 通知配置调试页面+接口联调
|
2023-01-29 16:02:20 +08:00 |
|
JiangQiming
|
e0c8e413bb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 14:45:18 +08:00 |
|
JiangQiming
|
c71328aab9
|
feat: 通知配置列表
|
2023-01-29 14:45:03 +08:00 |
|
easy
|
dc6ad3b081
|
update: 权限管理
|
2023-01-29 13:58:18 +08:00 |
|
jackhoo_98
|
3c5a2ef320
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 11:51:37 +08:00 |
|
jackhoo_98
|
6929dd2cfd
|
feat: 设备接入网关 官方接入 边缘网关/子设备接入
|
2023-01-29 11:51:21 +08:00 |
|
JiangQiming
|
3b660203ea
|
feat: 收信人, 部门和标签组件封装
|
2023-01-29 10:31:21 +08:00 |
|
JiangQiming
|
516127a168
|
fix: 通知模板-短信模板表单字段调试
|
2023-01-29 10:08: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 |
|
easy
|
ff7de315c8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-28 18:13:10 +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 |
|
easy
|
e41f19ca69
|
feat: 权限管理
|
2023-01-28 18:12:36 +08:00 |