From 9aed93946a567c874c847b4d3e356058b0455ae7 Mon Sep 17 00:00:00 2001
From: wangjuncheng <1>
Date: 星期二, 01 七月 2025 16:13:22 +0800
Subject: [PATCH] 2
---
src/views/left/CitySim.vue | 167 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 106 insertions(+), 61 deletions(-)
diff --git a/src/views/left/CitySim.vue b/src/views/left/CitySim.vue
index 27af36b..eefcfd3 100644
--- a/src/views/left/CitySim.vue
+++ b/src/views/left/CitySim.vue
@@ -447,15 +447,16 @@
/**
* 鏁版嵁澶勭悊涓诲嚱鏁�
+ * @param {Array} data - 瑙ｆ瀽鍚庣殑鍘熷鏁版嵁鏁扮粍锛屾瘡涓厓绱犳槸涓�涓璞�
*/
const processData = (data) => {
- // 妫�鏌ョ┖鏁版嵁
+ // 妫�鏌ユ槸鍚︿负绌烘暟鎹�
if (data.length === 0) {
ElMessage.warning("鏂囦欢鍐呭涓虹┖锛�");
return;
}
- // 鍖归厤瀛楁鍚�
+ // 鍖归厤鍒楀悕锛堜緥濡傗�滄椂闂粹�濄�佲�滃皬鏃堕洦寮衡�濓級
const columns = matchColumns(data[0]);
// 鏍￠獙蹇呰瀛楁鏄惁瀛樺湪
@@ -475,22 +476,18 @@
return;
}
- // 鏃堕棿鍒楁牎楠屾槸鍚﹀崌搴�
+ // 鏍￠獙鏃堕棿鍒楁槸鍚﹀崌搴忔帓鍒�
if (!isTimeColumnSorted(data, columns.time)) {
ElMessage.error("鏃堕棿鍒楀繀椤绘寜鍗囧簭鎺掑垪锛�");
forms.fileList = [];
return;
}
- // 鎻愬彇鍗曚綅
- forms.intensityUnit = extractUnitFromHeader(columns.intensity);
+ // 鎻愬彇鍗曚綅锛堝 mm/h锛夛紝鑻ユ病鏈夊垯璁句负绌哄瓧绗︿覆
+ forms.intensityUnit = extractUnitFromHeader(columns.intensity) || "";
- if (!forms.intensityUnit) {
- forms.intensityUnit = "";
- }
-
- // 杞崲 key 鍚嶅苟杞崲鏁板�肩被鍨�
- forms.rainFallList = data.map((row) => ({
+ // 灏嗗師濮嬫暟鎹浆鎹负缁熶竴缁撴瀯鐨勫璞℃暟缁�
+ const rawRainFallList = data.map((row) => ({
time: row[columns.time],
intensity: parseFloat(row[columns.intensity]),
total: columns.totalRainfall
@@ -498,21 +495,45 @@
: undefined,
}));
- console.log(forms.rainFallList, "瑙ｆ瀽鍚庣殑闄嶉洦鏁版嵁");
+ console.log(rawRainFallList, "鍘熷闄嶉洦鏁版嵁");
- // 璁＄畻缁熻淇℃伅
- const firstTime = parseDateTime(data[0][columns.time]);
- const lastTime = parseDateTime(data[data.length - 1][columns.time]);
+ // 鍒ゆ柇鏄惁涓烘暣灏忔椂鏁版嵁锛堝嵆鐩搁偦鏃堕棿闂撮殧鏄惁涓烘暣灏忔椂锛�
+ const isHourlyData = checkIfHourlyData(rawRainFallList);
+
+ let hourlyRainfallList = [];
+
+ if (!isHourlyData) {
+ // 濡傛灉涓嶆槸鏁村皬鏃舵暟鎹紝鎸夊皬鏃惰繘琛岃仛鍚堝鐞�
+ hourlyRainfallList = aggregateToHourlyRainfall(rawRainFallList);
+ console.log(hourlyRainfallList, "淇鍚庣殑灏忔椂闆ㄥ己");
+ } else {
+ // 濡傛灉鏄暣灏忔椂鏁版嵁锛岀洿鎺ヤ娇鐢ㄥ師濮嬮洦寮哄��
+ hourlyRainfallList = rawRainFallList.map((item) => ({
+ time: item.time,
+ intensity: item.intensity,
+ }));
+ }
+
+ // 鏇存柊 forms.rainFallList锛屽彲鐢ㄤ簬鍥捐〃鏄剧ず绛夌敤閫�
+ forms.rainFallList = rawRainFallList;
+
+ // 璁＄畻璧峰鏃堕棿鍜岀粨鏉熸椂闂达紙姣鏁帮級
+ const firstTime = parseDateTime(hourlyRainfallList[0]?.time);
+ const lastTime = parseDateTime(
+ hourlyRainfallList[hourlyRainfallList.length - 1]?.time
+ );
+
+ // 璁＄畻鎸佺画鏃堕棿锛堝崟浣嶏細灏忔椂锛�
const durationSeconds = Math.floor((lastTime - firstTime) / 1000);
- forms.duration = (durationSeconds / 3600).toFixed(2); // 灏忔椂
+ forms.duration = (durationSeconds / 3600).toFixed(2); // 鍗曚綅锛氬皬鏃�
+ // 鎵惧嚭鏈�澶у皬鏃堕洦寮�
const maxIntensity = Math.max(
- ...data
- .map((row) => parseFloat(row[columns.intensity]))
- .filter((v) => !isNaN(v))
+ ...hourlyRainfallList.map((item) => item.intensity).filter((v) => !isNaN(v))
).toFixed(2);
forms.intensity = maxIntensity;
+ // 鑻ユ湁鎬婚檷闆ㄩ噺鍒楋紝鍙栧嚭鏈�鍚庝竴涓�间綔涓烘�婚檷闆ㄩ噺
if (columns.totalRainfall) {
const lastTotal = parseFloat(data[data.length - 1][columns.totalRainfall]);
forms.rainfall = isNaN(lastTotal) ? 0 : lastTotal.toFixed(2);
@@ -521,56 +542,80 @@
}
};
-// // 澶勭悊鏁版嵁
-// const processData = (data) => {
-// // 1. 妫�鏌ユ暟鎹槸鍚︿负绌�
-// if (data.length === 0) {
-// ElMessage.warning("鏂囦欢鍐呭涓虹┖锛�");
-// return;
-// }
+/**
+ * 妫�鏌ユ暟鎹槸鍚︿负鏁村皬鏃惰褰�
+ * @param {Array} rainList - 鍘熷闄嶉洦鏁版嵁鍒楄〃锛屾瘡涓厓绱犲寘鍚� time 鍜� intensity
+ * @returns {boolean} - 鏄惁涓烘暣灏忔椂鏁版嵁
+ */
+function checkIfHourlyData(rainList) {
+ if (rainList.length < 2) return true; // 鍙湁涓�涓偣锛岄粯璁よ涓烘暣灏忔椂鏁版嵁
-// // 2. 鑾峰彇琛ㄥご锛堢涓�鍒楁槸鏃堕棿鍒楋級
-// const tableColumns = Object.keys(data[0]);
-// const timeColumn = tableColumns[0]; // 鍋囪绗竴鍒楁槸鏃堕棿
+ for (let i = 1; i < rainList.length; i++) {
+ // 瑙ｆ瀽涓や釜鐩搁偦鏃堕棿鐐�
+ const time1 = parseDateTime(rainList[i - 1].time);
+ const time2 = parseDateTime(rainList[i].time);
-// // 3. 鏍￠獙鏃堕棿鍒楁槸鍚︽寜鍗囧簭鎺掑垪
-// if (!isTimeColumnSorted(data, timeColumn)) {
-// ElMessage.error("鏃堕棿鍒楀繀椤绘寜鍗囧簭鎺掑垪锛�");
-// forms.fileList = [];
-// return; // 缁堟澶勭悊
-// }
+ // 璁＄畻鏃堕棿宸紙鍒嗛挓锛�
+ const diffMinutes = Math.abs(time2 - time1) / (1000 * 60);
-// const intensityColumn = tableColumns[1]; // 闆ㄥ己鍒楋紙濡� "灏忔椂闆ㄥ己(mm/h)"锛�
-// // console.log(intensityColumn, "intensityColumnintensityColumnintensityColumn");
-// // 3. 鎻愬彇绗簩鍒楃殑鍗曚綅锛堝 "(mm/h)" 鈫� "mm/h"锛�
-// const intensityUnit = extractUnitFromHeader(intensityColumn);
-// forms.intensityUnit = intensityUnit; // 瀛樺偍鍗曚綅锛堝彲閫夛級
-// console.log(forms.intensityUnit,'aaaaaaaaaaaaaaaaaaaaa')
+ // 濡傛灉鏃堕棿宸笉鏄暣灏忔椂锛堜笉鑳借60鏁撮櫎锛夛紝鍒欎笉鏄暣灏忔椂鏁版嵁
+ if (diffMinutes % 60 !== 0) {
+ return false;
+ }
+ }
-// // 4. 濡傛灉鏍￠獙閫氳繃锛岀户缁鐞嗘暟鎹�
-// forms.rainFallList = transformKeys(data);
-// console.log(forms.rainFallList, "data");
+ return true;
+}
-// // 5. 璁＄畻闄嶉洦鏃堕暱銆侀洦寮恒�佺疮璁￠洦閲忥紙鍘熼�昏緫锛�
-// const firstTime = parseDateTime(data[0][timeColumn]);
-// const lastTime = parseDateTime(data[data.length - 1][timeColumn]);
-// const timeDuration = Math.floor((lastTime - firstTime) / 1000);
-// // 闄嶉洦鏃堕暱
-// forms.duration = (timeDuration / 3600).toFixed(2);
-// // 闄嶉洦寮哄害
-// const maxValue = Math.max(
-// ...data.map((row) => {
-// const value = parseFloat(row[tableColumns[1]]);
-// return isNaN(value) ? -Infinity : value;
-// })
-// ).toFixed(2);
-// forms.intensity = maxValue;
+/**
+ * 灏嗕换鎰忔椂闂寸矑搴︾殑闆ㄥ己鏁版嵁锛屾寜灏忔椂鑱氬悎涓衡�滃皬鏃堕洦寮衡��
+ * @param {Array} rainList - 鍘熷鏁版嵁鍒楄〃锛屾瘡涓厓绱犲寘鍚� time 鍜� intensity
+ * @returns {Array} - 鎸夊皬鏃跺垎缁勭殑鑱氬悎缁撴灉
+ */
+function aggregateToHourlyRainfall(rainList) {
+ const grouped = {}; // 鐢ㄤ簬涓存椂瀛樺偍姣忎釜灏忔椂鐨勬暟鎹�
-// const lastValue = data[data.length - 1][tableColumns[2]];
-// forms.rainfall = lastValue;
+ for (const item of rainList) {
+ // 瑙ｆ瀽鏃堕棿瀛楃涓蹭负鏃堕棿鎴�
+ const timestamp = parseDateTime(item.time);
-// };
+ // 濡傛灉瑙ｆ瀽澶辫触锛岃烦杩囧綋鍓嶉」
+ if (isNaN(timestamp)) {
+ console.warn("鏃犳晥鐨勬椂闂存牸寮忥紝宸茶烦杩�", item.time);
+ continue;
+ }
+ // 灏嗘椂闂存埑杞负 Date 瀵硅薄浠ヤ究鎿嶄綔鏃ユ湡
+ const dt = new Date(timestamp);
+
+ // 鏋勯�犲勾鏈堟棩+灏忔椂閿紙濡傦細"2024-08-25 14"锛�
+ const year = String(dt.getFullYear()).padStart(4, "0");
+ const month = String(dt.getMonth() + 1).padStart(2, "0"); // 娉ㄦ剰鏈堜唤浠�0寮�濮�
+ const date = String(dt.getDate()).padStart(2, "0");
+ const hour = String(dt.getHours()).padStart(2, "0");
+
+ const hourKey = `${year}-${month}-${date} ${hour}`;
+
+ // 鍒濆鍖栬灏忔椂鐨勮仛鍚堝璞�
+ if (!grouped[hourKey]) {
+ grouped[hourKey] = {
+ time: `${hourKey}:00:00`, // 鏍囧噯鍖栦负鏁寸偣鏃堕棿
+ intensity: 0,
+ };
+ }
+
+ // 绱姞璇ュ皬鏃跺唴鎵�鏈夐洦寮哄��
+ grouped[hourKey].intensity += item.intensity;
+ }
+
+ // 灏嗚仛鍚堢粨鏋滆浆涓烘暟缁勫苟淇濈暀涓や綅灏忔暟
+ const result = Object.values(grouped).map((item) => ({
+ time: item.time,
+ intensity: Number(item.intensity.toFixed(2)),
+ }));
+
+ return result;
+}
/**
* 瑙ｆ瀽鏃ユ湡鏃堕棿瀛楃涓叉垨Excel鏁板瓧鏃ユ湡锛岃繑鍥炴椂闂存埑锛堟绉掓暟锛�
* @param {string|number} dateString - 鏃ユ湡瀛楃涓叉垨Excel鏁板瓧鏃ユ湡
--
Gitblit v1.9.3