Commit Graph

52 Commits

Author SHA1 Message Date
100011797 21863de3b1 fix: 合并冲突 2023-02-17 18:12:49 +08:00
100011797 6cb673fbe2 feat: 设备诊断 2023-02-17 18:11:55 +08:00
wangshuaiswim 8dcb2a00e2 fix: 物模型属性表单开发 2023-02-17 17:43:37 +08:00
leiqiaochu 293bba37a1 feat: 告警中心仪表盘 2023-02-16 16:07:14 +08:00
100011797 ab45dabd7f feat: 北向输出 2023-02-15 18:56:52 +08:00
leiqiaochu b493288b2e feat: 规则编排 2023-02-15 18:52:47 +08:00
leiqiaochu 220a2f65db feat: 设备管理仪表盘 2023-02-13 17:52:19 +08:00
leiqiaochu 6d68860808 feat: 消息协议解析 2023-02-10 17:43:53 +08:00
xiongqian 839d14937d feat: 产品管理添加导入导出功能 2023-02-08 17:00:43 +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 af3175e974 fix: 修改引导页显示 2023-02-07 11:36:35 +08:00
xiongqian b50cd0cba2 feat: 新增设备接入模块 2023-02-07 11:33:46 +08:00
blp 75e5c67ead feat: 新增设备管理-子设备 2023-02-06 18:24:19 +08:00
wangshuaiswim b46b71812d fix: 物模型开发 2023-02-02 18:29:32 +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 531ef16a2f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-01 11:00:02 +08:00
xiongqian c88283fb46 fix: 删除文件 2023-02-01 10:59:45 +08:00
100011797 2ba0164295 fix: 修复datSource问题 2023-02-01 10:58:26 +08:00
xiongqian e09eda6b41 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-01 10:56:45 +08:00
xiongqian e702dae9dd feat: 新增产品成功提示弹窗 2023-02-01 10:56:24 +08:00
100011797 53dd932293 fix: JTable的切换 2023-02-01 09:45:28 +08:00
wangshuaiswim 1f70697392 fix: 物模型开发 2023-01-31 18:25:26 +08:00
100011797 7c6b1ea074 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-31 17:26:56 +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 3f8aba0a8c fix: 修改设备卡片名称 2023-01-31 16:51:48 +08:00
100011797 f381453bce feat: 标签编辑和关系编辑 2023-01-31 15:38:04 +08:00
wangshuaiswim 5d88cbc5c8 fix: 修改物模型Cat组件 2023-01-31 11:36:36 +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
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
100011797 a8ef765702 fix: 合并冲突 2023-01-30 18:12:57 +08:00
100011797 56ca9f1dcf feat: 新增设备和设备基础信息 2023-01-30 18:11:11 +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
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
100011797 2b6048707b fix: 合并代码 2023-01-30 09:35:56 +08:00
100011797 c5bc7e7f6a fix: 新增设备 2023-01-30 09:34:04 +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
100011797 eb7eaef064 fix: 刷新表格 2023-01-17 11:34:38 +08:00
100011797 e3ddbbd3c4 fix: 更新AIcon 2023-01-16 15:19:41 +08:00