From 65e41e390f195d4a948e2afccfb711322ffa06b3 Mon Sep 17 00:00:00 2001 From: 23688nl <329261658@qq.com> Date: Mon, 29 Aug 2022 14:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4:=20=E7=8E=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81?= 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/project/index.vue | 4 +- .../DeviceManage/EDeviceChildren.vue | 15 +- .../profileV2/DeviceManage/EDeviceTable.vue | 9 +- .../profileV2/DeviceManage/EDynamicTable.vue | 56 +++-- .../project/profileV2/DeviceManage/index.vue | 6 +- .../iot/project/profileV2/ECensusCards.vue | 2 +- .../iot/project/profileV2/EEchartsGauge.vue | 7 + .../iot/project/profileV2/EEchartsLine.vue | 2 +- .../project/profileV2/EObjectContainer.vue | 2 +- .../iot/project/profileV2/EObjectSpace.vue | 16 +- .../iot/project/profileV2/EObjectTenant.vue | 11 + .../iot/project/profileV2/ETrendCensus.vue | 8 +- src/views/iot/project/profileV2/details.vue | 214 +++++++++++------- 14 files changed, 244 insertions(+), 117 deletions(-) diff --git a/src/api/iot/project_new.js b/src/api/iot/project_new.js index 675b67ff..be260e16 100644 --- a/src/api/iot/project_new.js +++ b/src/api/iot/project_new.js @@ -26,3 +26,12 @@ export function listProjectTableFilter(query) { params: query }); } + +// 查询 项目 型号 +export function statProject(query) { + return request({ + url: "/iot/project/projectStat", + method: "get", + params: query + }); +} diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue index eb51064e..f2992af5 100644 --- a/src/views/iot/project/index.vue +++ b/src/views/iot/project/index.vue @@ -304,7 +304,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import SelectTableWrap from "@/components/SelectTable/index"; /////、、、、、、、、、、、、、、、、、、、、 -// import DetailsWrapNew from './profileV2/details' +import DetailsWrapNew from './profileV2/details' export default { name: "Project", @@ -313,7 +313,7 @@ export default { Treeselect, DetailsWrap, SelectTableWrap, - // DetailsWrapNew + DetailsWrapNew }, data() { return { diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue index f03d1a16..6824468d 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue @@ -33,7 +33,7 @@
一键分闸
- +
{ - this.tableList = res.data + this.tableList = res.rows + this.deviceTotal = res.total if (this.stompClient) { this.closeSocket() } @@ -402,7 +405,7 @@ export default { } } .right-operate { - width: 350px; + width: 360px; display: flex; justify-content: flex-end; font-weight: 400; diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue index fff865a7..485edf5e 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue @@ -63,11 +63,11 @@ 搜索 - 重置 @@ -225,6 +225,7 @@ export default { sourceId(val) { if (val) { this.initHTML(); + this.showChildrenView = false } }, deviceType(val) { @@ -300,7 +301,7 @@ export default { projectId: this.sourceId, deviceTags: this.deviceType || '' }, this.queryParams)).then(res => { - this.list = res.data + this.list = res.rows if (this.stompClient) { this.closeSocket() } @@ -494,7 +495,7 @@ export default { .footer-title { width: 100%; - margin-left: 10px; + margin-left: 3px; display: block; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue index 466e8ca4..d39d58c6 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue @@ -1,8 +1,19 @@