Merge branch 'need-0111'

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -959,7 +959,7 @@ export const chartSetMixin = {
 
         //获取对应轴的上下限
         //预测指标-走势图；图表配置-主题设置；不使用自定义上下限，剔除
-        const useTableLimit = ['/predictEdb','/chartThemeSet'].includes(this.$route.path)
+        const useTableLimit = ['/predictEdb','/chartThemeSet','/addpredictEdb','/editpredictEdb'].includes(this.$route.path)
         let minLimit = 0,maxLimit = 0
         if(useTableLimit){
             minLimit = chartData.MinData

src/views/mychart_manage/components/chartDetailDia.vue

@@ -1228,6 +1228,9 @@ export default {
         : typeChartParam;
         
         if(![7,10,11].includes(this.selected_chartType)){
+            const {
+                min,max,rightMin,rightMax,rightTwoMin,rightTwoMax
+            } = this.chartLimit
             params = {
                 ...params,
                 LeftMin:min+'',