From 1af91ba9e524253c4617d035d9470a5b22962b62 Mon Sep 17 00:00:00 2001 From: 23688nl <329261568@qq.com> Date: Wed, 28 Sep 2022 16:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=20=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87=20?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3=20/iot/device/projectDev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/iot/project_new.js | 9 +++++++++ .../ESceneManage/ESceneAction/src/EDeviceParam.vue | 5 +++-- .../ESceneManage/ESceneTriggers/src/ESelectDevice.vue | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/api/iot/project_new.js b/src/api/iot/project_new.js index ecc28eeb..a568014f 100644 --- a/src/api/iot/project_new.js +++ b/src/api/iot/project_new.js @@ -232,3 +232,12 @@ export function projectSceneLoggingList(query) { params: query }); } + +// 查询 查询 项目中设备列表 +export function projectSelectDeviceList(query) { + return request({ + url: "/iot/device/projectDev", + method: "get", + params: query + }); +} diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue index 245aaa1f..0d26c7e0 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue @@ -154,7 +154,8 @@ // import { listDevice } from "@/api/iot/device"; import SelectTableWrap from "@/components/SelectTable/index"; import { getDeviceFunList, getDeviceCmdList } from "@/api/iot/device"; -import { getDeviceList } from "@/api/app"; +import { projectSelectDeviceList } from "@/api/iot/project_new"; + export default { name: "EDeviceParam", @@ -403,7 +404,7 @@ export default { this.deviceChildList(data); }, deviceChildList(data) { - getDeviceList(Object.assign(data.page, data.param)).then((res) => { + projectSelectDeviceList(Object.assign(data.page, data.param)).then((res) => { this.tableSelectOption.tableList = res.rows; this.tableList = res.rows; this.tableSelectOption.queryOpt.page.total = Number(res.total); diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue index 079a8e69..68faaaae 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue @@ -49,7 +49,7 @@