From e22520dd6217a7f95b2409d6892f8ac425dfa330 Mon Sep 17 00:00:00 2001 From: little4 <360013221@qq.com> Date: Mon, 14 Oct 2024 13:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/MonthlyEquipment/index.js | 5 ++++ .../maintenanceOperations/solar/index.vue | 23 +++++-------------- .../publicService/components/record/index.vue | 2 +- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js index c2167e86..f19f7ff4 100644 --- a/ruoyi-ui/src/api/MonthlyEquipment/index.js +++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js @@ -68,6 +68,11 @@ export function getSystemStatusExport(query) { url += "&deviceIp=" + query.deviceIp } + + if(query.exportType){ + url += "&exportType=" + + query.exportType + } return request.post( url, {}, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue index 37615529..33306214 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue @@ -79,11 +79,11 @@ data() { return { titles:[ - {icon:'total.png',label:'当年累计发电量',unit:'万度',value:'-'}, - {icon:'used.png',label:'当年累计用电量',unit:'万度',value:'-'}, - {icon:'CO2.png',label:'CO₂减排',unit:'吨',value:'-'}, + {icon:'total.png',label:'当年累计发电量',unit:'度',value:'-'}, + {icon:'used.png',label:'当年累计用电量',unit:'度',value:'-'}, + {icon:'CO2.png',label:'CO₂减排',unit:'kg',value:'-'}, {icon:'tree.png',label:'等效植树',unit:'棵',value:'-'}, - {icon:'coal.png',label:'节约标准煤',unit:'吨',value:'-'}, + {icon:'coal.png',label:'节约标准煤',unit:'kg',value:'-'}, {icon:'error.png',label:'放电异常设备',unit:'个',value:'-'}, ], chart1:null, @@ -123,21 +123,10 @@ initQueryTable() { this.loading = true; this.loading = false; - this.total = 1000; + this.total = 0; this.tableData = [ - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, - {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, ] + //{stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1}, // request({ // url: "/system/status/tablist", // method: "get", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue index 0a37caab..5d82cbdd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue @@ -32,7 +32,7 @@ - +