From d50717d0b9a30d0536b4cb33a1b0d518423bbfd8 Mon Sep 17 00:00:00 2001 From: 23688nl <329261568@qq.com> Date: Thu, 29 Sep 2022 11:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4:=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=B7=BB=E5=8A=A0=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/iot/project_new.js | 9 + src/views/iot/device/profile/details.vue | 13 +- src/views/profile/DeviceDetailsView/index.vue | 10 + src/views/profile/EDeviceScene/indexView.vue | 181 ++++++++++++++++++ 4 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 src/views/profile/EDeviceScene/indexView.vue diff --git a/src/api/iot/project_new.js b/src/api/iot/project_new.js index a568014f..0935d9a8 100644 --- a/src/api/iot/project_new.js +++ b/src/api/iot/project_new.js @@ -241,3 +241,12 @@ export function projectSelectDeviceList(query) { params: query }); } + +// 查询 设备关联场景 列表 +export function deviceSceneList(query) { + return request({ + url: "/iot/scene/listWithDev", + method: "get", + params: query + }); +} diff --git a/src/views/iot/device/profile/details.vue b/src/views/iot/device/profile/details.vue index adc4e19d..d7716ec5 100644 --- a/src/views/iot/device/profile/details.vue +++ b/src/views/iot/device/profile/details.vue @@ -56,6 +56,15 @@ > + + +
+ +
+
@@ -68,6 +77,7 @@ import DeviceLog from "@/views/profile/DeviceDetailsView/deviceLog"; import DeviceRunStartsWrap from "@/views/profile/DeviceRunStarts/index"; import { iotWebSocketBaseUrl } from "@/config/env"; import TriggerWrap from "@/views/profile/DeviceTrigger/index"; +import EDeviceScene from '@/views/profile/EDeviceScene/indexView' export default { name: "DetailsWrap", props: ["sourceId"], @@ -76,7 +86,8 @@ export default { ChildDevice, DeviceLog, DeviceRunStartsWrap, - TriggerWrap + TriggerWrap, + EDeviceScene }, data() { return { diff --git a/src/views/profile/DeviceDetailsView/index.vue b/src/views/profile/DeviceDetailsView/index.vue index f75d0d9c..ac603a74 100644 --- a/src/views/profile/DeviceDetailsView/index.vue +++ b/src/views/profile/DeviceDetailsView/index.vue @@ -98,6 +98,14 @@ > + +
+ +
+
@@ -111,6 +119,7 @@ import TriggerWrap from "@/views/profile/DeviceTrigger/index"; import DeviceSelect from "./deviceSelectNav"; import ModelOat from "./modelOat"; import ChildDevice from "./childDevice"; +import EDeviceScene from '@/views/profile/EDeviceScene/indexView' export default { name: "DetailsWrap", props: ["sourceId", "isTenant", 'isPersonal'], @@ -122,6 +131,7 @@ export default { DeviceSelect, ModelOat, ChildDevice, + EDeviceScene }, data() { return { diff --git a/src/views/profile/EDeviceScene/indexView.vue b/src/views/profile/EDeviceScene/indexView.vue new file mode 100644 index 00000000..889bfd71 --- /dev/null +++ b/src/views/profile/EDeviceScene/indexView.vue @@ -0,0 +1,181 @@ + + + \ No newline at end of file