xieyonghong
|
cc50da7b49
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# components.d.ts
# yarn.lock
|
2023-01-10 15:30:33 +08:00 |
easy
|
02d91eaec4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 15:29:38 +08:00 |
|
easy
|
30f930ef30
|
1
|
2023-01-10 15:27:07 +08:00 |
|
xieyonghong
|
3fba23e19f
|
feat: 添加commit校验
|
2023-01-10 15:26:20 +08:00 |
blp
|
54855c5263
|
fix：登录页修改
|
2023-01-10 15:11:46 +08:00 |
JiangQiming
|
79fc6a419c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 14:45:58 +08:00 |
|
JiangQiming
|
20d30e99b2
|
feat: 单点登录接口联调
|
2023-01-10 14:42:59 +08:00 |
|
easy
|
fac9f36162
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 14:39:49 +08:00 |
|
easy
|
d1eb8165c0
|
首页
|
2023-01-10 14:37:25 +08:00 |
胡彪
|
58c8f15c22
|
Merge pull request #41 from jetlinks/dev-hub
Dev hub
|
2023-01-10 13:57:57 +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 |
|
jackhoo_98
|
c2b83da156
|
feat: 新增TitleComponent组件
|
2023-01-10 13:44:31 +08:00 |
100011797
|
da0fc1b45a
|
fix: 修改token取反
|
2023-01-10 11:44:03 +08:00 |
|
100011797
|
be792dd961
|
feat: table
|
2023-01-10 11:44:03 +08:00 |
|
blp
|
81c27df227
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
# vite.config.ts
|
2023-01-10 11:38:46 +08:00 |
|
blp
|
8de9512364
|
fix：修改bug
|
2023-01-10 11:33:40 +08:00 |
|
blp
|
dda2821830
|
fix:配置文件修改
|
2023-01-10 11:30:37 +08:00 |
|
JiangQiming
|
5c9e024b62
|
fix: 解决冲突
|
2023-01-10 11:26:47 +08:00 |
|
JiangQiming
|
80bd48693d
|
fix: 三方绑定样式优化
|
2023-01-10 11:22:02 +08:00 |
|
blp
|
35f4b18ada
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
# package.json
# src/views/account/Center/bind/index.vue
|
2023-01-10 11:13:09 +08:00 |
|
blp
|
af223a16b8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 11:11:04 +08:00 |
|
blp
|
3dbe4ea2af
|
feat：登录页
|
2023-01-10 11:04:52 +08:00 |
|
JiangQiming
|
0434d12416
|
feat: 新增表单验证
|
2023-01-10 10:27:40 +08:00 |
|
胡彪
|
0f11e75bd4
|
Merge pull request #40 from jetlinks/dev-hub
Dev hub
|
2023-01-10 09:23:03 +08:00 |
|
jackhoo_98
|
bd267b32ff
|
Merge branch 'dev' into dev-hub
|
2023-01-10 09:20:53 +08:00 |
wangshuaiswim
|
f6ad749282
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
|
2023-01-09 18:35:19 +08:00 |
|
wangshuaiswim
|
e80d7f9039
|
fix: 增加jetlinks-store
|
2023-01-09 18:33:49 +08:00 |
|
wangshuaiswim
|
93e91f0073
|
fix: 增加权限按钮和相关内容
|
2023-01-09 18:33:02 +08:00 |
|
wangshuaiswim
|
6530755873
|
fix: 修改ext参数为非必输
|
2023-01-09 18:30:58 +08:00 |
|
easy
|
d38fe9e5b8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-09 18:13:41 +08:00 |
|
easy
|
c3b06ad3cd
|
首页页面
|
2023-01-09 18:12:23 +08:00 |
|
JiangQiming
|
640f6d898b
|
feat: 新增单点登录页面
|
2023-01-09 18:03:46 +08:00 |
|
jackhoo_98
|
9a633a1f5c
|
Merge branch 'dev' into dev-hub
|
2023-01-09 17:59:11 +08:00 |
|
jackhoo_98
|
bdd6f40079
|
feat: 日志管理 基本样式框架
|
2023-01-09 17:57:12 +08:00 |
|
jackhoo_98
|
e19947893a
|
feat: 证书管理新增 基本样式
|
2023-01-09 17:56:10 +08:00 |
|
wangshuaiswim
|
ef064a60c5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-09 16:12:12 +08:00 |
|
wangshuaiswim
|
5ad7ed969c
|
add: 新增权限按钮
|
2023-01-09 16:12:00 +08:00 |
|
100011797
|
d3879bebd1
|
feat: 增加vue-jsx配置
|
2023-01-09 16:03:34 +08:00 |
|
wangshuaiswim
|
4b0529631b
|
add: 增加permissionStore以及相关引用
|
2023-01-09 15:02:40 +08:00 |
|
easy
|
5aeeda5433
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-06 18:17:03 +08:00 |
|
easy
|
c691f246fe
|
添加iot首页
|
2023-01-06 18:15:19 +08:00 |
|
blp
|
735470715e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-06 17:53:53 +08:00 |
|
blp
|
0cdd32319a
|
feat：新增卡片、状态组件
|
2023-01-06 17:53:29 +08:00 |
|
JiangQiming
|
d37113b24b
|
fix: 删除无用代码
|
2023-01-05 17:47:52 +08:00 |
|
JiangQiming
|
291a9621bb
|
fix: 新增注释
|
2023-01-05 17:46:25 +08:00 |
|
JiangQiming
|
0323594841
|
fix: 地图标记点实现方式更改
|
2023-01-05 17:42:20 +08:00 |
|
JiangQiming
|
37689880f1
|
fix: 组件优化
|
2023-01-05 16:38:53 +08:00 |
|
JiangQiming
|
cb8f393a17
|
fix: 组件bug修复
|
2023-01-04 16:09:13 +08:00 |
|
JiangQiming
|
ebb0f58be5
|
fix: 编辑器默认值
|
2023-01-04 14:03:10 +08:00 |