xiongqian
|
531ef16a2f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 11:00:02 +08:00 |
|
xiongqian
|
c88283fb46
|
fix: 删除文件
|
2023-02-01 10:59:45 +08:00 |
100011797
|
2ba0164295
|
fix: 修复datSource问题
|
2023-02-01 10:58:26 +08:00 |
|
xiongqian
|
e09eda6b41
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 10:56:45 +08:00 |
|
xiongqian
|
e702dae9dd
|
feat: 新增产品成功提示弹窗
|
2023-02-01 10:56:24 +08:00 |
JiangQiming
|
d43c640a50
|
fix: 类型导入前加上type关键字
|
2023-02-01 10:47:15 +08:00 |
|
JiangQiming
|
2e7bcd030b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 10:27:42 +08:00 |
|
JiangQiming
|
42008555ac
|
fix: 路由跳转路径更改
|
2023-02-01 10:27:27 +08:00 |
blp
|
c7660bc128
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 10:25:20 +08:00 |
|
blp
|
35d789d043
|
feat: 充值管理查看详情
|
2023-02-01 10:24:50 +08:00 |
xieyonghong
|
419f5ff4a2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-01 10:10:43 +08:00 |
|
xieyonghong
|
676269db6c
|
update: 1.优化详情无法查看问题；2.优化PageContainer、Search样式
|
2023-02-01 10:10:19 +08:00 |
|
100011797
|
53dd932293
|
fix: JTable的切换
|
2023-02-01 09:45:28 +08:00 |
jackhoo_98
|
aa4fc217e4
|
fix: merge branch 'dev-hub' into dev
|
2023-02-01 09:29:52 +08:00 |
easy
|
43bfa89252
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 18:26:21 +08:00 |
|
easy
|
c55d3cd0de
|
update: 删除多余文件
|
2023-01-31 18:25:51 +08:00 |
wangshuaiswim
|
1f70697392
|
fix: 物模型开发
|
2023-01-31 18:25:26 +08:00 |
|
easy
|
4652ce6d8b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 18:24:13 +08:00 |
|
easy
|
730a77d2c4
|
update: 菜单管理
|
2023-01-31 18:23:56 +08:00 |
|
jackhoo_98
|
6a69661271
|
feat: 设备接入网关 卡片列表功能及基本流程
|
2023-01-31 18:18:53 +08:00 |
|
blp
|
09eb1c3a2a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 18:09:49 +08:00 |
|
blp
|
4dd78fbd63
|
feat: 充值管理列表、充值保存，接口联调
|
2023-01-31 18:09:23 +08:00 |
|
xieyonghong
|
16c320802e
|
update: 1.删除多余静态路由
|
2023-01-31 18:00:00 +08:00 |
|
xieyonghong
|
21a450e70e
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/router/menu.ts
# src/views/home/index.vue
|
2023-01-31 17:52:16 +08:00 |
|
xieyonghong
|
8e2e0de679
|
update: 1.优化动态路由,处理路由数据格式；优化layout样式
|
2023-01-31 17:50:47 +08:00 |
|
100011797
|
7c6b1ea074
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 17:26:56 +08:00 |
|
xiongqian
|
fb443e8206
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 17:26:12 +08:00 |
|
xiongqian
|
d48d504b30
|
fix: 修改新增产品
|
2023-01-31 17:25:51 +08:00 |
|
100011797
|
ed4331e7d0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 17:19:33 +08:00 |
|
JiangQiming
|
c4ae0a6ddd
|
fix: 代码编辑器粘贴时格式化代码
|
2023-01-31 17:16:19 +08:00 |
|
100011797
|
86cb742e48
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 16:51:56 +08:00 |
|
100011797
|
3f8aba0a8c
|
fix: 修改设备卡片名称
|
2023-01-31 16:51:48 +08:00 |
|
JiangQiming
|
8c348631f4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 16:48:15 +08:00 |
|
JiangQiming
|
ea4552a2b8
|
fix: 钉钉机器人消息类型优化
|
2023-01-31 16:48:01 +08:00 |
|
blp
|
57bd26dcaa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 16:14:29 +08:00 |
|
blp
|
88ecf733df
|
feat: 充值管理
|
2023-01-31 16:14:04 +08:00 |
|
blp
|
4fc5d5315f
|
feat: 物联卡管理查看
|
2023-01-31 16:12:49 +08:00 |
|
JiangQiming
|
2553b2dafc
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 16:07:59 +08:00 |
|
JiangQiming
|
fdacebbec8
|
fix: 新增模板交互优化
|
2023-01-31 16:07:46 +08:00 |
|
100011797
|
f381453bce
|
feat: 标签编辑和关系编辑
|
2023-01-31 15:38:04 +08:00 |
|
JiangQiming
|
0626348328
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 14:25:07 +08:00 |
|
JiangQiming
|
4ea899f874
|
fix: 通知管理新增编辑优化
|
2023-01-31 14:24:54 +08:00 |
|
blp
|
5abae54652
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 14:14:45 +08:00 |
|
blp
|
bd6a101afe
|
feat: 物联卡管理新增、编辑
|
2023-01-31 14:14:21 +08:00 |
|
easy
|
e3183975c3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 11:52:47 +08:00 |
|
easy
|
67a3780287
|
update: 首页权限调整及样式微调
|
2023-01-31 11:52:26 +08:00 |
|
xieyonghong
|
de3a57ce91
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-31 11:43:24 +08:00 |
|
easy
|
471a442709
|
update: 菜单管理-暂存
|
2023-01-31 11:39:47 +08:00 |
|
xieyonghong
|
8a33a58d63
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/router/menu.ts
|
2023-01-31 11:37:23 +08:00 |
|
wangshuaiswim
|
3f181dcfc4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 11:37:14 +08:00 |