From 92fb267f63163d94010dec2e39b225287f606099 Mon Sep 17 00:00:00 2001 From: mbp <360013221@qq.com> Date: Fri, 11 Oct 2024 15:29:25 +0800 Subject: [PATCH] update solar --- .../pages/control/device/record/index.vue | 6 +++--- .../smart/statisticalAnalysis/query/index.vue | 6 ++++-- .../pages/maintenanceOperations/solar/index.vue | 12 ++++++------ ruoyi-ui/vue.config.js | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue index 31717ae3..716db9d1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue @@ -20,9 +20,9 @@ - - - + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue index 45a491fd..29548fc5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue @@ -338,16 +338,18 @@ export default { if(this.deviceName){ params.deviceName = this.deviceName } + let fileName = '设备统计信息.xlsx' if(t === '1'){ params.exportType='1' - } + fileName = '设备丢包信息.xlsx' + } getSystemStatusExport(params) .then((res) => { const url = window.URL.createObjectURL(new Blob([res])); let link = document.createElement("a"); link.style.display = "none"; link.href = url; - link.setAttribute("download", "设备统计信息.xlsx"); + link.setAttribute("download", fileName); document.body.appendChild(link); link.click(); URL.revokeObjectURL(link.href); // 释放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 5ce5e562..37615529 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue @@ -35,7 +35,7 @@
- +
@@ -111,7 +111,7 @@ //翻页时不刷新序号 indexMethod(index) { return ( - index + (this.queryParams.pageNum - 1) * this.queryParams.pageSize + 1 + index + (this.searchData.pageNum - 1) * this.searchData.pageSize + 1 ); }, onSizeChange(pageSize) { @@ -250,7 +250,7 @@ }).then(result => { if (result.code != 200) return; const data = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - const total = 0; + let total = 0; for(let i in result.data){ total += result.data[i] const idx = parseInt(i.substr(11,2)); @@ -270,7 +270,7 @@ }).then(result => { if (result.code != 200) return; const data = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - const total = 0; + let total = 0; for(let i in result.data){ total += result.data[i] const idx = parseInt(i.substr(11,2)); @@ -290,7 +290,7 @@ }).then(result => { if (result.code != 200) return; const data = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - const total = 0; + let total = 0; for(let i in result.data){ total += result.data[i] const idx = parseInt(i.substr(11,2)); @@ -321,7 +321,6 @@ flex-direction: column; align-items: center; .solarCont{ - height:calc(100vh - 160px); display: flex; flex-direction: row; gap:10px; @@ -331,6 +330,7 @@ display: flex; flex-direction: column; gap:10px; + height: calc(100vh - 300px); .chartPanel{ flex:1; background: linear-gradient(to top, #064151, #042b34); diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 6291d625..9d8f215b 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -38,14 +38,14 @@ module.exports = { [process.env.VUE_APP_BASE_API]: { // target: `http://127.0.0.1:8087`, // target:`http://localhost:3001`, - target:`http://10.0.111.11:8097`, + // target:`http://10.0.111.11:8097`, // target:`http://10.0.111.11:8097`, // target: `http://10.168.66.196:8087`, //刘文阁 // target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟凡峰 // target: `http://10.168.79.46:8089`, //王家宝 - // target: `http://10.168.77.128:8087`, //王兴琳 + target: `http://10.168.77.128:8087`, //王兴琳 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",