Ver código fonte

拟合残差显示公式

Karsa 1 ano atrás
pai
commit
b769ee5ae4

+ 9 - 7
src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -28,7 +28,7 @@
         :disabled="operationForm.view"
       >
 			
-        <el-form-item label="自变量" prop="self_variate">
+        <el-form-item label="自变量(x)" prop="self_variate">
           <el-select
             v-model="formData.self_variate"
             v-loadMore="searchLoad"
@@ -72,7 +72,7 @@
           </template>  
         </el-form-item>
 
-        <el-form-item label="因变量" prop="depend_variate">
+        <el-form-item label="因变量(y)" prop="depend_variate">
           <el-select
             v-model="formData.depend_variate"
             v-loadMore="searchLoad"
@@ -117,7 +117,7 @@
             @change="changeDate"
             :picker-options="endDateOptions"
           />
-					<span v-if="correlationIndex" class="editsty" style="margin-left: 20px">相关系数:{{correlationIndex}}</span>
+					<span v-if="correlationStr" class="editsty" style="margin-left: 20px">{{correlationStr}}</span>
         </el-form-item>
         <el-form-item label="指标名称" prop="edb_name" class="target-form-cont">
           <el-input
@@ -225,6 +225,8 @@ export default {
 					StartDate: item.StartDate,
 					EndDate: item.EndDate,
 				}))
+
+				this.correlationStr = backData.correlationStr;
 				
 			}
 		}
@@ -298,7 +300,7 @@ export default {
 			depend_edb_name: '',
 			self_edb_name: '',
 
-			correlationIndex: '',//相关系数
+			correlationStr: '',//相关系数
 
 		};
 	},
@@ -397,9 +399,9 @@ export default {
 		/* 获取相关系数 */
 		async getCorrelationIndex() {
 
-			if(!this.formData.self_variate || !this.formData.depend_variate || !this.formData.date[0] || !this.formData.date[1]) return this.correlationIndex = '';
+			if(!this.formData.self_variate || !this.formData.depend_variate || !this.formData.date[0] || !this.formData.date[1]) return this.correlationStr = '';
 			
-			if(this.formData.self_move_type===1 && !this.formData.self_move_val) return this.correlationIndex = '';
+			if(this.formData.self_move_type===1 && !this.formData.self_move_val) return this.correlationStr = '';
 
 			const { date,self_variate,self_move_type,self_move_val,depend_variate } = this.formData;
 			let params = {
@@ -423,7 +425,7 @@ export default {
 
 			if(res.Ret !==200) return
 			
-			this.correlationIndex = res.Data;
+			this.correlationStr = res.Data;
 		},
 
     /* 选择日期 */

+ 1 - 0
src/views/dataEntry_manage/databaseList.vue

@@ -1754,6 +1754,7 @@ export default {
 							old_stay_edb: type === 24 ? old_edb.find(item => item.FromTag === 'A').FromEdbInfoId : '',
 							concat_edb: type === 24 ? old_edb.find(item => item.FromTag === 'B').FromEdbInfoId : '',
 							from_arr: old_edb,
+							correlationStr: dataInfo.CorrelationStr
 						} 
 					: {
 							...public_params,

+ 2 - 1
src/views/predictEdb_manage/predictEdb.vue

@@ -1112,7 +1112,7 @@ export default {
 		},
 
 		/* 计算指标回显 */
-		setComputedDialogForm({Source,CalculateList,CalculateFormula,EdbInfoId,EdbName,Unit,Frequency,ClassifyId,MoveType,MoveFrequency,Calendar},type='') {
+		setComputedDialogForm({Source,CalculateList,CalculateFormula,EdbInfoId,EdbName,Unit,Frequency,ClassifyId,MoveType,MoveFrequency,Calendar,CorrelationStr},type='') {
 			//找到指标的父级
 			let deep_arr = _.cloneDeep(this.treeData);
 			const parentNodes = this.findParentNodeHandle(deep_arr,ClassifyId,'ClassifyId')
@@ -1154,6 +1154,7 @@ export default {
 						old_stay_edb: Source === 48 ? CalculateList.find(item => item.FromTag === 'A').FromEdbInfoId : '',
 						concat_edb: Source === 48 ? CalculateList.find(item => item.FromTag === 'B').FromEdbInfoId : '',
 						from_arr: CalculateList,
+						correlationStr: CorrelationStr
 					}
 					return
 				}