Commit Graph

36 Commits

Author SHA1 Message Date
easy bc9fa060f5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-16 18:15:24 +08:00
easy e36529d7bd update: 系统管理-基础配置 2023-01-16 18:14:45 +08:00
100011797 e3ddbbd3c4 fix: 更新AIcon 2023-01-16 15:19:41 +08:00
xieyonghong 2a2a8121c3 update: 优化Search组件 2023-01-13 14:29:16 +08:00
blp f6fd6b38ef Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-12 18:31:40 +08:00
blp c217d51ab6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
#	src/router/menu.ts
2023-01-12 18:31:15 +08:00
easy a9f57ac414 update: 首页样式调整 2023-01-12 18:30:07 +08:00
blp b971bda7ac feat: 添加物联卡首页 2023-01-12 18:28:43 +08:00
JiangQiming c05cf5d961 feat: 通知配置详情表单 2023-01-12 16:48:39 +08:00
xieyonghong 0890350cf2 Merge remote-tracking branch 'origin/dev' into dev 2023-01-12 09:34:31 +08:00
xiongqian b0983a1988 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
#	components.d.ts
2023-01-11 18:41:06 +08:00
xiongqian 5304559608 feat: 添加初始化页面接口数据 2023-01-11 18:38:33 +08:00
xieyonghong ec79fa0669 feat: 新增Search组件 2023-01-11 18:26:30 +08:00
jackhoo_98 8ac810bfb5 feat: 设备接入网关 接入第一步部分功能 2023-01-11 18:12:41 +08:00
easy c22c195200 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-10 18:26:47 +08:00
easy c67de84110 首页目录调整+api配置页面 2023-01-10 18:26:17 +08:00
100011797 26c84eeab6 fix: yarn.lock不忽略 2023-01-10 17:06:53 +08:00
JiangQiming 1b2a8f1b79 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-10 16:54:54 +08:00
JiangQiming 4d83ed9e46 fix: 三方绑定联调 2023-01-10 16:54:47 +08:00
wangshuaiswim 6350a8f3b9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-10 16:22:36 +08:00
wangshuaiswim f801cffc00 fix: 删除菜单和按钮枚举 2023-01-10 16:22:24 +08:00
xieyonghong c5eb9fddc3 feat: 添加FormBuilder组件 2023-01-10 16:11:02 +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
100011797 be792dd961 feat: table 2023-01-10 11:44:03 +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
jackhoo_98 bd267b32ff Merge branch 'dev' into dev-hub 2023-01-10 09:20:53 +08:00
JiangQiming 640f6d898b feat: 新增单点登录页面 2023-01-09 18:03:46 +08:00
jackhoo_98 9a633a1f5c Merge branch 'dev' into dev-hub 2023-01-09 17:59:11 +08:00
jackhoo_98 e19947893a feat: 证书管理新增 基本样式 2023-01-09 17:56:10 +08:00
wangshuaiswim 4b0529631b add: 增加permissionStore以及相关引用 2023-01-09 15:02:40 +08:00
easy c691f246fe 添加iot首页 2023-01-06 18:15:19 +08:00
JiangQiming cf9787fd50 feat: 测试代码注释 2023-01-04 09:55:03 +08:00
JiangQiming 5fd1538d94 feat: 新增参数类型输入组件 2023-01-04 09:50:59 +08:00
xieyonghong c2216c4c31 feat: 初始化项目 2022-12-26 15:27:55 +08:00