easy
|
e36529d7bd
|
update: 系统管理-基础配置
|
2023-01-16 18:14:45 +08:00 |
jackhoo_98
|
79524793af
|
Merge branch 'dev-hub' into dev
|
2023-01-16 09:55:36 +08:00 |
|
jackhoo_98
|
295a283856
|
fix: 设备接入网关 视频设备表单
|
2023-01-16 09:53:54 +08:00 |
|
easy
|
6d01346d51
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 14:35:57 +08:00 |
|
easy
|
8dd5f2f22a
|
update: 首页
|
2023-01-13 14:35:34 +08:00 |
xieyonghong
|
9332e59f51
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yarn.lock
|
2023-01-13 14:30:14 +08:00 |
|
xieyonghong
|
2a2a8121c3
|
update: 优化Search组件
|
2023-01-13 14:29:16 +08:00 |
JiangQiming
|
30c1a1813d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 14:28:25 +08:00 |
|
JiangQiming
|
466dbae465
|
feat: 新增通知配置钉钉文档
|
2023-01-13 14:28:12 +08:00 |
100011797
|
a44b57232f
|
fix: 修改tree
|
2023-01-13 14:24:52 +08:00 |
blp
|
6d18f10d2a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 14:02:54 +08:00 |
|
blp
|
2e26ee726d
|
fix: 修改登录页
|
2023-01-13 14:02:23 +08:00 |
wangshuaiswim
|
b02d2704f3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 13:56:22 +08:00 |
|
wangshuaiswim
|
55336d6aa9
|
feat: 新增物模型组件开发
|
2023-01-13 13:56:00 +08:00 |
|
JiangQiming
|
fd46e8088b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 13:51:31 +08:00 |
|
JiangQiming
|
bafa5ef62b
|
fix: webhook编辑表格优化
|
2023-01-13 13:51:15 +08:00 |
|
100011797
|
91eeb2dadd
|
fix: 修改table卡片插槽样式
|
2023-01-13 13:47:28 +08:00 |
|
jackhoo_98
|
91d1d10da5
|
fix: 设备接入网关 自定义设备接入第三步
|
2023-01-13 13:37:23 +08:00 |
|
wangshuaiswim
|
7b53119ad9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 11:55:02 +08:00 |
|
wangshuaiswim
|
badecf9f64
|
feat: 增加menuStore
|
2023-01-13 11:54:44 +08:00 |
|
JiangQiming
|
83c75f1ae6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 11:49:39 +08:00 |
|
JiangQiming
|
5323a10c82
|
fix: 通知配置新增修改接口联调
|
2023-01-13 11:49:09 +08:00 |
|
wangshuaiswim
|
e01ab75de9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 11:03:32 +08:00 |
|
wangshuaiswim
|
8bd8ad3a39
|
feat: 新增设备和产品接口，新增productStore，新增utils.ts
|
2023-01-13 11:03:13 +08:00 |
|
jackhoo_98
|
44d6d77b8e
|
fix: 证书管理 文件上传地址常量更改
|
2023-01-13 10:35:55 +08:00 |
胡彪
|
6ed95f4758
|
Merge pull request #44 from jetlinks/dev-hub
Dev hub
|
2023-01-13 09:57:26 +08:00 |
|
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 |