Browse Source

区间分析

jwyu 10 months ago
parent
commit
266b176520

+ 5 - 0
src/api/modules/intervalAnalysis.js

@@ -66,5 +66,10 @@ export default{
   chartInfo:params=>{
     return http.get('/range_analysis/chart_info/detail',params)
   },
+
+  // 指标保存
+  edbSave:params=>{
+    return http.post('/range_analysis/edb/save',params)
+  }
   
 }

+ 9 - 1
src/components/chart/chartListTableWrap.vue

@@ -10,7 +10,7 @@
               :key="opt.colKey"
               :style="{ width: opt.width }"
             >
-              {{ opt.title }}
+              {{ getTableLable(opt.title) }}
             </td>
           </tr>
         </thead>
@@ -146,6 +146,14 @@ export default {
       if(path==='/rangeAnalysis') return rangeAnalysisBtnMap[btn]
 
       return false
+    },
+
+    getTableLable(e){
+      if(e==='名称') return this.$t('ETable.BalanceSheetTable.name') 
+      if(e==='创建人') return this.$t('ManualEdbListPage.table_col_creator') 
+      if(e==='创建时间') return this.$t('Common.create_time') 
+      if(e==='更新时间') return this.$t('Table.update_time')
+      if(e==='操作') return this.$t('Table.column_operations')  
     }
   },
 }

+ 3 - 1
src/lang/modules/StatisticAnalysis/IndexEn.js

@@ -3,6 +3,7 @@ import { ChartRelevanceEn } from "./ChartRelevance";
 import { CrossVarietyChartEn } from "./CrossVarietyChart";
 import { FittingEquationChartEn } from "./FittingEquationChart";
 import { StatisticFeatureChartEn } from "./statisticFeatureChart";
+import {IntervalAnalysisEn} from './intervalAnalysis'
 
 
 export default {
@@ -11,6 +12,7 @@ export default {
     ChartRelevance:ChartRelevanceEn,
     FittingEquationChart:FittingEquationChartEn,
     StatisticFeatureChart:StatisticFeatureChartEn,
-    CrossVarietyChart:CrossVarietyChartEn
+    CrossVarietyChart:CrossVarietyChartEn,
+    IntervalAnalysis:IntervalAnalysisEn,
   },
 };

+ 3 - 1
src/lang/modules/StatisticAnalysis/IndexZh.js

@@ -2,6 +2,7 @@ import { ChartRelevanceZh } from "./ChartRelevance";
 import { CrossVarietyChartZh } from "./CrossVarietyChart";
 import { FittingEquationChartZh } from "./FittingEquationChart";
 import { StatisticFeatureChartZh } from "./statisticFeatureChart";
+import { IntervalAnalysisZh } from "./intervalAnalysis";
 
 
 export default {
@@ -10,6 +11,7 @@ export default {
       ChartRelevance:ChartRelevanceZh,
       FittingEquationChart:FittingEquationChartZh,
       StatisticFeatureChart:StatisticFeatureChartZh,
-      CrossVarietyChart:CrossVarietyChartZh
+      CrossVarietyChart:CrossVarietyChartZh,
+      IntervalAnalysis:IntervalAnalysisZh
     },
   };

+ 74 - 0
src/lang/modules/StatisticAnalysis/intervalAnalysis.js

@@ -0,0 +1,74 @@
+/**
+ * 统计分析-区间分析
+ */
+
+/* 英文 */
+export const IntervalAnalysisEn = {
+  single_edb:'Single Indicator',
+  multiple_edb:'Multiple Indicators',
+  save_chart:'save chart',
+  chart_set:'chart setting',
+  interval:'Interval',
+  description:'description',
+  edb_date:'Indicator Date',
+  edb_end_date:'Deadline for generating indicators',
+  before_year:'previous year',
+  next_year:'following year',
+  outlier_treatment:'Outlier Treatment',
+  delete:'Delete',
+  value:'value',
+  replace:'replace',
+  with:'with',
+  data_transf:'Data Transformation',
+  semi_automatic:'Semi-Automatic',
+  manual:'manual',
+  cross_year:'Cross Year',
+  average:'Average',
+  sum:'Sum',
+  growth_rate:'Growth Rate',
+  annualized_growth_rate:'Annualized Growth Rate',
+  max:'Max',
+  min:'min',
+  multiply:'multiply',
+  divide:'divide',
+  logarithm:'logarithm',
+};
+
+/* 中文 */
+export const IntervalAnalysisZh = {
+  single_edb:'单指标',
+  multiple_edb:'选择多指标',
+  save_chart:'保存图',
+  chart_set:'图表设置',
+  interval:'区间划分',
+  description:'说明',
+  edb_date:'指标日期',
+  edb_end_date:'生成指标截止时间',
+  before_year:'前一年',
+  next_year:'后一年',
+  outlier_treatment:'原指标异常值处理',
+  delete:'剔除',
+  value:'的值',
+  replace:'将',
+  with:'替换为',
+  data_transf:'计算结果数据转换',
+  semi_automatic:'智能划分',
+  manual:'手工划分',
+  cross_year:'跨年划分',
+  average:'区间均值',
+  sum:'区间累计值',
+  growth_rate:'区间涨幅',
+  annualized_growth_rate:'区间年化增长率',
+  max:'区间最大值',
+  min:'区间最小值',
+  multiply:'乘以',
+  divide:'除以',
+  logarithm:'对数',
+  batch_select_edb:'批量选择指标',
+  chart_legend:'图例',
+  
+};
+
+/**
+ * $t('StatisticAnalysis.IntervalAnalysis.XXX')
+ */

+ 40 - 21
src/views/intervalAnalysis/addChart.vue

@@ -32,12 +32,12 @@
           <span
             :class="['item', computedType == 0 ? 'active' : '']"
             @click="handleComputedTypeChange(0)"
-            >单指标</span
+            >{{$t('StatisticAnalysis.IntervalAnalysis.single_edb')}}</span
           >
           <span
             :class="['item', computedType == 1 ? 'active' : '']"
             @click="handleComputedTypeChange(1)"
-            >选择多指标</span
+            >{{$t('StatisticAnalysis.IntervalAnalysis.multiple_edb')}}</span
           >
         </div>
         <!-- 指标计算模块 -->
@@ -79,7 +79,7 @@
               size="medium"
               class="year-btn"
               @click="handleShowSaveEdb"
-              >保存指标</el-button
+              >{{$t('StatisticAnalysis.ChartRelevance.save_edb')}}</el-button
             >
             <el-dropdown
               v-if="$route.query.id"
@@ -103,7 +103,7 @@
               size="medium"
               class="year-btn"
               @click="showSaveChart = true"
-              >保存图</el-button
+              >{{$t('StatisticAnalysis.IntervalAnalysis.save_chart')}}</el-button
             >
             <el-button
               type="primary"
@@ -111,7 +111,7 @@
               size="medium"
               class="year-btn"
               @click="handleShowChartSet"
-              >图表设置</el-button
+              >{{$t('StatisticAnalysis.IntervalAnalysis.chart_set')}}</el-button
             >
           </div>
         </div>
@@ -134,7 +134,7 @@
                     style="width: 60px; display: block"
                     size="mini"
                     type="number"
-                    placeholder="上限"
+                    :placeholder="$t('Chart.up_limit')"
                     v-model="chartLimit.max"
                     @change="changeLimit"
                   />
@@ -142,7 +142,7 @@
                     class="min-data-input"
                     size="mini"
                     type="number"
-                    placeholder="下限"
+                    :placeholder="$t('Chart.low_limit')"
                     v-model="chartLimit.min"
                     @change="changeLimit"
                   />
@@ -152,7 +152,7 @@
                     style="width: 60px; display: block"
                     size="mini"
                     type="number"
-                    placeholder="上限"
+                    :placeholder="$t('Chart.up_limit')"
                     v-model="chartLimit.rightMax"
                     @change="changeLimit"
                   />
@@ -160,7 +160,7 @@
                     class="min-data-input"
                     size="mini"
                     type="number"
-                    placeholder="下限"
+                    :placeholder="$t('Chart.low_limit')"
                     v-model="chartLimit.rightMin"
                     @change="changeLimit"
                   />
@@ -171,7 +171,7 @@
                     style="width: 60px; display: block"
                     size="mini"
                     type="number"
-                    placeholder="上限"
+                    :placeholder="$t('Chart.up_limit')"
                     v-model="chartLimit.rightTwoMax"
                     @change="changeLimit"
                   />
@@ -179,7 +179,7 @@
                     class="min-data-input"
                     size="mini"
                     type="number"
-                    placeholder="下限"
+                    :placeholder="$t('Chart.low_limit')"
                     v-model="chartLimit.rightTwoMin"
                     @change="changeLimit"
                   />
@@ -260,6 +260,7 @@
       :singleEdbData="singleEdbData"
       :tableData="tableData"
       @close="showSingleEdbSave = false"
+      @save="handleSaveEdb"
     />
 
     <!-- 多指标计算保存指标 -->
@@ -268,6 +269,7 @@
       :singleEdbData="singleEdbData"
       :tableData="tableData"
       @close="showMultipleEdbSave = false"
+      @save="handleSaveEdb"
     />
 
     <!-- 图表设置 -->
@@ -391,6 +393,33 @@ export default {
     }
   },
   methods: {
+    // 显示保存指标
+    handleShowSaveEdb() {
+      this.singleEdbData = this.$refs.edbComputedWrap.getParams()
+      if (this.computedType === 0) {
+        this.showSingleEdbSave = true
+      } else {
+        this.showMultipleEdbSave = true
+      }
+    },
+    // 保存指标
+    handleSaveEdb(arr){
+      const edbParams = this.$refs.edbComputedWrap.getParams()
+      const params={
+        EdbInfoList:arr,
+        MultipleGraphConfigId:this.intervalAnalysisChartData.MultipleGraphConfigId,
+        IsSaveAs:false,
+        EdbInfoType:this.tableData[0].EdbInfoCategoryType,
+        ExtraConfig:JSON.stringify(edbParams.ExtraConfig)
+      }
+      apiIntervalAnalysis.edbSave(params).then(res=>{
+        if(res.Ret===200){
+          this.$message.success(this.$t('MsgPrompt.saved_msg'))
+          this.showMultipleEdbSave=false
+        }
+      })
+    },
+
     // 多指标选择回调
     handleBatchSelectEdbSuccess(e) {
       this.$refs.edbComputedWrap.initMultipleEdbParams(e)
@@ -432,16 +461,6 @@ export default {
       this.showChartSet = false
     },
 
-    // 保存指标
-    handleShowSaveEdb() {
-      this.singleEdbData = this.$refs.edbComputedWrap.getParams()
-      if (this.computedType === 0) {
-        this.showSingleEdbSave = true
-      } else {
-        this.showMultipleEdbSave = true
-      }
-    },
-
     handleShowChartSet() {
       this.showChartSet = true
     },

+ 4 - 4
src/views/intervalAnalysis/components/batchSelectEdb.vue

@@ -8,7 +8,7 @@
     center
     top="5vh"
     v-dialogDrag
-    title="批量选择指标"
+    :title="$t('StatisticAnalysis.IntervalAnalysis.batch_select_edb')"
   >
     <div class="batch-computed-wrap">
       <div class="filter-wrap" style="margin-top: 20px">
@@ -78,7 +78,7 @@
           </template>
 
           <span>
-            <span>关联子分类</span>
+            <span>{{$t('HighFrequencyData.associative_sub_classify')}}</span>
             <el-switch
               v-model="isAssociativeSub"
               @change="handleAssociativeSubChange"
@@ -256,7 +256,7 @@
         <div
           style="float: right; width: 300px; display: flex; align-items: center"
         >
-          <span style="flex-shrink: 0">指标系列名称</span>
+          <span style="flex-shrink: 0">{{$t('StatisticAnalysis.ChartRelevance.series_name')}}</span>
           <el-input v-model="seriesName"></el-input>
         </div>
       </div>
@@ -374,7 +374,7 @@ export default {
       this.selectList = e.edbList
       this.seriesName = e.seriesName
       if(e.edbList.length>0){
-        this.edbType=e.edbList[0].EdbInfoType
+        this.edbType=e.edbList[0].EdbInfoCategoryType
         this.getEDBList()
       }
     },

+ 4 - 4
src/views/intervalAnalysis/components/chartSetWrap.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :modal-append-to-body="false"
-    title="图表设置"
+    :title="$t('StatisticAnalysis.IntervalAnalysis.chart_set')"
     :visible.sync="isShow"
     :close-on-click-modal="false"
     @close="cancelHandle"
@@ -39,9 +39,9 @@
         </el-form-item>
         <div class="series-list-wrap">
           <div class="item-box">
-            <div class="label-box">图例</div>
-            <div class="content-box">指标名称</div>
-            <div class="right-box">坐标轴</div>
+            <div class="label-box">{{$t('StatisticAnalysis.IntervalAnalysis.chart_legend')}}</div>
+            <div class="content-box">{{$t('Table.edb_name')}}</div>
+            <div class="right-box">{{$t('EtaChartPage.tab_series')}}</div>
           </div>
           <div class="item-box" v-for="item,index in seriesArr" :key="item.EdbInfoId">
             <div class="label-box">

+ 47 - 49
src/views/intervalAnalysis/components/edbComputedWrap.vue

@@ -29,7 +29,7 @@
           v-for="item in searchOptions"
           :key="item.EdbInfoId"
           :label="
-            chart_lang === 'en' ? item.EdbNameEn || item.EdbName : item.EdbName
+            $i18nt.locale === 'en' ? item.EdbNameEn || item.EdbName : item.EdbName
           "
           :value="item.EdbInfoId"
           :disabled="!item.HaveOperaAuth"
@@ -44,7 +44,7 @@
                 v-if="!item.HaveOperaAuth"
               />
               {{
-                chart_lang === "en"
+                $i18nt.locale === "en"
                   ? item.EdbNameEn || item.EdbName
                   : item.EdbName
               }}
@@ -55,7 +55,7 @@
     </div>
     <!-- 区间划分 -->
     <div class="item-box section" v-if="computedType === 0">
-      <span class="label">区间划分</span>
+      <span class="label">{{$t('StatisticAnalysis.IntervalAnalysis.interval')}}</span>
       <div class="con-box">
         <el-select v-model="dateRangeType" style="width: 90%">
           <el-option
@@ -88,12 +88,12 @@
       <!-- 起始日期 -->
       <div class="item-box section" style="align-items: flex-start">
         <span class="label" style="position: relative; top: 10px"
-          >起始日期</span
+          >{{$t('Edb.Detail.e_start_date')}}</span
         >
         <div class="con-box">
           <el-radio-group v-model="startDateConfig.startDateType">
             <el-radio :label="0">
-              <span>固定</span>
+              <span>{{$t('Common.fixed')}}</span>
               <el-date-picker
                 style="width: 72%; margin-left: 10px"
                 v-model="startDateConfig.startDateVal"
@@ -105,14 +105,14 @@
               ></el-date-picker>
             </el-radio>
             <el-radio :label="1" style="margin-top: 20px">
-              <span>动态</span>
+              <span>{{$t('Chart.Detail.edb_time_dyn')}}</span>
               <el-tooltip>
                 <div
                   slot="content"
                   v-html="$t('EtaChartAddPage.xserie_range_tip')"
                 />
                 <span style="cursor: pointer; margin-left: 10px">
-                  <span style="color: #333">说明</span>
+                  <span style="color: #333">{{$t('StatisticAnalysis.IntervalAnalysis.description')}}</span>
                   <img
                     src="~@/assets/img/icons/question_mark_black.png"
                     style="height: 16px; position: relative; top: 3px"
@@ -128,12 +128,12 @@
         <!-- 基准日期 -->
         <div class="item-box" style="align-items: flex-start">
           <span class="label" style="position: relative; top: 10px"
-            >基准日期</span
+            >{{$t('Chart.Detail.time_base')}}</span
           >
           <div class="con-box">
             <el-radio-group v-model="startDateConfig.baseDateType">
               <el-radio :label="0">
-                <span>指标日期</span>
+                <span>{{$t('StatisticAnalysis.IntervalAnalysis.edb_date')}}</span>
                 <span style="color: #333">{{
                   $t("ETableChildren.lagging_period_label")
                 }}</span>
@@ -153,7 +153,7 @@
                 }}</span>
               </el-radio>
               <el-radio :label="1" style="margin-top: 20px">
-                <span>系统日期</span>
+                <span>{{$t('Chart.Detail.sys_time')}}</span>
               </el-radio>
             </el-radio-group>
           </div>
@@ -162,12 +162,12 @@
       </div>
       <!-- 生成指标截止时间 -->
       <div class="item-box section" style="flex-wrap: wrap">
-        <span class="label">生成指标截止时间</span>
+        <span class="label">{{$t('StatisticAnalysis.IntervalAnalysis.edb_end_date')}}</span>
         <div class="con-box" style="width: 100%">
           <div>
-            <el-radio-group v-model="endDateConfig.baseDateType">
-              <el-radio :label="0">
-                <span>指标最新日期</span>
+            <el-radio-group v-model="endDateConfig.endDateType">
+              <el-radio :label="1">
+                <span>{{$t('Chart.Detail.edb_new_time')}}</span>
                 <span style="color: #333">{{
                   $t("ETableChildren.lagging_period_label")
                 }}</span>
@@ -191,8 +191,8 @@
                   class="date-trans-box"
                 />
               </el-radio>
-              <el-radio :label="2" style="margin-top: 20px">
-                <span>固定</span>
+              <el-radio :label="0" style="margin-top: 20px">
+                <span>{{$t('Common.fixed')}}</span>
                 <el-date-picker
                   style="width: 72%; margin-left: 10px"
                   v-model="endDateConfig.endDateVal"
@@ -212,14 +212,14 @@
     <div class="section" v-if="dateRangeType === 1">
       <!-- 时间段列表 -->
       <div class="item-box" v-for="(item, index) in dateList" :key="index">
-        <span class="label">时间段{{ index + 1 }}</span>
+        <span class="label">{{$t('Chart.time_interval')}}{{ index + 1 }}</span>
         <div class="con-box">
           <el-date-picker
             v-model="item.date"
             type="daterange"
-            range-separator="至"
-            start-placeholder="起始日期"
-            end-placeholder="截至日期"
+            :range-separator="$t('Common.to')"
+            :start-placeholder="$t('Edb.Detail.e_start_date')"
+            :end-placeholder="$t('Edb.Detail.e_end_time')"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             style="width: 90%"
@@ -242,14 +242,14 @@
           src="~@/assets/img/add-quadrate-blue.png"
           alt=""
         />
-        <span style="font-size: 16px">添加更多</span>
+        <span style="font-size: 16px">{{$t('PredictEditPage.add_more_btn')}}</span>
       </div>
     </div>
 
     <!-- 跨年划分模块 -->
     <template v-if="dateRangeType === 2">
       <div class="item-box section">
-        <span class="label">前一年&nbsp;&nbsp;&nbsp;</span>
+        <span class="label">{{$t('StatisticAnalysis.IntervalAnalysis.before_year')}}&nbsp;&nbsp;&nbsp;</span>
         <div class="con-box">
           <el-date-picker
             v-model="yearDateStart"
@@ -261,7 +261,7 @@
         </div>
       </div>
       <div class="item-box">
-        <span class="label">后一年&nbsp;&nbsp;&nbsp;</span>
+        <span class="label">{{$t('StatisticAnalysis.IntervalAnalysis.next_year')}}&nbsp;&nbsp;&nbsp;</span>
         <div class="con-box">
           <el-date-picker
             v-model="yearDateEnd"
@@ -276,7 +276,7 @@
 
     <!-- 计算公式 -->
     <div class="item-box section" style="align-items: flex-start">
-      <span class="label" style="position: relative; top: 10px">计算公式</span>
+      <span class="label" style="position: relative; top: 10px">{{$t('ETableChildren.formula_lable')}}</span>
       <div class="con-box">
         <el-select v-model="calculateType" style="width: 90%">
           <el-option
@@ -293,12 +293,12 @@
     <div class="item-box section">
       <div class="con-box">
         <el-checkbox v-model="unNormalDataDeal.isDeal"
-          >原指标异常值处理</el-checkbox
+          >{{$t('StatisticAnalysis.IntervalAnalysis.outlier_treatment')}}</el-checkbox
         >
         <div v-show="unNormalDataDeal.isDeal">
           <el-radio-group v-model="unNormalDataDeal.type">
             <el-radio :label="1" style="margin-top: 10px">
-              <span style="color: #333">剔除</span>
+              <span style="color: #333">{{$t('StatisticAnalysis.IntervalAnalysis.delete')}}</span>
               <el-select
                 v-model="unNormalDataDeal.formula_out"
                 style="width: 60px"
@@ -321,10 +321,10 @@
                   }
                 "
               />
-              <span style="color: #333">的值</span>
+              <span style="color: #333">{{$t('StatisticAnalysis.IntervalAnalysis.value')}}</span>
             </el-radio>
             <el-radio :label="2" style="margin-top: 10px">
-              <span style="color: #333">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+              <span style="color: #333">{{$t('StatisticAnalysis.IntervalAnalysis.replace')}}&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <el-select
                 v-model="unNormalDataDeal.formula_replace"
                 style="width: 60px"
@@ -347,7 +347,7 @@
                   }
                 "
               />
-              <span style="color: #333">的值,替换为</span>
+              <span style="color: #333">{{$t('StatisticAnalysis.IntervalAnalysis.value')}},{{$t('StatisticAnalysis.IntervalAnalysis.with')}}</span>
               <el-input
                 v-model="unNormalDataDeal.endValue"
                 type="number"
@@ -369,7 +369,7 @@
     <div class="item-box section">
       <div class="con-box">
         <el-checkbox v-model="dataConvert.isConvert"
-          >计算结果数据转换</el-checkbox
+          >{{$t('StatisticAnalysis.IntervalAnalysis.data_transf')}}</el-checkbox
         >
         <div v-show="dataConvert.isConvert">
           <div style="margin-top: 10px">
@@ -394,7 +394,7 @@
             />
           </div>
           <div style="margin-top: 10px">
-            <span style="display: inline-block; width: 80px">单位</span>
+            <span style="display: inline-block; width: 80px">{{$t('Table.unit')}}</span>
             <el-input v-model="dataConvert.unit" style="width: 60px" />
           </div>
         </div>
@@ -418,15 +418,15 @@ export default {
     dateRangeTypeOpts() {
       return [
         {
-          label: '智能划分',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.semi_automatic')||'智能划分',
           value: 0
         },
         {
-          label: '手工划分',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.manual')||'手工划分',
           value: 1
         },
         {
-          label: '跨年划分',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.cross_year')||'跨年划分',
           value: 2
         }
       ]
@@ -434,27 +434,27 @@ export default {
     calculateTypeOpts() {
       return [
         {
-          label: '区间均值',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.average')||'区间均值',
           value: 0
         },
         {
-          label: '区间累计值',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.sum')||'区间累计值',
           value: 1
         },
         {
-          label: '区间涨幅',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.growth_rate')||'区间涨幅',
           value: 2
         },
         {
-          label: '区间年化增长率',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.annualized_growth_rate')||'区间年化增长率',
           value: 3
         },
         {
-          label: '区间最大值',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.max')||'区间最大值',
           value: 4
         },
         {
-          label: '区间最小值',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.min')||'区间最小值',
           value: 5
         }
       ]
@@ -462,15 +462,15 @@ export default {
     mathSymbolOpts() {
       return [
         {
-          label: '乘以',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.multiply')||'乘以',
           value: 1,
         },
         {
-          label: '除以',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.divide')||'除以',
           value: 2,
         },
         {
-          label: '对数',
+          label: this.$t('StatisticAnalysis.IntervalAnalysis.logarithm')||'对数',
           value: 3,
         }
       ]
@@ -497,7 +497,7 @@ export default {
       },
 
       endDateConfig: {
-        baseDateType: 0,//准日期类型:0指标日期,1系统日期,2固定日期
+        endDateType: 1,//日期类型 0固定 1动态
         endDateVal: '2020-01-01',
         MoveForward: 0,
         dateTransfData: [],//日期变换数据
@@ -587,13 +587,13 @@ export default {
             IsAutoStartDate: this.startDateConfig.startDateType,
             StartDate: this.startDateConfig.startDateVal,
             EndDate: this.endDateConfig.endDateVal,
+            IsAutoEndDate:this.endDateConfig.endDateType,
             StartDateConf: {
               BaseDateType: this.startDateConfig.baseDateType,
               MoveForward: this.startDateConfig.MoveForward,
               DateChange: this.startDateConfig.dateTransfData || []
             },
             EndDateConf: {
-              BaseDateType: this.endDateConfig.baseDateType,
               MoveForward: this.endDateConfig.MoveForward,
               DateChange: this.endDateConfig.dateTransfData || []
             }
@@ -679,7 +679,7 @@ export default {
         dateTransfData: DataResp.AutoDateConf.StartDateConf.DateChange || [],//日期变换数据
       }
       this.endDateConfig = {
-        baseDateType: DataResp.AutoDateConf.EndDateConf.BaseDateType || 0,//准日期类型:0指标日期,1系统日期,2固定日期
+        endDateType: DataResp.AutoDateConf.IsAutoEndDate || 0,//日期类型 0固定 1动态
         endDateVal: DataResp.AutoDateConf.EndDate || '2020-01-01',
         MoveForward: DataResp.AutoDateConf.EndDateConf.MoveForward || 0,
         dateTransfData: DataResp.AutoDateConf.EndDateConf.DateChange || [],//日期变换数据
@@ -718,7 +718,7 @@ export default {
         })
       } else {
         this.edbInfoId = EdbInfoList[0].EdbInfoId
-        this.edbFromType = EdbInfoList[0].EdbInfoType
+        this.edbFromType = EdbInfoList[0].EdbInfoCategoryType
         this.searchOptions = EdbInfoList || []
       }
 
@@ -736,8 +736,6 @@ export default {
           })
         });
       }
-      console.log(arr,this.edbList);
-      
     },
   },
 }

+ 1 - 1
src/views/intervalAnalysis/components/saveChart.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :modal-append-to-body="false"
-    title="保存图"
+    :title="$t('StatisticAnalysis.IntervalAnalysis.save_chart')"
     :visible.sync="isShow"
     :close-on-click-modal="false"
     @close="cancelHandle"

+ 10 - 3
src/views/intervalAnalysis/components/saveSingleEdb.vue

@@ -88,7 +88,7 @@ export default {
             4:'Max()',
             5:'Min()'
           }
-          this.formData.name=`${this.$i18nt.locale==='zh'?edbData.EdbName:edbData.EdbNameEn}${calculateTypeMap[this.singleEdbData.CalculateType]}`
+          this.formData.name=`${this.$i18nt.locale==='zh'?edbData.EdbName:edbData.EdbNameEn}${calculateTypeMap[this.singleEdbData.ExtraConfig.CalculateType]}`
           this.formData.classify=edbData.ClassifyId
           this.formData.frequency=edbData.Frequency
           this.formData.unit=edbData.Unit
@@ -134,7 +134,14 @@ export default {
   methods: {
     async saveHandle() {
       await this.$refs.diaForm.validate();
-      
+      const edbList=[{
+        EdbName:this.formData.name,
+        Frequency:this.formData.frequency,
+        Unit:this.formData.unit,
+        ClassifyId:this.formData.classify,
+        FromEdbInfoId:this.tableData[0].EdbInfoId
+      }]
+      this.$emit('save',edbList)
     },
 
     cancelHandle() {
@@ -152,7 +159,7 @@ export default {
 		},
 
     async getClassifyOpts() {
-      const res=this.tableData[0].EdbType===1?await preDictEdbInterface.classifyListV2():await dataBaseInterface.menuListV3()
+      const res=this.tableData[0].EdbInfoCategoryType===1?await preDictEdbInterface.classifyListV2():await dataBaseInterface.menuListV3()
 			if(res.Ret === 200) {
 				this.filterNodes(res.Data.AllNodes||[]);
 				this.classifyOpts = res.Data.AllNodes || [];

+ 6 - 6
src/views/intervalAnalysis/list.vue

@@ -226,7 +226,7 @@
                         style="width: 60px; display: block"
                         size="mini"
                         type="number"
-                        placeholder="上限"
+                        :placeholder="$t('Chart.up_limit')"
                         v-model="chartLimit.max"
                         @change="changeLimit"
                       />
@@ -234,7 +234,7 @@
                         class="min-data-input"
                         size="mini"
                         type="number"
-                        placeholder="下限"
+                        :placeholder="$t('Chart.low_limit')"
                         v-model="chartLimit.min"
                         @change="changeLimit"
                       />
@@ -244,7 +244,7 @@
                         style="width: 60px; display: block"
                         size="mini"
                         type="number"
-                        placeholder="上限"
+                        :placeholder="$t('Chart.up_limit')"
                         v-model="chartLimit.rightMax"
                         @change="changeLimit"
                       />
@@ -252,7 +252,7 @@
                         class="min-data-input"
                         size="mini"
                         type="number"
-                        placeholder="下限"
+                        :placeholder="$t('Chart.low_limit')"
                         v-model="chartLimit.rightMin"
                         @change="changeLimit"
                       />
@@ -266,7 +266,7 @@
                         style="width: 60px; display: block"
                         size="mini"
                         type="number"
-                        placeholder="上限"
+                        :placeholder="$t('Chart.up_limit')"
                         v-model="chartLimit.rightTwoMax"
                         @change="changeLimit"
                       />
@@ -274,7 +274,7 @@
                         class="min-data-input"
                         size="mini"
                         type="number"
-                        placeholder="下限"
+                        :placeholder="$t('Chart.low_limit')"
                         v-model="chartLimit.rightTwoMin"
                         @change="changeLimit"
                       />