Merge branch 'master' into eta1.4.6

src/App.vue

@@ -6,6 +6,12 @@
 </template>
 
 <style lang="less">
+div{
+  box-sizing: border-box;
+}
+#app{
+  height: 100%;
+}
 .el-message{
   min-width: 250px !important;
 }

src/hooks/chart/useChartRender.ts

@@ -724,7 +724,8 @@ const initBarData = (data: { XEdbIdValue: number[]; YDataList: any; EdbInfoList:
   return setBarChart()
 }
 const setBarChart = () => {
-  const {barDateList,barXIdData,chartLimit,barEdbData,chartInfo} = barChartRenderData.value;
+  const {barDateList,barXIdData,barEdbData,chartInfo} = barChartRenderData.value;
+  const { chartLimit } = state;
   let seriesData: { data: any; type: string; yAxis: number; name: any; color: any; chartType: string; }[] = [];
   const data = _.cloneDeep(barDateList);
 
@@ -1597,7 +1598,8 @@ const setRadarChart = () => {
       categories,
       labels: {
         allowOverlap: true,
-        autoRotationLimit: 40,
+        // autoRotationLimit: 40,
+        distance: 10,
         style: {
           ...chartTheme&&chartTheme.xAxisOptions.style
         }
@@ -1830,7 +1832,8 @@ const setAxisPlotLines = (axis: number, axisType: any = null) => {
     let markerValue:number;
     if (isXDateAxis) {
       //季节图x轴额外拼个年份
-      let nowYear = new Date().getFullYear();
+      let nowYear = ChartType===2 ? new Date(state.dataList[0].DataList[1].DataList
+        [0].DataTimestamp).getFullYear() : '';
       markerValue =
         ChartType === 2
           ? new Date(`${nowYear}-${_.value}`).getTime()
@@ -1871,7 +1874,8 @@ const setAxisPlotAreas = (axis: number, axisType: any = null) => {
     let fromMarkerValue:number, toMarkerValue:number;
     if (isXDateAxis) {
       //季节图x轴额外拼个年份
-      let nowYear = new Date().getFullYear();
+      let nowYear = ChartType===2 ? new Date(state.dataList[0].DataList[1].DataList
+        [0].DataTimestamp).getFullYear() : '';
       fromMarkerValue =
         ChartType === 2
           ? new Date(`${nowYear}-${_.fromValue}`).getTime()

src/utils/chartOptions.ts

@@ -100,7 +100,9 @@ export const defaultOpts = {
   legend: {
     enabled: true,
     verticalAlign: 'top',
-    margin: 5,
+    margin: 10,
+    itemMarginBottom:0,
+		itemMarginTop: 0
     // layout: 'vertical'
   },
   //滚动条

src/views/chartShow/index.less

@@ -18,12 +18,15 @@
 		}
 		max-width: 1200px;
 		max-height: 100vh;
+		height: 100%;
 		overflow: hidden;
 		position: relative;
 		margin: 0 auto;
 		border: 1px solid rgba(0, 0, 0, 0.125);
 		background: #fff;
 		border-radius: 5px;
+		display: flex;
+		flex-direction: column;
 		.chart-header {
 			background-color: #F2F2F2;
 			border-bottom: 1px solid rgba(0, 0, 0, 0.125);
@@ -48,6 +51,7 @@
 		.chart-wrapper {
 			flex: 1;
 			position: relative;
+			overflow: hidden;
 			.mark {
 				position:absolute;
 				left: 50%;
@@ -61,7 +65,7 @@
 		}
 		.bootom-source {
 			font-size: 12px;
-			padding-left: 40px;
+			padding-left: 25px;
 			padding-bottom: 10px;
 			display: flex;
 			justify-content: space-between;
@@ -113,11 +117,12 @@
 		}
 		.chart-show {
 			top: 5vh;
+			max-height: 90vh;
 		}
 		.chart-wrapper {
 			padding: 0 10px 10px;
-			height: calc(100vh - 170px);
-			max-height: calc(100vh - 170px);
+			// height: calc(100vh - 170px);
+			// max-height: calc(100vh - 170px);
 			// max-height: 750px;
 		}
 	}
@@ -134,8 +139,8 @@
 		}
 		.chart-wrapper {
 			width:  calc(100vw - 4px);
-			height: calc(100vh - 100px);
-			max-height: calc(100vw - 100px);
+			// height: calc(100vh - 100px);
+			// max-height: calc(100vw - 100px);
 			padding: 0 0 5px;
 		}
 	}

src/views/chartShow/index.vue

@@ -55,7 +55,7 @@
     <div class="bootom-source">
 
       <!-- 自定义来源 -->
-      <div class="chart-source" 
+      <div class="chart-source text_oneLine" 
         v-if="chartInfo.SourcesFrom&&JSON.parse(chartInfo.SourcesFrom).isShow"
         :style="`
             color: ${ JSON.parse(chartInfo.SourcesFrom).color };