Commit Graph

26 Commits

Author SHA1 Message Date
leiqiaochu 6d68860808 feat: 消息协议解析 2023-02-10 17:43:53 +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 b50cd0cba2 feat: 新增设备接入模块 2023-02-07 11:33:46 +08:00
blp 75e5c67ead feat: 新增设备管理-子设备 2023-02-06 18:24:19 +08:00
100011797 fa00834c95 fix: 运行状态操作 2023-02-02 17:55:36 +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
100011797 68eaa0ac76 feat: 运行状态 2023-02-01 17:46:25 +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 f381453bce feat: 标签编辑和关系编辑 2023-01-31 15:38:04 +08:00
100011797 a8ef765702 fix: 合并冲突 2023-01-30 18:12:57 +08:00
100011797 56ca9f1dcf feat: 新增设备和设备基础信息 2023-01-30 18:11:11 +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
wangshuaiswim f66ee9bdf8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-29 18:33:02 +08:00
wangshuaiswim f5f56a1257 fix: 物模型组件开发 2023-01-29 18:32:41 +08:00
xiongqian 37c4e654ee feat: 新增产品分类模块 2023-01-28 21:56:11 +08:00
100011797 5e5087602c feat: 设备管理批量操作 2023-01-17 18:04:42 +08:00
xieyonghong 6934a59e56 Merge remote-tracking branch 'origin/dev' into dev 2023-01-17 11:44:41 +08:00
xieyonghong f3120719c5 update: 优化Search组件查询以及重置 2023-01-17 11:41:58 +08:00
100011797 eb7eaef064 fix: 刷新表格 2023-01-17 11:34:38 +08:00
100011797 e3ddbbd3c4 fix: 更新AIcon 2023-01-16 15:19:41 +08:00
wangshuaiswim 8bd8ad3a39 feat: 新增设备和产品接口,新增productStore,新增utils.ts 2023-01-13 11:03:13 +08:00
wangshuaiswim bcdf8b7882 fix: 新增设备和产品接口 2023-01-12 17:56:51 +08:00
wangshuaiswim 48ca21ab3d fix: 修改设备api目录,增加产品api 2023-01-12 11:34:24 +08:00