Browse Source

图库保存、MyETA保存

cxmo 1 year ago
parent
commit
fb0e9373f8
3 changed files with 28 additions and 6 deletions
  1. 2 2
      src/hooks/chart/render.js
  2. 13 2
      src/views/chartETA/ChartDetail.vue
  3. 13 2
      src/views/myETA/ChartDetail.vue

+ 2 - 2
src/hooks/chart/render.js

@@ -51,7 +51,7 @@ let leftLimitData = ref([0,0]) //左轴上下限
 let rightLimitData = ref([0,0]) //右轴上下限
 let rightTwoLimitData = ref([0,0]) //右二轴上下限
 //仅ETA图库内图表需要使用自定义上下限
-const useSalfLimit = ['/myETA/chartdetail','/chartETA/chartdetail'].includes(window.location.pathname)
+let useSalfLimit = false
 
 export function useChartRender(){
     return {
@@ -103,7 +103,7 @@ export function chartRender({data,renderId,lang='zh',changeLangIsCheck,showChart
     LangType.value=lang
     RenderDomId.value=renderId
     chartData.value=data
-
+    useSalfLimit = ['/myETA/chartdetail','/chartETA/chartdetail'].includes(window.location.pathname)
     if(data.ChartInfo.Source===1){
         const chartSetMap = {
             1: setSplineOpt,

+ 13 - 2
src/views/chartETA/ChartDetail.vue

@@ -170,7 +170,6 @@ let axisLimitDataTem=reactive({//左右轴极值
 function handleShowAxisLimitOpt(){
     //7柱形图10截面散点11雷达图不使用自定义上下限
     if(![7,10,11].includes(chartInfo.value.ChartType)){
-        console.log('触发')
         axisLimitDataTem.leftMin=leftLimitData.value[1]
         axisLimitDataTem.leftMax=leftLimitData.value[0]
 
@@ -203,7 +202,6 @@ function handleConfirmLimitChange(){
     const data=_.cloneDeep(chartInfoData)
     //7柱形图10截面散点11雷达图不使用自定义上下限
     if(![7,10,11].includes(chartInfo.value.ChartType)){
-        console.log("触发2")
         if(axisLimitState.hasLeftAxis){
             leftLimitData.value = [Number(axisLimitDataTem.leftMax),Number(axisLimitDataTem.leftMin)]
         }
@@ -514,6 +512,19 @@ function saveChart(){
         }
     }
     let params = {...public_param,...type_param}
+    if(![7,10,11].includes(chartInfo.value.ChartType)){
+        params = {
+            ...params,
+            LeftMin:leftLimitData.value[1]+'',
+            LeftMax:leftLimitData.value[0]+'',
+            RightMin:rightLimitData.value[1]+'',
+            RightMax:rightLimitData.value[0]+'',
+            Right2Min:rightTwoLimitData.value[1]+'',
+            Right2Max:rightTwoLimitData.value[0]+'',
+            //手动保存视为更改过上下限
+            MinMaxSave:1
+        }
+    }
     //保存
     apiChart.chartSave(params).then(async res=>{
         if(res.Ret!==200) return

+ 13 - 2
src/views/myETA/ChartDetail.vue

@@ -278,7 +278,6 @@ let axisLimitDataTem=reactive({//左右轴极值
 function handleShowAxisLimitOpt(){
     //ETA图库的图表使用自定义上下限
     if(chartInfo.value.Source===1&&![7,10,11].includes(chartInfo.value.ChartType)){
-        console.log('触发')
         axisLimitDataTem.leftMin=leftLimitData.value[1]
         axisLimitDataTem.leftMax=leftLimitData.value[0]
 
@@ -311,7 +310,6 @@ function handleConfirmLimitChange(){
     const data=_.cloneDeep(chartInfoData)
     //ETA图库的图表使用自定义上下限
     if(chartInfo.value.Source===1&&![7,10,11].includes(chartInfo.value.ChartType)){
-        console.log("触发2")
         if(axisLimitState.hasLeftAxis){
             leftLimitData.value = [Number(axisLimitDataTem.leftMax),Number(axisLimitDataTem.leftMin)]
         }
@@ -664,6 +662,19 @@ function saveChartHandle(){
         }
     }
     let params = {...public_param,...type_param}
+    if(![7,10,11].includes(chartInfo.value.ChartType)){
+        params = {
+            ...params,
+            LeftMin:leftLimitData.value[1]+'',
+            LeftMax:leftLimitData.value[0]+'',
+            RightMin:rightLimitData.value[1]+'',
+            RightMax:rightLimitData.value[0]+'',
+            Right2Min:rightTwoLimitData.value[1]+'',
+            Right2Max:rightTwoLimitData.value[0]+'',
+            //手动保存视为更改过上下限
+            MinMaxSave:1
+        }
+    }
     //保存
     apiChart.chartSave(params).then(async res=>{
         if(res.Ret!==200) return