fix 编辑图表-删除右轴 报错

src/views/dataEntry_manage/components/chartReleationEdbTable.vue

@@ -67,7 +67,8 @@
         width="140"
     >
         <template slot-scope="scope" v-if="scope.row.HaveOperaAuth">
-            <span @click="delTarget(scope.row)" class="deletesty"><!-- 删除 -->{{$t('Table.delete_btn')}}&nbsp;</span>
+            <!-- 如果是季节性图的右轴，隐藏删除按钮 -->
+            <span @click="delTarget(scope.row)" class="deletesty" v-if="!(scope.$index===1&&chartInfo.ChartType===2)"><!-- 删除 -->{{$t('Table.delete_btn')}}&nbsp;</span>
             <span v-permission="permissionBtn.chartLibPermission.chartLib_copyData"
                 class="editsty" @click="copyCode(scope.row)">
                 <i class="el-icon-document-copy" />&nbsp;<!-- 复制数据 -->{{$t('Edb.detail_copydata_btn')}}</span
@@ -152,16 +153,6 @@ export default {
         },
       ]
     },
-    currentTableData(){
-        if(!(this.chartInfo.ChartType===2&&tableData[1])){
-            //左轴同比不会加在tableData内,若右轴隐藏则只显示第一项
-            if(!this.chartInfo.SeasonRightConfig.IsShow){
-
-            }
-            return this.tableData[0]
-        }
-        return this.tableData
-    },
   },
   data() {
     return {

src/views/dataEntry_manage/components/markersSection.vue

@@ -422,6 +422,10 @@ export default {
                 IsAdd:false,
                 IsShow:false
             }
+            if(type===2){
+                this.averageForm.Color = '#999'
+                this.averageForm.LineType = 'ShortDash'
+            }
         }else{
             this.averageForm = data
         }
@@ -459,8 +463,9 @@ export default {
     },
     //取消添加右轴指标
     deleteRightEdb(){
-        Object.assign(this.rightEdbForm,baseRightForm)
-        this.$emit('previewSeasonRight',{rightConfig:this.rightEdbForm,tableData:this.rightEdbForm})
+        this.rightEdbForm.IsAdd = false
+        this.rightEdbForm.IsShow = false
+        this.$emit('previewSeasonRight',{rightConfig:this.rightEdbForm,tableData:this.rightEdbInfo})
         this.rightEdbForm = {}
     },
     //更新季节性图 同期/右轴

src/views/dataEntry_manage/editChart.vue

@@ -212,7 +212,8 @@
             <el-collapse-item v-for="(item,index) in tableData" :key="item.EdbInfoId" :disabled="[2,5].includes(chartInfo.ChartType)">
               <template slot="title">
                 <span class="text_oneLine">{{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}</span>
-								<i class="el-icon-delete del-icon" @click.stop="delTarget(item)"></i>
+								<!-- 当为季节性图的第二个轴时,隐藏删除按钮 -->
+								<i class="el-icon-delete del-icon" @click.stop="delTarget(item)" v-if="!(chartInfo.ChartType===2&&index===1)"></i>
               </template>
               <ul class="setting-cont">
 								<!-- 堆叠图 或组合图中的堆叠类型 非第一项隐藏配置 -->

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -1212,8 +1212,6 @@ export default {
 					this.delTarget(tableData)
 				}
 			}
-			//mock 预览
-			//this.reLoadChartOption()
 			this.previewSeasonChart({SeasonAverageConfig:this.chartInfo.SeasonAverageConfig,SeasonRightEdbConfig:rightConfig})
 		},
 		//获取图表全局设置

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -3077,7 +3077,7 @@ export const chartSetMixin = {
             }
             //季节性图-右轴为左轴同比,单独处理
             if(this.chartInfo.ChartType===2){
-                if(this.chartInfo.SeasonRightConfig&&this.chartInfo.SeasonRightConfig.IsShow){
+                if(this.chartInfo.SeasonRightConfig&&this.chartInfo.SeasonRightConfig.IsAdd&&this.chartInfo.SeasonRightConfig.IsShow){
                     if(this.chartInfo.SeasonRightConfig.IndicatorType===1){
                         this.chartLimit.rightMin = this.chartInfo.SeasonRightConfig.EdbInfoList[0].MinData||0
                         this.chartLimit.rightMax = this.chartInfo.SeasonRightConfig.EdbInfoList[0].MaxData||0