Commit Graph

17 Commits

Author SHA1 Message Date
leiqiaochu e2eabb7bcb fix: 初始化页面 2023-02-21 16:45:36 +08:00
100011797 2ba0164295 fix: 修复datSource问题 2023-02-01 10:58:26 +08:00
100011797 f381453bce feat: 标签编辑和关系编辑 2023-01-31 15:38:04 +08:00
blp 21efdef721 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-30 18:13:08 +08:00
blp ac62778a2f feat: 增加物联卡列表卡片、导出、导入、绑定设备 2023-01-30 18:12:42 +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
jackhoo_98 35a53fc47c feat: 设备接入网关 云平台接入 Ctwing/OneNet设备接入 2023-01-29 17:38:07 +08:00
100011797 e3ddbbd3c4 fix: 更新AIcon 2023-01-16 15:19:41 +08:00
xiongqian 748fac80a7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
#	components.d.ts
#	src/utils/consts.ts
2023-01-10 18:31:05 +08:00
xiongqian 73278105e7 feat:添加初始化页面 2023-01-10 18:25:54 +08:00
jackhoo_98 1bd0b49dc4 fix: Merge branch 'dev' into dev-hub 2023-01-10 13:56:41 +08:00
jackhoo_98 7e1c9de11f feat: 设备接入网关 自定义设备接入基本Card样式 2023-01-10 13:51:14 +08:00
blp af223a16b8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-10 11:11:04 +08:00
blp 3dbe4ea2af feat:登录页 2023-01-10 11:04:52 +08:00
easy c3b06ad3cd 首页页面 2023-01-09 18:12:23 +08:00
xieyonghong c2216c4c31 feat: 初始化项目 2022-12-26 15:27:55 +08:00