From 191fa0586d11c82ae5a5c39a39201cef19d9985f Mon Sep 17 00:00:00 2001 From: "VIJAY\\vijay" Date: Tue, 23 Aug 2022 15:07:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E9=87=8F=E6=98=BE=E7=A4=BA=E4=BB=8E?= =?UTF-8?q?=E7=94=B5=E5=8E=8B=E8=BD=AC=E5=8C=96=E4=B8=BA=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en.js | 2 +- src/lang/zh.js | 2 +- src/views/weather/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 524f8aa..f6e126c 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -232,6 +232,6 @@ export default { totalRadiation1IntervalCum: 'Total Radiation 1 Interval Cum(MJ/㎡)', rainfallDailyCum: 'Rainfall Daily Cum(mm)', totalRadiation1DailyCum: 'Total Radiation 1 Daily Cum(MJ/㎡)', - power: 'Power(V)' + power: 'Power(%)' } } diff --git a/src/lang/zh.js b/src/lang/zh.js index d6fd106..f843f01 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -232,6 +232,6 @@ export default { totalRadiation1IntervalCum: '总辐射1间隔累计(MJ/㎡)', rainfallDailyCum: '雨量日累计(mm)', totalRadiation1DailyCum: '总辐射1日累计(MJ/㎡)', - power: '电量(V)' + power: '电量(%)' } } diff --git a/src/views/weather/index.vue b/src/views/weather/index.vue index e8e3cf0..947e17b 100644 --- a/src/views/weather/index.vue +++ b/src/views/weather/index.vue @@ -230,7 +230,7 @@ export default { this.filename = 'WeatherStationData' + String(start).replace(/-/g, '') + '_' + String(end).replace(/-/g, '') + '.xlsx' import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['Data Time', 'Device ID', 'Device Name', 'Env. Temp(℃)', 'Daw Point Temp(℃)', 'Env. Humi(%RH)', 'Air Pressure(hPa)', 'Total Radiation 1 Ins(W/㎡)', 'Wind Directiong(°)', 'Wind Speed Ins(m/s)', 'Wind Speed 2mins(m/s)', 'Wind Speed 10mins(m/s)', 'Rainfall Interval Cum(mm)', 'Total Radiation 1 Interval Cum(MJ/㎡)', 'Rainfall Daily Cum(mm)', 'Total Radiation 1 Daily Cum(MJ/㎡)', 'Power(V)'] + const tHeader = ['Data Time', 'Device ID', 'Device Name', 'Env. Temp(℃)', 'Daw Point Temp(℃)', 'Env. Humi(%RH)', 'Air Pressure(hPa)', 'Total Radiation 1 Ins(W/㎡)', 'Wind Directiong(°)', 'Wind Speed Ins(m/s)', 'Wind Speed 2mins(m/s)', 'Wind Speed 10mins(m/s)', 'Rainfall Interval Cum(mm)', 'Total Radiation 1 Interval Cum(MJ/㎡)', 'Rainfall Daily Cum(mm)', 'Total Radiation 1 Daily Cum(MJ/㎡)', 'Power(%)'] const filterVal = ['data_time', 'device_id', 'device_name', 'env_temp', 'dew_point_temp', 'env_humi', 'air_pressure', 'total_radiation_1_ins', 'wind_direction', 'wind_speed_ins', 'wind_speed_2mins', 'wind_speed_10mins', 'rainfall_interval_cum', 'total_radiation_1_interval_cum', 'rainfall_daily_cum', 'total_radiation_1_daily_cum', 'power'] const list = this.logExportList const data = this.formatJson(filterVal, list)