|
@@ -42,9 +42,23 @@ const makeTimeData=(type)=>{
|
|
|
monthArr.push(i<10?'0'+i:i)
|
|
|
}
|
|
|
if(type==1){
|
|
|
- return [{values:yearArr,defaultIndex: yearArr.length-1},{values:monthArr,defaultIndex: monthArr.length-1},{values:yearArr,defaultIndex: yearArr.length-1},{values:monthArr,defaultIndex: monthArr.length-1}]
|
|
|
+ let index1=yearArr.indexOf(startDate.value.split('-')[0])
|
|
|
+ let index2=monthArr.indexOf(startDate.value.split('-')[1])
|
|
|
+ let index3=yearArr.indexOf(endDate.value.split('-')[0])
|
|
|
+ let index4=monthArr.indexOf(endDate.value.split('-')[1])
|
|
|
+ return [
|
|
|
+ {values:yearArr,defaultIndex: index1>-1?index1:yearArr.length-1},
|
|
|
+ {values:monthArr,defaultIndex: index2>-1?index2:monthArr.length-1},
|
|
|
+ {values:yearArr,defaultIndex: index3>-1?index3:yearArr.length-1},
|
|
|
+ {values:monthArr,defaultIndex: index4>-1?index4:monthArr.length-1}
|
|
|
+ ]
|
|
|
}else{
|
|
|
- return [{values:yearArr,defaultIndex: yearArr.length-1},{values:yearArr,defaultIndex: yearArr.length-1}]
|
|
|
+ let index1=yearArr.indexOf(startDate.value)
|
|
|
+ let index2=yearArr.indexOf(endDate.value)
|
|
|
+ return [
|
|
|
+ {values:yearArr,defaultIndex: index1>-1?index1:yearArr.length-1},
|
|
|
+ {values:yearArr,defaultIndex: index2>-1?index2:yearArr.length-1}
|
|
|
+ ]
|
|
|
}
|
|
|
}
|
|
|
const handleShowDate=()=>{
|
|
@@ -71,7 +85,7 @@ const handleConfirmDate=(e)=>{
|
|
|
startDate.value=start
|
|
|
endDate.value=end
|
|
|
dateType.value=5
|
|
|
- getChartInfo()
|
|
|
+ getChartInfo('time')
|
|
|
showDate.value=false
|
|
|
}else{
|
|
|
Toast('结束时间不能小于开始时间')
|
|
@@ -131,7 +145,8 @@ let chartData=ref({
|
|
|
})// 图表配置数据
|
|
|
let resData=ref(null)//接口详情数据
|
|
|
let loading=ref(false)
|
|
|
-const getChartInfo=async ()=>{
|
|
|
+// 如果type:time则是修改时间重新获取数据 此时不重置时间
|
|
|
+const getChartInfo=async (type)=>{
|
|
|
// resData.value=null
|
|
|
loading.value=true
|
|
|
const res=await apiChartInfo({
|
|
@@ -148,10 +163,22 @@ const getChartInfo=async ()=>{
|
|
|
if(res.code===200){
|
|
|
resData.value=res.data
|
|
|
document.title=res.data.ChartInfo.ChartName
|
|
|
+
|
|
|
// 设置highchart配置 ChartType: 1曲线图 2季节图:季节图中公历和农历数据结构不同
|
|
|
if(res.data.ChartInfo.ChartType===1){
|
|
|
+ if(type!='time'){
|
|
|
+ dateType.value=res.data.ChartInfo.DateType||3
|
|
|
+ startDate.value=res.data.ChartInfo.StartDate||''
|
|
|
+ endDate.value=res.data.ChartInfo.EndDate||''
|
|
|
+ }
|
|
|
setSplineOpt(res.data.EdbInfoList)
|
|
|
}else{
|
|
|
+ if(type!='time'){
|
|
|
+ dateType.value=res.data.ChartInfo.DateType||3
|
|
|
+ startDate.value=res.data.ChartInfo.SeasonStartDate||''
|
|
|
+ endDate.value=res.data.ChartInfo.SeasonEndDate||''
|
|
|
+ }
|
|
|
+
|
|
|
setSeasonOpt(res.data.EdbInfoList[0])
|
|
|
}
|
|
|
}
|