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 @@