diff --git a/package.json b/package.json index f937b4a..969eb34 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "connect": "3.6.6", "eslint": "7.15.0", "eslint-plugin-vue": "7.2.0", + "html-webpack-plugin": "^5.6.3", "lint-staged": "10.5.3", "runjs": "4.4.2", "sass": "1.32.13", diff --git a/src/views/hotWater/energyAnalysis/components/temReport.vue b/src/views/hotWater/energyAnalysis/components/temReport.vue index 441b147..fcade05 100644 --- a/src/views/hotWater/energyAnalysis/components/temReport.vue +++ b/src/views/hotWater/energyAnalysis/components/temReport.vue @@ -35,7 +35,7 @@ :data="tableData" @row-click="handlerow" highlight-current-row - height="500" + height="400" ref="maintable" :cell-style="tableRowStyle" > @@ -44,10 +44,18 @@ + + + + + + + + @@ -251,10 +259,18 @@ export default { var tHeader = [ "楼栋名称", "0点", - "02点", - "06点", + "1点", + "2点", + "3点", + "4点", + "5点", + "6点", + "7点", "8点", + "9点", + "10点", "11点", + "12点", "13点", "14点", "15点", @@ -270,10 +286,18 @@ export default { var filterVal = [ "buildingName", "temp00", + "temp01", "temp02", + "temp03", + "temp04", + "temp05", "temp06", + "temp07", "temp08", + "temp09", + "temp10", "temp11", + "temp12", "temp13", "temp14", "temp15", @@ -290,10 +314,18 @@ export default { var tHeader = [ "热泵名称", "0点", - "02点", - "06点", + "1点", + "2点", + "3点", + "4点", + "5点", + "6点", + "7点", "8点", + "9点", + "10点", "11点", + "12点", "13点", "14点", "15点", @@ -309,10 +341,18 @@ export default { var filterVal = [ "deviceName", "temp00", + "temp01", "temp02", + "temp03", + "temp04", + "temp05", "temp06", + "temp07", "temp08", + "temp09", + "temp10", "temp11", + "temp12", "temp13", "temp14", "temp15", diff --git a/src/views/hotWater/energyAnalysis/components/waterReport.vue b/src/views/hotWater/energyAnalysis/components/waterReport.vue index 545f710..6553c2a 100644 --- a/src/views/hotWater/energyAnalysis/components/waterReport.vue +++ b/src/views/hotWater/energyAnalysis/components/waterReport.vue @@ -35,7 +35,7 @@ :data="tableData" @row-click="handlerow" highlight-current-row - height="500" + height="400" ref="maintable" :cell-style="tableRowStyle" > @@ -43,10 +43,18 @@ + + + + + + + + @@ -235,7 +243,7 @@ export default { const data = params[0]; const month = data.name; const value = data.value; - return `${month}
温度: ${value} ℃`; + return `${month}
水位: ${value} %`; }, }; this.brokenOption.xAxis.data = this.brokenTime; @@ -250,10 +258,18 @@ export default { "楼栋名称", "设备名称", "0点", - "02点", - "06点", + "1点", + "2点", + "3点", + "4点", + "5点", + "6点", + "7点", "8点", + "9点", + "10点", "11点", + "12点", "13点", "14点", "15点", @@ -270,10 +286,18 @@ export default { "buildingName", "deviceName", "temp00", + "temp01", "temp02", + "temp03", + "temp04", + "temp05", "temp06", + "temp07", "temp08", + "temp09", + "temp10", "temp11", + "temp12", "temp13", "temp14", "temp15", @@ -290,10 +314,18 @@ export default { var tHeader = [ "楼栋名称", "0点", - "02点", - "06点", + "1点", + "2点", + "3点", + "4点", + "5点", + "6点", + "7点", "8点", + "9点", + "10点", "11点", + "12点", "13点", "14点", "15点", @@ -309,10 +341,18 @@ export default { var filterVal = [ "buildingName", "temp00", + "temp01", "temp02", + "temp03", + "temp04", + "temp05", "temp06", + "temp07", "temp08", + "temp09", + "temp10", "temp11", + "temp12", "temp13", "temp14", "temp15", @@ -331,7 +371,7 @@ export default { excel.export_json_to_excel({ header: tHeader, //表头 data, //数据 - filename: "温度变化报表", //名称 + filename: "水位变化报表", //名称 autoWidth: true, //宽度自适应 }); }); diff --git a/src/views/hotWater/energyQuery/components/electReading.vue b/src/views/hotWater/energyQuery/components/electReading.vue index d462445..170cf2e 100644 --- a/src/views/hotWater/energyQuery/components/electReading.vue +++ b/src/views/hotWater/energyQuery/components/electReading.vue @@ -52,9 +52,9 @@ - + - + - + - +