Merge branch 'xqc_215'

src/views/dataEntry_manage/databaseComponents/batchComptedDialog.vue

@@ -120,6 +120,15 @@
 						>
 						</el-option>
 					</el-select>
+					<el-select
+						v-if="type===45"
+						v-model="list.emptyType"
+						:placeholder="$t('Edb.InputHolderAll.input_fre')"
+						style="width:20%;margin-left:10px"
+					>
+						<el-option :label="$t('EtaBasePage.null_val_deal_2')" :value="0"></el-option>
+						<el-option :label="$t('EtaBasePage.null_val_deal_3')" :value="3"></el-option>
+					</el-select>
         </li>
       </ul>
     </div>
@@ -197,6 +206,7 @@ export default {
           menu: '',
           frequency: '',
           n_num: 1,
+					emptyType:0,
 				},
 				{
 					tag: tag_arr[1],
@@ -208,6 +218,7 @@ export default {
           menu: '',
           frequency: '',
           n_num: 1,
+					emptyType:0
 				},
       ],
 
@@ -363,6 +374,7 @@ export default {
         menu: '',
         frequency: '',
         n_num: 1,
+				emptyType:0
 			};
 			this.targetList.push(item);
 		},
@@ -425,6 +437,7 @@ export default {
           menu: '',
           frequency: '',
           n_num: 1,
+					emptyType:0,
 				},
 				{
 					tag: tag_arr[1],
@@ -436,6 +449,7 @@ export default {
           menu: '',
           frequency: '',
           n_num: 1,
+					emptyType:0,
 				},
       ]
 			// this.$refs.form.resetFields();
@@ -459,7 +473,8 @@ export default {
           MoveFrequency: "天",
           MoveType: 1,
           Source: this.type,
-          Unit: item.unit
+          Unit: item.unit,
+					EmptyType:item.emptyType
         }
       }))
 

src/views/dataEntry_manage/databaseComponents/batchComputedSave.vue

@@ -294,7 +294,8 @@ export default {
                 Extra:JSON.stringify({
                     LastValType:this.formData.newValue,
                     DateTag:this.formData.timeSeriesVal
-                })
+                }),
+                EmptyType:this.formData.emptyType
             }
             // 处理多指标求和\平均 情况的数据
             if(this.computedType==='multipleEDB'){

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -232,6 +232,18 @@
                     </el-form-item>
                     </template>
 
+                    <!-- 升频 -->
+                    <template v-if="computedType==14">
+                    <el-form-item :label="$t('EtaBasePage.null_val_deal')" prop="emptyType">
+                        <el-select
+                            v-model="formData.emptyType"
+                            :placeholder="$t('Edb.InputHolderAll.input_fre')"
+                        >
+                            <el-option :label="$t('EtaBasePage.null_val_deal_2')" :value="0"></el-option>
+                            <el-option :label="$t('EtaBasePage.null_val_deal_3')" :value="3"></el-option>
+                        </el-select>
+				    </el-form-item>
+                    </template>
 
                 </div>
             </div>
@@ -555,6 +567,7 @@ export default {
                     timeSeriesVal:'A',
                     nullValueWay:0,
                     maxNullWay:1,
+                    emptyType:0
                 }
             }else{
                 // 编辑多指标求和\平均
@@ -582,6 +595,7 @@ export default {
                 timeSeriesVal:'A',
                 nullValueWay:0,
                 maxNullWay:1,
+                emptyType:0,
             },
 
             select_target:'',
@@ -784,6 +798,7 @@ export default {
                 timeSeriesVal:'A',
                 nullValueWay:0,
                 maxNullWay:1,
+                emptyType:0
             }
             this.filter={
                 classify:'',

src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -256,6 +256,16 @@
 								<el-option :label="$t('EtaBasePage.mean_imputation_select_text')" :value="'均值填充'" v-if="hasNewValueOpt"></el-option> 
 							</el-select>
 						</el-form-item>
+						<el-form-item :label="$t('EtaBasePage.null_val_deal')" prop="emptyType" v-if="type===14">
+							<el-select
+								v-model="formData.emptyType"
+								:placeholder="$t('Edb.InputHolderAll.input_fre')"
+								style="width: 340px"
+							>
+								<el-option :label="$t('EtaBasePage.null_val_deal_2')" :value="0"></el-option>
+								<el-option :label="$t('EtaBasePage.null_val_deal_3')" :value="3"></el-option>
+							</el-select>
+						</el-form-item>
 					</el-form>
 				</div>
 			</div>
@@ -321,7 +331,8 @@ export default {
 					moveVal,
 					oldedb_id,
 					oldEdb_name,
-					calendar_type
+					calendar_type,
+					EmptyType
 				} = backData;
 				this.formData = {
 					edb_id,
@@ -335,7 +346,8 @@ export default {
 					moveUnit,
 					moveVal,
 					calendar_type,
-					new_value:''
+					new_value:'',
+					emptyType:EmptyType,
 				}
 				this.getDataList();
 
@@ -500,6 +512,7 @@ export default {
 				calendar_type: '公历',
 				value_type: '期末值',
 				new_value:'',
+				emptyType:0,
 			},
 			options: [],
 			levelProps: {
@@ -688,7 +701,8 @@ export default {
 				moveVal: '',
 				calendar_type: '公历',
 				value_type: '期末值',
-				new_value:''
+				new_value:'',
+				emptyType:0,
 			};
 			this.$refs.form.resetFields();
 		},
@@ -718,7 +732,8 @@ export default {
 					Calendar: this.formData.calendar_type,
 					Extra:JSON.stringify({
 						LastValType:this.formData.new_value==='均值填充'?1:0
-					})
+					}),
+					EmptyType:this.formData.emptyType
 				}
 
 				const res = this.operationForm.edb_id 
@@ -844,7 +859,8 @@ export default {
 				moveVal: '',
 				calendar_type: this.formData.calendar_type,
 				value_type: this.formData.value_type,
-				new_value:''
+				new_value:'',
+				emptyType:0
 			}
 		},
         handleSelectBtnClick(){

src/views/dataEntry_manage/databaseList.vue

@@ -1920,6 +1920,7 @@ export default {
 							moveUnit: dataInfo.MoveFrequency,
 							moveVal: type === 22 ? dataInfo.CalculateFormula : '',
 							calendar_type: type === 35 ? dataInfo.Calendar : '',
+							EmptyType:dataInfo.EmptyType||0,
 					}
 
 				if([72,73].includes(type)){

src/views/predictEdb_manage/components/operationDialog.vue

@@ -253,6 +253,17 @@
 						<el-form-item :label="$t('Edb.Detail.source')" v-if="[69,70].includes(type)" style="width:50%">
 							<span>{{type===69?'标准差':'百分比'}}</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"
+								:placeholder="$t('Edb.InputHolderAll.input_fre')"
+								style="width: 340px"
+							>
+								<el-option :label="$t('EtaBasePage.null_val_deal_2')" :value="0"></el-option>
+								<el-option :label="$t('EtaBasePage.null_val_deal_3')" :value="3"></el-option>
+							</el-select>
+						</el-form-item>
 					</el-form>
 				</div>
 			</div>
@@ -313,6 +324,7 @@ export default {
 					moveVal:backData.moveVal,
 					calendar_type:backData.calendar_type,
 					value_type: this.type === 54 ? backData.formula : '期末值',
+					emptyType:backData.emptyType||0
 				}
 				this.getDataList();
 
@@ -428,7 +440,8 @@ export default {
 				moveUnit: '天',
 				moveVal: '',
 				calendar_type: '公历',
-				value_type: '期末值'
+				value_type: '期末值',
+				emptyType:0
 			},
 			options: [],
 			//frequencyArr: ['日度', '周度','旬度', '月度', '季度', '年度'],
@@ -597,7 +610,8 @@ export default {
 				moveUnit: '天',
 				moveVal: '',
 				calendar_type: '公历',
-				value_type: '期末值'
+				value_type: '期末值',
+				emptyType:0,
 			};
 			this.$refs.form.resetFields();
 		},
@@ -625,6 +639,7 @@ export default {
 					MoveFrequency: this.formData.moveUnit,
 					MoveType: this.formData.moveType, 
 					Calendar: this.formData.calendar_type,
+					EmptyType:this.formData.emptyType
 				}
 
 				/* 编辑 */
@@ -696,7 +711,8 @@ export default {
 				moveUnit: '天',
 				moveVal: '',
 				calendar_type: this.formData.calendar_type,
-				value_type: this.formData.value_type
+				value_type: this.formData.value_type,
+				emptyType:0,
 			}
 		},
 

src/views/predictEdb_manage/predictEdb.vue

@@ -1273,6 +1273,7 @@ export default {
 					moveUnit: MoveFrequency,
 					moveVal: Source === 46 ? CalculateFormula : '',
 					calendar_type: Source === 49 ? Calendar : '',
+					emptyType:EmptyType
 				}
 
 				if([72,73].includes(Source)){