JiangQiming
|
ea98e6c788
|
update: 类型改变清空字段
|
2023-02-22 17:55:08 +08:00 |
|
JiangQiming
|
5cd3065b39
|
update: 新增默认值
|
2023-02-22 17:29:12 +08:00 |
|
JiangQiming
|
dccebe617e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 17:23:31 +08:00 |
|
JiangQiming
|
611fa0ea18
|
update: 类型改变重置字段
|
2023-02-22 17:22:42 +08:00 |
xieyonghong
|
737a06e988
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-22 17:01:45 +08:00 |
|
xieyonghong
|
b9d91170a8
|
update: 优化查询组件重置功能
|
2023-02-22 17:01:04 +08:00 |
|
JiangQiming
|
50af3f1ad8
|
update: 路由跳转改为menuStory方式
|
2023-02-22 16:50:45 +08:00 |
|
xieyonghong
|
c48ea97962
|
update: 优化查询组件性能问题
|
2023-02-22 16:44:34 +08:00 |
|
JiangQiming
|
9fd6044e56
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 16:35:38 +08:00 |
|
JiangQiming
|
5c1506a4c4
|
update: 通知模板优化
|
2023-02-22 16:35:23 +08:00 |
|
xieyonghong
|
754fe63fc1
|
update: 优化北向输出跳转
|
2023-02-22 16:07:24 +08:00 |
|
xieyonghong
|
1460ebcdbb
|
update: 优化菜单路由处理
|
2023-02-22 15:51:13 +08:00 |
|
xieyonghong
|
9d8b31713c
|
update: 重命名Northbound
|
2023-02-22 14:15:00 +08:00 |
|
xieyonghong
|
643067656d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-22 13:38:52 +08:00 |
|
xieyonghong
|
e313b36471
|
update: 优化路由处理
|
2023-02-22 13:36:51 +08:00 |
|
JiangQiming
|
8ac4fc8178
|
update: 通知管理交互优化
|
2023-02-22 11:03:45 +08:00 |
|
JiangQiming
|
9a3a752ac0
|
update: 通知模板详情接口调用逻辑更改
|
2023-02-22 10:30:17 +08:00 |
|
JiangQiming
|
3bb6a8f519
|
fix: 解决表单回显必填验证无法通过的问题
|
2023-02-22 10:20:08 +08:00 |
|
JiangQiming
|
383b4a897e
|
update: 页面新增page-container组件包裹
|
2023-02-22 09:50:54 +08:00 |
|
xieyonghong
|
58bbb1ac36
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yarn.lock
|
2023-02-22 09:11:05 +08:00 |
|
xieyonghong
|
1851833bc4
|
update: 优化动态路由
|
2023-02-22 09:08:20 +08:00 |
|
JiangQiming
|
ba17669e95
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 20:06:29 +08:00 |
|
JiangQiming
|
7a220d2c1e
|
fix: 通知管理优化
|
2023-02-21 20:06:13 +08:00 |
easy
|
a9bb84ed6e
|
update: api配置
|
2023-02-21 19:53:03 +08:00 |
|
xieyonghong
|
4599a01de7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-21 19:46:38 +08:00 |
|
xieyonghong
|
80b7436717
|
update: 优化打包
|
2023-02-21 19:44:43 +08:00 |
|
easy
|
58e9a993a3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 16:57:00 +08:00 |
|
easy
|
f5e7ce0015
|
update: api配置
|
2023-02-21 16:56:42 +08:00 |
leiqiaochu
|
ee89ea27b0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 16:46:11 +08:00 |
|
leiqiaochu
|
e2eabb7bcb
|
fix: 初始化页面
|
2023-02-21 16:45:36 +08:00 |
jackhoo_98
|
c0367ebebd
|
Merge branch 'dev' into dev-hub
|
2023-02-21 16:39:36 +08:00 |
|
jackhoo_98
|
235b620c9e
|
feat: 网络组件详情 新增/编辑功能
|
2023-02-21 16:38:18 +08:00 |
|
easy
|
6dffff43dd
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 13:41:19 +08:00 |
|
easy
|
cdb964e932
|
update: 暂存
|
2023-02-21 13:39:43 +08:00 |
|
jackhoo_98
|
9fee5864c5
|
Merge branch 'dev' into dev-hub
|
2023-02-21 09:38:32 +08:00 |
|
jackhoo_98
|
5f56b3d4db
|
feat: 网络组件详情 表单部分交互
|
2023-02-21 09:37:48 +08:00 |
100011797
|
97e40c509a
|
fix: 合并冲突
|
2023-02-20 20:05:20 +08:00 |
|
100011797
|
909abdbc2a
|
feat: websocket
|
2023-02-20 20:03:45 +08:00 |
|
easy
|
e5e096b0d0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-20 19:58:57 +08:00 |
|
easy
|
58e5eec93b
|
update: 数据源管理-管理模块
|
2023-02-20 19:58:37 +08:00 |
|
JiangQiming
|
d3bdbe8909
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-20 16:54:44 +08:00 |
|
JiangQiming
|
b82c2ecda7
|
update: 代码编辑器格式化
|
2023-02-20 16:54:17 +08:00 |
|
leiqiaochu
|
aab1fc7d45
|
fix: 产品切换物联网卡导出无数据
|
2023-02-20 15:47:25 +08:00 |
|
JiangQiming
|
45e2479831
|
feat: 设备功能-高级模式页面&接口联调
|
2023-02-20 15:38:16 +08:00 |
|
JiangQiming
|
9fb27c6fd7
|
feat: 设备功能-精简模式页面&接口联调
|
2023-02-20 14:54:29 +08:00 |
|
JiangQiming
|
fbd917328c
|
feat: 设备功能
|
2023-02-20 13:52:11 +08:00 |
|
JiangQiming
|
c29f2d0cad
|
feat: 设备详情新增设备功能菜单
|
2023-02-20 11:06:04 +08:00 |
|
JiangQiming
|
ca66f58bdd
|
fix: 解决通知管理表格卡片超出边界的问题
|
2023-02-20 10:41:20 +08:00 |
|
JiangQiming
|
0148179444
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-20 10:35:31 +08:00 |
|
JiangQiming
|
94254b6235
|
fix: 删除无用代码
|
2023-02-20 10:35:18 +08:00 |
|
leiqiaochu
|
518390837f
|
feat: 告警中心基础配置
|
2023-02-20 09:42:59 +08:00 |
|
JiangQiming
|
c36d4b95e0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-20 09:33:17 +08:00 |
|
JiangQiming
|
136fdb8b79
|
fix: 解决表单回显必填严重无法通过的问题
|
2023-02-20 09:33:02 +08:00 |
|
jackhoo_98
|
1ad7bcad8b
|
Merge branch 'dev' into dev-hub
|
2023-02-20 09:28:13 +08:00 |
|
easy
|
67df928602
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-17 18:17:07 +08:00 |
|
easy
|
42d49a3083
|
feat: 系统管理-数据源管理
|
2023-02-17 18:16:49 +08:00 |
|
jackhoo_98
|
bc93563d12
|
feat: 网络组件详情 代码优化，共享/独立配置表单校验
|
2023-02-17 18:14:09 +08:00 |
|
100011797
|
21863de3b1
|
fix: 合并冲突
|
2023-02-17 18:12:49 +08:00 |
|
100011797
|
6cb673fbe2
|
feat: 设备诊断
|
2023-02-17 18:11:55 +08:00 |
wangshuaiswim
|
8dcb2a00e2
|
fix: 物模型属性表单开发
|
2023-02-17 17:43:37 +08:00 |
|
JiangQiming
|
cdd0ddd88a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-17 17:37:20 +08:00 |
|
JiangQiming
|
87c4447f31
|
feat: 视频设备-新增编辑
|
2023-02-17 17:37:04 +08:00 |
|
easy
|
9e2c0069b6
|
update: 菜单管理、权限管理、关系配置添加权限
|
2023-02-17 14:37:26 +08:00 |
|
jackhoo_98
|
f7f0556b00
|
Merge branch 'dev' into dev-hub
|
2023-02-17 09:28:45 +08:00 |
|
jackhoo_98
|
0fddd9b8ff
|
feat: 网络组件详情 独立配置表单样式
|
2023-02-17 09:22:30 +08:00 |
|
JiangQiming
|
646e586119
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-16 18:05:23 +08:00 |
|
JiangQiming
|
7bf810065f
|
feat: 视频中心-新增/编辑页面
|
2023-02-16 18:05:08 +08:00 |
|
easy
|
eb2e68e0ea
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-16 18:03:53 +08:00 |
|
wangshuaiswim
|
184e10d239
|
fix: 修复PermissionButton中popconfirm方法调用
|
2023-02-16 18:03:39 +08:00 |
|
easy
|
d692480d41
|
update: 角色管理添加按钮权限
|
2023-02-16 17:35:44 +08:00 |
|
easy
|
86c005b67c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-16 16:35:58 +08:00 |
|
easy
|
0929185967
|
update: 组织管理添加按钮权限
|
2023-02-16 16:35:39 +08:00 |
|
wangshuaiswim
|
7daa9df6a6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-16 16:23:07 +08:00 |
|
wangshuaiswim
|
24690e1cdb
|
fix: 修改权限按钮重复点击问题
|
2023-02-16 16:22:47 +08:00 |
|
JiangQiming
|
b7b3ecbd1c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-16 16:13:39 +08:00 |
|
JiangQiming
|
693c9d3311
|
feat: 视频中心-视频设备列表开发
|
2023-02-16 16:13:23 +08:00 |
|
leiqiaochu
|
293bba37a1
|
feat: 告警中心仪表盘
|
2023-02-16 16:07:14 +08:00 |
|
leiqiaochu
|
40a62317d9
|
feat: 告警中心仪表盘
|
2023-02-16 16:05:29 +08:00 |
|
easy
|
d7754789bf
|
update: 用户管理添加按钮权限
|
2023-02-16 14:47:40 +08:00 |
|
wangshuaiswim
|
bf6c705eda
|
fix: 修复PermissionButton禁用不生效问题
|
2023-02-16 14:32:21 +08:00 |
|
JiangQiming
|
b2653adda5
|
update: 代码编辑器支持脚本语言输入
|
2023-02-16 14:03:46 +08:00 |
|
JiangQiming
|
b55a7bd490
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-16 13:45:52 +08:00 |
|
JiangQiming
|
7308148b69
|
feat: 视频中心, 仪表盘开发
|
2023-02-16 13:45:34 +08:00 |
|
easy
|
b3459c4f97
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-16 11:33:14 +08:00 |
|
easy
|
4c61eaf918
|
feat: 用户管理
|
2023-02-16 11:32:52 +08:00 |
|
jackhoo_98
|
0138941c57
|
Merge branch 'dev' into dev-hub
|
2023-02-16 09:02:16 +08:00 |
|
jackhoo_98
|
6acc522ed5
|
feat: 网络组件详情 表单共享配置基本样式
|
2023-02-15 21:01:46 +08:00 |
|
100011797
|
ab45dabd7f
|
feat: 北向输出
|
2023-02-15 18:56:52 +08:00 |
|
leiqiaochu
|
b493288b2e
|
feat: 规则编排
|
2023-02-15 18:52:47 +08:00 |
|
jackhoo_98
|
91ae45d227
|
feat: 网络组件 卡片/列表基本功能
|
2023-02-15 13:34:56 +08:00 |
|
easy
|
4d099365d8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-14 17:53:19 +08:00 |
|
easy
|
da5b9bd790
|
update: 部门管理over
|
2023-02-14 17:52:59 +08:00 |
|
jackhoo_98
|
97c6d391fb
|
Merge branch 'dev' into dev-hub
|
2023-02-14 14:56:10 +08:00 |
|
jackhoo_98
|
2555f827ef
|
feat: 流媒体服务 卡片列表/新增/编辑等功能
|
2023-02-14 14:53:53 +08:00 |
|
easy
|
b02f7f5add
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-13 18:11:46 +08:00 |
|
easy
|
60acde0b8e
|
update: 组织管理-产品、设备模块
|
2023-02-13 18:11:22 +08:00 |
|
leiqiaochu
|
220a2f65db
|
feat: 设备管理仪表盘
|
2023-02-13 17:52:19 +08:00 |
|
easy
|
51b234b2b0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-10 18:14:00 +08:00 |
|
easy
|
025c2c430a
|
update: 部门管理
|
2023-02-10 18:13:41 +08:00 |
|
leiqiaochu
|
6d68860808
|
feat: 消息协议解析
|
2023-02-10 17:43:53 +08:00 |
|
easy
|
db05307557
|
update: 组织管理
|
2023-02-09 18:27:35 +08:00 |
|
easy
|
09a3873546
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-08 18:16:21 +08:00 |
|
easy
|
bd7547405b
|
feat: 部门管理
|
2023-02-08 18:16:06 +08:00 |
|
easy
|
ece2ba2ff4
|
update: 权限管理
|
2023-02-08 18:15:16 +08:00 |
|
easy
|
37c8110ddc
|
feat: 关系配置
|
2023-02-08 18:12:27 +08:00 |
xiongqian
|
f81d36708d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-08 17:05:37 +08:00 |
|
xiongqian
|
839d14937d
|
feat: 产品管理添加导入导出功能
|
2023-02-08 17:00:43 +08:00 |
blp
|
0bf0046fb2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-08 14:43:41 +08:00 |
|
blp
|
beebc3fafa
|
fix: 样式冲突，类名修改
|
2023-02-08 14:43:13 +08:00 |
|
easy
|
3b799e53d7
|
update: 角色管理over
|
2023-02-07 18:05:00 +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
|
af3175e974
|
fix: 修改引导页显示
|
2023-02-07 11:36:35 +08:00 |
|
xiongqian
|
b50cd0cba2
|
feat: 新增设备接入模块
|
2023-02-07 11:33:46 +08:00 |
|
blp
|
619d21f3f1
|
fix: 物联卡引导页菜单、按钮权限
|
2023-02-07 10:13:52 +08:00 |
|
blp
|
355bc6df64
|
fix: 修改物联卡列表卡片显示
|
2023-02-06 18:25:53 +08:00 |
|
blp
|
75e5c67ead
|
feat: 新增设备管理-子设备
|
2023-02-06 18:24:19 +08:00 |
|
easy
|
a7772d55b5
|
update: 角色管理-权限分配组件
|
2023-02-06 18:11:54 +08:00 |
|
easy
|
3d22650763
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-03 18:15:42 +08:00 |
|
easy
|
8df165e916
|
update: 菜单管理-菜单配置
|
2023-02-03 18:15:22 +08:00 |
|
blp
|
3df97244e3
|
fix: 仪表盘、物联卡管理查看 根据时间选择查询流量图表
|
2023-02-03 17:39:27 +08:00 |
|
jackhoo_98
|
b4850cb168
|
Merge branch 'dev-hub' into dev
|
2023-02-02 23:04:53 +08:00 |
|
wangshuaiswim
|
b46b71812d
|
fix: 物模型开发
|
2023-02-02 18:29:32 +08:00 |
|
easy
|
519042d019
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-02 18:10:16 +08:00 |
|
easy
|
6aeaa716bf
|
update: 菜单管理-菜单配置
|
2023-02-02 18:09:54 +08:00 |
|
jackhoo_98
|
c54894a20f
|
feat: 协议管理
|
2023-02-02 18:08:26 +08:00 |
|
jackhoo_98
|
ecd941c84c
|
update: 组件RadioCard新增layout、checkStyle、disabled属性
|
2023-02-02 18:07:14 +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
|
af2136a033
|
fix: 修改搜索传参、弹窗按钮中文
|
2023-02-02 14:32: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 |
|
wangshuaiswim
|
095a8a9977
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-02 11:42:37 +08:00 |
|
wangshuaiswim
|
ae37dbc2bd
|
fix: 修改PermissionButton的Props透传
|
2023-02-02 11:42:17 +08:00 |
|
blp
|
001bb6bce0
|
feat: 新增平台对接
|
2023-02-02 11:06:58 +08:00 |
|
xieyonghong
|
67d637cca9
|
fix: 修复拓展路由无法访问
|
2023-02-02 10:42:35 +08:00 |
|
xieyonghong
|
eaea45668c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-02 10:38:20 +08:00 |
|
xieyonghong
|
f9e283b190
|
fix: 修复详情路由无法访问
|
2023-02-02 10:37:53 +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 |
|
xieyonghong
|
00d57cc44a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-01 18:21:44 +08:00 |
|
xieyonghong
|
22bdc79013
|
update: 1.优化多层级路由
|
2023-02-01 18:21:00 +08:00 |
|
blp
|
9e6d68a555
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 18:16:18 +08:00 |
|
blp
|
9304911139
|
fix: 修改page-container
|
2023-02-01 18:15:30 +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 |
|
jackhoo_98
|
6879397b77
|
fix: 处理搜索的特殊参数column
|
2023-02-01 15:52:15 +08:00 |
|
JiangQiming
|
9c64386cc4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 15:39:27 +08:00 |
|
JiangQiming
|
c8b94bf439
|
feat: 视频中心首页页面
|
2023-02-01 15:39:13 +08:00 |
|
blp
|
be172b1580
|
fix: 修改卡片样式
|
2023-02-01 13:50:17 +08:00 |
|
jackhoo_98
|
15e19f8714
|
fix: 设备接入网关/证书管理 代码优化
|
2023-02-01 11:38:22 +08:00 |
|
easy
|
5c0c82e0d9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-01 11:00:39 +08:00 |
|
easy
|
66f77fbbd4
|
update: 菜单管理-暂存
|
2023-02-01 11:00:20 +08:00 |
|
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 |
|
wangshuaiswim
|
5d88cbc5c8
|
fix: 修改物模型Cat组件
|
2023-01-31 11:36:36 +08:00 |
|
xieyonghong
|
e550fe67e5
|
update: 1.优化动态路由
|
2023-01-31 11:35:54 +08:00 |
|
JiangQiming
|
0189595c99
|
fix: 通知配置, 卡片按钮插槽
|
2023-01-31 10:40:28 +08:00 |
|
xiongqian
|
d93ab65a4a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 09:52:21 +08:00 |
|
xiongqian
|
809515e73e
|
feat: 增加产品新增弹窗
|
2023-01-31 09:52:00 +08:00 |
|
jackhoo_98
|
df2f497605
|
fix: merge branch dev-hub into dev
|
2023-01-31 09:38:42 +08:00 |
|
wangshuaiswim
|
cc07ccb19d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/router/menu.ts
|
2023-01-30 18:41:48 +08:00 |
|
wangshuaiswim
|
b9d6ca5854
|
fix: 增加设备详情页
|
2023-01-30 18:40:08 +08:00 |
|
wangshuaiswim
|
42d18f687b
|
fix: 修改上传物模型组件
|
2023-01-30 18:39:12 +08:00 |
|
jackhoo_98
|
282c93ecdd
|
feat: 设备接入网关 卡片列表基本样式
|
2023-01-30 18:18:18 +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 |
|
easy
|
ed03ceea5c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:11:25 +08:00 |
|
100011797
|
56ca9f1dcf
|
feat: 新增设备和设备基础信息
|
2023-01-30 18:11:11 +08:00 |
|
easy
|
0c9de15e9a
|
update: 菜单管理
|
2023-01-30 18:11:05 +08:00 |
|
wangshuaiswim
|
a3451187a4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:08:53 +08:00 |
|
wangshuaiswim
|
9a483a678d
|
fix: 修改scss为less，修复权限组件
|
2023-01-30 18:06:47 +08:00 |
|
xieyonghong
|
8d2b41c8f5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-30 17:35:39 +08:00 |
|
JiangQiming
|
c9c8583712
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:30:26 +08:00 |
|
xieyonghong
|
2533a1dff7
|
update: 1.优化动态路由；2. PageContainer放开title插槽
|
2023-01-30 17:30:12 +08:00 |
|
JiangQiming
|
9a82577e9c
|
feat: 绑定用户接口
|
2023-01-30 17:30:12 +08:00 |
|
xiongqian
|
0a8aab6c8e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/api/device/product.ts
|
2023-01-30 17:22:39 +08:00 |
|
xiongqian
|
9da8599575
|
feat: 添加产品列表模块
|
2023-01-30 17:19:41 +08:00 |
|
easy
|
fda769acc6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:11:49 +08:00 |
|
JiangQiming
|
c1adddbb3b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:08:46 +08:00 |
|
JiangQiming
|
05e1281728
|
feat: 同步用户接口
|
2023-01-30 17:06:50 +08:00 |
|
easy
|
4a6b4c6003
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:06:47 +08:00 |
|
xieyonghong
|
96787070ea
|
update: 删除未使用参数
|
2023-01-30 17:06:15 +08:00 |
|
easy
|
b0148bcac6
|
update: 暂存
|
2023-01-30 17:05:27 +08:00 |
|
xieyonghong
|
e6c2a0875a
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/router/menu.ts
# src/utils/comm.ts
|
2023-01-30 16:57:51 +08:00 |
|
xieyonghong
|
6d701c5204
|
feat: 添加PageContainer；完善动态路由
|
2023-01-30 16:52:33 +08:00 |
|
wangshuaiswim
|
6abc69e1d8
|
fix: 修复权限按钮组件
|
2023-01-30 15:04:46 +08:00 |
|
jackhoo_98
|
e96a43ad8b
|
Merge branch 'dev' into dev-hub
|
2023-01-30 14:51:21 +08:00 |
|
jackhoo_98
|
9d4ed41193
|
feat: 证书管理 列表
|
2023-01-30 14:49:55 +08:00 |
|
JiangQiming
|
9f0e384be6
|
feat: 通知模板记录
|
2023-01-30 10:55:15 +08:00 |
|
JiangQiming
|
6898913d45
|
feat: 通知模板调试接口
|
2023-01-30 10:47:02 +08:00 |
|
JiangQiming
|
b667574d78
|
fix: 去除card
|
2023-01-30 09:54:18 +08:00 |