@@ -32,6 +32,9 @@ export const IntervalAnalysisEn = {
multiply:'multiply',
divide:'divide',
logarithm:'logarithm',
+ batch_select_edb:'Selct Indicator',
+ chart_legend:'Legend',
+ interval_analysis_name:'Interval Analysis',
};
/* 中文 */
@@ -66,6 +69,7 @@ export const IntervalAnalysisZh = {
logarithm:'对数',
batch_select_edb:'批量选择指标',
chart_legend:'图例',
+ interval_analysis_name:'区间分析',
@@ -1337,7 +1337,7 @@ export default {
if(data.EdbCode) {
/* 编辑指标 基础弹窗 */
- (data.EdbType===1 || [58,59,67,68,74].includes(data.Source)) && dataBaseInterface.targetDetail({
+ (data.EdbType===1 || [58,59,67,68,74,87].includes(data.Source)) && dataBaseInterface.targetDetail({
EdbInfoId: data.EdbInfoId
}).then(res => {
if(res.Ret === 200) {
@@ -541,7 +541,7 @@ export default {
methods: {
// 单指标选择指标后计算一次
handleSelectSingleEdb(){
- this.$emit('computed')
+ // this.$emit('computed')
},
// 更新多指标计算时的数据
@@ -549,7 +549,7 @@ export default {
this.dateRangeType = 0
this.edbList = data.edbList
this.seriesName = data.seriesName
handleShowEditBatchSelectEbd() {
this.$emit('showBatchSelectEdb', {
@@ -39,7 +39,7 @@
@click.native="inputFocusHandle"
@change="chooseTarget"
@blur="search_have_more = false"
- :disabled="operationForm.view||[69,70].includes(type)"
+ :disabled="operationForm.view||[69,70,90].includes(type)"
>
<i slot="prefix" class="el-input__icon el-icon-search"></i>
<el-option
@@ -254,6 +254,11 @@
<span>{{type===69?'标准差':'百分比'}}</span>
</el-form-item>
+ <!-- 区间分析保存的 -->
+ <el-form-item :label="$t('Edb.Detail.source')" v-if="[90].includes(type)" style="width:50%">
+ <span>{{$t('StatisticAnalysis.IntervalAnalysis.interval_analysis_name')}}</span>
+ </el-form-item>
+
<el-form-item :label="$t('EtaBasePage.null_val_deal')" prop="emptyType" v-if="type===45">
<el-select
v-model="formData.emptyType"
@@ -413,6 +418,7 @@ export default {
[66,this.$t('Edb.CalculatesAll.cumulate')],/* '累计值' */
[69,this.$t('Edb.CalculatesAll.standard_differ')],/* 标准差 */
[70,this.$t('Edb.CalculatesAll.percent')],/* 百分比 */
+ [90,this.$t('StatisticAnalysis.IntervalAnalysis.interval_analysis_name')],/* 区间分析 */
]),//标题
saveBtnMap: new Map([
[42,/* '转月值计算' */this.$t('Edb.CalculateBtns.to_month')],
@@ -421,7 +421,7 @@
<!-- 同比同差计算弹窗 -->
<!-- 转月值 同比 同差 平均值弹窗 -->
<operationDialog
- :isOperation="[42,32,33,39,43,44,45,46,49,54,55,64,65,66,69,70].includes(computed_type) && computed_source===1"
+ :isOperation="[42,32,33,39,43,44,45,46,49,54,55,64,65,66,69,70,90].includes(computed_type) && computed_source===1"
:type="computed_type"
:operationForm="operationForm"
@cancel="computed_type=0"