Merge branch 'master' into debug

src/views/chartRelevance_manage/relevanceChartEditor.vue

@@ -530,7 +530,7 @@ export default {
       }
       const { Correlation,RollingCorrelation } = this.chartInfo;
       if(Correlation.CalculateValue*valueMap[Correlation.CalculateUnit] < Correlation.LeadValue*valueMap[Correlation.LeadUnit]*2) {
-        this.chartInfo.Correlation.CalculateValue = '';
+        this.chartInfo.Correlation.CalculateValue = 0;
         this.$message.warning('相关性计算窗口必须≥2*分析周期')
         checkBool = false
       }