Commit Graph

135 Commits

Author SHA1 Message Date
100011797 db5514d27f fix: 自测修改设备管理 2023-03-10 16:52:05 +08:00
wangshuaiswim c160e2d0e2 fix: 修改物模型校验 2023-03-10 15:19:28 +08:00
wangshuaiswim 772b71206d fix: 修改测试物模型问题 2023-03-10 15:16:47 +08:00
leiqiaochu ff52a91888 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-10 11:00:15 +08:00
leiqiaochu d45af8a1bf feat: 子组件绑定和产品仪表盘 2023-03-10 10:59:39 +08:00
wangshuaiswim e7630bc7e2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 16:05:07 +08:00
wangshuaiswim 1642290608 fix: 修改物模型规则属性 2023-03-09 16:04:20 +08:00
leiqiaochu d527cc09fe Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 15:57:30 +08:00
leiqiaochu c9b56626d5 feat: 子设备新增并绑定 2023-03-09 15:56:55 +08:00
100011797 d70956e1e1 fix: 修改北向输出 2023-03-08 18:16:59 +08:00
wangshuaiswim 23aff419a3 fix: 物模型组件修改 2023-03-08 18:00:07 +08:00
JiangQiming 56122ac90c update: 设备功能组件替换 2023-03-08 16:11:45 +08:00
jackhoo_98 ae959f9dcd fix: 合并冲突 2023-03-08 09:36:46 +08:00
jackhoo_98 de603868c4 Merge remote-tracking branch 'origin/dev' into dev-hub 2023-03-08 09:27:42 +08:00
jackhoo_98 a48a1f73c7 feat: 采集器 左侧树全部功能,右侧卡片列表以及部分表单 2023-03-08 09:27:22 +08:00
leiqiaochu 41e1ca9f9c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-07 10:14:26 +08:00
leiqiaochu 356bf1fccf feat: 按钮鉴权 2023-03-07 10:13:41 +08:00
100011797 1cf4a3f8b0 fix: dueros替换组件 2023-03-06 18:03:51 +08:00
100011797 4ce8a15b6e fix: 设备替换组件 2023-03-06 17:42:26 +08:00
100011797 66234bdfd4 fix: 修改设备新增 2023-03-06 11:19:11 +08:00
jackhoo_98 05fa3208b7 Merge remote-tracking branch 'origin/dev' into dev-hub 2023-03-04 17:37:04 +08:00
xieyonghong 04eb06976b update: 添加组件库按需引入 2023-03-04 17:34:59 +08:00
leiqiaochu ad2cf137f5 fix: 组件替换 2023-03-04 16:03:30 +08:00
leiqiaochu 14d2a782ce Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-04 13:46:50 +08:00
leiqiaochu 43cb12bb2b fix: 设备接入表格样式接入 2023-03-04 13:46:11 +08:00
wzyyy 7e053e0d00 fix: 物联卡组件替换及部分场景联动 2023-03-04 11:51:42 +08:00
jackhoo_98 573ae35353 update: 运维管理、数据采集替换组件 2023-03-04 10:50:06 +08:00
wzyyy 36b673157a fix: merge 2023-03-02 20:46:32 +08:00
wzyyy 4d8f68dabb fix: 物联卡及数据解析替换 2023-03-02 20:43:33 +08:00
wangshuaiswim c401da070b fix: 修改替换组件 2023-03-02 19:12:20 +08:00
100011797 f7fac41743 fix: 修改设备列表为protable 2023-03-02 17:55:28 +08:00
wzyyy 42ecbbf0ea Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 21:35:15 +08:00
wzyyy f36e4b00ac fix: 物联卡权限及下载模板 2023-03-01 21:34:49 +08:00
wangshuaiswim c07199ca2b fix: 解决物模型TODO 2023-03-01 18:43:02 +08:00
jackhoo_98 86c15261e8 fix: 合并冲突 2023-03-01 17:32:29 +08:00
jackhoo_98 4e75bf94c6 feat: 远程升级 加入权限 2023-03-01 17:08:18 +08:00
wzyyy 7cefa62e45 fix: 去掉ant的样式 2023-03-01 15:07:21 +08:00
wzyyy 1f4bdc274e fix: merge 2023-03-01 14:15:55 +08:00
wzyyy 34fbb4d67c feat: 数据解析 2023-03-01 14:14:09 +08:00
JiangQiming fac1b5d1df update: 国标级联表单数据赋值方式更改 2023-03-01 11:40:12 +08:00
jackhoo_98 8972c003ba feat: 协议管理 加入权限 2023-03-01 10:58:19 +08:00
jackhoo_98 67a5a78db5 Merge branch 'dev' into dev-hub 2023-02-28 21:17:00 +08:00
wangshuaiswim bee4050386 fix: 物模型TSL修改 2023-02-28 20:44:44 +08:00
wangshuaiswim 468bbd3eb3 fix: 修改物模型 2023-02-28 20:06:15 +08:00
wangshuaiswim 7abe5adf2e fix: 物模型修改 2023-02-28 17:19:06 +08:00
100011797 74fb1cc403 feat: 设备-日志管理 2023-02-28 15:25:38 +08:00
100011797 7dbf13888f feat: 地图轨迹 2023-02-28 14:25:38 +08:00
leiqiaochu b92fe00806 feat: 告警记录 2023-02-28 11:16:04 +08:00
wangshuaiswim 46264b3696 fix: 物模型功能开发 2023-02-28 10:26:59 +08:00
wangshuaiswim 02153a63da fix: 物模型属性开发 2023-02-27 19:35:05 +08:00