diff --git a/src/views/bigScreen/v3/profile/typeDistribution.vue b/src/views/bigScreen/v3/profile/typeDistribution.vue index 75394170..648c28c5 100644 --- a/src/views/bigScreen/v3/profile/typeDistribution.vue +++ b/src/views/bigScreen/v3/profile/typeDistribution.vue @@ -134,12 +134,12 @@ export default { if (list) { for (var i = 0; i < list.length; i++) { // console.log(list[i]['typeCode'].indexOf('a')) - if (list[i]["typeCode"].indexOf("a") === 0) { + if (list[i]["tag"] === 'A') { this.templist["alarm"].push({ value: list[i].alarmTotal, name: list[i].typeName, }); - } else if (list[i]["typeCode"].indexOf("w") === 0) { + } else if (list[i]["tag"] === 'B') { this.templist["waraing"].push({ value: list[i].alarmTotal, name: list[i].typeName, diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue index f2992af5..e0bb6267 100644 --- a/src/views/iot/project/index.vue +++ b/src/views/iot/project/index.vue @@ -239,6 +239,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue index 41a1e582..07731b93 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue @@ -9,14 +9,7 @@ > - - + - +
- {{ devItem.deviceId }} - {{ devItem.deviceSecret }} + {{ devItem.deviceName }} + {{ devItem.deviceKey }} {{ devItem.deviceAddress }}
@@ -299,6 +292,7 @@ export default { this.getGatewayList(); }, resetQuery() { + this.resetForm("queryForm"); this.getGatewayList(); }, // 获取 项目 型号列表 diff --git a/src/views/iot/project/profileV2/ETypeCensus.vue b/src/views/iot/project/profileV2/ETypeCensus.vue index 9d0a5f51..06d73b9d 100644 --- a/src/views/iot/project/profileV2/ETypeCensus.vue +++ b/src/views/iot/project/profileV2/ETypeCensus.vue @@ -142,12 +142,12 @@ export default { if (list) { for (var i = 0; i < list.length; i++) { // console.log(list[i]['typeCode'].indexOf('a')) - if (list[i]["typeCode"].indexOf("a") === 0) { + if (list[i]["tag"] === 'A') { this.templist["alarm"].push({ value: list[i].alarmTotal, name: list[i].typeName, }); - } else if (list[i]["typeCode"].indexOf("w") === 0) { + } else if (list[i]["tag"] === 'B') { this.templist["waraing"].push({ value: list[i].alarmTotal, name: list[i].typeName, @@ -155,6 +155,7 @@ export default { } } } + console.log('result-update-', this.templist, list) this.updateEcharts(); }, deep: true, @@ -181,7 +182,7 @@ export default { flex-wrap: wrap; .conter-block { width: 100%; - height: 238px; + height: 218px; display: flex; flex-wrap: wrap; justify-content: center; @@ -245,14 +246,14 @@ export default { .echarts-legend-c .legend-for::-webkit-scrollbar-thumb { /*滚动条里面小方块*/ border-radius: 10px; - box-shadow: inset 0 0 5px #004eb0; - background: #004eb0; + box-shadow: inset 0 0 5px #dbdada; + background: #dbdada; } .echarts-legend-c .legend-for::-webkit-scrollbar-track { /*滚动条里面轨道*/ - box-shadow: inset 0 0 5px #042764; + box-shadow: inset 0 0 5px #04276400; border-radius: 10px; - background: #042764; + background: #04276400; } } diff --git a/src/views/iot/project/profileV2/details.vue b/src/views/iot/project/profileV2/details.vue index 55aa1e40..b0856fe4 100644 --- a/src/views/iot/project/profileV2/details.vue +++ b/src/views/iot/project/profileV2/details.vue @@ -12,10 +12,21 @@ >
-
+
{{ item.projectName }} - - + +
@@ -34,14 +45,14 @@ {{ statusFormat(infoData) }} - {{ - infoData.contractName - }} - 林工1586000000 + + {{ infoData["contacts1"] || "--" }} + - {{ infoData["projectDeviceName"] }} + {{ infoData["contacts2"] || "--" }} + + + {{ infoData["contacts3"] || "--" }} {{ infoData.projectAddress @@ -51,7 +62,10 @@
- +
@@ -81,19 +95,28 @@
@@ -101,7 +124,7 @@