ETA1.6.5

src/views/dataEDB/calculate/components/FormulaCalculate.vue

@@ -52,6 +52,12 @@ watch(
             nullWayStr.value = nullWayOptions.value.find(_ =>_.value===baseInfo.nullValueWay).label
             maxNullStr.value = maxNullWayOptions.value.find(_=>_.value===baseInfo.maxNullWay).label
 
+            if(props.edbInfo.EdbInfoDetail.Extra){
+                const ExtraObj=JSON.parse(props.edbInfo.EdbInfoDetail.Extra)
+                baseInfo.timeSeriesVal=ExtraObj.DateTag
+                timeSeriesVal.value=timeSeriesOpts.value.find(_=>_.value===baseInfo.timeSeriesVal).label
+            }
+
             setTimeout(() => {
                 selectEDBClassifyINS.value?.getSelectClassifyOpt(props.edbInfo.EdbInfoDetail.ClassifyId)//获取选择的分类目录
             }, 1000);
@@ -306,7 +312,7 @@ const timeSeriesOpts=computed(()=>{
     arr.push(
         {
 			label:'所有指标时间序列并集',
-			value:'all_edb',
+			value:'all',
 		}
     )
 
@@ -376,7 +382,10 @@ async function handleSave(){
         Unit:baseInfo.unit,
         EdbInfoIdArr:arr,
         EmptyType:baseInfo.nullValueWay,
-        MaxEmptyType:baseInfo.maxNullWay
+        MaxEmptyType:baseInfo.maxNullWay,
+        Extra:JSON.stringify({
+			DateTag:baseInfo.timeSeriesVal
+		})
     }
     const edbInfoId=route.query.edbInfoId
     const res=edbInfoId?await apiDataEDB.editCalculateFormula({...params,EdbInfoId:Number(edbInfoId)}):await apiDataEDB.addCalculateFormula(params)

src/views/dataEDB/calculate/components/OtherCalculate.vue

@@ -53,6 +53,10 @@ watch(
             if([72].includes(edbInfoData.Source)){//指数修匀
                 baseInfo.alphaVal=Number(edbInfoData.CalculateFormula)
             }
+            if([62].includes(edbInfoData.Source)){//最新值处理
+                const ExtraObj=JSON.parse(edbInfoData.Extra)
+                baseInfo.newVal=ExtraObj.LastValType==1?'均值填充':'默认'
+            }
 
             setTimeout(() => {
                 selectEDBClassifyINS.value?.getSelectClassifyOpt(props.edbInfo.EdbInfoDetail.ClassifyId)//获取选择的分类目录
@@ -199,7 +203,7 @@ const baseInfo=reactive({
     calendarType:'公历',
     valueType:'期末值',
     alphaVal:'',
-    newVal:'',
+    newVal:'默认',
 })
 
 // 选择单位
@@ -227,6 +231,14 @@ function handleConfirmClassify({value,selectedOptions}){
 const showSelectFrequency=ref(false)
 function handleConfirmFrequency(value){
     baseInfo.frequency=value
+
+    // 修改指标名称
+    if(!selectEDBinfo.value||editEdbInfoId.value) return
+    const name_map = {
+		51: `${selectEDBinfo.value.EdbName}/${baseInfo.frequency.substr(0,1)}频`,
+		62:  `${selectEDBinfo.value.EdbName}累计值/${baseInfo.frequency}`,
+	}
+    baseInfo.name=name_map[source.value]||''
 }
 
 //移动方式类型选择
@@ -318,6 +330,9 @@ async function handleSave(){
 		MoveFrequency: baseInfo.moveUnit,
 		MoveType: baseInfo.moveType, 
 		Calendar: baseInfo.calendarType,
+        Extra:JSON.stringify({
+			LastValType:baseInfo.newVal==='均值填充'?1:0
+		})
     }
 
     saveBtnLoading.value=true
@@ -353,7 +368,7 @@ function handleTabChange(){
     baseInfo.moveUnit='天'
     baseInfo.calendarType='公历'
     baseInfo.valueType='期末值'
-    baseInfo.newVal=''
+    baseInfo.newVal='默认'
     classifyStr.value=''
 
 }