jwyu 10 meses atrás
pai
commit
294d9c22a6

+ 3 - 1
src/lang/modules/EtaChart/En.js

@@ -128,6 +128,8 @@ export default {
     series_name_repeat:'Duplicate Series Name, Please Adjust',
     series_number_tips:'Inconsistent Series Metric Count, Please Adjust', 
     series_del_tips:'Are you sure you want to delete all series? The chart will be cleared after the operation.',
-
+    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',
   }
 }

+ 3 - 2
src/lang/modules/EtaChart/Zh.js

@@ -126,8 +126,9 @@ export default {
     series_name_repeat:'系列名称重复,请调整',
     series_number_tips:'系列指标数量不一致,请调整',
     series_del_tips:'系列全部删除后,图表会被清除,确认操作吗?',
-
-
+    select_refrence_tips:'请选择引用日期',
+    stack_tips:'开启时,图上的所有柱形系列堆积',
+    select_date_type:'请选择日期类型',
 
 
   }

+ 1 - 1
src/views/dataEntry_manage/addChart.vue

@@ -597,7 +597,7 @@
 							<div v-if="showIsHeap">
 								<span>柱形堆积</span>
 								<el-tooltip
-                  content="开启时,该系列上展示数据点"
+                  :content="$t('EtaChartAddPage.stack_tips')"
                   placement="top"
                 >
                   <i class="el-icon-info"></i>

+ 12 - 4
src/views/dataEntry_manage/components/sectionalCombination/batchModifyDate.vue

@@ -13,7 +13,7 @@
   >
     <div class="top-flex-box">
       <div style="display: flex; align-items: center">
-        <el-radio v-model="dateType" :label="1">{{$t('ETableChildren.latest_date_indicator')}}</el-radio>
+        <el-radio v-model="dateType" :label="0">{{$t('ETableChildren.latest_date_indicator')}}</el-radio>
         <div>
           <label class="el-form-item__label">{{
             $t("ETableChildren.advance_the_term")
@@ -33,7 +33,7 @@
         </div>
       </div>
       <div>
-        <el-radio v-model="dateType" :label="2">{{$t('EtaChartAddPage.refrence_date_name')}}</el-radio>
+        <el-radio v-model="dateType" :label="1">{{$t('EtaChartAddPage.refrence_date_name')}}</el-radio>
         <el-select v-model="refrenceDateName" :placeholder="$t('Edb.InputHolderAll.input_date')" style="width: 120px">
           <el-option v-for="opt in referenceDateOpts" :key="opt.name" :label="opt.name" :value="opt.name"></el-option>
         </el-select>
@@ -78,7 +78,7 @@ export default {
   watch: {
     show(n){
       if(n){
-        this.dateType=1
+        this.dateType=''
         this.MoveForward=0
         this.dateTransfData=[]
         this.refrenceDateName=''
@@ -98,7 +98,7 @@ export default {
   },
   data() {
     return {
-      dateType: 1,
+      dateType: '',
       MoveForward: 0,
       dateTransfData: [],//日期变换数据
       refrenceDateName:''
@@ -109,6 +109,14 @@ export default {
       this.$emit("update:show", false);
     },
     handleApply(){
+      if(![0,1].includes(this.dateType)){
+        this.$message.warning(this.$t('EtaChartAddPage.select_date_type'))
+        return
+      }
+      if(this.dateType===1&&!this.refrenceDateName){
+        this.$message.warning(this.$t('EtaChartAddPage.select_refrence_tips'))
+        return
+      }
       this.$emit('apply',{
         dateType:this.dateType,
         MoveForward:this.MoveForward,

+ 2 - 1
src/views/dataEntry_manage/components/sectionalCombination/sectionalCombinationOption.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sectionalCombination-option-wrap">
-    <div class="sort-wrap">
+    <div class="sort-wrap" v-if="seriesData.length>1">
       <div>
         <el-tooltip
           effect="dark"
@@ -374,6 +374,7 @@ export default {
         }
         this.handleGetChartData()
       }
+      console.log('this.seriesData',this.seriesData);
     },
 
     //复制系列

+ 6 - 2
src/views/dataEntry_manage/components/sectionalCombination/seriesEdit.vue

@@ -191,8 +191,12 @@ export default {
   },
   methods: {
     initData() {
-      const arr = JSON.parse(JSON.stringify(this.defaultData))
-      this.list = arr
+      this.list=[]
+      const temArr=_.cloneDeep(this.defaultData)
+      if(this.activeIndex>temArr.length-1){
+        this.activeIndex=0
+      }
+      this.list = temArr
     },
 
     cancelHandle() {

+ 1 - 0
src/views/dataEntry_manage/components/sectionalCombination/seriesItemWrap.vue

@@ -200,6 +200,7 @@ export default {
 
     // 批量覆盖日期变换
     handleBatchModifyDate(data){
+      console.log('handleBatchModifyDate',data);
       this.compData.edbList.forEach((item,index) => {
         item.dateType=data.dateType
         item.MoveForward=data.MoveForward

+ 1 - 1
src/views/dataEntry_manage/editChart.vue

@@ -614,7 +614,7 @@
 							<div v-if="showIsHeap">
 								<span>柱形堆积</span>
 								<el-tooltip
-                  content="开启时,该系列上展示数据点"
+                  :content="$t('EtaChartAddPage.stack_tips')"
                   placement="top"
                 >
                   <i class="el-icon-info"></i>