Merge branch 'bug-fixa'

src/views/dataEntry_manage/addChart.vue

@@ -150,18 +150,6 @@
 						@change="xAxisChange"
 						:clearable="false"
 					></el-date-picker>
-					<!-- <el-date-picker
-						style="width: 90%;"
-						v-model="xAxisRange"
-						type="daterange"
-						value-format="MM-dd"
-						format="MM-dd"
-						popper-class="x-range-picker-date"
-						start-placeholder="开始日期"
-						end-placeholder="结束日期"
-						@change="xAxisRangeChange"
-						:clearable="false"
-						></el-date-picker> -->
 					<el-checkbox label="跨年" v-model="isSpanYear" :disabled="isSpanYearDisable"
 					style="margin-top: 12px;" @change="changeIsSpanYear"></el-checkbox>
 					<div class="legend-set-text" @click="openLegendEditDia">

src/views/dataEntry_manage/editChart.vue

@@ -126,7 +126,7 @@
 					</el-select>
 				</div>
 
-				<div class="xaxis-range-cont" v-if="chartInfo.ChartType===2">
+				<div class="xaxis-range-cont" v-if="chartInfo.ChartType===2 && tableData && tableData.length>0">
 					<!-- 仅用于季节性图配置 -->
 					<div style="margin-bottom: 12px;" class="xaxis-range-tip">
 						横坐标显示范围 
@@ -159,18 +159,6 @@
 						@change="xAxisChange"
 						:clearable="false"
 					></el-date-picker>
-					<!-- <el-date-picker
-						style="width: 90%;"
-						v-model="xAxisRange"
-						type="daterange"
-						value-format="MM-dd"
-						popper-class="x-range-picker-date"
-						format="MM-dd"
-						start-placeholder="开始日期"
-						end-placeholder="结束日期"
-						@change="xAxisRangeChange"
-						:clearable="false"
-					></el-date-picker> -->
 					<el-checkbox label="跨年" v-model="isSpanYear" :disabled="isSpanYearDisable"
 					style="margin-top: 12px;" @change="changeIsSpanYear"></el-checkbox>
 					<div class="legend-set-text" @click="openLegendEditDia">

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -651,6 +651,7 @@ export default {
 				// this.xAxisRange = ['01-01','12-31']
 				this.SeasonExtraConfig.XStartDate = '01-01'
 				this.SeasonExtraConfig.XEndDate = '12-31'
+				this.SeasonExtraConfig.JumpYear=0
 				this.isSpanYear=false
 				this.isSpanYearDisable=false
 				this.SeasonExtraConfig.ChartLegend=[]
@@ -664,30 +665,6 @@ export default {
 			}
 		},
 		// 横轴显示范围改变
-		// xAxisRangeChange(date){
-		// 	console.log(date);
-		// 	if(date && date.length>0){
-		// 		// console.log(date[0],date[1]);
-		// 		let xStartDate = date[0]
-		// 		let xEndDate = date[1]
-		// 		if(new Date(`2023-${xStartDate}`) > new Date(`2023-${xEndDate}`) || 
-		// 		new Date(`2023-${xStartDate}`) == new Date(`2023-${xEndDate}`)){
-		// 			// 开始日期 >= 结束日期 跨年
-		// 			this.isSpanYear=true
-		// 			this.isSpanYearDisable=true
-		// 		}else{
-		// 			this.isSpanYearDisable=false
-		// 		}
-		// 		// this.xAxisRange = [xStartDate,xEndDate]
-		// 		this.SeasonExtraConfig.XStartDate = xStartDate
-		// 		this.SeasonExtraConfig.XEndDate = xEndDate
-		// 		this.SeasonExtraConfig.JumpYear = this.isSpanYear?1:0
-		// 		this.getPreviewSplineInfo()
-		// 	}else{
-		// 		this.isSpanYearDisable=false
-		// 	}
-		// },
-		// 横轴显示范围改变
 		xAxisChange(date){
 			if(this.SeasonExtraConfig.XStartDate && this.SeasonExtraConfig.XEndDate){
 				if(new Date(`2023-${this.SeasonExtraConfig.XStartDate}`) > new Date(`2023-${this.SeasonExtraConfig.XEndDate}`) ||