Commit Graph

404 Commits

Author SHA1 Message Date
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