Browse Source

Merge branch 'ETA_1.0.5'

hbchen 1 year ago
parent
commit
72718e073a

+ 13 - 0
src/hooks/chart/commonFun.js

@@ -0,0 +1,13 @@
+
+
+export function setExtremumDate(dataList){
+  let startDateList = dataList.map(it => it.StartDate)
+                                  .filter(Boolean)
+                                  .sort((a,b)=> new Date(a).getTime() - new Date(b).getTime())
+  //过滤、排序 拿到最新日期
+  let endDateList = dataList.map(it => it.LatestDate)
+                                .filter(Boolean)
+                                .sort((a,b)=> new Date(b).getTime() - new Date(a).getTime())
+
+  return {earliestDate:startDateList[0],latestDate:endDateList[0]}
+}

+ 112 - 110
src/hooks/chart/render.js

@@ -637,11 +637,13 @@ function setSeasonOpt(e){
     const colorsArr=['#4B0082','#7FFFAA','#FF4500','#808000','#EEE8AA','#849EC1','#8A4294','#578B5A','#FDA8C7','#53B3FF','#999999','#000000','#FFDF0C','#FF0000','#0033FF']
     let series=[],yAxis=[]
     //农历默认选中一年数据并隐藏按钮  公历显示全部数据
-    let rangeSelector={}
-
-    // 公历
-    if(calendarType==='公历'){
-        data.DataList.forEach((item,index)=>{
+    // let rangeSelector={}
+    // 农历数据需要去除第一项  农历和公历处理逻辑一样
+    const chartDataHandle=calendarType === '农历'?
+                        data.DataList.filter((item, index) => index > 0):
+                        data.DataList
+    // if(calendarType==='公历'){
+        chartDataHandle.forEach((item,index)=>{
              //预测指标配置
             let predict_params =  data.EdbInfoCategoryType === 1 ? getSeasonPredictParams(item.CuttingDataTimestamp) : {};
 
@@ -652,8 +654,8 @@ function setSeasonOpt(e){
                 },
                 type:data.ChartStyle,
                 yAxis:index,
-                name:item.Year,
-                color:colorsArr.slice(-data.DataList.length)[index],                
+                name:item.ChartLegend,
+                color:colorsArr.slice(-chartDataHandle.length)[index],                
                 visible:true,
                 ...predict_params
             }
@@ -707,115 +709,115 @@ function setSeasonOpt(e){
             yAxis.push(yAxisItem)
         })
 
-        rangeSelector={ enabled: false}
-    }
+        // rangeSelector={ enabled: false}
+    // }
 
     // 农历
-    if(calendarType==='农历'){
-        let filterArr=data.DataList.List&&data.DataList.List.slice(1,data.DataList.List.length)||[]
-        // console.log('aaa',filterArr);
-        filterArr.forEach((item,index)=>{
-             //预测指标配置
-            let predict_params =  data.EdbInfoCategoryType === 1 ? getSeasonPredictParams(item.CuttingDataTimestamp) : {};
-
-            let seriesItem={
-                data:[],
-                dataGrouping:{
-                    enabled:false
-                },
-                type:data.ChartStyle,
-                yAxis:index,
-                name:item.Year,
-                color:colorsArr.slice(-filterArr.length)[index],         
-                visible:true,
-                ...predict_params
-            }
-            let temarr=item.Items||[]
-            for(let i of temarr){
-                seriesItem.data.push([i.DataTimestamp, i.Value])
-            }
-            series.push(seriesItem)
-
-            let yAxisItem={
-                IsAxis:data.IsAxis,
-                labels: {
-                    formatter: function (ctx) {
-                        return ctx.value;
-                    },
-                    align: 'center',
-                    y:5
-                },
-                title: {
-                    text:  `${data.Unit}`,
-                    textZh:data.Unit, // 中文
-                    // 中文不存在,无论英文有无都显示空
-                    textEn:data.Unit?data.UnitEn?data.UnitEn:'英文单位':'', // 英文
-                    styleEn:data.Unit && (!data.UnitEn)?{cursor:'pointer',color:"#999"}:{cursor:'pointer'}, // 英文样式
-                    align: 'high',
-                    rotation: 0,
-                    y: -5,
-                    x:-(10 * data.Unit.length),
-                    offset: -(10 * data.Unit.length),
-                },
-                max: Number(data.MaxData),
-                min: Number(data.MinData),
-                lineWidth: 1,
-                lineColor: '#bfbfbf',
-                tickColor: '#bfbfbf',
-                offset: 0,
-                opposite: false,
-                reversed: false,
-                visible: true,
-                gridLineWidth: 0,
-                tickWidth: 1,
-                tickLength:5,
-                tickPosition: 'inside',
-                endOnTick: false,
-                startOnTick: false,
-                showLastLabel: true, //显示最后刻度值
-                tickPixelInterval: 50,
-                // chartEdbInfo:item//指标数据用于在保存时读取指标数据
-            }
-            yAxis.push(yAxisItem)
-        })
-
-        rangeSelector={ 
-            enabled: true,
-            selected: 0,
-            inputStyle: {
-                display: 'none',
-            },
-            labelStyle: {
-                display: 'none',
-            },
-            buttonTheme: {
-                style: {
-                    display: 'none',
-                },
-            },
-            buttons: [
-                {
-                  type: 'month',
-                  count: 12,
-                  text: '12月',
-                },
-                {
-                  type: 'month',
-                  count: 15,
-                  text: '15月',
-                },
-                {
-                  type: 'all',
-                  text: '全部',
-                }
-            ]
-        }
-    }
+    // if(calendarType==='农历'){
+    //     let filterArr=data.DataList.List&&data.DataList.List.slice(1,data.DataList.List.length)||[]
+    //     // console.log('aaa',filterArr);
+    //     filterArr.forEach((item,index)=>{
+    //          //预测指标配置
+    //         let predict_params =  data.EdbInfoCategoryType === 1 ? getSeasonPredictParams(item.CuttingDataTimestamp) : {};
+
+    //         let seriesItem={
+    //             data:[],
+    //             dataGrouping:{
+    //                 enabled:false
+    //             },
+    //             type:data.ChartStyle,
+    //             yAxis:index,
+    //             name:item.Year,
+    //             color:colorsArr.slice(-filterArr.length)[index],         
+    //             visible:true,
+    //             ...predict_params
+    //         }
+    //         let temarr=item.Items||[]
+    //         for(let i of temarr){
+    //             seriesItem.data.push([i.DataTimestamp, i.Value])
+    //         }
+    //         series.push(seriesItem)
+
+    //         let yAxisItem={
+    //             IsAxis:data.IsAxis,
+    //             labels: {
+    //                 formatter: function (ctx) {
+    //                     return ctx.value;
+    //                 },
+    //                 align: 'center',
+    //                 y:5
+    //             },
+    //             title: {
+    //                 text:  `${data.Unit}`,
+    //                 textZh:data.Unit, // 中文
+    //                 // 中文不存在,无论英文有无都显示空
+    //                 textEn:data.Unit?data.UnitEn?data.UnitEn:'英文单位':'', // 英文
+    //                 styleEn:data.Unit && (!data.UnitEn)?{cursor:'pointer',color:"#999"}:{cursor:'pointer'}, // 英文样式
+    //                 align: 'high',
+    //                 rotation: 0,
+    //                 y: -5,
+    //                 x:-(10 * data.Unit.length),
+    //                 offset: -(10 * data.Unit.length),
+    //             },
+    //             max: Number(data.MaxData),
+    //             min: Number(data.MinData),
+    //             lineWidth: 1,
+    //             lineColor: '#bfbfbf',
+    //             tickColor: '#bfbfbf',
+    //             offset: 0,
+    //             opposite: false,
+    //             reversed: false,
+    //             visible: true,
+    //             gridLineWidth: 0,
+    //             tickWidth: 1,
+    //             tickLength:5,
+    //             tickPosition: 'inside',
+    //             endOnTick: false,
+    //             startOnTick: false,
+    //             showLastLabel: true, //显示最后刻度值
+    //             tickPixelInterval: 50,
+    //             // chartEdbInfo:item//指标数据用于在保存时读取指标数据
+    //         }
+    //         yAxis.push(yAxisItem)
+    //     })
+
+        // rangeSelector={ 
+        //     enabled: true,
+        //     selected: 0,
+        //     inputStyle: {
+        //         display: 'none',
+        //     },
+        //     labelStyle: {
+        //         display: 'none',
+        //     },
+        //     buttonTheme: {
+        //         style: {
+        //             display: 'none',
+        //         },
+        //     },
+        //     buttons: [
+        //         {
+        //           type: 'month',
+        //           count: 12,
+        //           text: '12月',
+        //         },
+        //         {
+        //           type: 'month',
+        //           count: 15,
+        //           text: '15月',
+        //         },
+        //         {
+        //           type: 'all',
+        //           text: '全部',
+        //         }
+        //     ]
+        // }
+    // }
 
     chartData.chart={ ...chartDefaultOpts.chart,spacing: [30, 8, 2, 8]}
     chartData.series=series
     chartData.yAxis=yAxis
-    chartData.rangeSelector=rangeSelector
+    // chartData.rangeSelector=rangeSelector
     // 设置坐标轴极值
     axisLimitState.hasLeftAxis=true
     axisLimitState.leftMin=Number(data.MinData)

+ 74 - 11
src/views/chartETA/ChartDetail.vue

@@ -13,6 +13,8 @@ import TreeSelectPop from './components/TreeSelectPop.vue'
 import AddChartToMyETA from './components/AddChartToMyETA.vue'
 import SetChartEnName from './components/SetChartEnName.vue'
 import {useCachedViewsStore} from '@/store/modules/cachedViews'
+import { setExtremumDate } from '@/hooks/chart/commonFun.js'
+
 import _ from 'lodash';
 
 
@@ -42,11 +44,14 @@ async function getChartDetail(e){
         DateType: chartState.yearVal,
         StartDate: chartState.startTime,
         EndDate: chartState.endTime,
+        StartYear:chartState.startYear
     }:{
         ChartInfoId:Number(routeQueryData.id),
         Calendar: chartState.calendarType,//this.calendar_type
-        SeasonStartDate: chartState.startTime,
-        SeasonEndDate:chartState.endTime ,
+        DateType: chartState.yearVal,
+        StartDate: chartState.startTime,
+        EndDate:chartState.endTime,
+        StartYear:chartState.startYear
     }
     const res=await apiChart.chartInfoById(params)
     if(res.Ret!==200) return
@@ -62,6 +67,16 @@ async function getChartDetail(e){
         chartState.yearVal=res.Data.ChartInfo.DateType
     }
 
+    // 设置 起始日期 和 最新日期
+    const extremumDate= setExtremumDate(edbList.value)
+
+    minDate = new Date(extremumDate.earliestDate)
+    earliestDate.value = extremumDate.earliestDate
+
+    latestDate.value = extremumDate.latestDate
+
+    setDateAppear()
+
     nextTick(()=>{
         highChart.value = chartRender({
             data:{
@@ -79,24 +94,38 @@ async function getChartDetail(e){
     })
     
 }
+
+function setDateAppear() {
+    if(chartState.yearVal == 20){
+        let latestYear = parseInt(latestDate.value.substring(0,4))
+        chartState.startTime =  `${latestYear-chartState.startYear+1}-01-01`
+        chartState.endTime = `${latestYear}-12-31`   
+    }
+}
+
 onMounted(() => {
     currentLang.value = localStorage.getItem('chartETALange')==='EN'?'en':'zh'
     initChartState(route.query)
     getChartDetail('init')
 })
 
-const minDate=new Date(1970, 0, 1)
+let minDate=new Date(1970, 0, 1)
 const maxDate=new Date(2050, 11, 31)
 const cYear=moment().format('YYYY')
 const cMonth=moment().format('MM')
-let temStartTime=ref([cYear,cMonth])
-let temEndTime=ref([cYear,cMonth])
+const cDay=moment().format('dd')
+let temStartTime=ref([cYear,cMonth,cDay])
+let temEndTime=ref([cYear,cMonth,cDay])
+const latestDate = ref('')
+const earliestDate = ref('')
+
 let chartState=reactive({
     showTimePop:false,
     startTime:'',
     endTime:'',
     yearVal:'',
-    calendarType:'公历'
+    calendarType:'公历',
+    startYear:5
 })
 // 切换年份选项
 function handleYearChange(item){
@@ -109,7 +138,7 @@ function handleYearChange(item){
 function handleTimeChange(){
     chartState.startTime=temStartTime.value.join('-')
     chartState.endTime=temEndTime.value.join('-')
-    chartState.yearVal=6
+    chartState.yearVal=5
     getChartDetail()
     chartState.showTimePop=false
 }
@@ -468,6 +497,40 @@ function initChartState(data){
     chartState.endTime=sameOptionType.includes(Number(data.chartType))?data.EndDate:data.SeasonEndDate
     chartState.yearVal=data.DateType
     chartState.calendarType=data.Calendar
+    chartState.startYear=Number(data.StartYear)
+}
+
+function openDateSelect(){
+    // 回显
+
+    switch (chartState.yearVal) {
+        case 3:
+            temStartTime.value = [2015,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case 9:
+            temStartTime.value = [2020,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case 4:
+            temStartTime.value = [2021,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case 11:
+            temStartTime.value = [2022,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case '':
+            temStartTime.value = earliestDate.value.split('-')
+            temEndTime.value = latestDate.value.split('-')
+            break;  
+        default:
+            temStartTime.value = chartState.startTime.split('-')
+            temEndTime.value = chartState.endTime.split('-')
+            break;
+    }
+
+    chartState.showTimePop=true
 }
 
 
@@ -481,7 +544,7 @@ function initChartState(data){
         <div 
             class="select-time-box" 
             v-if="sameOptionType.includes(chartInfo.ChartType)||chartInfo.ChartType===2" 
-            @click="chartState.showTimePop=true"
+            @click="openDateSelect"
         >
             <img class="left-icon" src="@/assets/imgs/icon_calendar.png" alt="">
             <span :class="['val-box',!chartState.startTime?'val-box_grey':'']">{{chartState.startTime||'开始日期'}} ~ {{chartState.endTime||'结束日期'}}</span>
@@ -502,7 +565,7 @@ function initChartState(data){
                 <span 
                     class="time-box" 
                     v-if="sameOptionType.includes(chartInfo.ChartType)||chartInfo.ChartType===2"
-                    @click="chartState.showTimePop=true"
+                    @click="openDateSelect"
                 >
                     {{chartState.startTime?`${chartState.startTime} ~ ${chartState.endTime||'至今'}`:'请选择时间段'}}
                 </span>
@@ -595,13 +658,13 @@ function initChartState(data){
                         v-model="temStartTime"
                         :min-date="minDate"
                         :max-date="maxDate"
-                        :columns-type="chartInfo.ChartType==2?['year']:['year','month']"
+                        :columns-type="['year','month','day']"
                     />
                     <van-date-picker 
                         v-model="temEndTime" 
                         :min-date="minDate" 
                         :max-date="maxDate"
-                        :columns-type="chartInfo.ChartType==2?['year']:['year','month']"
+                        :columns-type="['year','month','day']"
                     />
                 </van-picker-group>
             </div>

+ 1 - 0
src/views/chartETA/List.vue

@@ -41,6 +41,7 @@ const goChartDetail = (item)=>{
             Calendar:item.Calendar?item.Calendar:'公历',
             SeasonStartDate:item.SeasonStartDate,
             SeasonEndDate:item.SeasonEndDate,
+            StartYear:item.StartYear
         }
     })
 }

+ 23 - 7
src/views/dataEDB/components/EDBChartDetail.vue

@@ -409,6 +409,8 @@ async function getEDBLineChartData(){
 		tableData.value = DataList || [];
         limitData.leftMin=chartInfo.value.MinValue
         limitData.leftMax=chartInfo.value.MaxValue
+        minDate = new Date(EdbInfo.StartDate)
+
         setLineChart()
     }
 }
@@ -430,9 +432,11 @@ async function getEDBTBChartData(){
 async function getEDBSeasonChartData(){
     const res=await apiDataEDB.edbSeasonChartData({
         EdbInfoId:route.query.edbInfoId,
+        DateType:selectYear.value,
         Calendar:calendarType.value,
         StartDate:selectStartDate.value,
-        EndDate:selectEndDate.value
+        EndDate:selectEndDate.value,
+        StartYear:startYear.value
     })
     if(res.Ret===200){
         const { DataList,EdbInfo } = res.Data;
@@ -445,6 +449,12 @@ async function getEDBSeasonChartData(){
 		tableData.value = DataList || [];
         limitData.leftMin=chartInfo.value.MinValue
         limitData.leftMax=chartInfo.value.MaxValue
+        latestDate = EdbInfo.LatestDate
+        if(selectYear.value == 20){
+            let latestYear = parseInt(latestDate.substring(0,4))
+            selectStartDate.value = `${latestYear-startYear.value+1}-01-01`
+            selectEndDate.value = `${latestYear}-01-01`
+        }
         setSeasonChart()
     }
 }
@@ -491,7 +501,9 @@ function initData(){
     console.log('init data');
     selectStartDate.value=''
     selectEndDate.value=''
-    selectYear.value=10
+    // 季节性图默认最近5年 selectYear:20代表最近几年
+    selectYear.value=chartType.value==='季节性图'?20:10
+    startYear.value=5
     options.value={}
     oldOptions.MinValue=0
     oldOptions.MaxValue=0
@@ -506,13 +518,17 @@ function initData(){
 
 
 // 自定义时间段数据
-const minDate=new Date(1970, 0, 1)
+let minDate=new Date(1970, 0, 1)
 const maxDate=new Date(2050, 11, 31)
-const temStartDate=ref([moment().format('YYYY'),moment().format('MM')])
-const temEndDate=ref([moment().format('YYYY'),moment().format('MM')])
+const temStartDate=ref([moment().format('YYYY'),moment().format('MM'),moment().format('dd')])
+const temEndDate=ref([moment().format('YYYY'),moment().format('MM'),moment().format('dd')])
 const showSelectDate=ref(false)
 const selectStartDate=ref('')
 const selectEndDate=ref('')
+const startYear=ref(5)
+// 最新日期
+let latestDate=''
+
 function handleConfrimSelectDate(e){
     selectStartDate.value=e[0].selectedValues.join('-')
     selectEndDate.value=e[1].selectedValues.join('-')
@@ -664,13 +680,13 @@ async function handleSaveChartLimit(){
                     v-model="temStartDate"
                     :min-date="minDate"
                     :max-date="maxDate"
-                    :columns-type="['year','month']"
+                    :columns-type="['year','month','day']"
                 />
                 <van-date-picker
                     v-model="temEndDate"
                     :min-date="minDate" 
                     :max-date="maxDate"
-                    :columns-type="['year','month']"
+                    :columns-type="['year','month','day']"
                 />
             </van-picker-group>
         </div>

+ 73 - 11
src/views/myETA/ChartDetail.vue

@@ -20,6 +20,7 @@ import {setClipboardData} from '@/hooks/common'
 import SetChartEnName from '@/components/SetChartEnName.vue'
 import {useCachedViewsStore} from '@/store/modules/cachedViews'
 import AddChartToMyETA from '@/views/chartETA/components/AddChartToMyETA.vue'
+import { setExtremumDate } from '@/hooks/chart/commonFun.js'
 
 const { width, height } = useWindowSize()
 const cachedViewsStore=useCachedViewsStore()
@@ -86,6 +87,13 @@ async function getChartInfo(){
     }else{
         edbList.value=res.Data.EdbInfoList
     }
+    // 设置 起始日期 和 最新日期
+    const extremumDate= setExtremumDate(edbList.value)
+
+    minDate = new Date(extremumDate.earliestDate)
+
+    earliestDate.value = extremumDate.earliestDate
+    latestDate.value = extremumDate.latestDate
 
     chartState.yearVal=res.Data.ChartInfo.DateType
     if(res.Data.ChartInfo.DateType===5){
@@ -99,6 +107,18 @@ async function getChartInfo(){
         temStartTime.value=res.Data.ChartInfo.StartDate.split('-')
     }
 
+    if(res.Data.ChartInfo.DateType===20){
+        // 最近几年
+        let latestYear = parseInt(latestDate.value.substring(0,4))
+        chartState.startTime =  `${latestYear-chartState.startYear+1}-01-01`
+        chartState.endTime = `${latestYear}-12-31`   
+
+        chartState.startTime=res.Data.ChartInfo.StartDate
+        chartState.endTime=res.Data.ChartInfo.EndDate
+        temStartTime.value=chartState.startTime.split('-')
+        temEndTime.value=chartState.endTime.split('-')
+    }
+
     nextTick(()=>{
         CHARTINS=chartRender({
             data:res.Data,
@@ -109,6 +129,41 @@ async function getChartInfo(){
         })
     })
 }
+
+
+function openDateSelect(){
+    // 回显
+
+    switch (chartState.yearVal) {
+        case 3:
+            temStartTime.value = [2015,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case 9:
+            temStartTime.value = [2020,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case 4:
+            temStartTime.value = [2021,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case 11:
+            temStartTime.value = [2022,1,1]
+            temEndTime.value = latestDate.value.split('-')
+            break;
+        case '':
+            temStartTime.value = earliestDate.value.split('-')
+            temEndTime.value = latestDate.value.split('-')
+            break;  
+        default:
+            temStartTime.value = chartState.startTime.split('-')
+            temEndTime.value = chartState.endTime.split('-')
+            break;
+    }
+
+    chartState.showTimePop=true
+}
+
 getChartInfo()
 
 // 选择项发生变化时 非配置项 获取新的图表数据
@@ -120,9 +175,10 @@ async function reloadChartInfo(){
         EndDate: chartState.endTime,
     }:{
         ChartInfoId: chartInfo.value.ChartInfoId,
+        DateType: chartState.yearVal,
         Calendar: chartState.calendarType,//this.calendar_type
-        SeasonStartDate: chartState.startTime,
-        SeasonEndDate:chartState.endTime ,
+        StartDate: chartState.startTime,
+        EndDate:chartState.endTime ,
     }
     const res=await apiETAChart.chartInfoById(params)
     if(res.Ret!==200) return
@@ -143,18 +199,24 @@ async function reloadChartInfo(){
     })
 }
 
-const minDate=new Date(1970, 0, 1)
+let minDate=new Date(1970, 0, 1)
 const maxDate=new Date(2050, 11, 31)
 const cYear=moment().format('YYYY')
 const cMonth=moment().format('MM')
-let temStartTime=ref([cYear,cMonth])
-let temEndTime=ref([cYear,cMonth])
+const cDay=moment().format('dd')
+
+let temStartTime=ref([cYear,cMonth,cDay])
+let temEndTime=ref([cYear,cMonth,cDay])
+const earliestDate=ref('')
+const latestDate=ref('')
+
 let chartState=reactive({
     showTimePop:false,
     startTime:'',
     endTime:'',
     yearVal:'',
-    calendarType:'公历'
+    calendarType:'公历',
+    startYear:5
 })
 
 // 切换年份选项
@@ -169,7 +231,7 @@ function handleYearChange(item){
 function handleTimeChange(){
     chartState.startTime=temStartTime.value.join('-')
     chartState.endTime=temEndTime.value.join('-')
-    chartState.yearVal=6
+    chartState.yearVal=5
     reloadChartInfo()
     chartState.showTimePop=false
 }
@@ -509,7 +571,7 @@ const isShowAddToMyETADialog=ref(false)
         <div 
             class="select-time-box" 
             v-if="(sameOptionType.includes(chartInfo.ChartType)&& chartInfo.Source===1)||chartInfo.ChartType===2" 
-            @click="chartState.showTimePop=true"
+            @click="openDateSelect"
         >
             <img class="left-icon" src="@/assets/imgs/icon_calendar.png" alt="">
             <span :class="['val-box',!chartState.startTime?'val-box_grey':'']">{{chartState.startTime||'开始日期'}} ~ {{chartState.startTime&&!chartState.endTime?'至今':chartState.endTime||'结束日期'}}</span>
@@ -531,7 +593,7 @@ const isShowAddToMyETADialog=ref(false)
                 <span 
                     class="time-box"
                     v-if="(sameOptionType.includes(chartInfo.ChartType)&& chartInfo.Source===1)||chartInfo.ChartType===2"
-                    @click="chartState.showTimePop=true"
+                    @click="openDateSelect"
                 >{{chartState.startTime?chartState.startTime+'~'+(chartState.endTime?chartState.endTime:'至今'):'请选择时间段'}}</span>
             </div>
             <div class="right-action-box">
@@ -625,13 +687,13 @@ const isShowAddToMyETADialog=ref(false)
                     v-model="temStartTime"
                     :min-date="minDate"
                     :max-date="maxDate"
-                    :columns-type="chartInfo.ChartType==2?['year']:['year','month']"
+                    :columns-type="['year','month','day']"
                 />
                 <van-date-picker 
                     v-model="temEndTime" 
                     :min-date="minDate" 
                     :max-date="maxDate"
-                    :columns-type="chartInfo.ChartType==2?['year']:['year','month']"
+                    :columns-type="['year','month','day']"
                 />
             </van-picker-group>
         </div>