合并需求池

src/api/modules/chartApi.js

@@ -359,6 +359,21 @@ const dataBaseInterface = {
 		return http.get('datamanage/edb_info/trace',params)
 	},
 
+	/** 拟合残差相关系数
+	 * @param {*} params 
+	 *"Formula": "2020-01-01,2022-12-13",
+		"EdbInfoIdArr": [
+				{
+						"EdbInfoId": 113123,
+						"FromTag": "A",
+						"MoveValue": 0
+				}
+		]
+		*/
+	correlationIndex: params => {
+		return http.post('/datamanage/edb_info/calculate/compute_correlation',params)
+	},
+
 
 	//========================================chart
 	// /**

src/api/modules/predictEdbApi.js

@@ -275,4 +275,20 @@ export const batchCalculateTargetAdd = params => {
  */
 export const saveChartInfo = params => {
 	return http.post('/datamanage/predict_edb_info/modify',params)
+}
+
+/** 拟合残差相关系数
+ * @param {*} params 
+ *  "Formula": "2020-01-01,2022-12-13",
+    "EdbInfoIdArr": [
+        {
+            "EdbInfoId": 113123,
+            "FromTag": "A",
+            "MoveValue": 0
+        }
+    ]
+ * @returns 
+ */
+export const correlationIndex = params => {
+	return http.post('/datamanage/edb_info/calculate/compute_correlation',params)
 }

src/views/chartRelevance_manage/fittingEquationChartEditor.vue

@@ -10,10 +10,23 @@
     <div class="left-cont" v-show="!isSlideLeft" id="left">
       <div class="left-top">
         <el-button type="primary" @click="saveHandle">保存</el-button>
-        <el-button type="primary" plain @click="$router.replace({
+        <el-button style="margin-right:20px" type="primary" plain @click="$router.replace({
 					path: '/fittingEquationList',
 					query: $route.query
 				})">取消</el-button>
+				<span style="color: #666;">
+						使用说明
+					<el-tooltip
+						effect="dark"
+					>
+						<div
+							slot="content"
+							v-html="useTip"
+							style="line-height: 20px;width:350px"
+						></div>
+						<i class="el-icon-question" />
+					</el-tooltip>
+				</span>
       </div>
 			<div class="left-min">
 				<div class="section-item">
@@ -219,7 +232,11 @@ export default {
 
 			classifyOptions: [],//分类option
 
-			isSaveDialog: false
+			isSaveDialog: false,
+
+			useTip:`1、选择两组有相关性的指标<br>
+					2、对两组在选定时间范围内的每一个时间节点,生成拟合方程Y=aX+b以及相关系数R²<br>
+					3、分别画出弹性系数a,截距b,相关系数R²,在选定时间范围内的曲线图`
 
     };
   },

src/views/chartRelevance_manage/fittingEquationList.vue

@@ -12,6 +12,19 @@
       <div class="main-left left" id="left" v-show="!isSlideLeft">
 				<div class="datasheet_top">
 						<el-button type="primary" @click="goAddChart">添加图表</el-button>
+						<div style="color: #666">
+							 使用说明
+							<el-tooltip
+								effect="dark"
+							>
+								<div
+									slot="content"
+									v-html="useTip"
+									style="line-height: 20px;width:350px"
+								></div>
+								<i class="el-icon-question" />
+							</el-tooltip>
+						</div>
 				</div>
 
 				<div class="search-cont">
@@ -295,6 +308,10 @@ export default {
 			search_page: 1,
 			search_have_more: false,
 			current_search:'',
+
+			useTip:`1、选择两组有相关性的指标<br>
+					2、对两组在选定时间范围内的每一个时间节点,生成拟合方程Y=aX+b以及相关系数R²<br>
+					3、分别画出弹性系数a,截距b,相关系数R²,在选定时间范围内的曲线图`
 		};
 	},
 	methods: {
@@ -654,6 +671,9 @@ $mini-font: 12px; $normal-font: 14px;
 				border: 1px solid #ececec;
 				box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
 				margin-bottom: 20px;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
 			}
 			.search-cont {
 				padding: 0 20px;

src/views/dataEntry_manage/addChart.vue

@@ -56,6 +56,15 @@
 							placeholder="请选择所属分类"
 						/>
 					</el-form-item>
+					<el-form-item label="图表单位" prop="Unit" v-if="chartInfo.ChartType===7">
+						<el-input
+							v-model="chartInfo.Unit"
+							style="width: 90%"
+							placeholder="请输入图表单位"
+							clearable
+							@change="changeUnit"
+						/>
+					</el-form-item>
 				</el-form>
 
 				<div class="search-cont" v-if="chartInfo.ChartType!==10">

src/views/dataEntry_manage/chartSetting.vue

@@ -142,7 +142,7 @@
             <div
               class="noDepart"
               @click="addLevelOneHandle"
-              v-if="role === 'admin'"
+              v-if="CanOpClassify"
             >
               <img
                 src="~@/assets/img/set_m/add_ico.png"
@@ -824,7 +824,9 @@ export default {
       /* 查看历史弹窗 */
 			isLookHistory: false,
 			lookEdbId: 0,
-        labelList:[],//标签列表
+      labelList:[],//标签列表
+
+      CanOpClassify: false,//添加分类按钮控制
     };
   },
   watch: {
@@ -957,6 +959,9 @@ export default {
 							isLeaf:item.Children.length?false:true
 						}
 					})
+
+          this.CanOpClassify = res.Data.CanOpClassify;
+
           this.$nextTick(() => {
             /* 新增完成后 处理树展开和选中图表 */
             params && this.selectCurrentNode(params);

src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -55,7 +55,7 @@
           <span v-if="formData.self_variate" style="color: #409EFF;margin-left: 20px;">{{formData.self_edb_date[0]+'至'+ formData.self_edb_date[1]}}</span>
         </el-form-item>
         <el-form-item label="" style="display: block;">
-          <el-radio-group v-model="formData.self_move_type" style="margin-right: 10px" @change="formData.self_move_val=''">
+          <el-radio-group v-model="formData.self_move_type" style="margin-right: 10px" @change="() => {getCorrelationIndex();formData.self_move_val=''}">
             <el-radio :label="0">标准指标</el-radio>
             <el-radio :label="1">领先天数</el-radio>
           </el-radio-group>
@@ -66,6 +66,7 @@
               size="mini"
               v-model="formData.self_move_val"
               @keyup.native="filterCode(formData)"
+							@change="getCorrelationIndex"
             ></el-input>
 						天
           </template>  
@@ -97,23 +98,6 @@
           </el-select>
           <span v-if="formData.depend_variate" style="color: #409EFF;margin-left: 20px;">{{formData.depend_edb_date[0]+'至'+ formData.depend_edb_date[1]}}</span>
         </el-form-item>
-        <!-- <el-form-item label="" style="display: block;">
-          <el-radio-group v-model="formData.depend_move_type" style="margin-right: 10px" @change="formData.depend_move_val=''">
-            <el-radio :label="0">标准指标</el-radio>
-            <el-radio :label="1">领先天数</el-radio>
-          </el-radio-group>
-          <template v-if="formData.depend_move_type !== 0">
-            <el-input
-              style="width: 80px"
-              type="number"
-              min="0"
-              size="mini"
-              v-model="formData.depend_move_val"
-              @keyup.native="filterCode(formData)"
-            ></el-input>
-            天
-          </template>  
-        </el-form-item> -->
 
         <el-form-item label="拟合时间段" prop="date">
           <el-date-picker
@@ -133,6 +117,7 @@
             @change="changeDate"
             :picker-options="endDateOptions"
           />
+					<span v-if="correlationIndex" class="editsty" style="margin-left: 20px">相关系数:{{correlationIndex}}</span>
         </el-form-item>
         <el-form-item label="指标名称" prop="edb_name" class="target-form-cont">
           <el-input
@@ -311,7 +296,9 @@ export default {
 			},
 
 			depend_edb_name: '',
-			self_edb_name: ''
+			self_edb_name: '',
+
+			correlationIndex: '',//相关系数
 
 		};
 	},
@@ -404,6 +391,39 @@ export default {
 					: this.formData.depend_edb_date = [choose_obj.StartDate,choose_obj.EndDate]
 
 			}
+			this.getCorrelationIndex();
+		},
+
+		/* 获取相关系数 */
+		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_move_type===1 && !this.formData.self_move_val) return this.correlationIndex = '';
+
+			const { date,self_variate,self_move_type,self_move_val,depend_variate } = this.formData;
+			let params = {
+					Formula: date.join(','),
+					EdbInfoIdArr: [
+						{
+							EdbInfoId: self_variate,
+							FromTag: 'A',
+							MoveValue: self_move_type === 0 ? 0 : Number(self_move_val)
+						},
+						{
+							EdbInfoId: depend_variate,
+							FromTag: 'B',
+							MoveValue: 0 
+						},
+					],
+			}
+			const res = this.isPredict 
+				? await preDictEdbInterface.correlationIndex(params)
+				: await dataBaseInterface.correlationIndex(params)
+
+			if(res.Ret !==200) return
+			
+			this.correlationIndex = res.Data;
 		},
 
     /* 选择日期 */
@@ -420,6 +440,7 @@ export default {
 					this.$message.warning(`${differ<0?'开始日期不能晚于结束日期':'日期间隔不得少于两天'}`)
 				}
 			}
+			this.getCorrelationIndex();
     },
 
 		init() {

src/views/dataEntry_manage/databaseComponents/util.js

@@ -325,7 +325,7 @@ export const formulaTip = new Map([
 	1、计算过去N年同期数值和，则时间向前追溯 N年（包括最新一年）<br>
 	2、参与计算的指标数据通过线性方程补全为日度的数据（包括周末）<br>
 	3、遇到闰二月，如2.29，去掉该天数据<br>
-	4、进行农历计算时，如果当前月为12月，则取第二年的春节为时间位移标准点<br>
+	4、进行农历计算时，只计算11月--次年5月，如果当前月为12月，则取第二年的春节为时间位移标准点<br>
 	5、计算生成的结果的数据频度与原始指标频度保持一致
 	`],
 	[37,`拟合残差：计算一个指标(B)的实际值和拟合值(B’)的差值。拟合值B’由指标A（自变量）和指标B（因变量）通过线性回归拟合得到，具体算法如下:<br>

src/views/dataEntry_manage/databaseList.vue

@@ -145,7 +145,7 @@
 							</span>
 						</span>
 					</el-tree>
-					<div class="noDepart" @click="addLevelOneHandle" v-if="role === 'admin'">
+					<div class="noDepart" @click="addLevelOneHandle" v-if="CanOpClassify">
 						<img
 							src="~@/assets/img/set_m/add_ico.png"
 							alt=""
@@ -649,6 +649,8 @@ export default {
 			isLookHistory: false,
 			lookEdbId: 0,
 			labelList:[],//标签列表
+
+			CanOpClassify: false
 		};
 	},
 	watch: {
@@ -723,6 +725,7 @@ export default {
 							isLeaf:item.Children.length?false:true
 						}
 					})
+					this.CanOpClassify = res.Data.CanOpClassify;
 					this.currentLang = res.Data.Language === 'EN' ? 'en' : 'ch';
 					this.setLangIntoStore()
 					this.showData = true;

src/views/dataEntry_manage/editChart.vue

@@ -64,6 +64,15 @@
 							placeholder="请选择所属分类"
 						/>
 					</el-form-item>
+					<el-form-item label="图表单位" prop="Unit" v-if="chartInfo.ChartType===7">
+						<el-input
+							v-model="chartInfo.Unit"
+							style="width: 90%"
+							placeholder="请输入图表单位"
+							clearable
+							@change="changeUnit"
+						/>
+					</el-form-item>
 				</el-form>
 
 				<div class="search-cont" v-if="chartInfo.ChartType!==10">
@@ -561,7 +570,11 @@ export default {
           if (res.Ret !== 200) return;
 					const { ChartInfo,EdbInfoList,BarChartInfo } = res.Data;
 
-          this.chartInfo = {...ChartInfo, classify: [ChartInfo.ChartClassify[0].ParentId,...ChartInfo.ChartClassify.map(item => item.ChartClassifyId)]};
+           this.chartInfo = {
+						...ChartInfo,
+						classify: [ChartInfo.ChartClassify[0].ParentId,...ChartInfo.ChartClassify.map(item => item.ChartClassifyId)],
+						Unit: BarChartInfo ? BarChartInfo.Unit : ''
+					};
           this.tableData = EdbInfoList;
           this.setDefaultDateSelect(); //设置默认的日期选中
 					

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -11,6 +11,7 @@ export default {
 			chartInfo: {
 				ChartType: 1,
 				Source:1,
+				Unit: '',
 				ChartName: ''
 			},
 			chartRules: {
@@ -23,6 +24,9 @@ export default {
 				classify:[
 					{ required: true, message: '图表分类不能为空', trigger: 'blur' },
 				],
+				Unit:[
+					{ required: true, message: '图表单位不能为空', trigger: 'blur' },
+				],
 			},
 
 			classifyOptions: [],//分类option
@@ -512,7 +516,8 @@ export default {
 							Sort: {
 								Sort: this.$refs.BarOptRef.sortObj.sort,
 								DateIndex: Number(this.$refs.BarOptRef.sortObj.sortIndex)
-							}
+							},
+							Unit: this.chartInfo.Unit
 						}
 					}
 				case 10: 
@@ -561,6 +566,13 @@ export default {
 						})
 					}	
 			}
+		},
+
+		/* 奇怪柱形图更新单位 */
+		changeUnit(val) {
+			if(!this.options.series) return
+
+			this.options.yAxis[0].title.text = val;
 		}
 	}
 }

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -362,6 +362,11 @@ export const chartSetMixin = {
       this.options.xAxis.categories = this.barXIdList.map(_ => this.currentLang == 'ch' 
         ? this.barEdbData.find(edb => edb.EdbInfoId===_).EdbAliasName
         : this.barEdbData.find(edb => edb.EdbInfoId===_).EdbNameEn)
+
+      // 单位
+      this.options.yAxis.forEach(item => {
+        item.title.text = this.currentLang == 'ch' ? this.chartInfo.Unit : this.chartInfo.Unit;
+      });
     },
     // 切换中英文时，更改图表配置
     changeOptions(){
@@ -1057,9 +1062,9 @@ export const chartSetMixin = {
       let yAxis = {
         ...basicYAxis,
         title: {
-          text:  ``,
-          textCh: '',
-          textEn: '',
+          text:  this.chartInfo.Unit,
+          textCh: this.chartInfo.Unit,
+          textEn: this.chartInfo.UnitEn,
           align: 'high',
           rotation: 0,
           y: -15,

src/views/mychart_manage/components/chooseChart.vue

@@ -37,7 +37,7 @@
 						<el-radio :label="6">拟合方程曲线</el-radio>
 						<el-radio :label="7">统计特征</el-radio>
 					</el-radio-group>
-          <el-checkbox v-model="isShowMe"  @change="searchHandle" v-if="chart_source!==1">只看我的</el-checkbox>
+          <el-checkbox v-model="isShowMe"  @change="searchHandle">只看我的</el-checkbox>
         </div>
       </div>
       <div class="choose-dialog-min">
@@ -138,7 +138,7 @@ export default {
         CurrentIndex: this.page_no,
         ChartClassifyId: 0,
         KeyWord: this.search_txt,
-        IsShowMe: this.chart_source!==1 ? this.isShowMe : false
+        IsShowMe: this.isShowMe
       };
       let res=null 
       if(this.chart_source===1){

src/views/ppt_manage/mixins/mixins.js

@@ -663,9 +663,9 @@ export default {
       let yAxis = {
         ...basicYAxis,
         title: {
-          text:  ``,
-          textCh:  ``,
-          textEn:  ``,
+          text:  this.chartInfo.Unit,
+          textCh: this.chartInfo.Unit,
+          textEn: this.chartInfo.UnitEn,
           align: 'high',
           rotation: 0,
           y: -15,

src/views/predictEdb_manage/addPredicEdb.vue

@@ -81,6 +81,19 @@
               />
             </div>
           </el-form-item>
+          <el-form-item prop="dateType">
+            <div class="item">
+              <span class="label">预测日期类型</span>
+               <el-select
+                v-model="formData.dateType"
+                placeholder="请选择日期类型"
+                style="width: 100%"
+              >
+                <el-option label="交易日" value="交易日"></el-option>
+                <el-option label="自然日" value="自然日"></el-option>
+              </el-select>
+            </div>
+          </el-form-item>
           <el-form-item v-if="formData.oldEdbName">
             <div class="item" style="margin-top: 30px">
               <span class="label">原指标名称：{{ formData.oldEdbName }}</span>
@@ -263,7 +276,7 @@
                     remote
                     clearable
                     placeholder="指标ID/指标名称"
-                    style="width:100%;margin-top: 10px;display: block;"
+                    style="width:88%;margin-top: 10px;display:inline-block"
                     :remote-method="searchHandle"
                     @click.native="inputFocusHandle($event,'self_target')"
                   >
@@ -276,6 +289,7 @@
                     >
                     </el-option>
                   </el-select>
+                  <i class="el-icon-tickets" style="color:#409EFF;font-size:18px" @click="isLookHistory=true;lookEdbId=item.self_target;" v-if="item.self_target"/>
                 </div>
                 <div class="item">
                   <span class="label">
@@ -379,6 +393,13 @@
       :edbList="dynamicDifferList"
       :dialog_formula="dialog_formula"
       @ensureBack="saveDynamicDifferRule"
+      @lookHistory="id => {isLookHistory=true;lookEdbId=id;}"
+    />
+
+    <!-- 指标历史记录 -->
+    <edbHistoryDialog
+      :isOpenDialog.sync="isLookHistory"
+      :edbId="lookEdbId"
     />
     
   </div>
@@ -439,6 +460,7 @@ export default {
         frequency: "",
         newdata: "",
         lasetDate: "",
+        dateType: '交易日',
       },
       formRules: {
         classify: [
@@ -540,6 +562,10 @@ export default {
       select_year: '',
 
       edbFromType: 0,//标准指标
+
+      /* 查看历史弹窗 */
+			isLookHistory: false,
+			lookEdbId: 0,
     };
   },
   created() {
@@ -569,6 +595,7 @@ export default {
             RuleList,
             EdbInfoId,
             LatestDate,
+            DataDateType
           } = res.Data;
           this.formData = {
             edb_id: EdbInfoId,
@@ -579,6 +606,7 @@ export default {
             frequency: Frequency,
             newdata: LatestValue,
             lasetDate: LatestDate,
+            dateType: DataDateType
           };
 
           this.rulesArr = RuleList.map(_ => ({
@@ -808,7 +836,7 @@ export default {
       })
       if(!isRulesComplete) return this.$message.warning('请填写完整的规则')
       
-      const { edb_id,classify,oldEdb,edbName } = this.formData;
+      const { edb_id,classify,oldEdb,edbName,dateType } = this.formData;
 
       //规则参数
       let RuleList = this.rulesArr.map(_ => {
@@ -862,6 +890,7 @@ export default {
         EdbName: edbName,
         MaxValue: Number(this.$refs.chartInfo.tableData[0].MaxData),
 				MinValue: Number(this.$refs.chartInfo.tableData[0].MinData),
+        DataDateType: dateType,
         RuleList
       };
 

src/views/predictEdb_manage/components/dynamicRingdiffer.vue

@@ -39,6 +39,7 @@
 						>
 						</el-option>
 					</el-select>
+					<i class="el-icon-tickets" style="color:#409EFF;font-size:18px" @click="$emit('lookHistory',list.target)" v-if="list.target"/>
 					<i
 						class="el-icon-error del-tag"
 						v-if="index > 3"

src/views/predictEdb_manage/predictEdb.vue

@@ -119,6 +119,20 @@
 									v-if="data.Button.DeleteButton&&!data.EdbInfoId"
 								/>
 								<i class="el-icon-view" v-if="data.EdbInfoId" @click.stop="viewNode(node,data)"></i>
+								<img 
+									v-if="data.Button.ShowChartRelation" 
+									@click.stop="showAssociateChart=true,showAssociateComputeData=false"
+									src="~@/assets/img/icons/associate_chart.png" 
+									style="width: 14px; height: 14px;margin-left: 8px"
+									alt=""
+								/>
+								<img 
+									v-if="data.Button.ShowEdbRelation" 
+									@click.stop="showAssociateComputeData=true,showAssociateChart=false"
+									src="~@/assets/img/icons/associate_data.png" 
+									style="width: 14px; height: 14px;margin-left: 8px"
+									alt=""
+								/>
 							</span>
 						</span>
 					</el-tree>
@@ -149,7 +163,7 @@
 			<div class="main-right" id="right" :style="isSlideLeft ? 'width:100%' : 'width:80%'">
 
 				<!-- 详情 -->
-				<div class="edb-detail-wrapper" v-if="select_id">
+				<div class="edb-detail-wrapper" v-if="select_id&&!showAssociateChart&&!showAssociateComputeData">
 					<div class="detail-top">
 						<span class="title">{{ currentLang==='en'?(edb_nameEn||edbName):edbName }}</span>
 						<ul class="action-ul">
@@ -185,7 +199,7 @@
 				</div>
 
 				<!-- 列表 -->
-				<div class="sheet-list-cont" v-else>
+				<div class="sheet-list-cont" v-else-if="!select_id">
 					<div class="list-top">
 						<span>共{{ edb_total }}个预测指标</span>
 					</div>
@@ -220,6 +234,14 @@
 						<tableNoData text="暂无指标"/>
 					</div>
 				</div>
+
+				<!-- 指标关联图模块 -->
+				<div class="edb-detail-wrapper" style="padding: 30px 20px;" v-if="showAssociateChart&&select_id">
+					<dataAssociateChart :edbInfoId="select_id"></dataAssociateChart>
+				</div>
+				<div class="edb-detail-wrapper" style="padding: 30px 20px;" v-if="showAssociateComputeData&&select_id">
+					<dataAssociateComputeData :edbInfoId="select_id"></dataAssociateComputeData>
+				</div>
 			</div>
 		</div>
 
@@ -391,6 +413,8 @@ import jointTargetDia from '@/views/dataEntry_manage/databaseComponents/jointTar
 import fittingResidueDia from '@/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue';
 import diffusionIndexDialog from '@/views/dataEntry_manage/databaseComponents/diffusionIndexDia.vue';
 import { formulaTip } from '@/views/dataEntry_manage/databaseComponents/util';
+import dataAssociateChart from '@/views/dataEntry_manage/databaseComponents/dataAssociateChart.vue'
+import dataAssociateComputeData from '@/views/dataEntry_manage/databaseComponents/dataAssociateComputeData.vue'
 
 export default {
 	name:'',
@@ -408,7 +432,9 @@ export default {
 		jointTargetDia,
 		fittingResidueDia,
 		batchComputedDialog,
-		diffusionIndexDialog
+		diffusionIndexDialog,
+		dataAssociateChart,
+		dataAssociateComputeData
 	},
 	mixins:[ leftMixin ],
 	beforeRouteLeave (to, from, next) {
@@ -548,6 +574,9 @@ export default {
 			isLookHistory: false,
 			lookEdbId: 0,
 			searchLoading:false,
+
+			showAssociateChart:false,//显示指标关联的图
+			showAssociateComputeData:false,//显示指标关联的引用计算指标
 		};
 	},
 	computed: {
@@ -703,6 +732,8 @@ export default {
 			this.select_classify = !EdbInfoId ? ClassifyId : 0;
 			this.resetNodeStyle(node);
 			this.dynamicNode = node;
+			this.showAssociateChart=false
+			this.showAssociateComputeData=false
 		},
 
 		async saveEdbHandle() {
@@ -1170,6 +1201,9 @@ export default {
 		addComputedCallBack(type, params) {
 			this.computed_type = 0;
 			this.computed_source = 1;
+			
+			this.showAssociateChart=false;
+			this.showAssociateComputeData=false;
 			type === 'add' ? this.getTreeData(params) : this.getTreeData();
 			if(type === 'edit') {
 				this.detail_show_chart ? this.$refs.detailComponentRef.getDetail() : this.$refs.detailComponentRef.getData();