leiqiaochu
|
6d68860808
|
feat: 消息协议解析
|
2023-02-10 17:43:53 +08:00 |
easy
|
db05307557
|
update: 组织管理
|
2023-02-09 18:27:35 +08:00 |
|
easy
|
bd7547405b
|
feat: 部门管理
|
2023-02-08 18:16:06 +08:00 |
|
easy
|
37c8110ddc
|
feat: 关系配置
|
2023-02-08 18:12:27 +08:00 |
xiongqian
|
a8af608299
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-07 11:36:55 +08:00 |
|
xiongqian
|
b50cd0cba2
|
feat: 新增设备接入模块
|
2023-02-07 11:33:46 +08:00 |
blp
|
75e5c67ead
|
feat: 新增设备管理-子设备
|
2023-02-06 18:24:19 +08:00 |
|
easy
|
a7772d55b5
|
update: 角色管理-权限分配组件
|
2023-02-06 18:11:54 +08:00 |
jackhoo_98
|
b4850cb168
|
Merge branch 'dev-hub' into dev
|
2023-02-02 23:04:53 +08:00 |
|
jackhoo_98
|
c54894a20f
|
feat: 协议管理
|
2023-02-02 18:08:26 +08:00 |
100011797
|
fa00834c95
|
fix: 运行状态操作
|
2023-02-02 17:55:36 +08:00 |
JiangQiming
|
2c6e4173f8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-02 17:23:44 +08:00 |
|
JiangQiming
|
c051cdeae4
|
feat: 视频中心,仪表盘图表card封装
|
2023-02-02 17:23:29 +08:00 |
|
blp
|
ff87cb9b6d
|
feat: 新增物联卡操作记录
|
2023-02-02 13:56:26 +08:00 |
|
JiangQiming
|
f2bd1d37a2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-02 11:51:20 +08:00 |
|
JiangQiming
|
e67d9519a8
|
feat: 视频中心仪表盘
|
2023-02-02 11:51:06 +08:00 |
|
blp
|
001bb6bce0
|
feat: 新增平台对接
|
2023-02-02 11:06:58 +08:00 |
|
xiongqian
|
ad2e5b1ec5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 18:23:41 +08:00 |
|
xiongqian
|
93763374fe
|
fix: 修改产品新增、编辑、添加详情页面
|
2023-02-01 18:23:24 +08:00 |
|
jackhoo_98
|
c384fd6f6c
|
Merge branch 'dev-hub' into dev
|
2023-02-01 18:14:44 +08:00 |
|
jackhoo_98
|
f4679f4727
|
feat: 协议管理 卡片/列表基本样式
|
2023-02-01 18:14:02 +08:00 |
|
easy
|
58c6d1aaf3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 18:11:27 +08:00 |
|
easy
|
d4bf79f802
|
update: 菜单管理
|
2023-02-01 18:10:53 +08:00 |
|
100011797
|
68eaa0ac76
|
feat: 运行状态
|
2023-02-01 17:46:25 +08:00 |
|
JiangQiming
|
1eda294d48
|
feat: 视频中心仪表盘卡片组件封装
|
2023-02-01 17:34:15 +08:00 |
|
jackhoo_98
|
888bb5b961
|
feat: 运维管理 日志管理 访问日志/系统日志
|
2023-02-01 17:01:11 +08:00 |
|
JiangQiming
|
59e4bacd74
|
feat: 基础统计组件封装
|
2023-02-01 15:59:53 +08:00 |
|
JiangQiming
|
d43c640a50
|
fix: 类型导入前加上type关键字
|
2023-02-01 10:47:15 +08:00 |
|
jackhoo_98
|
aa4fc217e4
|
fix: merge branch 'dev-hub' into dev
|
2023-02-01 09:29:52 +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
|
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 |
|
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 |
|
blp
|
57bd26dcaa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 16:14:29 +08:00 |
|
blp
|
4fc5d5315f
|
feat: 物联卡管理查看
|
2023-01-31 16:12:49 +08:00 |
|
100011797
|
f381453bce
|
feat: 标签编辑和关系编辑
|
2023-01-31 15:38:04 +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
|
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 |
|
xieyonghong
|
e550fe67e5
|
update: 1.优化动态路由
|
2023-01-31 11:35:54 +08:00 |
|
jackhoo_98
|
df2f497605
|
fix: merge branch dev-hub into dev
|
2023-01-31 09:38:42 +08:00 |
|
100011797
|
f5f0d2cb23
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:14: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 |
|
blp
|
21efdef721
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:13:08 +08:00 |
|
100011797
|
a8ef765702
|
fix: 合并冲突
|
2023-01-30 18:12:57 +08:00 |
|
blp
|
ac62778a2f
|
feat: 增加物联卡列表卡片、导出、导入、绑定设备
|
2023-01-30 18:12:42 +08:00 |