Commit Graph

939 Commits

Author SHA1 Message Date
胡彪 39694d7b04
Merge pull request #59 from jetlinks/dev-hub
feat: 采集器 MODBUS、OPCUA表单,读写以及批量操作
feat: 采集器 OPCUA扫描全部功能
style: 调整TitleComponent组件样式
2023-03-12 15:53:05 +08:00
jackhoo_98 08ca907b99 Merge branch 'dev' into dev-hub 2023-03-12 15:47:21 +08:00
jackhoo_98 92590869b7 style: 调整TitleComponent组件样式 2023-03-12 15:45:41 +08:00
jackhoo_98 721409dfb0 feat: 采集器 OPCUA扫描全部功能 2023-03-12 15:27:39 +08:00
easy c4e66cc414 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-10 18:09:30 +08:00
easy df1fe4bd0f fix: 组织管理自测及优化 2023-03-10 18:08:29 +08:00
100011797 db5514d27f fix: 自测修改设备管理 2023-03-10 16:52:05 +08:00
JiangQiming 0589ea17ed Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-10 16:25:55 +08:00
JiangQiming 26eee3c169 fix: bug#10242 #10245 2023-03-10 16:25:38 +08:00
wangshuaiswim c160e2d0e2 fix: 修改物模型校验 2023-03-10 15:19:28 +08:00
wangshuaiswim 772b71206d fix: 修改测试物模型问题 2023-03-10 15:16:47 +08:00
easy 8e92b62c5c fix: 用户管理自测及优化 2023-03-10 14:12:28 +08:00
JiangQiming fbbeb1df6d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-10 11:29:33 +08:00
JiangQiming f5aae8528f update: 组件更换测试 2023-03-10 11:29:18 +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
easy 0c80efe6d2 fix: 基础配置自测及优化 2023-03-10 10:49:13 +08:00
xieyonghong 7427301495 update: 优化场景联动 DropdownMenus布尔值 2023-03-10 10:27:07 +08:00
xieyonghong b583fa77a9 update: 场景联动ParamsDropdown 添加插槽 2023-03-10 10:27:06 +08:00
JiangQiming 7f3978fe17 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 20:01:09 +08:00
JiangQiming cfff69bd43 update: 组件更换测试 2023-03-09 20:00:52 +08:00
easy f245461c68 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 19:52:18 +08:00
easy d2e7a410b7 fix: 个人中心自测、优化 2023-03-09 19:52:00 +08:00
JiangQiming 204a916e48 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 19:38:30 +08:00
JiangQiming c97571e5cf update: 组件更换测试 2023-03-09 19:38:03 +08:00
100011797 0330a7702f fix: 场景联动-执行动作-设备输出 2023-03-09 18:25:10 +08:00
wangshuaiswim 9cd78db1f6 fix: 修改物模型规则调试 2023-03-09 17:40:13 +08:00
easy d650757dc2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 17:29:05 +08:00
easy 37e381f961 fix: 个人中心 2023-03-09 17:28:35 +08:00
jackhoo_98 4e51d021eb feat: 采集器 MODBUS、OPCUA表单,读写以及批量操作 2023-03-09 16:57:11 +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
JiangQiming a5d7c228c2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 16:02:53 +08:00
JiangQiming 57a2aceaa9 update: 视频中心组件替换测试 2023-03-09 16:02:39 +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
xieyonghong 75eca7d0dc feat: 场景联动添加ParamsDropdown组件 2023-03-09 15:22:20 +08:00
JiangQiming c5018e631a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 15:16:53 +08:00
JiangQiming 257765cb50 update: 组件替换自测优化 2023-03-09 15:16:22 +08:00
easy 80faeb5f0f fix: 首页自测 优化 2023-03-09 15:05:05 +08:00
easy 4dcbf18939 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-08 19:43:58 +08:00
easy 58106e9fe4 update: 应用管理组件替换、弹窗优化 2023-03-08 19:43:36 +08:00
easy 68720f668c update: api配置组件替换、逻辑优化 2023-03-08 19:07:34 +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
JiangQiming 8622bfe8f1 update: 通知模板组件替换 2023-03-08 16:10:14 +08:00
JiangQiming f3bebd063b update: 通知配置组件更换 2023-03-08 16:04:38 +08:00
JiangQiming 25d44f841b update: 视频中心-国标级联组件更换 2023-03-08 15:43:47 +08:00
JiangQiming 749127730e update: 视频设备组件替换 2023-03-08 15:30:06 +08:00