计算指标-空值处理

src/lang/modules/EtaBase/En.js

@@ -90,6 +90,7 @@ export default {
     5. equal to 0: the null value is 0 value to participate in the calculation <br>
     Note: The processing of missing values here applies to all time periods of the data`,
     max_null_val: 'MAX、MIN Null Value Handling',
+    max_null_val_2:'Skip null',
     max_null_val_hint:`If there is a null value in the MAX and MIN formulas, handle it according to the following rules: <br>
     1. equal to 0, null value with 0 to participate in the calculation; <br>
     2. Skip the null value, remove the null value indicator, and calculate the remaining indicators. If all indicators of the date are null values, the date has no value;`,

src/lang/modules/EtaBase/Zh.js

@@ -90,6 +90,7 @@ export default {
     5、等于0：空值以0值参与计算 <br>
     注意：此处缺失值的处理，作用于数据全部时间段`,
     max_null_val: 'MAX、MIN空值处理',
+    max_null_val_2:'跳过空值',
     max_null_val_hint:`MAX、MIN公式中指标存在空值时按如下规则处理：<br>
     1、等于0，空值用0参与计算；<br>
     2、跳过空值，去除空值指标，剩余指标进行计算，若该日期所有指标均为空值，则该日期无值；`,

src/views/dataEntry_manage/databaseComponents/computedDialog.vue

@@ -90,7 +90,7 @@
 								:options="timeSeriesOpt"
 								:props="{emitPath:false}"
 								:show-all-levels="false"
-								placeholder="请选择"
+								:placeholder="$t('Edb.please_select')"
 								:disabled="calulateForm.view"
 							></el-cascader>
 						</div>
@@ -108,7 +108,7 @@
 						</label>
 						<el-select
 							v-model="nullValueForm.nullValueWay"
-							placeholder="请选择"
+							:placeholder="$t('Edb.please_select')"
 							:disabled="calulateForm.view"
 						>
 							<el-option
@@ -130,11 +130,11 @@
 						</label>
 						<el-select
 							v-model="nullValueForm.maxNullWay"
-							placeholder="请选择"
+							:placeholder="$t('Edb.please_select')"
 							:disabled="calulateForm.view"
 						>
-							<el-option label="等于0" :value="1" />
-							<el-option label="跳过空值" :value="2" />
+							<el-option :label="$t('EtaBasePage.null_val_deal_4')" :value="1" />
+							<el-option :label="$t('EtaBasePage.max_null_val_2')" :value="2" />
 						</el-select>
 					</div>
 				</div>