jackhoo_98
|
7c62c8903d
|
Merge remote-tracking branch 'origin/dev' into dev-hub
|
2023-01-13 09:54:22 +08:00 |
|
jackhoo_98
|
f225993626
|
fix: 设备接入网关 json转Markdown
|
2023-01-13 09:52:56 +08:00 |
wangshuaiswim
|
3ed04a35ff
|
fix: 修改VERSION_CODE
|
2023-01-13 09:49:43 +08:00 |
|
wangshuaiswim
|
5a47580ab7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 09:46:31 +08:00 |
|
wangshuaiswim
|
0a2056bc0a
|
fix: 修改SystemConst定义
|
2023-01-13 09:46:05 +08:00 |
xiongqian
|
5f6aa6ce65
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 19:17:35 +08:00 |
|
xiongqian
|
2094994890
|
feat: 初始化页面添加接口调试和图片上传
|
2023-01-12 19:17:14 +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
|
18c6c95ccf
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 18:30:25 +08:00 |
|
easy
|
a9f57ac414
|
update: 首页样式调整
|
2023-01-12 18:30:07 +08:00 |
|
blp
|
b971bda7ac
|
feat: 添加物联卡首页
|
2023-01-12 18:28:43 +08:00 |
100011797
|
20061fb499
|
fix: table actions
|
2023-01-12 18:23:53 +08:00 |
胡彪
|
853331f4b4
|
Merge pull request #43 from jetlinks/dev-hub
Dev hub
|
2023-01-12 18:14:36 +08:00 |
|
jackhoo_98
|
cc8e9aa77b
|
Merge remote-tracking branch 'origin/dev' into dev-hub
|
2023-01-12 18:13:11 +08:00 |
|
jackhoo_98
|
ab8636c7fd
|
feat: 设备接入网关 自定义设备接入 二三步部分功能
|
2023-01-12 18:12:52 +08:00 |
JiangQiming
|
0154ca8a32
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 18:02:07 +08:00 |
|
JiangQiming
|
7ee453b706
|
feat: webhook请求头字段表格
|
2023-01-12 18:00:04 +08:00 |
|
wangshuaiswim
|
bcdf8b7882
|
fix: 新增设备和产品接口
|
2023-01-12 17:56:51 +08:00 |
|
wangshuaiswim
|
a1e00a3734
|
add: 增加设备和产品typing
|
2023-01-12 17:56:19 +08:00 |
|
wangshuaiswim
|
9658a11666
|
add: 增加instanceStore
|
2023-01-12 17:55:48 +08:00 |
|
easy
|
085a2d711a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 17:39:45 +08:00 |
|
easy
|
6728105539
|
update: api配置
|
2023-01-12 17:39:02 +08:00 |
XieYongHong
|
5a8799ffaa
|
update: 忽略component.d.ts
|
2023-01-12 16:56:52 +08:00 |
|
JiangQiming
|
a91b4b6b99
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 16:50:37 +08:00 |
|
JiangQiming
|
c05cf5d961
|
feat: 通知配置详情表单
|
2023-01-12 16:48:39 +08:00 |
|
100011797
|
ea151386b9
|
fix: merge
|
2023-01-12 15:32:14 +08:00 |
|
100011797
|
7451dad544
|
fix: vue转tsx
|
2023-01-12 15:31:20 +08:00 |
|
xieyonghong
|
a8b9108462
|
update: 修改主题色
|
2023-01-12 14:52:48 +08:00 |
|
blp
|
b69a1721bf
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 14:42:11 +08:00 |
|
blp
|
2ef9df6c04
|
fix: 登录页样式修改
|
2023-01-12 14:41:49 +08:00 |
|
xieyonghong
|
bd7ef2131b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-12 11:46:44 +08:00 |
|
xieyonghong
|
34459132cf
|
update: 添加axios response泛型处理
|
2023-01-12 11:45:59 +08:00 |
|
wangshuaiswim
|
48ca21ab3d
|
fix: 修改设备api目录，增加产品api
|
2023-01-12 11:34:24 +08:00 |
|
xieyonghong
|
3135213a05
|
fix: 修复commit信息无法校验
|
2023-01-12 09:54:56 +08:00 |
|
xieyonghong
|
0890350cf2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-12 09:34:31 +08:00 |
|
xieyonghong
|
ce3d168f68
|
feat: merge components.d.ts
|
2023-01-12 09:13:05 +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 |
|
100011797
|
7f61e53b75
|
fix: merge
|
2023-01-11 18:24:29 +08:00 |
|
100011797
|
2d49f87cea
|
feat: 表格选择
|
2023-01-11 18:24:07 +08:00 |
|
jackhoo_98
|
011f289262
|
Merge branch 'dev-hub' into dev
|
2023-01-11 18:13:39 +08:00 |
|
jackhoo_98
|
8ac810bfb5
|
feat: 设备接入网关 接入第一步部分功能
|
2023-01-11 18:12:41 +08:00 |
|
easy
|
fed499e18c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-11 18:12:21 +08:00 |
|
easy
|
ffc55b91e0
|
update: api配置
|
2023-01-11 18:11:56 +08:00 |
|
JiangQiming
|
0f7cc7d9ec
|
fix: 单点登录接口联调
|
2023-01-11 18:07:10 +08:00 |
|
xieyonghong
|
2e4d853e1b
|
update: 优化config文件
|
2023-01-11 18:04:28 +08:00 |
|
JiangQiming
|
d2a82edbe4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-11 16:39:30 +08:00 |
|
JiangQiming
|
f687ca0fad
|
fix: 单点登录接口
|
2023-01-11 16:38:57 +08:00 |