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],