gxwebsoft/jczxw-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xiaoman'

Browse Source
This commit is contained in:
shixiaoman
2021-12-13 14:08:50 +08:00
parent c55bb59a19 d9bf82d72a
commit 8b0bc652cb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/water/river/collect/utils.js
View File

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