From d9bf82d72afcb85756a5cdca36867b776685a9df Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Mon, 13 Dec 2021 14:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/river/collect/utils.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js
index c5e6a94..cba1a06 100644
--- a/src/views/water/river/collect/utils.js
+++ b/src/views/water/river/collect/utils.js
@@ -71,12 +71,12 @@ export default {
     // 江河水站(国家系统)均值数据
     toRiverStationObjData(excelData,form) {
         return excelData.map(item => {
-            console.log("时间"+item[1])
+            console.log("时间1"+ moment(item[1],"YYYY/MM/DD"))
             const row = {
                 riverName:form.riverName,
                 stationName:form.stationName,
                 waterTarget:form.waterTarget,
-                samplingTime: item[1],
+                samplingTime: moment(item[1],"YYYY/MM/DD").format("YYYY-MM-DD"),
                 waterTemperature: item[2],
                 ph: item[3],
                 dissolvedOxygen: item[4],
@@ -98,13 +98,13 @@ export default {
       // 江河水站(广西系统)均值数据
       toCityStationObjData(excelData,form) {
         return excelData.map(item => {
-            console.log("时间"+item[2])
+            console.log("时间2"+ moment(item[2],"YYYY/MM/DD"))
             var reg = RegExp("--")
             const row = {
                 riverName:form.riverName,
                 stationName:form.stationName,
                 waterTarget:form.waterTarget,
-                samplingTime: item[2],
+                samplingTime: moment(item[2],"YYYY/MM/DD").format("YYYY-MM-DD"),
                 waterQualityType: item[3],
                 waterTemperature:item[4],
                 ph: reg.test(item[5])?null:item[5],