1.6.5

src/views/dataEntry_manage/databaseComponents/computedDialog.vue

@@ -352,6 +352,21 @@ export default {
 				this.getNewestDate();
 			}
 		},
+
+		'addList':{
+			handler(n){
+				if(!this.selectTimeSeriesVal){
+					const arr=this.addList.filter(item=>item.target).map(item=>{
+						return {
+							label:`指标${item.tag}`,
+							value:item.tag
+						}
+					})
+					this.selectTimeSeriesVal=arr[0].value
+				}
+			},
+			deep:true
+		}
 	},
 	data() {
 		return {

src/views/dataEntry_manage/databaseComponents/diffusionIndexDia.vue

@@ -96,7 +96,7 @@
 			<selectUnit 
 			  	v-model="formData.unit" 
 				style="width:340px" 
-				:disabled="!operationForm.edb_id&&[6,7].includes(type)"
+				:disabled="type===53"
 			/>
           </el-form-item>
           <el-form-item label="指标目录" prop="menu" style="margin-right: 40px;">
@@ -205,6 +205,9 @@ export default {
 
 				this.formData.select_date.length && this.formData.date_type === 2 && this.setConcatDate()
 			}
+			if(newval&&this.type===53&&!this.operationForm.edb_id){
+				this.formData.unit='无'
+			}
 		}
 	},
 	data () {

src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -390,6 +390,13 @@ export default {
 					? this.formData.self_edb_date = [choose_obj.StartDate,choose_obj.EndDate]
 					: this.formData.depend_edb_date = [choose_obj.StartDate,choose_obj.EndDate]
 
+				// 设置目录、频度、单位
+				if(type==='self'){
+					this.formData.menu=choose_obj.ClassifyId
+					this.formData.unit=choose_obj.Unit
+					this.formData.frequency=choose_obj.Frequency
+				}
+				
 			}
 			this.getCorrelationIndex();
 		},

src/views/dataEntry_manage/databaseComponents/jointTargetDia.vue

@@ -79,6 +79,7 @@
 							:remote-method="query=>{searchHandle(query)}"
 							@click.native="inputFocusHandle"
 							@blur="search_have_more = false"
+							@change="chooseTarget(formData.after_edb,'searchOptions')"
 						>
 							<i slot="prefix" class="el-input__icon el-icon-search"></i>
 							<el-option
@@ -106,6 +107,7 @@
 						:remote-method="query=>{searchHandle(query,'month')}"
 						@click.native="e => {inputFocusHandle(e,'month')} "
 						@blur="search_have_more = false"
+						@change="chooseTarget(formData.old_stay_edb,'searchMonthOptions')"
 						>
 							<i slot="prefix" class="el-input__icon el-icon-search"></i>
 							<el-option
@@ -354,6 +356,18 @@ export default {
 		};
 	},
 	methods: {
+		// 选中指标更新默认值
+		chooseTarget(val,key){
+			if(!val) return
+			const arr=key==='searchMonthOptions'?this.searchMonthOptions:this.searchOptions
+			let obj = arr.find(item => item.EdbInfoId === val);
+			console.log(obj);
+			this.formData.edb_name=`${obj.EdbName}/拼接`
+			this.formData.menu=obj.ClassifyId||''
+			this.formData.frequency=obj.Frequency
+			this.formData.unit=obj.Unit
+		},
+
 		/* 搜索 */
 		searchHandle(query,type) {
 			this.search_page = 1;

src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -229,7 +229,7 @@
 						<el-form-item label="最新值处理" prop="new_value" v-if="type===62">
 							<el-select v-model="formData.new_value" placeholder="请选择" style="width: 340px">
 								<el-option label="默认" value=""></el-option>
-								<el-option label="均值填充" value="均值填充"></el-option> 
+								<el-option label="均值填充" :value="'均值填充'" v-if="hasNewValueOpt"></el-option> 
 							</el-select>
 						</el-form-item>
 					</el-form>
@@ -273,6 +273,12 @@ export default {
 			type: Object,
 		}
 	},
+	computed: {
+		// 累计值计算时 均值填充判断标识
+		frequencyChangeFlag(){
+			return this.tableData[0]?`${this.tableData[0].Frequency}转${this.formData.frequency}`:''
+		}
+	},
 	watch: {
 		isOperation(newval) {
 			newval && this.getMenu();
@@ -304,7 +310,8 @@ export default {
 					moveType,
 					moveUnit,
 					moveVal,
-					calendar_type
+					calendar_type,
+					new_value:''
 				}
 				this.getDataList();
 
@@ -322,6 +329,15 @@ export default {
 				: [62,63].includes(this.type)
 				? [{ label: '累计值',key: 62 },{ label: '年初至今累计值',key: 63 }]
 				: []
+		},
+		frequencyChangeFlag(n){
+			const arr=['日度转周度','日度转旬度','周度转旬度']
+			if(n&&arr.includes(n)){
+				this.hasNewValueOpt=false
+				this.formData.new_value=''
+			}else{
+				this.hasNewValueOpt=true
+			}
 		}
 	},
 	data () {
@@ -368,14 +384,14 @@ export default {
 				[5,'累计值转月/季值'],
 				[6,'同比值'],
 				[7,'同差值'],
-				[8,'N数值移动平均计算'],
-				[12,'N数值环比值'],
-				[13,'N数值环差值'],
+				[8,'N期移动均值'],
+				[12,'N期环比值'],
+				[13,'N期环差值'],
 				[14,'升频'],
 				[22,'时间移位'],
 				[35,'超季节性'],
 				[40,'数据调整'],
-				[52,'年化'],
+				[52,'年化值'],
 				[51,'降频'],
 				[61,'累计值转月/季值'],
 				[62,'累计值'],
@@ -446,6 +462,8 @@ export default {
 
 			sourceList: [],
 
+			hasNewValueOpt:true,//最新值处理的选项
+
 		};
 	},
 	methods: {
@@ -592,7 +610,8 @@ export default {
 				moveUnit: '天',
 				moveVal: '',
 				calendar_type: '公历',
-				value_type: '期末值'
+				value_type: '期末值',
+				new_value:''
 			};
 			this.$refs.form.resetFields();
 		},
@@ -683,19 +702,19 @@ export default {
 				['年度','Y'],
 			])
 			const name_map = {
-				5: obj.EdbName,
+				5: `${obj.EdbName}转月值`,
 				8: `${obj.EdbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
-				14: `${obj.EdbName}/${obj.Frequency}升频`,
+				14: `${obj.EdbName}/日频`,
 				6: `${obj.EdbName}同比`,
 				7: `${obj.EdbName}同差`,
 				12: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
 				13: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
 				35: `${obj.EdbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`,
-				52: `${obj.EdbName}年化`,
-				51: `${obj.EdbName}/${obj.Frequency}降频`,
-				61:  obj.EdbName,
-				62:  obj.EdbName,
-				63:  obj.EdbName,
+				52: `${obj.EdbName}年化值`,
+				51: `${obj.EdbName}/${obj.Frequency.substr(0,1)}频`,
+				61:  `${obj.EdbName}转季值`,
+				62:  `${obj.EdbName}累计值/${obj.Frequency}`,
+				63:  `${obj.EdbName}累计值/${obj.Frequency}`,
 				75: `${obj.EdbName}日均值`
 			}
 			
@@ -709,13 +728,14 @@ export default {
 				targetName: name_map[this.type] || '',
 				frequency: frequerncyMap[this.type] || obj.Frequency,
 				unit: [5,8,14,7,35,75].includes(this.type) ? obj.Unit : '无',
-				menu: this.type===75 ? obj.ClassifyId : '',
+				menu: obj.ClassifyId || '',
 				n_num: 1,
 				moveType: 1,
 				moveUnit: '天',
 				moveVal: '',
 				calendar_type: this.formData.calendar_type,
-				value_type: this.formData.value_type
+				value_type: this.formData.value_type,
+				new_value:''
 			}
 		},
         handleSelectBtnClick(){

src/views/dataEntry_manage/databaseComponents/util.js

@@ -52,15 +52,15 @@ export const computedTypes = [
 		type:7
 	},
 	{
-		name:'N数值移动平均计算',
+		name:'N期移动均值',
 		type:8
 	},
 	{
-		name:'N数值环比值',
+		name:'N期环比值',
 		type:12
 	},
 	{
-		name:'N数值环差值',
+		name:'N期环差值',
 		type:13
 	},
 	{
@@ -84,7 +84,7 @@ export const computedTypes = [
 		type: 37
 	},
 	{
-		name: '年化',
+		name: '年化值',
 		type: 52
 	},
 	{