数据来源拼接,相关性在列表的展示

src/views/chartRelevance_manage/relevance/list.vue

@@ -644,6 +644,10 @@ export default {
                 },
               ],
             };
+            //多因子
+            if(res.Data.CorrelationChartInfo.AnalysisMode===1){
+                this.relevanceChartData.YDataList = res.Data.YDataList
+            }
             this.initRelevanceChartData() 
           }else if(this.chartInfo.Source === 4) { //滚动相关性逻辑又换成曲线了
             this.relevanceChartData = {

src/views/chartRelevance_manage/relevance/relevanceChartEditorV2.vue

@@ -461,50 +461,6 @@ export default {
         },
         //预览多因子矩阵 初始化 factorTableData
         previewMultipleTable(){
-            /* //mock
-            //获取分析周期，生成±分析周期的数组
-            const {LeadValue} = this.infoForm.Correlation
-            this.SortedArray = generateSortedArray(LeadValue)
-
-             
-            this.factorTableData = [
-                {
-                    EdbInfoId:104176,
-                    EdbName:'美国10年通胀预期同比henchaisaodjasdo',
-                    EdbNameEn:'10years balabal',
-                    dataList:[0.11,0.22,0.33,0.44,0.55,0.66],
-                    isAdd:false
-                },
-                {
-                    EdbInfoId:104177,
-                    EdbName:'天津螺纹价格同比',
-                    EdbNameEn:'tianjingkasdadjoasjd',
-                    isAdd:false,
-                    dataList:[0.22,0.15,0.96,0.45,0.45,0.33,0.96,0.14,0.12,0.47,0.11,0.63]
-                },
-                {
-                    EdbInfoId:104845,
-                    EdbName:'生成指标',
-                    EdbNameEn:'generate edb',
-                    isAdd:false,
-                    dataList:[0.15,0.55,0.48,0.33,0.56,0.33,0.74,0.25,0.09,0.69,0.73,0.37]
-                },
-                {EdbInfoId:111,EdbName:'ccc',dataList:[],isAdd:false},{EdbInfoId:222,EdbName:'ddd',dataList:[],isAdd:false},{EdbInfoId:123,EdbName:'eee',dataList:[],isAdd:false},{EdbInfoId:129,EdbName:'ggg',dataList:[],isAdd:false},
-                {EdbInfoId:112,EdbName:'hhh',dataList:[],isAdd:false},{EdbInfoId:117,EdbName:'iii',dataList:[],isAdd:false},{EdbInfoId:124,EdbName:'jjj',dataList:[],isAdd:false},{EdbInfoId:130,EdbName:'kkk',dataList:[],isAdd:false},
-                {EdbInfoId:113,EdbName:'lll',dataList:[],isAdd:false},{EdbInfoId:118,EdbName:'mmm',dataList:[],isAdd:false},{EdbInfoId:125,EdbName:'nnn',dataList:[],isAdd:false},{EdbInfoId:131,EdbName:'ooo',dataList:[],isAdd:false},
-                {EdbInfoId:114,EdbName:'ppp',dataList:[],isAdd:false},{EdbInfoId:119,EdbName:'qqq',dataList:[],isAdd:false},{EdbInfoId:126,EdbName:'rrr',dataList:[],isAdd:false},{EdbInfoId:132,EdbName:'sss',dataList:[],isAdd:false},
-                {EdbInfoId:115,EdbName:'ttt',dataList:[],isAdd:false},{EdbInfoId:121,EdbName:'uuu',dataList:[],isAdd:false},{EdbInfoId:127,EdbName:'vvv',dataList:[],isAdd:false},{EdbInfoId:133,EdbName:'www',dataList:[],isAdd:false},
-                {EdbInfoId:116,EdbName:'xxx',dataList:[],isAdd:false},{EdbInfoId:122,EdbName:'yyy',dataList:[],isAdd:false},{EdbInfoId:128,EdbName:'zzz',dataList:[],isAdd:false}
-            ]
-            
-            this.multipleChartData.ChartInfo.Source = 3
-            this.multipleChartData.ChartInfo.ChartName = this.multipleChartData.ChartInfo.EdbName+'相关性分析（xxx）'
-            this.multipleChartData.CorrelationChartInfo = {
-                LeadValue:this.infoForm.Correlation.LeadValue,
-                LeadUnit:this.infoForm.Correlation.LeadUnit
-            }
-            this.multipleChartData.XEdbIdValue = generateXEdbValue(this.infoForm.Correlation.LeadValue) */
-
             //全局loading
             const {IndTarget,Correlation} = this.infoForm
             const SeriesIds = this.$refs.multipleIndForm.factorList.map(i=>i.SeriesId)
@@ -567,10 +523,12 @@ export default {
                 NameEn:row.EdbNameEn
             })
             row.isAdd = true
+            //数据来源拼接
+            this.multipleChartData.SourcesFrom.text += `${this.multipleChartData.SourcesFrom.text.length?',':''}${row.SourceName}`
         },
         //相关性矩阵-删除曲线
         deleteCurve(row){
-            const index = this.multipleChartData.YDataList.findIndex(i=>i.EdbInfoId===row.EdbInfoId)
+            const index = this.multipleChartData.YDataList.findIndex(i=>i.Id===row.EdbInfoId&&i.SeriesId===row.SeriesId)
             index!==-1&&this.multipleChartData.YDataList.splice(index,1)
             row.isAdd = false
             if(!this.multipleChartData.YDataList.length){
@@ -703,7 +661,13 @@ export default {
                 }
                 this.multipleChartData.XEdbIdValue = XEdbIdValue
                 this.multipleChartData.EdbInfoList = EdbInfoList
-                this.multipleChartData.YDataList = YDataList
+                this.multipleChartData.YDataList = YDataList.map(i=>{
+                    return {
+                        ...i,
+                        Id:i.SeriesEdb.EdbInfoId,
+                        SeriesId:i.SeriesEdb.SeriesId
+                    }
+                })
                 try{
                     this.multipleChartData.SourcesFrom = SourcesFrom?JSON.parse(SourcesFrom):baseSourcesFrom
                 }catch(e){