iot-ui-vue

f4679f4727 feat: 协议管理卡片/列表基本样式 jackhoo_98 2023-02-01 18:14:02 +0800
58c6d1aaf3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-01 18:11:27 +0800
d4bf79f802 update: 菜单管理 easy 2023-02-01 18:10:53 +0800
68eaa0ac76 feat: 运行状态 100011797 2023-02-01 17:46:25 +0800
1eda294d48 feat: 视频中心仪表盘卡片组件封装 JiangQiming 2023-02-01 17:34:15 +0800
888bb5b961 feat: 运维管理日志管理访问日志/系统日志 jackhoo_98 2023-02-01 17:01:11 +0800
59e4bacd74 feat: 基础统计组件封装 JiangQiming 2023-02-01 15:59:53 +0800
6879397b77 fix: 处理搜索的特殊参数column jackhoo_98 2023-02-01 15:52:15 +0800
9c64386cc4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-01 15:39:27 +0800
c8b94bf439 feat: 视频中心首页页面 JiangQiming 2023-02-01 15:39:13 +0800
be172b1580 fix: 修改卡片样式 blp 2023-02-01 13:50:17 +0800
15e19f8714 fix: 设备接入网关/证书管理代码优化 jackhoo_98 2023-02-01 11:38:22 +0800
5c0c82e0d9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-01 11:00:39 +0800
66f77fbbd4 update: 菜单管理-暂存 easy 2023-02-01 11:00:20 +0800
531ef16a2f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-02-01 11:00:02 +0800
c88283fb46 fix: 删除文件 xiongqian 2023-02-01 10:59:45 +0800
2ba0164295 fix: 修复datSource问题 100011797 2023-02-01 10:58:26 +0800
e09eda6b41 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-02-01 10:56:45 +0800
e702dae9dd feat: 新增产品成功提示弹窗 xiongqian 2023-02-01 10:56:24 +0800
d43c640a50 fix: 类型导入前加上type关键字 JiangQiming 2023-02-01 10:47:15 +0800
2e7bcd030b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-01 10:27:42 +0800
42008555ac fix: 路由跳转路径更改 JiangQiming 2023-02-01 10:27:27 +0800
c7660bc128 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-02-01 10:25:20 +0800
35d789d043 feat: 充值管理查看详情 blp 2023-02-01 10:24:50 +0800
419f5ff4a2 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-01 10:10:43 +0800
676269db6c update: 1.优化详情无法查看问题；2.优化PageContainer、Search样式 xieyonghong 2023-02-01 10:10:19 +0800
53dd932293 fix: JTable的切换 100011797 2023-02-01 09:45:28 +0800
aa4fc217e4 fix: merge branch 'dev-hub' into dev jackhoo_98 2023-02-01 09:29:52 +0800
43bfa89252 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-31 18:26:21 +0800
c55d3cd0de update: 删除多余文件 easy 2023-01-31 18:25:51 +0800
1f70697392 fix: 物模型开发 wangshuaiswim 2023-01-31 18:25:17 +0800
4652ce6d8b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-31 18:24:13 +0800
730a77d2c4 update: 菜单管理 easy 2023-01-31 18:23:56 +0800
6a69661271 feat: 设备接入网关卡片列表功能及基本流程 jackhoo_98 2023-01-31 18:18:53 +0800
09eb1c3a2a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-31 18:09:49 +0800
4dd78fbd63 feat: 充值管理列表、充值保存，接口联调 blp 2023-01-31 18:09:23 +0800
16c320802e update: 1.删除多余静态路由 xieyonghong 2023-01-31 18:00:00 +0800
21a450e70e Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-31 17:52:16 +0800
8e2e0de679 update: 1.优化动态路由,处理路由数据格式；优化layout样式 xieyonghong 2023-01-31 17:50:47 +0800
7c6b1ea074 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-01-31 17:26:56 +0800
fb443e8206 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-01-31 17:26:12 +0800
d48d504b30 fix: 修改新增产品 xiongqian 2023-01-31 17:25:51 +0800
ed4331e7d0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-01-31 17:19:33 +0800
c4ae0a6ddd fix: 代码编辑器粘贴时格式化代码 JiangQiming 2023-01-31 17:16:19 +0800
86cb742e48 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-01-31 16:51:56 +0800
3f8aba0a8c fix: 修改设备卡片名称 100011797 2023-01-31 16:51:48 +0800
8c348631f4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-31 16:48:15 +0800
ea4552a2b8 fix: 钉钉机器人消息类型优化 JiangQiming 2023-01-31 16:48:01 +0800
57bd26dcaa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-31 16:14:29 +0800
88ecf733df feat: 充值管理 blp 2023-01-31 16:14:04 +0800
4fc5d5315f feat: 物联卡管理查看 blp 2023-01-31 16:12:49 +0800
2553b2dafc Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-31 16:07:59 +0800
fdacebbec8 fix: 新增模板交互优化 JiangQiming 2023-01-31 16:07:46 +0800
f381453bce feat: 标签编辑和关系编辑 100011797 2023-01-31 15:38:04 +0800
0626348328 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-31 14:25:07 +0800
4ea899f874 fix: 通知管理新增编辑优化 JiangQiming 2023-01-31 14:24:54 +0800
5abae54652 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-31 14:14:45 +0800
bd6a101afe feat: 物联卡管理新增、编辑 blp 2023-01-31 14:14:21 +0800
e3183975c3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-31 11:52:47 +0800
67a3780287 update: 首页权限调整及样式微调 easy 2023-01-31 11:52:26 +0800
de3a57ce91 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-31 11:43:24 +0800
471a442709 update: 菜单管理-暂存 easy 2023-01-31 11:39:47 +0800
8a33a58d63 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-31 11:37:23 +0800
3f181dcfc4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-31 11:37:14 +0800
5d88cbc5c8 fix: 修改物模型Cat组件 wangshuaiswim 2023-01-31 11:36:21 +0800
e550fe67e5 update: 1.优化动态路由 xieyonghong 2023-01-31 11:35:54 +0800
0189595c99 fix: 通知配置, 卡片按钮插槽 JiangQiming 2023-01-31 10:40:28 +0800
d93ab65a4a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-01-31 09:52:21 +0800
809515e73e feat: 增加产品新增弹窗 xiongqian 2023-01-31 09:52:00 +0800
df2f497605 fix: merge branch dev-hub into dev jackhoo_98 2023-01-31 09:38:42 +0800
cc07ccb19d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-30 18:41:30 +0800
b9d6ca5854 fix: 增加设备详情页 wangshuaiswim 2023-01-30 18:40:01 +0800
42d18f687b fix: 修改上传物模型组件 wangshuaiswim 2023-01-30 18:38:52 +0800
282c93ecdd feat: 设备接入网关卡片列表基本样式 jackhoo_98 2023-01-30 18:18:18 +0800
f5f0d2cb23 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-01-30 18:14:08 +0800
24514e2b7a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-01-30 18:13:29 +0800
21efdef721 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-30 18:13:08 +0800
a8ef765702 fix: 合并冲突 100011797 2023-01-30 18:12:57 +0800
ac62778a2f feat: 增加物联卡列表卡片、导出、导入、绑定设备 blp 2023-01-30 18:12:42 +0800
ed03ceea5c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-30 18:11:25 +0800
56ca9f1dcf feat: 新增设备和设备基础信息 100011797 2023-01-30 18:11:11 +0800
0c9de15e9a update: 菜单管理 easy 2023-01-30 18:11:05 +0800
a3451187a4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-30 18:08:53 +0800
9a483a678d fix: 修改scss为less，修复权限组件 wangshuaiswim 2023-01-30 18:06:16 +0800
8d2b41c8f5 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-30 17:35:39 +0800
c9c8583712 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-30 17:30:26 +0800
2533a1dff7 update: 1.优化动态路由；2. PageContainer放开title插槽 xieyonghong 2023-01-30 17:30:12 +0800
9a82577e9c feat: 绑定用户接口 JiangQiming 2023-01-30 17:30:12 +0800
0a8aab6c8e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-01-30 17:22:39 +0800
9da8599575 feat: 添加产品列表模块 xiongqian 2023-01-30 17:19:41 +0800
fda769acc6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-30 17:11:49 +0800
c1adddbb3b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-30 17:08:46 +0800
05e1281728 feat: 同步用户接口 JiangQiming 2023-01-30 17:06:50 +0800
4a6b4c6003 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-30 17:06:47 +0800
96787070ea update: 删除未使用参数 xieyonghong 2023-01-30 17:06:15 +0800
b0148bcac6 update: 暂存 easy 2023-01-30 17:05:27 +0800
e6c2a0875a Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-30 16:57:51 +0800
6d701c5204 feat: 添加PageContainer；完善动态路由 xieyonghong 2023-01-30 16:52:33 +0800
6abc69e1d8 fix: 修复权限按钮组件 wangshuaiswim 2023-01-30 15:04:19 +0800
e96a43ad8b Merge branch 'dev' into dev-hub jackhoo_98 2023-01-30 14:51:21 +0800

Commit Graph Select branches Hide Pull Requests 2.2-dev Mono Color

Commit Graph

Select branches

Hide Pull Requests

2.2-dev