jackhoo_98
|
df2f497605
|
fix: merge branch dev-hub into dev
|
2023-01-31 09:38:42 +08:00 |
wangshuaiswim
|
cc07ccb19d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/router/menu.ts
|
2023-01-30 18:41:48 +08:00 |
|
wangshuaiswim
|
b9d6ca5854
|
fix: 增加设备详情页
|
2023-01-30 18:40:08 +08:00 |
100011797
|
24514e2b7a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:13:29 +08:00 |
|
100011797
|
a8ef765702
|
fix: 合并冲突
|
2023-01-30 18:12:57 +08:00 |
easy
|
ed03ceea5c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:11:25 +08:00 |
|
100011797
|
56ca9f1dcf
|
feat: 新增设备和设备基础信息
|
2023-01-30 18:11:11 +08:00 |
xieyonghong
|
8d2b41c8f5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-30 17:35:39 +08:00 |
|
xieyonghong
|
2533a1dff7
|
update: 1.优化动态路由；2. PageContainer放开title插槽
|
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
|
4a6b4c6003
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:06:47 +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 |
|
jackhoo_98
|
9d4ed41193
|
feat: 证书管理 列表
|
2023-01-30 14:49:55 +08:00 |
blp
|
8c66f9a319
|
feat: 新增物联卡管理列表
|
2023-01-29 18:05:25 +08:00 |
|
xieyonghong
|
f3bc5740af
|
feat: 优化Layout组件，添加动态路由
|
2023-01-29 17:16:16 +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 |
|
easy
|
e41f19ca69
|
feat: 权限管理
|
2023-01-28 18:12:36 +08:00 |
|
blp
|
4a01193d97
|
feat: 新增物联卡-仪表盘
|
2023-01-28 18:12:04 +08:00 |
|
easy
|
9ae2c6981a
|
update: 角色管理
|
2023-01-17 18:17:21 +08:00 |
|
easy
|
66e88145c7
|
feat: 角色管理
|
2023-01-17 11:38:16 +08:00 |
|
easy
|
bc9fa060f5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-16 18:15:24 +08:00 |
|
easy
|
e36529d7bd
|
update: 系统管理-基础配置
|
2023-01-16 18:14:45 +08:00 |
|
100011797
|
e3ddbbd3c4
|
fix: 更新AIcon
|
2023-01-16 15:19:41 +08:00 |
|
xieyonghong
|
2a2a8121c3
|
update: 优化Search组件
|
2023-01-13 14:29:16 +08:00 |
|
blp
|
f6fd6b38ef
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 18:31:40 +08:00 |
|
blp
|
c217d51ab6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/router/menu.ts
|
2023-01-12 18:31:15 +08:00 |
|
easy
|
a9f57ac414
|
update: 首页样式调整
|
2023-01-12 18:30:07 +08:00 |
|
blp
|
b971bda7ac
|
feat: 添加物联卡首页
|
2023-01-12 18:28:43 +08:00 |
JiangQiming
|
c05cf5d961
|
feat: 通知配置详情表单
|
2023-01-12 16:48:39 +08:00 |
|
xieyonghong
|
0890350cf2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-12 09:34:31 +08:00 |
|
xiongqian
|
b0983a1988
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
|
2023-01-11 18:41:06 +08:00 |
|
xiongqian
|
5304559608
|
feat: 添加初始化页面接口数据
|
2023-01-11 18:38:33 +08:00 |
|
xieyonghong
|
ec79fa0669
|
feat: 新增Search组件
|
2023-01-11 18:26:30 +08:00 |
|
jackhoo_98
|
8ac810bfb5
|
feat: 设备接入网关 接入第一步部分功能
|
2023-01-11 18:12:41 +08:00 |
|
easy
|
c22c195200
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 18:26:47 +08:00 |
|
easy
|
c67de84110
|
首页目录调整+api配置页面
|
2023-01-10 18:26:17 +08:00 |
|
100011797
|
26c84eeab6
|
fix: yarn.lock不忽略
|
2023-01-10 17:06:53 +08:00 |
|
JiangQiming
|
1b2a8f1b79
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 16:54:54 +08:00 |
|
JiangQiming
|
4d83ed9e46
|
fix: 三方绑定联调
|
2023-01-10 16:54:47 +08:00 |
|
wangshuaiswim
|
6350a8f3b9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 16:22:36 +08:00 |
|
wangshuaiswim
|
f801cffc00
|
fix: 删除菜单和按钮枚举
|
2023-01-10 16:22:24 +08:00 |
|
xieyonghong
|
c5eb9fddc3
|
feat: 添加FormBuilder组件
|
2023-01-10 16:11:02 +08:00 |
|
jackhoo_98
|
1bd0b49dc4
|
fix: Merge branch 'dev' into dev-hub
|
2023-01-10 13:56:41 +08:00 |
|
jackhoo_98
|
7e1c9de11f
|
feat: 设备接入网关 自定义设备接入基本Card样式
|
2023-01-10 13:51:14 +08:00 |
|
100011797
|
be792dd961
|
feat: table
|
2023-01-10 11:44:03 +08:00 |
|
blp
|
af223a16b8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 11:11:04 +08:00 |