fix

src/lang/modules/EtaChart/En.js

@@ -131,5 +131,6 @@ export default {
     select_refrence_tips:'Please select Date Name',
     stack_tips:'When turned on, all bar series on the chart are stacked.',
     select_date_type:'Please select Date type',
+    series_name_empty:'Empty Series Name，Please Adjust'
   }
 }

src/lang/modules/EtaChart/Zh.js

@@ -129,6 +129,7 @@ export default {
     select_refrence_tips:'请选择引用日期',
     stack_tips:'开启时，图上的所有柱形系列堆积',
     select_date_type:'请选择日期类型',
+    series_name_empty:'系列名称不能为空，请调整'
 
 
   }

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="chartInfo.ChartType!==14"><!-- 删除 -->{{$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

src/views/dataEntry_manage/components/sectionalCombination/referenceDateSet.vue

@@ -161,7 +161,7 @@ export default {
       this.list[index].selectEdbData = e || null
       // 设置name
       if (this.list[index].dateType === 0 && !this.list[index].name && e) {
-        this.list[index].name = e.LatestDate
+        this.list[index].name = e.EndDate
       }
     },
 

src/views/dataEntry_manage/components/sectionalCombination/seriesEdit.vue

@@ -288,6 +288,11 @@ export default {
       // 检查所有 edbList 是否一样长，并且 selectEdbData 都不是 null
       const edbListLength = arr[0].edbList.length;
       for (let item of arr) {
+        // 检查是否有seriesName为空
+        if(!item.seriesName){
+          this.$message.warning(this.$t('EtaChartAddPage.series_name_empty'))
+          return false
+        }
         // 检查 seriesName 是否重复
         if (seriesNameSet.has(item.seriesName)) {
           this.$message.warning(this.$t('EtaChartAddPage.series_name_repeat'))

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -2254,17 +2254,30 @@ export const chartSetMixin = {
 
       const tooltip={
         formatter:function () { 
-          return `<b>${this.x}</b>
-          <br><span style="color:${this.color}">\u25CF</span>${this.series.options.name}:${this.y} ${this.series.options.unitName}`
+          let str=`<b>${this.points[0].x}</b>`
+          this.points.forEach(item=>{
+            const sObj=seriesData.find(_=>_.name===item.series.name)
+            str=str+`<br><span style="color:${item.color}">\u25CF</span>${sObj.name}:${item.y} ${sObj.unitNameCh}`
+          })
+          return str
         },
         formatterCh:function () { 
-          return `<b>${this.x}</b>
-          <br><span style="color:${this.color}">\u25CF</span>${this.series.options.nameCh}:${this.y} ${this.series.options.unitNameCh}`
+          let str=`<b>${this.points[0].x}</b>`
+          this.points.forEach(item=>{
+            const sObj=seriesData.find(_=>_.name===item.series.name)
+            str=str+`<br><span style="color:${item.color}">\u25CF</span>${sObj.nameCh}:${item.y} ${sObj.unitNameCh}`
+          })
+          return str
         },
         formatterEn:function () { 
-          return `<b>${this.x}</b>
-          <br><span style="color:${this.color}">\u25CF</span>${this.series.options.nameEn}:${this.y} ${this.series.options.unitNameEn}`
-        }
+          let str=`<b>${this.points[0].x}</b>`
+          this.points.forEach(item=>{
+            const sObj=seriesData.find(_=>_.name===item.series.name)
+            str=str+`<br><span style="color:${item.color}">\u25CF</span>${sObj.nameEn}:${item.y} ${sObj.unitNameEn}`
+          })
+          return str
+        },
+        shared:true
       }
 
       this.options = {