Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_eta_web into crm14.1

config/dev.env.js

@@ -11,5 +11,7 @@ module.exports = merge(prodEnv, {
 	REPORT_SHARE_LINK:'"http://rddpweb.brilliantstart.cn"',
   VUE_APP_HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
-  VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"'
+  VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"',
+  VUE_APP_ETA_DOCS:'"http://8.136.199.33:8622/update/index"',
+	VUE_APP_ETA_HELP_DOCS:'"http://8.136.199.33:8622/help/index"'
 });

config/prod.env.js

@@ -8,5 +8,8 @@ module.exports = {
 	REPORT_SHARE_LINK:'"https://ficc.hzinsights.com"',
 	VUE_APP_HR_MANAGEMENT_SYSTEM:'"https://hr.hzinsights.com/login"',
 	VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"https://fms.hzinsights.com/login"',
-	VUE_APP_CRM_SYSTEM:'"https://admin.hzinsights.com/temppage"'
+	VUE_APP_CRM_SYSTEM:'"https://admin.hzinsights.com/temppage"',
+	VUE_APP_ETA_DOCS:'"https://etadocs.hzinsights.com/update/index"',
+	VUE_APP_ETA_HELP_DOCS:'"https://etadocs.hzinsights.com/help/index"'
+		
 }

config/prod.test.env.js

@@ -1,6 +1,6 @@
 module.exports = {
 	NODE_ENV:'"test"',
-	VUE_APP_API_ROOT:'"http://8.136.199.33:7778/adminapi"',  //测试环境
+	VUE_APP_API_ROOT:'"/adminapi"',  //测试环境
 	Domain:'"brilliantstart.cn"',
 	// Login:'"http://8.136.199.33:7778/login"',
 	CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
@@ -8,5 +8,7 @@ module.exports = {
 	REPORT_SHARE_LINK:'"http://rddpweb.brilliantstart.cn"',
 	VUE_APP_HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
-	VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"'
+	VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"',
+	VUE_APP_ETA_DOCS:'"http://8.136.199.33:8622/update/index"',
+	VUE_APP_ETA_HELP_DOCS:'"http://8.136.199.33:8622/help/index"'
 }

src/api/api.js

@@ -181,7 +181,8 @@ const {
   setchapterTPermission,
   reportMessageSend,
   weekReportValidAudio,
-  getUserUuid
+  getUserUuid,
+  getBusinessCode
 } = oldApis;
 
 export {
@@ -253,6 +254,7 @@ export {
   setchapterTPermission,
   reportMessageSend,
   weekReportValidAudio,
-  getUserUuid
+  getUserUuid,
+  getBusinessCode
 };
 

src/api/modules/chartApi.js

@@ -811,7 +811,13 @@ const dataBaseInterface = {
 	getEDBInfoCalculateMap:params=>{
 		return http.get('/datamanage/edb_info/calculate/mapping',params)
 	},
-
+	/**
+	 * 获取创建人列表
+	 * Source - 来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库
+	 */
+	getEdbChartAdminList: params => {
+		return http.get('/datamanage/edb_chart/adminList',params)
+	},
 	/* eta图库 图表预览  启用之前根据传参刷数据的详情接口 
 		{
 			ChartType：1，

src/api/modules/oldApi.js

@@ -291,6 +291,11 @@ const reportMessageSend=params=>{
 	return http.post('/report/sendMsg',params)
 }
 
+// 获取商家code
+const getBusinessCode=params=>{
+	return http.get('/business_conf/code_encrypt',params)
+}
+
 export {
 	userLogin,
 	modifyPwd,
@@ -360,5 +365,6 @@ export {
 	setchapterTPermission,
 	reportMessageSend,
 	weekReportValidAudio,
-	getUserUuid
+	getUserUuid,
+	getBusinessCode
 }

src/api/modules/positionAnalysis.js

@@ -0,0 +1,21 @@
+// 持仓分析模块
+
+import http from "@/api/http.js"
+
+/**
+ * 持仓分析详情
+ * @param DataTime 查询日期，日期为空时，默认返回最新日期
+ * @param ClassifyName 品种名称
+ * @param ClassifyType 合约名称
+ * @param Exchange 交易所名称
+ */
+export const apiPositionAnalysisInfo=params=>{
+    return http.get('/trade_analysis/top',params)
+}
+
+/**
+ * 持仓分析列表
+ */
+export const apiPositionAnalysisList=()=>{
+    return http.get('/trade_analysis/classify',{})
+}

src/api/modules/sheetApi.js

@@ -245,4 +245,13 @@ export const searchTarget  = params => {
  */
 export const insertData = params => {
 	return http.get('/datamanage/edb_info/date_data',params)
+}
+
+/**
+ * 获取日期最近几期的数据
+ * @param {*} params EdbInfoId Date Num
+ * @returns 
+ */
+export const getDateLatelyData = params => {
+	return http.get('/datamanage/edb_info/date_data/before_after',params)
 }

src/routes/modules/chartRoutes.js

@@ -153,12 +153,12 @@ export default [
 	{
 		path:'/',
 		component: home,
-		name: '相关性',
+		name: '统计分析',
 		hidden:  false,
 		children: [
 			{
 				path: 'chartrelevance',
-				name: '相关性图表',
+				name: '相关性分析',
 				component:()=>import('@/views/chartRelevance_manage/list.vue')
 			},
 			{
@@ -187,5 +187,25 @@ export default [
 				component:()=>import('@/views/chartRelevance_manage/statisticFeatureChartEditor.vue')
 			}
 		]
+	},
+
+	/* 持仓分析 */
+	{
+		path:'/',
+		component: home,
+		name: '持仓分析',
+		hidden:  false,
+		children: [
+			{
+				path: 'positionAnalysisList',
+				name: '持仓列表',
+				component:()=>import('@/views/positionAnalysis_manage/list.vue')
+			},
+			{
+				path: 'positionAnalysisDetail',
+				name: '持仓详情',
+				component:()=>import('@/views/positionAnalysis_manage/detail.vue'),
+			}
+		]
 	}
 ]

src/views/Home.vue

@@ -181,6 +181,9 @@
                           : ""
                       }}客户列表
                     </template>
+                    <template v-if="$route.path==='/positionAnalysisDetail'">
+                      {{breadSelfName||'持仓详情'}}
+                    </template>
                     <template v-else>
                       {{ item.name }}
                     </template>
@@ -221,6 +224,25 @@
                     </svg>
                   </div>
                 </el-tooltip> -->
+                <el-dropdown trigger="click" style="width:130px;">
+                  <span class="el-dropdown-link userinfo-inner help-center-inner">
+                    <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" style="color:#333">
+                      <path d="M9.24255 14.5C9.24255 14.0858 9.57834 13.75 9.99255 13.75C10.4068 13.75 10.7426 14.0858 10.7426 14.5C10.7426 14.9142 10.4068 15.25 9.99255 15.25C9.57834 15.25 9.24255 14.9142 9.24255 14.5Z" fill="currentColor"/>
+                      <path d="M9.99261 5.00763C8.32056 5.00763 6.96136 6.36682 6.96136 8.03888H8.21136C8.21136 7.05718 9.01092 6.25763 9.99261 6.25763C10.9743 6.25763 11.7739 7.05718 11.7739 8.03888C11.7739 8.71106 11.2183 9.3851 10.4931 9.67971L10.4899 9.68101C9.82793 9.95419 9.36767 10.6052 9.36767 11.3656V12.5H10.6177V11.3656C10.6177 11.1228 10.7618 10.9216 10.9655 10.837C11.9996 10.4161 13.0239 9.37337 13.0239 8.03888C13.0239 6.36682 11.6647 5.00763 9.99261 5.00763Z" fill="currentColor"/>
+                      <path d="M18.7427 10C18.7427 5.16751 14.8252 1.25 9.99268 1.25C5.16019 1.25 1.24268 5.16751 1.24268 10C1.24267 14.8325 5.16018 18.75 9.99267 18.75C14.8252 18.75 18.7427 14.8325 18.7427 10ZM17.4927 10C17.4927 14.1421 14.1348 17.5 9.99267 17.5C5.85054 17.5 2.49267 14.1421 2.49268 10C2.49268 5.85786 5.85054 2.5 9.99268 2.5C14.1348 2.5 17.4927 5.85787 17.4927 10Z" fill="currentColor"/>
+                    </svg>
+                    <span style="line-height: 20px;margin-left: 4px;">帮助中心</span>
+                    <i class="el-icon-arrow-down el-icon--right" />
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item divided @click.native="toDoc"
+                      >更新日志</el-dropdown-item
+                    >
+                    <el-dropdown-item divided @click.native="toOperation"
+                      >帮助文档</el-dropdown-item
+                    >
+                  </el-dropdown-menu>
+                </el-dropdown>
               </div>
 
               <el-dropdown trigger="click" style="width:130px;">
@@ -236,6 +258,9 @@
                   <el-dropdown-item divided @click.native="logout"
                     >退出登录</el-dropdown-item
                   >
+                  <!-- <el-dropdown-item divided @click.native="toDoc"
+                    >更新日志</el-dropdown-item
+                  > -->
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -277,6 +302,7 @@ import {
   departInterence,
   customInterence,
   roadshowInterence,
+  getBusinessCode,
 } from "api/api.js";
 import PwdDlg from "@/components/pwdDlg.vue";
 import questionMsgDia from "@/components/questionMsgDia.vue";
@@ -306,18 +332,9 @@ export default {
     },
   },
   computed: {
-    done() {
-      //今日待办是否处理完
-      if (!this.todayList) {
-        return false;
-      }
-      // 之前是通过判断列表中是否都有说明,现需要判断列表中都要添加或编辑
-      return this.todayList.every((item) => item.isEdited);
-    },
-    // Role() {
-    //   let role = localStorage.getItem("Role") || "";
-    //   return role;
-    // },
+    breadSelfName() {
+      return this.$store.state.breadSelfName;
+    },  
     isShowRole() {
       let role = localStorage.getItem("RoleIdentity") || "";
       return (
@@ -608,13 +625,23 @@ export default {
     },
 
     // 操作指南的跳转
-    toOperation(url) {
+    toOperation() {
       // this.$router.replace({name: '/fingerpost', params: {id: 1}})
-      let { href } = this.$router.resolve({
-        path: `/${url}`,
-        query: { contractid: this.contractId },
-      });
-      window.open(href, "_blank");
+      // let { href } = this.$router.resolve({
+      //   path: `/${url}`,
+      //   query: { contractid: this.contractId },
+      // });
+      // window.open(href, "_blank");
+      // 获取商家
+      getBusinessCode().then(res=>{
+        if(res.Ret!==200) return 
+        const bus_code = res.Data||''
+        //打开帮助文档
+        const href = `${process.env.VUE_APP_ETA_HELP_DOCS}?bus_code=${bus_code}`
+        console.log(href);
+        // const href = `http://192.168.77.13:3033/help/index?bus_code=${bus_code}`
+        window.open(href, "_blank");
+      })
     },
     // 跳转去其他的系统
     async linkToOtherMS({path,key}) {
@@ -852,9 +879,21 @@ export default {
         })
         .catch(() => {});
     },
+    toDoc(){
+        //获取商家code
+        getBusinessCode().then(res=>{
+            if(res.Ret!==200) return 
+            const bus_code = res.Data||''
+            //打开更新日志项目
+            const href = `${process.env.VUE_APP_ETA_DOCS}?bus_code=${bus_code}`
+            window.open(href, "_blank");
+        })
+        
+    },
     collapseHandle () {
       //折叠导航栏
       this.isCollapse = !this.isCollapse;
+      this.$store.commit('SET_COLLAPSE',this.isCollapse)
       // 派发折叠导航栏事件
       EventBus.$emit("collapseHandle", this.isCollapse);
     },
@@ -1160,7 +1199,7 @@ export default {
         .userinfo-fingerpost {
           display: flex;
           align-items: center;
-          margin-right: 50px;
+          // margin-right: 50px;
           color: $theme-color;
           .el-button:hover {
             background: #ecf2fe;
@@ -1181,7 +1220,9 @@ export default {
         .userinfo-inner:hover {
           color: #5882ef;
         }
+        .help-center-inner{
 
+        }
         .icon-box-item {
           padding: 12px;
           border-radius: 4px;

src/views/chartRelevance_manage/components/chartCard.vue

@@ -127,8 +127,7 @@ export default {
           this.chartInfo = data.ChartInfo;
           this.setDefaultChart(data.EdbInfoList);
           break
-        case 3: //3相关性 4滚动相关性
-        case 4:
+        case 3: //3相关性 
           this.chartInfo = data.ChartInfo;
           this.relevanceChartData={
             ChartInfo:data.ChartInfo,
@@ -147,6 +146,14 @@ export default {
           this.tableData=data.EdbInfoList||[]
           this.initRelevanceChartData()
           break
+        case 4: //4滚动相关性
+          this.relevanceChartData = {
+            ChartInfo:data.ChartInfo,
+            CorrelationChartInfo: data.CorrelationChartInfo
+          }
+          this.chartInfo = data.ChartInfo;
+          this.setDefaultChart([data.DataResp]);
+          break
         case 6: //弹性系数
           this.initFittingEquation(data);
           break
@@ -155,7 +162,7 @@ export default {
           this.chartInfo = data.ChartInfo;
           this.setDefaultChart([data.DataResp]);
           break
-        case 9: 
+        case 9: //频率分布
           this.chartInfo = data.ChartInfo;
           this.tableData=data.EdbInfoList||[]
           this.statisticFrequencyData = data.DataResp;

src/views/chartRelevance_manage/components/selectTarget.vue

@@ -14,7 +14,8 @@
         :value="item.val"
       />
     </el-select>
-    <div v-else>
+
+    <div v-else-if="selectStyleType===2">
       <label>选择指标：</label>
       <el-radio-group v-model="targetType" @change="targetTypeChange">
         <el-radio  
@@ -24,9 +25,50 @@
         >{{item.label}}</el-radio>
       </el-radio-group>
     </div>
+
+    <div v-else-if="selectStyleType===3" style="display:flex;align-items:center">
+      <el-select
+        v-model="targetType"
+        placeholder="请选择指标种类"
+        @change="targetTypeChange"
+        style="width: 150px;"
+      >
+        <el-option
+          v-for="item in etaTypeOpt"
+          :key="item.val"
+          :label="item.label"
+          :value="item.val"
+        />
+      </el-select>
+      <el-select
+        v-model="search_txt"
+        v-loadMore="searchLoad"
+        :filterable="!search_txt"
+        remote
+        clearable
+        placeholder="请选择指标名称"
+        style="flex: 1;margin-left: 15px"
+        :remote-method="searchHandle"
+        @click.native="inputFocusHandle"
+        @change="handleSelectTarget"
+      >
+        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        <el-option
+          v-for="item in searchOptions"
+          :key="item.EdbInfoId"
+          :label="item.EdbName"
+          :value="item.EdbInfoId"
+        >
+          <edbDetailPopover :info="item">
+            <div slot="reference">{{item.EdbName}}</div>
+          </edbDetailPopover>
+        </el-option>
+      </el-select>
+    </div>
     <el-select
       v-model="search_txt"
       v-loadMore="searchLoad"
+      v-if="selectStyleType!==3"
       :filterable="!search_txt"
       remote
       clearable

src/views/chartRelevance_manage/list.vue

@@ -605,27 +605,29 @@ export default {
 
           this.chartInfo = res.Data.ChartInfo;
           this.tableData = res.Data.EdbInfoList;
-          this.relevanceChartData = {
-            ChartInfo: res.Data.ChartInfo,
-            EdbInfoList: res.Data.EdbInfoList,
-            XEdbIdValue:
-              this.chartInfo.Source === 3
-                ? res.Data.XEdbIdValue
-                : res.Data.DataResp.XDateTimeValue,
-            CorrelationChartInfo: res.Data.CorrelationChartInfo,
-            YDataList: [
-              {
-                Value:
-                  this.chartInfo.Source === 3
-                    ? res.Data.YDataList[0].Value
-                    : res.Data.DataResp.YDataList[0].Value,
-                Color: "#00f",
-                Name: res.Data.ChartInfo.ChartName,
-                NameEn: res.Data.ChartInfo.ChartNameEn,
-              },
-            ],
-          };
-          this.initRelevanceChartData();
+          if(this.chartInfo.Source === 3) {
+            this.relevanceChartData = {
+              ChartInfo: res.Data.ChartInfo,
+              EdbInfoList: res.Data.EdbInfoList,
+              XEdbIdValue:res.Data.XEdbIdValue,
+              CorrelationChartInfo: res.Data.CorrelationChartInfo,
+              YDataList: [
+                {
+                  Value: res.Data.YDataList[0].Value,
+                  Color: "#00f",
+                  Name: res.Data.ChartInfo.ChartName,
+                  NameEn: res.Data.ChartInfo.ChartNameEn
+                },
+              ],
+            };
+            this.initRelevanceChartData() 
+          }else if(this.chartInfo.Source === 4) { //滚动相关性逻辑又换成曲线了
+            this.relevanceChartData = {
+              CorrelationChartInfo: res.Data.CorrelationChartInfo
+            }
+            this.setDefaultChart([res.Data.DataResp]);
+          }
+          
         });
     },
 
@@ -711,12 +713,6 @@ export default {
               fontSize: "18px",
             },
           },
-          xAxis: [
-            {
-              ...this.options.xAxis,
-              offset: -(heightNum - 136) / 2,
-            },
-          ],
           legend: {
             ...copyOtherOptions[chartType],
             ...dynamic_copyOptions[chartType],

src/views/chartRelevance_manage/relevanceChartEditor.vue

@@ -522,7 +522,7 @@ export default {
       }
       const { Correlation,RollingCorrelation } = this.chartInfo;
       if(Correlation.CalculateValue*valueMap[Correlation.CalculateUnit] < Correlation.LeadValue*valueMap[Correlation.LeadUnit]*2) {
-        this.chartInfo.Correlation.CalculateValue = '';
+        this.chartInfo.Correlation.CalculateValue = 0;
         this.$message.warning('相关性计算窗口必须≥2*分析周期')
         checkBool = false
       }

src/views/dataEntry_manage/adjustdata/adjustData.vue

@@ -30,9 +30,9 @@
             <i class="el-icon-tickets" style="color:#409EFF;font-size:18px" @click="isLookHistory=true;lookEdbId=select_target" v-if="select_target"/>
           </li>
           <li v-show="old_edb_info.id">
-            <label style="margin-right:5px;"> 查询结果：( </label>
+            <label style="margin-right:5px;"> 查询结果：</label>
             <span style="margin-right: 20px">指标ID：{{old_edb_info.id}}</span>
-            <span>指标名称：{{old_edb_info.name}})</span>
+            <span>指标名称：{{old_edb_info.name}}</span>
           </li>
         </ul>
         <div v-if="edb_id" style="margin-bottom:20px">

src/views/dataEntry_manage/components/chart.vue

@@ -54,21 +54,21 @@ export default {
 	methods: {
 
 		init() {
-			if(this.options.isRelevanceChart){//相关性图表设置x轴在y轴0刻度
-				this.$nextTick(()=>{
-					// let h = $('.highcharts-yaxis .highcharts-axis-line')[0].getBoundingClientRect().height;
-					// console.log(h)
-					// this.options.xAxis.offset=-h/2;
-					const h=$(`#container${this.index}`)[0].style.height
-					if(h=='500px'){
-						this.options.xAxis.offset=-200.5
-					}else if(h=='440px'){
-						this.options.xAxis.offset=-170.5
-					}else if(h=='350px'){
-						this.options.xAxis.offset=-125.5
-					}
-				})
-			}
+			// if(this.options.isRelevanceChart){//相关性图表设置x轴在y轴0刻度
+			// 	this.$nextTick(()=>{
+			// 		// let h = $('.highcharts-yaxis .highcharts-axis-line')[0].getBoundingClientRect().height;
+			// 		// console.log(h)
+			// 		// this.options.xAxis.offset=-h/2;
+			// 		const h=$(`#container${this.index}`)[0].style.height
+			// 		if(h=='500px'){
+			// 			this.options.xAxis.offset=-200.5
+			// 		}else if(h=='440px'){
+			// 			this.options.xAxis.offset=-170.5
+			// 		}else if(h=='350px'){
+			// 			this.options.xAxis.offset=-125.5
+			// 		}
+			// 	})
+			// }
 
 			const options = {...defaultOpts,...this.options}
 			let thatThis = this
@@ -127,20 +127,20 @@ export default {
 			}else {
 				$(`#container${this.index}`)[0].style.height = this.height || '440px';
 			}
-			if(this.options.isRelevanceChart){//相关性图表设置x轴在y轴0刻度
-				this.$nextTick(()=>{
-					const h=$(`#container${this.index}`)[0].style.height
-					if(h=='500px'){
-						this.options.xAxis.offset=-200.5
-					}else if(h=='440px'){
-						this.options.xAxis.offset=-170.5
-					}else if(h=='350px'){
-						this.options.xAxis.offset=-125.5
-					}
-					// let h = $('.highcharts-yaxis .highcharts-axis-line')[0].getBoundingClientRect().height;
-					// this.options.xAxis.offset=-h/2;
-				})
-			}
+			// if(this.options.isRelevanceChart){//相关性图表设置x轴在y轴0刻度
+			// 	this.$nextTick(()=>{
+			// 		const h=$(`#container${this.index}`)[0].style.height
+			// 		if(h=='500px'){
+			// 			this.options.xAxis.offset=-200.5
+			// 		}else if(h=='440px'){
+			// 			this.options.xAxis.offset=-170.5
+			// 		}else if(h=='350px'){
+			// 			this.options.xAxis.offset=-125.5
+			// 		}
+			// 		// let h = $('.highcharts-yaxis .highcharts-axis-line')[0].getBoundingClientRect().height;
+			// 		// this.options.xAxis.offset=-h/2;
+			// 	})
+			// }
 
 		}
 	},

src/views/dataEntry_manage/databaseComponents/util.js

@@ -30,7 +30,7 @@ export const computedTypes = [
 		type:4
 	},
 	{
-		name:'累计值转月值/转季值',
+		name:'累计值转月/季值',
 		type:'toMonthSeason'
 	},
 	{
@@ -118,7 +118,7 @@ export const computedBatchTypes = [
 		type:14
 	},
 	{
-		name:'累计值转月值/转季值',
+		name:'累计值转月/季值',
 		type:'toMonthSeason'
 	},
 	{

src/views/dataEntry_manage/databaseList.vue

@@ -1846,6 +1846,7 @@ export default {
 };
 </script>
 <style lang="scss">
+@import "~@/styles/theme-vars.scss";
 .database_container {
 	$mini_font: 12px;
 	$normal_font: 14px;
@@ -1860,12 +1861,12 @@ export default {
 	}
 
 	.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
-		background-color: #409eff !important;
-		border-color: #409eff;
+		background-color: $theme-color !important;
+		border-color: $theme-color;
 	}
 	.el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner {
-		background-color: #409eff !important;
-		border-color: #409eff;
+		background-color: $theme-color !important;
+		border-color: $theme-color;
 	}
 	.el-icon-refresh {
 		font-size: 17px;
@@ -1937,7 +1938,7 @@ export default {
 						margin-right: 2px;
 					}
 					.el-icon-view {
-						color: #409EFF;
+						color: #409eff;
 						font-size: 18px;
 						margin-left: 5px;
 					}
@@ -1948,7 +1949,7 @@ export default {
 					right:0; */
 					height:3px;
 					// margin-top: 8px;
-					background-color:#409EFF;
+					background-color:$theme-color;
 				}
 				.el-tree-node__content {
 					margin-bottom: 14px !important;
@@ -1989,7 +1990,7 @@ export default {
 				display: flex;
 				align-items: center;
 				justify-content: center;
-				color: #409eff;
+				color: $theme-color;
 				font-size: 16px;
 				cursor: pointer;
 			}
@@ -2071,11 +2072,11 @@ export default {
 			.cpmputed-li {
 				width: 180px;
 				padding: 19px 0;
-				color: #409EFF;
+				color: $theme-color;
 				font-size: 16px;
 				background:#ECF5FF;
 				border-radius: 8px;
-				border: 1px solid #B3D8FF;
+				border: 1px solid #99baf0;
 				text-align: center;
 				cursor: pointer;
 				margin-right: 65px;
@@ -2084,11 +2085,11 @@ export default {
 					margin-right:0;
 				}
 				&:hover {
-					background: #409EFF;
+					background: $theme-color;
 					color: #fff;
 				}
 				&.act {
-					background: #409EFF;
+					background: $theme-color;
 					color: #fff;
 				}
 			}

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -468,7 +468,7 @@ export const chartSetMixin = {
     /* 曲线图设置 */
     setDefaultChart(newval) {
       /* 上下限显示和值的设置 */
-      if([6,7,8].includes(this.chartInfo.Source)) {
+      if([4,6,7,8].includes(this.chartInfo.Source)) {
         this.leftIndex = -1;
         this.rightIndex = -1;
         this.rightTwoIndex = -1;
@@ -566,10 +566,33 @@ export const chartSetMixin = {
       });
 
       this.xLabelDealHandle();
+
       this.options = {
         series: data,
         yAxis: ydata,
       };
+
+      //滚动相关性独立tooltip
+      if(this.chartInfo.Source === 4) {
+        const { LeadValue,LeadUnit } = this.relevanceChartData.CorrelationChartInfo;
+        let relevanceUnitEnMap = this.relevanceUnitEnMap;
+        this.options.tooltip = {
+          formatter: function() {
+            let str = `${Highcharts.dateFormat('%Y/%m/%d',this.x)}<br><p>相关性系数：${this.y.toFixed(4)}</p><br><p>领先${LeadValue+LeadUnit}</p>`
+            return str
+          },
+          formatterCh: function() {
+            let str = `${Highcharts.dateFormat('%Y/%m/%d',this.x)}<br><p>相关性系数：${this.y.toFixed(4)}</p><br><p>领先${LeadValue+LeadUnit}</p>`
+            return str
+          },
+          formatterEn: function() {
+            let str = `${Highcharts.dateFormat('%Y/%m/%d',this.x)}<br><p>Correlation coefficient：${this.y.toFixed(4)}</p><br><p>lead${LeadValue+relevanceUnitEnMap[LeadUnit]}</p>`
+            return str
+          }
+        }
+      }
+
+
       if(this.currentLang=='en') this.changeOptions()
     },
 
@@ -1382,11 +1405,11 @@ export const chartSetMixin = {
           },
           align: 'center',
         },
-        min: -1,
-        max: 1,
+        // min: -1,
+        // max: 1,
         opposite: false,
         tickWidth: 1,
-        tickInterval:0.2,
+        // tickInterval:0.2,
       }
 
       //处理series

src/views/datasheet_manage/common/customTable.js

@@ -149,7 +149,9 @@ export function getRightClickMenu(pos) {
       { label: "删除", key: "del" },
     ],
     'cell': [
+      { label: "选择指标", key: "choose-target" },
       { label: "插入指标值", key: "insert-value" },
+      { label: "清空", key: "reset" },
     ]
   }
 
@@ -159,6 +161,9 @@ export function getRightClickMenu(pos) {
 //日期格式识别转换
 export function checkDateFormat(str) {
   const dateRegex = /^(?:(?:19|20)\d\d)([-/.])(0?[1-9]|1[0-2])\1(0?[1-9]|[12][0-9]|3[01])$/;
+
+  //也支持年-月
+  const dateMonthRegex = /^(?:(?:19|20)\d\d)([-])(0[1-9]|1[0-2])$/;
   
   if(dateRegex.test(str)) {
     const date = new Date(str);
@@ -171,19 +176,21 @@ export function checkDateFormat(str) {
     } else {
       return false;
     }
-  }else {
+  } else if(dateMonthRegex.test(str)){
+    return str
+  } else {
     return false
   }
 }
 
-/* 根据key找到关联格子 设置关联格子样式 */
-export function setRelationStyle(query) {
+/* 根据key找到格子 设置格子样式 */
+export function setRelationStyle(query,classname="td-relation") {
   const { key } = query;
 
   let table = document.querySelector('.table');
   let el = table.querySelector("td[data-key='" + key + "']");
   
-  el.nodeName==='TD' && $(el).addClass("td-relation")
+  el.nodeName==='TD' && $(el).addClass(classname)
 }
 
 //根据cell key找到cell数据
@@ -203,3 +210,19 @@ export function findCellByKey(arr,key) {
   return cell
 }
 
+/* 清空插入单元格重置关联样式 */
+export function resetRelationStyle() {
+  let table = document.querySelector('.table');
+  table.querySelectorAll(".td-relation").forEach(el => {
+    el.classList.remove('td-relation')
+  })
+}
+
+/* 重置右键选择指标时的单元格标识样式 弹窗消失样式就消失 */
+export function resetDialogCellStyle() {
+  let table = document.querySelector('.table');
+  table.querySelectorAll(".td-choose-insert-target").forEach(el => {
+    el.classList.remove('td-choose-insert-target')
+  })
+}
+

src/views/datasheet_manage/components/CustomTable.vue

@@ -48,7 +48,9 @@
                 :data-cindex="columnHeader[sub_index]"
                 @click="() => { !disabled && item==='EdbName' && clickEdbName(edb)}"
               >
-                <template v-if="item === 'EdbName'">{{ edb.EdbAliasName||edb[item] }}</template>
+                <template v-if="item === 'EdbName'">
+                  <span :class="{'edbname-td':disabled}" @click="edbJumpToBase(edb)">{{ edb.EdbAliasName||edb[item] }}</span>
+                </template>
                 <template v-else>{{ edb[item] }}/{{ edb.Frequency }}</template>
               </td>
             </tr>
@@ -72,7 +74,7 @@
                 :key="edb_index"
                 :data-rindex="rowHeader[dateIndex]"
                 :data-cindex="columnHeader[edb_index]"
-                :class="([2,3].includes(edb.Data.find(_ =>_.DataTime === date).DataType)&&edb.Data.find(_ =>_.DataTime === date).ShowValue)?'insert': ''"
+                :class="([2,3,5].includes(edb.Data.find(_ =>_.DataTime === date).DataType)&&edb.Data.find(_ =>_.DataTime === date).ShowValue)?'insert': ''"
                 @click="clickCell($event,edb.Data.find(_ =>_.DataTime === date))"
                 @dblclick="dblClickCell($event,edb.Data.find(_ =>_.DataTime === date))"
               >
@@ -113,7 +115,7 @@
                 :key="`${index}_${cell_index}`"
                 :data-rindex="rowHeader[index+dateArr.length]"
                 :data-cindex="cell_index===0?-1:columnHeader[cell_index-1]"
-                :class="([2,3].includes(cell.DataType)&&cell.ShowValue)?'insert': ''"
+                :class="([2,3,5].includes(cell.DataType)&&cell.ShowValue)?'insert': ''"
                 @click="clickCell($event,cell)"
                 @dblclick="dblClickCell($event,cell)"
               >
@@ -189,7 +191,7 @@
                 :key="index"
                 :data-cindex="-1"
                 :data-rindex="rowHeader[index+dateArr.length]"
-                :class="([2,3].includes(column[0].DataType)&&column[0].ShowValue)?'insert': ''"
+                :class="([2,3,5].includes(column[0].DataType)&&column[0].ShowValue)?'insert': ''"
                 @click="clickCell($event,column[0])"
                  @dblclick="dblClickCell($event,column[0])"
               >
@@ -233,7 +235,9 @@
                 :data-cindex="columnHeader[edb_index]"
                 @click="() => { !disabled && item==='EdbName' && clickEdbName(edb)}"
               >
-                <template v-if="item === 'EdbName'">{{ edb[item] }}</template>
+                <template v-if="item === 'EdbName'">
+                  <span :class="{'edbname-td':disabled}" @click="edbJumpToBase(edb)">{{ edb.EdbAliasName||edb[item] }}</span>
+                </template>
                 <template v-else>{{ edb[item] }}/{{ edb.Frequency }}</template>
               </td>
 
@@ -243,7 +247,7 @@
                 :key="`${edb.EdbInfoId}_${rowHeader[data_index]}_${columnHeader[edb_index]}`"
                 :data-rindex="rowHeader[data_index]"
                 :data-cindex="columnHeader[edb_index]"
-                :class="([2,3].includes(data.DataType)&&data.ShowValue)?'insert': ''"
+                :class="([2,3,5].includes(data.DataType)&&data.ShowValue)?'insert': ''"
                 @click="clickCell($event,data)"
                 @dblclick="dblClickCell($event,data)"
               >
@@ -274,7 +278,7 @@
                 :key="`${rowHeader[column_index+dateArr.length]}_${columnHeader[edb_index]}`"
                 :data-rindex="rowHeader[column_index+dateArr.length]"
                 :data-cindex="columnHeader[edb_index]"
-                :class="([2,3].includes(column[edb_index+1].DataType)&&column[edb_index+1].ShowValue)?'insert': ''"
+                :class="([2,3,5].includes(column[edb_index+1].DataType)&&column[edb_index+1].ShowValue)?'insert': ''"
                 @click="clickCell($event,column[edb_index+1])"
                 @dblclick="dblClickCell($event,column[edb_index+1])"
               >
@@ -303,7 +307,7 @@
 
 
       <!-- 添加 -->
-      <div class="add-fixed" v-if="!disabled">
+      <div class="add-fixed" v-if="!disabled" draggable @dragend="dragEnd" :style="isCollapse?'left:70px;':'left:200px;'">
         <div class="add-wrapper" v-show="!isSlideLeft">
           <div @click="addDateRow"> <i class="el-icon-circle-plus-outline"></i> 添加日期</div>
           <div @click="addTextRow"> <i class="el-icon-circle-plus-outline"></i> 添加文本</div>
@@ -396,6 +400,7 @@ import {
 } from '../common/customTable';
 import addDateCellDia from './addDateCellDia';
 import * as sheetInterface from '@/api/modules/sheetApi.js';
+import { dataBaseInterface }  from '@/api/api.js';
 import mDialog from '@/components/mDialog.vue'
 export default {
   props: {
@@ -429,6 +434,9 @@ export default {
     dateArr() {
       console.log(this.config.data)
       return this.config.data.length ? this.config.data[0].Data.map(_ => _.DataTime) : []
+    },
+    isCollapse() {
+      return this.$store.state.isCollapse
     }
   },
   data() {
@@ -437,9 +445,9 @@ export default {
       formula: '',
       config: {
         type: this.sheetType,
-        order: 1,// 1降序 2升序
+        order: 2,// 1降序 2升序
         EdbKeys: ["EdbName", "Unit"],
-        data: [],
+        data: [], //单元格类型 1默认格 2补充格 3自定义输入 4公式求值格 5预测值
         textRowData: [],
         contextMenuOption: [
           { label: '删除',key: 'del' },
@@ -746,10 +754,32 @@ export default {
       }
     },
 
+    /* 跳转到指标库 */
+    async edbJumpToBase(edb) {
+      //非详情页不跳转
+      if(!this.disabled) return
+
+      const res = await dataBaseInterface.targetDetail({EdbInfoId:edb.EdbInfoId})
+      if(res.Ret !== 200) return
+
+       //EdbInfoType=1 跳预测指标详情,=0跳指标库详情
+      const {ClassifyId,UniqueCode,EdbInfoId,EdbInfoType} = res.Data;
+      let {href} = this.$router.resolve({
+        path:EdbInfoType===1?'/predictEdb':'/database',
+        query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}
+      });
+      window.open(href,'_blank');
+    },
+
     /* 清空所有数据 */
     reset() {
       this.config.data = [];
       this.config.textRowData = [];
+    },
+
+    dragEnd(e) {
+      let dom = document.querySelector('.add-fixed');
+      dom.style.top = e.clientY-10 + 'px';
     }
   },
 };
@@ -835,6 +865,11 @@ export default {
     &.insert {
       background: #FFEFDD;
     }
+    .edbname-td {
+      &:hover {
+        text-decoration: underline;
+      }
+    }
   }
   
   .th-tg {
@@ -874,9 +909,11 @@ export default {
   }
 
   .add-fixed {
-    position: absolute;
-    bottom: 20%;
+    cursor: move;
+    position: fixed;
+    top: 70%;
     left: 0;
+    z-index: 99;
     .add-wrapper {
       position: relative;
       padding: 5px 50px 5px 20px;

src/views/datasheet_manage/components/MixedTable.vue

@@ -46,15 +46,43 @@
               :data-key="cell.Uid"
               @click="clickCell($event, cell)"
               @contextmenu.prevent="rightClickHandle($event,cell)"
+              @mouseenter="getRelationEdbInfo(cell)"
             >
+
+            <!-- 插入单元格禁止编辑 -->
+            <template v-if="[4,5].includes(cell.DataType) || disabled">
+              <!-- 单元格类型5显示指标浮窗 -->
+              <el-popover
+                v-if="cell.DataType===5&&!disabled"
+                placement="top-start"
+                width="350"
+                trigger="hover"
+              >
+                <ul>
+                  <li style="display:flex;margin:10px;">
+                    <label style="min-width:80px;">指标名称</label> 
+                    {{cellrelationEdbInfo.EdbName}}
+                  </li>
+                  <li style="display:flex;margin:10px;">
+                    <label style="min-width:80px;">指标ID</label> 
+                    {{cellrelationEdbInfo.EdbCode}}
+                  </li>
+                </ul>
+                <span
+                  slot="reference"
+                  :data-rindex="rowHeader[index]"
+                  :data-cindex="columnHeader[cell_index]"
+                  :data-key="cell.Uid"
+                >{{ cell.ShowValue }}</span>
+              </el-popover>
+
               <span
                 :data-rindex="rowHeader[index]"
                 :data-cindex="columnHeader[cell_index]"
                 :data-key="cell.Uid"
-                v-if="cell.DataType === 4 || disabled"
-              >
-                {{ cell.ShowValue }}</span
-              >
+                v-else
+              >{{ cell.ShowValue }}</span>
+            </template>
 
               <el-autocomplete
                 v-else
@@ -64,15 +92,19 @@
                 :data-key="cell.Uid"
                 :data-rindex="rowHeader[index]"
                 :data-cindex="columnHeader[cell_index]"
+                :highlight-first-item="cell.DataType===2"
                 @select="selectTarget($event,cell)"
                 @click="clickCell($event, cell)"
                 @change.native="changeVal($event, cell)"
               >
                 <template slot-scope="scope">
                     <edbDetailPopover :info="scope.item">
-                      <div slot="reference">
-                          {{ scope.item.EdbName }}
+                      <div slot="reference" v-if="cell.DataType===2" class="edb-item">
+                         <span class="edb-item-name text_oneLine">{{ scope.item.EdbName }}</span>
+                         <i class="el-icon-check" style="color:#0052D9;font-size:18px;"/>
                       </div>
+
+                      <div slot="reference" v-else>{{ scope.item.EdbName }}</div>
                     </edbDetailPopover>
                 </template>
               </el-autocomplete>
@@ -83,13 +115,20 @@
 
       <!-- 右键菜单 -->
       <div class="contextMenu-wrapper" id="contextMenu-wrapper" @mouseleave="hideContextMenu">
-        <div class="item" v-for="menu in config.contextMenuOption" :key="menu.key" @click="handleContext(menu.key)">{{menu.label}}</div>
+        <div :class="['item',{'deletesty': menu.key==='reset'}]" v-for="menu in config.contextMenuOption" :key="menu.key" @click="handleContext(menu.key)">{{menu.label}}</div>
       </div>
     </template>
 
     <div class="nodata" v-else>
       <tableNoData text="暂无数据"/>
     </div>
+
+    <!-- 选择指标 -->
+    <selectTargetValueDia
+      :isShow.sync="isSelectTargetValueDialog"
+      @insert="insertSelectData"
+      ref="selectTargetValueRef"
+    />
   </div>
 </template>
 <script>
@@ -102,18 +141,22 @@ import {
   getRightClickMenu,
   checkDateFormat,
   setFocus,
-  findCellByKey
-  
+  findCellByKey,
+  resetRelationStyle,
+  resetDialogCellStyle
 } from "../common/customTable";
 import * as sheetInterface from "@/api/modules/sheetApi.js";
-import md5 from '@/utils/md5.js'
+import { dataBaseInterface } from '@/api/api.js';
+import md5 from '@/utils/md5.js';
+import selectTargetValueDia from './selectTargetValueDia.vue';
 export default {
   props: {
     disabled: { //是否只预览
       type: Boolean,
-      default: false
+      default: false,
     }
   },
+  components: { selectTargetValueDia },
   computed: {
     //列头
     columnHeader() {
@@ -131,15 +174,21 @@ export default {
   data() {
     return {
       config: {
-        data: [],
+        data: [], //单元格类型 1日期格 2指标格 3自定义输入 4插入值 有关联的日期和指标格 5弹窗里的插入值 有关联日期格
         contextMenuOption: [],
       },
 
-      selectCell: {},
+      selectCell: {},//选中单元格info
+
+      rightClickCell: {},//右键单元格 key c r
+
+      insertTargetCell: {},//选择右键插入指标的单元格 可和右键单元格不一样 key c r
+
+      insertRelationArr: [],
 
-      rightClickCell: {},
+      isSelectTargetValueDialog: false,
 
-      insertRelationArr: []
+      cellrelationEdbInfo: {}
     };
   },
   mounted() {
@@ -148,17 +197,21 @@ export default {
   methods: {
 
     async searchTarget(query,cb) {
-      if(!query) return cb([])
-      // cb([])
+      if(!query||checkDateFormat(query)) return cb([])
       
-      const res = await sheetInterface.searchTarget({
-        KeyWord: query,
-        CurrentIndex: 1,
-        PageSize: 1000
-      })
+      const { DataType,EdbInfoId } = this.selectCell;
+
+      const res = DataType===2 
+        ? await dataBaseInterface.targetDetail({EdbInfoId})
+        : await sheetInterface.searchTarget({
+            KeyWord: query,
+            CurrentIndex: 1,
+            PageSize: 1000
+          })
       if(res.Ret !== 200) return
 
-      cb(res.Data.List)
+      let arr = DataType===2 ? [res.Data] : (res.Data.List||[])
+      cb(arr);
     },
 
     /* 单击 */
@@ -171,14 +224,16 @@ export default {
       setFocus(e);
 
       //插入值时寻找关联依赖的单元格 设置选框
-      if(cell.DataType === 4) {
+      if([4,5].includes(cell.DataType)) {
         const { key } = e.target.dataset;
         if(!this.insertRelationArr.find(_ => _.key===key)) return
         let { relation_date,relation_edb } = this.insertRelationArr.find(_ => _.key===key)
 
-        setRelationStyle(relation_date)
-        setRelationStyle(relation_edb)
+        relation_date.key && setRelationStyle(relation_date)
+        relation_edb.key && setRelationStyle(relation_edb)
       }
+
+      this.isSelectTargetValueDialog&&this.$refs.selectTargetValueRef.chooseEdb(this.$refs.selectTargetValueRef.edbInfo)
     },
 
     /* 插入值 往左往上寻找同行同列是否有符合条件的一指标一日期 */
@@ -223,10 +278,10 @@ export default {
     },
     
     // 建立插入单元格和依赖单元格关联关系
-    setRelation(data) {
+    setRelation(data,cellType=4) {
       const { insert_cell } = data;
       let relation_obj = {
-        type: 4,
+        type: cellType,
         key: insert_cell.key,
         relation_date: {
           type: 1,
@@ -291,24 +346,27 @@ export default {
 
     },
 
-    /* 选择指标 单元格类型为2*/
+    /* 选择指标 单元格类型为2 已经是指标单元格了就重置单元格 否则就视为选择指标*/
     selectTarget(e,cell) {
       const { EdbName,EdbInfoId }  = e;
 
-      cell.DataType = 2;
-      cell.DataTime = '';
-      cell.ShowValue = EdbName;
-      cell.Value = EdbName;
-      cell.EdbInfoId = EdbInfoId;
-
+      //如果已经是指标单元格了再次点击就清空
+      if(cell.DataType===2&&cell.EdbInfoId) {
+        this.clearCell()
+      }else {
+        cell.DataType = 2;
+        cell.DataTime = '';
+        cell.ShowValue = EdbName;
+        cell.Value = EdbName;
+        cell.EdbInfoId = EdbInfoId;
+      }
 
-      this.checkCellRelation(e,cell)
+      this.checkCellRelation(cell)
     },
 
     /* 输入框失焦  */
     async changeVal(e, cell) {
       // 是日期格式 DataType为1
-      //是指标 DataType为2
       // 否则是3
 
       const {value} = e.target;
@@ -319,6 +377,9 @@ export default {
         cell.EdbInfoId = 0;
         cell.DataTime = '';
       }else {
+        //指标类型不做格式处理
+        if(cell.DataType===2) return
+        
         console.log(checkDateFormat(value))
         if(checkDateFormat(value)) { //是日期格式
           cell.DataType = 1;
@@ -337,11 +398,11 @@ export default {
       }
 
       //判断是否是有插入值的依赖单元格 更新值或重置关系
-      this.checkCellRelation(e,cell)
+      this.checkCellRelation(cell)
     },
 
     /* 当前单元格是否和插入值有关联 无就不管 */
-    async checkCellRelation(e,cell) {
+    async checkCellRelation(cell) {
       if(!this.insertRelationArr.length) return
 
       const key= cell.Uid;
@@ -360,7 +421,7 @@ export default {
           //刷新插入值结果
           let params = null;
           if(relation_date.key === key && cell.DataType === 1) { //修改的是依赖日期格
-            let { EdbInfoId } = findCellByKey(this.config.data,relation_edb.key)
+            let { EdbInfoId } = findCellByKey(this.config.data,relation.key)
             params = {
               EdbInfoId,
               Date: cell.ShowValue
@@ -377,12 +438,12 @@ export default {
           const res = await sheetInterface.insertData(params)
           if(res.Ret !==200) return
 
-          !res.Data && this.updateInsertCell(relation.key,true);
+          !res.Data && this.updateInsertCell(relation.key);
   
           res.Data && this.config.data.forEach(row => {
             row.forEach(cell => {
               if(cell.Uid === relation.key) {
-                  cell.DataType = 4;
+                  cell.DataType = relation.type;
                   cell.ShowValue = res.Data;
                   cell.Value = res.Data;
                   cell.EdbInfoId = params.EdbInfoId;
@@ -400,17 +461,15 @@ export default {
     },
 
     // 清除插入值单元格式和关联关系
-    updateInsertCell(key,initValue=false) {
+    updateInsertCell(key) {
       this.config.data.forEach(row => {
         row.forEach(cell => {
           if(cell.Uid === key) {
             cell.DataType = 3;
             cell.EdbInfoId = 0;
             cell.DataTime = '';
-            if(initValue) {
-                cell.ShowValue = '';
-                cell.Value = '';
-            }
+            cell.ShowValue = '';
+            cell.Value = '';
           }
         })
       })
@@ -466,12 +525,61 @@ export default {
         'insert-col-right': this.insertCol,
         'insert-row-up': this.insertRow,
         'insert-row-down': this.insertRow,
-        'insert-value': this.insertValue
+        'insert-value': this.insertValue,
+        'choose-target': this.selectTargetOpen,
+        'reset': this.clearCell
       }
       keyMap[key] && keyMap[key](key)
+      
       this.hideContextMenu()
     },
 
+    /* 打开选择指标弹窗  
+    打开弹窗后仍可以在页面上点击 多存一个选择指标时的信息 */
+    selectTargetOpen() {
+      this.insertTargetCell = this.selectCell;
+      resetDialogCellStyle();
+      setRelationStyle({ key:this.insertTargetCell.Uid },'td-choose-insert-target')
+      this.isSelectTargetValueDialog = true;
+    },
+
+    /* 插入选择指标的值 */
+    insertSelectData({ edbId,value }) {
+
+      this.insertTargetCell.DataType = 5;
+      this.insertTargetCell.ShowValue = value;
+      this.insertTargetCell.Value = value;
+      this.insertTargetCell.EdbInfoId = edbId;
+      this.insertTargetCell.DataTime = this.selectCell.ShowValue;
+
+      this.$message.success('插入成功')
+
+      //建立新的关联关系
+      let relation = {
+        insert_cell: {
+          key: this.insertTargetCell.Uid,
+          relation_date: this.selectCell.Uid,
+          relation_edb: '',
+        }
+      }
+
+      this.setRelation(relation,5);
+
+    },
+
+    /* 清除单元格内容 格式 关联关系 */
+    clearCell() {
+      if([4,5].includes(this.selectCell.DataType)) resetRelationStyle();
+
+      this.selectCell.DataType = 3;
+      this.selectCell.ShowValue = '';
+      this.selectCell.Value = '';
+      this.selectCell.DataTime = '';
+      this.selectCell.EdbInfoId = 0;
+
+      this.checkCellRelation(this.selectCell)
+    },
+
     /* 删除行列 */
     delColOrRow() {
       let { rindex,cindex } = this.rightClickCell;
@@ -486,7 +594,8 @@ export default {
         //删除时清除关系
         if(this.insertRelationArr.length) {
           let delCellIds = this.config.data.map(row => row[index].Uid);
-          this.insertRelationArr = this.insertRelationArr.filter(_ => !delCellIds.includes(_.key)&&!delCellIds.includes(_.relation_date.key)&&!delCellIds.includes(_.relation_edb.key))
+          
+          this.clearRelationInsertCell(delCellIds);
         }
 
         this.config.data.forEach(row => {
@@ -502,13 +611,27 @@ export default {
         if(this.insertRelationArr.length) {
           //删除时清除关系
           let delCellIds = this.config.data[index].map(cell => cell.Uid);
-          this.insertRelationArr = this.insertRelationArr.filter(_ => !delCellIds.includes(_.key)&&!delCellIds.includes(_.relation_date.key)&&!delCellIds.includes(_.relation_edb.key));
+          
+          this.clearRelationInsertCell(delCellIds);
         }
 
         this.config.data.splice(index,1)
 
       }
-      console.log(this.insertRelationArr)
+      // console.log(this.insertRelationArr)
+    },
+
+    /* 删除时清除关联关系 和删除单元格有关联的插入值单元格和 */
+    clearRelationInsertCell(delCellIds) {
+      //清除关联插入值得单元格
+      let haveRelationArr = this.insertRelationArr.filter(_ => delCellIds.includes(_.relation_date.key)||delCellIds.includes(_.relation_edb.key));
+      // console.log(haveRelationArr)
+
+      haveRelationArr.forEach(relation => {
+        !delCellIds.includes(relation)&&this.updateInsertCell(relation.key);
+      })
+
+      this.insertRelationArr = this.insertRelationArr.filter(_ => !delCellIds.includes(_.key)&&!delCellIds.includes(_.relation_date.key)&&!delCellIds.includes(_.relation_edb.key))
     },
 
     /* 插入列 */
@@ -549,6 +672,17 @@ export default {
 
     },
 
+    /* 单元格类型5 浮到上面展示指标信息浮窗 */
+    async getRelationEdbInfo({EdbInfoId,DataType}) {
+      if(DataType!==5||this.disabled) return
+
+      const res = await dataBaseInterface.targetDetail({EdbInfoId})
+
+      if(res.Ret !== 200) return
+
+      this.cellrelationEdbInfo =  res.Data;
+    },
+
     /* 初始化8行5列 */
     initData(initData=null) {
       if(initData) {
@@ -645,8 +779,17 @@ export default {
       border-left: none;
       border-right: none;
     }
-    &.insert {
-      background: #ffefdd;
+    &.td-choose-insert-target::after {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      content: "";
+      display: block;
+      outline: 0;
+      border: 2px dashed orange;
+      box-shadow: 0 0 5px rgba(73, 177, 249, 0.5);
     }
   }
 
@@ -716,5 +859,13 @@ export default {
 }
 .edb-select-popover {
   width: 300px !important;
+  .edb-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .edb-item-name {
+      max-width: 260px;
+    }
+  }
 }
 </style>

src/views/datasheet_manage/components/selectTargetValueDia.vue

@@ -0,0 +1,161 @@
+<template>
+<div v-dialogDrag v-show="isShow" >
+  <div class="select-target-value-dia el-dialog" >
+    <div class="header el-dialog__header">
+      <span>选择指标</span>
+      <i class="el-icon-close" @click="cancelHandle"/>
+    </div>
+    <div class="main">
+      <selectTarget
+        ref="selectRef"
+        :selectStyleType="3"
+        @select="chooseEdb"
+      />
+
+      <ul class="data-cont">
+        <template v-if="result.List">
+          <li v-for="(item,index) in result.List" :key="index" :class="[{'choose': item.DataTime===result.Date},'data-li']">
+            <span>{{item.DataTime}}</span>
+            <span style="min-width:150px">{{item.Value}}</span>
+          </li>
+        </template>
+        <tableNoData size="mini" v-else/>
+      </ul>
+
+      <div class="dia-bot">
+        <el-button type="primary" style="margin-right: 20px" :disabled="!result.Date" @click="insertData"
+          >插入值</el-button
+        >
+        <el-button type="primary" plain @click="cancelHandle">取消</el-button>
+      </div>
+    </div>
+    
+  </div>
+</div>
+</template>
+<script>
+import * as sheetInterface from "@/api/modules/sheetApi.js";
+import selectTarget from '@/views/chartRelevance_manage/components/selectTarget.vue';
+import { resetDialogCellStyle } from "../common/customTable";
+export default {
+  props: {
+    isShow: {
+      type: Boolean,
+    }
+  },
+  components: { selectTarget },
+  data() {
+    return {
+      result: {},
+      edbInfo: null,
+      chooseItem: {
+        edbId: 0,
+        value:''
+      }
+    }
+  },
+  methods:{
+    /* 选择指标和日期获取近5期数据 */
+    async chooseEdb(edb) {
+      if(!edb){
+        this.initData();
+        return
+      } 
+
+      this.edbInfo = edb;
+      
+      if(this.$parent.selectCell.DataType !== 1){
+
+        this.$message.warning('请在表格中选择日期')
+        this.initData();
+        return
+      }
+
+      const res = await sheetInterface.getDateLatelyData({ 
+        EdbInfoId: edb.EdbInfoId,
+        Date: this.$parent.selectCell.ShowValue
+      })
+      if(res.Ret !== 200) return
+
+      this.result = res.Data;
+      if(!this.result.Date) return this.$message.warning('所选指标所选日期无值')
+      this.chooseItem = {
+        edbId: edb.EdbInfoId,
+        value: this.result.Date?this.result.List.find(_ =>_.DataTime===this.result.Date).Value.toString():''
+      }
+
+    },
+
+    insertData() {
+      this.$emit('insert',this.chooseItem)
+      this.cancelHandle();
+    },
+
+    initData() {
+      this.$refs.selectRef.search_txt='';
+      this.result = {};
+      this.edbInfo=null;
+      this.chooseItem = { edbId: 0,value: '' }
+    },
+
+    cancelHandle() {
+      this.initData();
+      this.$emit('update:isShow',false);
+      resetDialogCellStyle();
+    }
+  },
+}
+</script>
+<style scoped lang='scss'>
+@import "../../../styles/theme-vars.scss";
+.select-target-value-dia {
+  background: #fff;
+  position: fixed;
+  top: 20%;
+  left: 55%;
+  width: 500px;
+  border-radius: 2px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  z-index: 999;
+  .header { 
+    height: 50px;
+    font-size: 16px;
+    background: $theme-color;
+    color: #fff;
+    padding: 0 15px;
+    display: flex;
+    align-content: center;
+    justify-content: space-between;
+    span {
+      line-height: 50px;
+    }
+    .el-icon-close {
+      font-size: 20px;
+      line-height: 50px;
+      cursor: pointer;
+    }
+  }
+  .main {
+    padding: 20px 15px;
+    .data-cont {
+      margin: 15px 0;
+      border: 1px solid #DCDFE6;
+      /* padding: 20px; */
+      .data-li {
+        display: flex;
+        padding: 15px;
+        text-align: center;
+        justify-content: space-around;
+        &.choose {
+          background: #ECF5FF;
+        }
+      }
+    }
+    .dia-bot {
+      margin-top: 20px; 
+      display: flex;
+      justify-content: center;
+    }
+  }
+}
+</style>

src/views/datasheet_manage/customSheetEdit.vue

@@ -132,8 +132,16 @@ export default {
       if(this.$refs.customTableRef.config.data.find(_ => _.EdbInfoId===EdbInfoId)) return this.$message.warning('指标已存在')
       
       const {Data} = this.$refs.customTableRef.config.data.length 
-      ? await sheetInterface.getEdbInsertDataOther({EdbInfoId: EdbInfoId,DateList: this.$refs.customTableRef.dateArr})
-      : await sheetInterface.getEdbInsertDataA({EdbInfoId: EdbInfoId,Num: 12})
+      ? await sheetInterface.getEdbInsertDataOther({
+        EdbInfoId: EdbInfoId,
+        DateList: this.$refs.customTableRef.dateArr,
+        SortType: this.$refs.customTableRef.config.order===1 ? 'desc' : 'asc'
+      })
+      : await sheetInterface.getEdbInsertDataA({
+        EdbInfoId: EdbInfoId,
+        SortType: this.$refs.customTableRef.config.order===1 ? 'desc' : 'asc',
+        Num: 12
+      })
       
       this.$refs.customTableRef.updateEdbData({
         Data: Data.Data.map(_ => ({..._,DataTimeType: 1,})),

src/views/mychart_manage/components/chartDetailDia.vue

@@ -119,7 +119,7 @@
               class="span-item"
               style="margin-left: 7px"
               @click="saveChartMapHandle"
-              v-if="![3,6,7,8,9].includes(chartInfo.Source)"
+              v-if="![3,4,6,7,8,9].includes(chartInfo.Source)"
             >
               <span> <i class="el-icon-collection" />&nbsp;保存 </span>
             </span>
@@ -689,16 +689,16 @@ export default {
             } : res.Data.ChartInfo;
             //商品价格图
             this.initCommodityData(res.Data);
-          }else if([3,4].includes(this.chartInfo.Source)){//相关性 滚动相关性
+          }else if([3].includes(this.chartInfo.Source)){//相关性 滚动相关性
 
             this.relevanceChartData={
                 ChartInfo:res.Data.ChartInfo,
                 EdbInfoList:res.Data.EdbInfoList,
-                XEdbIdValue:this.chartInfo.Source === 3 ? res.Data.XEdbIdValue : res.Data.DataResp.XDateTimeValue,
+                XEdbIdValue:res.Data.XEdbIdValue,
                 CorrelationChartInfo:res.Data.CorrelationChartInfo,
                 YDataList:[
                   {
-                    Value: this.chartInfo.Source === 3 ? res.Data.YDataList[0].Value : res.Data.DataResp.YDataList[0].Value,
+                    Value: res.Data.YDataList[0].Value,
                     Color:'#00f',
                     Name:res.Data.ChartInfo.ChartName,
                     NameEn:res.Data.ChartInfo.ChartNameEn
@@ -708,6 +708,13 @@ export default {
             
             this.initRelevanceChartData()
             this.tableData = res.Data.EdbInfoList
+          }else if(this.chartInfo.Source===4) {//滚动相关性换成曲线图绘图
+            this.tableData = res.Data.EdbInfoList
+            this.relevanceChartData = {
+              CorrelationChartInfo: res.Data.CorrelationChartInfo
+            }
+            this.setDefaultChart([res.Data.DataResp]);
+
           }else if([6,7,8].includes(this.chartInfo.Source)){//拟合方程 标准差 百分比
             this.tableData = res.Data.EdbInfoList;
             
@@ -975,15 +982,6 @@ export default {
           ...dynamic_copyOptions[chartType]
         },
       }
-      if(this.options.isRelevanceChart){
-        svgObj={
-          ...svgObj,
-          xAxis:[{
-            ...this.options.xAxis,
-            offset:-(heightNum-136)/2
-          }],
-        }
-      }
       let svg = this.$refs.chartRef.chart.getSVG(svgObj);
       this.copyBlobItem(widthNum,heightNum,svg,type);
     },500),

src/views/positionAnalysis_manage/components/chartBox.vue

@@ -0,0 +1,402 @@
+<template>
+  <div :class="['chart-render-box', isPcShow ? 'chart-render-box-pc' : '']">
+    <div class="label-box">
+      <div>
+        <span
+          class="color-box"
+          :style="{ background: colorMap.get(keyVal)[0] }"
+        ></span>
+        <span>{{ data.labelName }}</span>
+      </div>
+      <div>
+        <span
+          class="color-box"
+          :style="{ background: colorMap.get(keyVal)[1] }"
+        ></span>
+        <span>增</span>
+      </div>
+      <div>
+        <span
+          class="color-box"
+          :style="{ background: colorMap.get(keyVal)[2] }"
+        ></span>
+        <span>减</span>
+      </div>
+    </div>
+    <div class="chart-content">
+      <!-- <img class="mark-img" src="../../../../../assets/hzyb/chart/mark.png" alt=""> -->
+      <div class="chart-box" :id="'chart-box-' + keyVal"></div>
+    </div>
+
+    <!-- 详情弹窗 -->
+    <el-dialog
+      :visible.sync="showDetailDia"
+      title="详情"
+      :width="500"
+      draggable
+      :close-on-click-modal="false"
+      append-to-body
+      custom-class="position-analysis-detail-page-dialog"
+    >
+      <div class="detail-pop-wrap">
+        <h2 class="title">{{ showDetailData.DealShortName }}</h2>
+        <div class="table-box">
+          <div class="item">
+            <div>持{{ showDetailData.TypeName }}</div>
+            <div>{{ showDetailData.DealValue }}</div>
+          </div>
+          <div class="item">
+            <div>增减</div>
+            <div>{{ showDetailData.DealChange }}</div>
+          </div>
+          <div class="item">
+            <div>占比</div>
+            <div>{{ (showDetailData.Rate * 100).toFixed(2) }}%</div>
+          </div>
+          <div class="item">
+            <div>前{{ showDetailData.Rank }}名持净多单</div>
+            <div>{{ showDetailData.BeforeAllValue }}</div>
+          </div>
+          <div class="item">
+            <div>增减</div>
+            <div>{{ showDetailData.BeforeAllChange }}</div>
+          </div>
+          <div class="item">
+            <div>占比</div>
+            <div>{{ (showDetailData.BeforeAllRate * 100).toFixed(2) }}%</div>
+          </div>
+        </div>
+        <div class="close-btn" @click="showDetailDia = false">知道了</div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Highcharts from "highcharts";
+import HighchartsMore from "highcharts/highcharts-more";
+import HighchartszhCN from "@/utils/highcahrts-zh_CN";
+
+HighchartszhCN(Highcharts);
+HighchartsMore(Highcharts);
+export default {
+  props: {
+    keyVal: String,
+    data: Object,
+  },
+  computed: {
+    //图表默认配置项
+    chartDefaultOpts() {
+      let that = this;
+      const chartDefaultOpts = {
+        chart: {
+          type: "column",
+          inverted: true, //xy轴换位置
+          marginRight: 85,
+        },
+        title: {
+          text: "",
+        },
+        //版权信息
+        credits: { enabled: false },
+        plotOptions: {
+          column: {
+            pointPadding: 0,
+            stacking: "normal",
+            dataLabels: {
+              enabled: true,
+              align: "right",
+              color: "#333",
+              inside: false,
+              crop: false,
+              overflow: true,
+              x: 80,
+              formatter: function (e) {
+                return this.point.options.isLabel;
+              },
+            },
+            events: {
+              click: function (event) {
+                const name = event.point.category;
+                that.showDetail(name);
+              },
+            },
+          },
+        },
+        legend: {
+          enabled: false, //关闭图例
+        },
+        tooltip: {
+          enabled: false,
+        },
+      };
+      return chartDefaultOpts;
+    },
+  },
+  watch: {
+    data(nval) {
+      nval.List && this.chartRender();
+    },
+  },
+  data() {
+    return {
+      //配色表
+      colorMap: new Map([
+        ["BuyList", ["#FFD600", "#F32F2F", "#52D424"]],
+        ["SoldList", ["#C6DDFF", "#363EFF", "#52D424"]],
+        ["CleanBuyList", ["#FFD600", "#F32F2F", "#52D424"]],
+        ["CleanSoldList", ["#C6DDFF", "#363EFF", "#52D424"]],
+      ]),
+
+      isPcShow: true,
+
+      //点击柱子显示弹窗
+      showDetailDia: false,
+      showDetailData: {},
+    };
+  },
+
+  methods: {
+    //绘图
+    chartRender() {
+      let options = {};
+      let categories = [];
+      let series = [
+        {
+          name: "总数",
+          data: [],
+        },
+        {
+          name: "增长",
+          data: [],
+        },
+        {
+          name: "减少",
+          data: [],
+        },
+      ];
+      let totalArr = [],
+        increaseArr = [],
+        reduceArr = [];
+      this.data.List.forEach((item, index) => {
+        categories.push(item.DealShortName);
+        // 处理series
+        if (item.DealChange < 0) {
+          //减少
+          totalArr.push({ y: item.DealValue });
+          increaseArr.push({ y: 0 });
+          reduceArr.push({
+            y: -item.DealChange,
+            isLabel: `${item.DealValue}/${item.DealChange}`,
+          });
+        } else {
+          totalArr.push({ y: item.DealValue - item.DealChange });
+          reduceArr.push({ y: 0 });
+          increaseArr.push({
+            y: item.DealChange,
+            isLabel: `${item.DealValue}/+${item.DealChange}`,
+          });
+        }
+      });
+      series[0].data = totalArr;
+      series[1].data = increaseArr;
+      series[2].data = reduceArr;
+      let xAxis = {
+        categories: categories,
+        tickWidth: 1,
+        tickPosition: "outside",
+      };
+      let yAxis = {
+        opposite: true,
+        gridLineWidth: 1,
+        gridLineColor: "#E4E4E4",
+        gridLineDashStyle: "longdash",
+        endOnTick: false,
+        showLastLabel: true,
+        lineWidth: 1,
+        tickWidth: 1,
+        tickPosition: "outside",
+        title: {
+          text: "",
+        },
+        reversedStacks: false,
+      };
+
+      options.colors = this.colorMap.get(this.keyVal);
+      options.xAxis = xAxis;
+      options.yAxis = yAxis;
+      options.series = series;
+      options = { ...this.chartDefaultOpts, ...options };
+      // console.log('渲染',options);
+      Highcharts.chart(`chart-box-${this.keyVal}`, options);
+    },
+
+    showDetail(name) {
+      let data = {};
+      this.data.List.forEach((item) => {
+        if (item.DealShortName === name) {
+          data = item;
+        }
+      });
+      // 判断是否是在pc中 如果是则通知pc显示弹窗
+      // console.log(window.innerWidth);
+
+      this.showDetailDia = true;
+      this.showDetailData = {
+        ...data,
+        type_name: this.data.name,
+      };
+    },
+  },
+  mounted() {
+    this.data.List && this.chartRender();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/theme-vars.scss";
+* {
+  box-sizing: border-box;
+}
+.chart-render-box {
+  width: 100%;
+  overflow: hidden;
+  .label-box {
+    display: flex;
+    justify-content: center;
+    div {
+      margin-right: 30px;
+    }
+    .color-box {
+      display: inline-block;
+      width: 22px;
+      height: 22px;
+      margin-right: 10px;
+      border-radius: 4px;
+    }
+  }
+  .chart-content {
+    width: 100%;
+    height: 70vh;
+    position: relative;
+    .mark-img {
+      position: absolute;
+      width: 58%;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      pointer-events: none;
+      z-index: 2;
+    }
+    .chart-box {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+.mobile-detail-pop-wrap {
+  width: 90vw;
+  .title {
+    text-align: center;
+    font-size: 32px;
+    padding: 30px;
+  }
+  .table-box {
+    display: flex;
+    flex-wrap: wrap;
+    .item {
+      width: 33.33%;
+      text-align: center;
+      padding: 30px 20px;
+      border-right: 1px solid #e5e5e5;
+      border-bottom: 1px solid #e5e5e5;
+      div:first-child {
+        color: #999999;
+        font-size: 24px;
+      }
+      div:last-child {
+        font-size: 32px;
+        font-weight: 600;
+      }
+    }
+  }
+  .close-btn {
+    text-align: center;
+    line-height: 96px;
+    color: #e3b377;
+  }
+}
+
+.detail-pop-wrap {
+  .title {
+    text-align: center;
+    font-size: 16px;
+    padding-bottom: 10px;
+    margin-top: 0;
+  }
+  .table-box {
+    display: flex;
+    flex-wrap: wrap;
+    .item {
+      width: 33.33%;
+      text-align: center;
+      padding: 30px 20px;
+      border-right: 1px solid #e5e5e5;
+      border-bottom: 1px solid #e5e5e5;
+      div:first-child {
+        color: #999999;
+        font-size: 14px;
+      }
+      div:last-child {
+        font-size: 16px;
+        font-weight: 600;
+      }
+    }
+    .item:nth-child(3n) {
+      border-right: none;
+    }
+    .item:nth-child(n + 4) {
+      border-bottom: none;
+    }
+  }
+  .close-btn {
+    text-align: center;
+    line-height: 40px;
+    color: #fff;
+    width: 300px;
+    height: 40px;
+    background: $theme-color;
+    border-radius: 41px;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 30px;
+    margin-bottom: 20px;
+    cursor: pointer;
+  }
+}
+// @media (min-width: 600px){
+.chart-render-box-pc {
+  .label-box {
+    display: flex;
+    justify-content: center;
+    font-size: 14px;
+    div {
+      margin-right: 20px;
+    }
+    .color-box {
+      display: inline-block;
+      width: 14px;
+      height: 14px;
+      margin-right: 8px;
+      border-radius: 4px;
+      position: relative;
+      top: 2px;
+    }
+  }
+  .chart-content {
+    height: 800px;
+  }
+}
+// }
+</style>

src/views/positionAnalysis_manage/components/chartDetail.vue

@@ -0,0 +1,348 @@
+<template>
+  <div
+    :class="[
+      'chart-position-analysis-page',
+      isPcShow ? 'chart-position-analysis-page-pc' : '',
+    ]"
+    v-loading="pageLoading"
+    element-loading-text="加载中"
+  >
+    <div class="chart-wrap-box">
+      <div class="wrap-top">
+        <div>
+          <el-radio-group
+            v-model="tabKey"
+            @change="chartItemInfo = chartListState[tabKey]"
+            v-show="chartListState.BuyList.List"
+          >
+            <el-radio-button
+              :label="tab.key"
+              v-for="tab in tabKeys"
+              :key="tab.key"
+              >{{ tab.label }}</el-radio-button
+            >
+          </el-radio-group>
+        </div>
+        <div>
+          <el-date-picker
+            v-model="selectDate"
+            type="date"
+            placeholder="请选择日期"
+            value-format="yyyy-MM-dd"
+            :picker-options="pickerOption"
+            @change="getInfo"
+            style="margin-right: 10px"
+          />
+          <el-button type="primary" @click="handleDateChange('before')"
+            >查看前一天</el-button
+          >
+          <el-button type="primary" @click="handleDateChange('next')"
+            >查看后一天</el-button
+          >
+        </div>
+      </div>
+      <div
+        class="chart-wrap"
+        v-if="chartItemInfo&&chartItemInfo.List && chartListState.BuyList.List"
+      >
+        <div class="top-info-box">
+          <span>{{ chartItemInfo.name }}</span>
+          <span
+            ><span style="color: #999; margin-right: 2px">总计 </span
+            >{{ chartItemInfo.TotalDealValue }}</span
+          >
+          <span
+            ><span style="color: #999; margin-right: 2px">较昨日 </span
+            >{{ chartItemInfo.TotalDealChange }}</span
+          >
+        </div>
+        <chart-box :keyVal="tabKey" :data="chartItemInfo" />
+      </div>
+
+      <div class="empty-wrap" v-else>
+        <tableNoData text="该日期无数据" />
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {
+  apiPositionAnalysisInfo,
+  apiPositionAnalysisList,
+} from "@/api/modules/positionAnalysis";
+import chartBox from "./chartBox.vue";
+export default {
+  components: { chartBox },
+  computed: {
+    pickerOption() {
+      let that = this;
+      let obj = {
+        // 周六日禁用
+        disabledDate(t) {
+          if ([5, 6].includes(that.$moment(t).weekday())) {
+            return true;
+          } else {
+            return false;
+          }
+        },
+      };
+      return obj;
+    },
+  },
+  watch: {
+    "$route.query": {
+      handler(nval) {
+        this.selectDate = "";
+        this.getInfo();
+      },
+    },
+  },
+  data() {
+    return {
+      isPcShow: true,
+
+      isRefresh: false,
+
+      minDate: new Date("2000/01/01"),
+      currentDate: "", //
+      selectDate: "",
+
+      allClassifyTypeList: [],
+
+      pageLoading: false,
+      chartListState: {
+        BuyList: {
+          name: "多单",
+          labelName: "持多单量",
+        },
+        SoldList: {
+          name: "空单",
+          labelName: "持空单量",
+        },
+        CleanBuyList: {
+          name: "净多单",
+          labelName: "净多单量",
+        },
+        CleanSoldList: {
+          name: "净空单",
+          labelName: "净空单量",
+        },
+      },
+
+      tabKeys: [
+        { label: "多单", key: "BuyList" },
+        { label: "空单", key: "SoldList" },
+        { label: "净多单", key: "CleanBuyList" },
+        { label: "净空单", key: "CleanSoldList" },
+      ],
+      tabKey: "BuyList",
+      chartItemInfo: null,
+    };
+  },
+
+  methods: {
+    getAllClassifyType() {
+      apiPositionAnalysisList().then((res) => {
+        if (res.Ret !== 200) return;
+        const arr = res.Data || [];
+        // 将数据展开
+        arr.forEach((item) => {
+          item.Items &&
+            item.Items.forEach((itemC1) => {
+              itemC1.Items &&
+                itemC1.Items.forEach((itemC2) => {
+                  this.allClassifyTypeList.push({
+                    exchange: item.Exchange,
+                    classify_name: itemC1.ClassifyName,
+                    classify_type: itemC2.ClassifyType,
+                  });
+                });
+            });
+        });
+      });
+    },
+
+    handleClassifyTypeChange(type) {
+      if (!this.allClassifyTypeList.length) return;
+
+      const currentExchange = this.$route.query.exchange;
+      const currentClassifyName = this.$route.query.classify_name;
+      const currentClassifyType = this.$route.query.classify_type;
+      // 找index
+      let indexNum = 0;
+      this.allClassifyTypeList.forEach((item, index) => {
+        if (
+          item.exchange === currentExchange &&
+          item.classify_name === currentClassifyName &&
+          item.classify_type === currentClassifyType
+        )
+          indexNum = index;
+      });
+      // console.log(indexNum);
+      let obj = {};
+      if (type === "before") {
+        obj =
+          this.allClassifyTypeList[
+            indexNum === 0 ? this.allClassifyTypeList.length - 1 : indexNum - 1
+          ];
+      } else {
+        obj =
+          this.allClassifyTypeList[
+            indexNum === this.allClassifyTypeList.length - 1 ? 0 : indexNum + 1
+          ];
+      }
+      // console.log(obj);
+
+      this.$router.replace({
+        query: {
+          ...this.$route.query,
+          exchange: obj.exchange,
+          classify_name: obj.classify_name,
+          classify_type: obj.classify_type,
+        },
+      });
+      // window.location.reload();
+    },
+
+    //切换 前一天\后一天 如果遇到周六日则跳过
+    handleDateChange(type) {
+      let num = 1;
+      if (type === "before") {
+        if (this.$moment(this.selectDate).isoWeekday() === 1) {
+          //向前一天时 当前为周一则 跳到 上周五
+          num = 3;
+        }
+        this.selectDate = this.$moment(this.selectDate)
+          .add(-num, "days")
+          .format("YYYY-MM-DD");
+      } else {
+        if (this.$moment(this.selectDate).isoWeekday() === 5) {
+          //向前一天时 当前为周五则 跳到 下周一
+          num = 3;
+        }
+        this.selectDate = this.$moment(this.selectDate)
+          .add(num, "days")
+          .format("YYYY-MM-DD");
+      }
+
+      this.getInfo();
+    },
+
+    async getInfo() {
+      this.pageLoading = true;
+      const res = await apiPositionAnalysisInfo({
+        DataTime: this.selectDate || "",
+        ClassifyName: this.$route.query.classify_name,
+        ClassifyType: this.$route.query.classify_type,
+        Exchange: this.$route.query.exchange,
+      });
+      this.pageLoading = false;
+      if (res.Ret === 200) {
+        const obj = res.Data || {};
+        for (let key in this.chartListState) {
+          this.chartListState[key] = {
+            ...this.chartListState[key],
+            ...obj[key],
+          };
+        }
+        this.chartItemInfo = this.chartListState[this.tabKey];
+        if (res.Data.DataTime) {
+          this.selectDate = this.$moment(res.Data.DataTime).format(
+            "YYYY-MM-DD"
+          );
+        }
+
+        this.$store.commit(
+          "SET_TITLE",
+          `${this.$route.query.classify_type} ${this.$moment(
+            this.selectDate
+          ).format("YYYYMMDD")}持仓`
+        );
+      } else {
+        // 清空数据
+        for (let key in this.chartListState) {
+          this.chartListState[key].List = null;
+        }
+      }
+    },
+
+    getHandles(data) {
+      // 监听选择的日期改变
+      if (data.opt == "date") {
+        this.selectDate = data.val;
+        this.getInfo();
+      } else if (data.opt === "beforeDate") {
+        this.handleDateChange("before");
+      } else if (data.opt === "nextDate") {
+        this.handleDateChange("next");
+      } else if (data.opt === "beforeClassifyType") {
+        this.handleClassifyTypeChange("before");
+      } else if (data.opt === "nextClassifyType") {
+        this.handleClassifyTypeChange("next");
+      }
+    },
+  },
+
+  mounted() {
+    this.getAllClassifyType();
+    this.getInfo();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chart-position-analysis-page {
+  padding-bottom: calc(160px + constant(safe-area-inset-bottom));
+  padding-bottom: calc(160px + env(safe-area-inset-bottom));
+}
+.chart-wrap {
+  width: 100%;
+  margin-bottom: 60px;
+  .top-info-box {
+    padding: 0 34px 30px 34px;
+    text-align: center;
+    span {
+      display: inline-block;
+      margin-right: 50px;
+    }
+  }
+}
+.wrap-top {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20px;
+}
+.empty-wrap {
+  text-align: center;
+  padding: 150px 0;
+}
+
+// @media (min-width: 600px){
+.chart-position-analysis-page-pc {
+  padding: 0;
+  .top-sticky-wrap {
+    display: none;
+  }
+  .bot-fixed-wrap {
+    display: none;
+  }
+  .empty-wrap {
+    font-size: 16px;
+  }
+  .chart-wrap {
+    margin-bottom: 60px;
+    .top-info-box {
+      padding: 0 20px 20px;
+      text-align: center;
+      font-size: 20px;
+      span {
+        display: inline-block;
+        margin-right: 30px;
+      }
+    }
+  }
+}
+// }
+</style>

src/views/positionAnalysis_manage/components/indexContent.vue

@@ -0,0 +1,139 @@
+<template>
+    <div class="index-content-wrap">
+        <div class="top-box">
+            <span style="margin-right:20px">{{num}}品种</span>
+            <span>{{time}}</span>
+        </div>
+        <div style="margin:30px 0">
+            <el-switch
+                v-model="isHistory"
+                size="large"
+                active-text="历史合约"
+            />
+        </div>
+        <div class="list-wrap">
+            <div class="item" v-for="item in clist" :key="item.ClassifyName">
+                <div class="label">{{item.ClassifyName}}</div>
+                <div style="flex:1">
+                    <div 
+                        class="opt" 
+                        v-for="_item in item.Items" 
+                        :key="_item.ClassifyType"
+                        @click="goDetail(_item,item)"
+                    >{{_item.ClassifyType}}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  props: {
+    num:Number,
+    time:String,
+    exchange:String,
+    now:String,
+    list:null
+  },
+  computed: {
+    clist() {
+      if(this.isHistory){
+          console.log('看历史');
+          return this.list
+      }
+
+      const now=this.$moment(this.now).format('YYMM')//当前时间
+      const arr=this.list?JSON.parse(JSON.stringify(this.list)):[]
+      let resArr=[]
+      if(this.exchange!='郑商所'){
+          resArr=arr.map(item=>{
+              item.Items=item.Items.filter(_item=>{
+                  const t=_item.ClassifyType.substr(-4)
+                  
+                  //15号之后过滤非当月合约
+				  return Number(this.now.substr(-2)) <= 15 ? Number(t)>=now : Number(t)>now;
+              })
+              return item
+          })
+      }else{
+          resArr=arr.map(item=>{
+              item.Items=item.Items.filter(_item=>{
+                  // 如果合约编号没有含日期 肯定是少于4位的 因为至少为一个字母加三位数的日期
+                  if(_item.ClassifyType.length<4) return true
+                  const t=2+_item.ClassifyType.substr(-3)
+                  
+                  return Number(this.now.substr(-2)) <= 15 ? Number(t)>=now : Number(t)>now;
+              })
+              return item
+          })
+      }
+
+      return resArr
+    }
+  },
+  data() {
+    return {
+      isHistory: false,
+
+    }
+  },
+
+  methods: {
+    goDetail(_item,item){
+      this.$router.push({
+          path:"/positionAnalysisDetail",
+          query:{
+              classify_name:item.ClassifyName,
+              classify_type:_item.ClassifyType,
+              exchange:this.exchange
+          }
+      })      
+    }
+  },
+
+  mounted() {
+
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+@import '~@/styles/theme-vars.scss';
+.index-content-wrap{
+    .top-box{
+        background: #e6eefb;
+        padding: 15px 30px;
+        span{
+            display: inline-block;
+        }
+    }
+    .list-wrap{
+        padding: 30px 0;
+        .item{
+            margin-bottom: 40px;
+            display: flex;
+
+            .label{
+                color: #666;
+                width: 100px;
+                padding-top: 10px;
+                font-size: 14px;
+            }
+            .opt{
+                padding: 6px 10px;
+                min-width: 100px;
+                text-align: center;
+                display: inline-block;
+                margin-right: 20px;
+                margin-bottom: 20px;
+                background: #e6eefb;
+                border: 1px solid $theme-color;
+                border-radius: 4px;
+                cursor: pointer;
+            }
+        }
+    }
+}
+</style>

src/views/positionAnalysis_manage/detail.vue

@@ -0,0 +1,110 @@
+<template>
+  <div class="hasrightaside-box position-analysis-detail-page">
+    <div class="detail-top">
+      <span></span>
+      <div>
+        <el-button type="primary" @click="refreshData" plain>一键刷新</el-button>
+        <el-button type="primary" @click="handleOpt('beforeClassifyType')">上一个合约</el-button>
+        <el-button type="primary" @click="handleOpt('nextClassifyType')">下一个合约</el-button>
+      </div>
+    </div>
+    <div class="content-box detail-content">
+        <chartDetail ref="chartDetailRef"/>
+    </div>
+   
+  </div>
+</template>
+
+<script>
+import chartDetail from './components/chartDetail.vue'
+export default {
+  components: { chartDetail },
+  data() {
+    return {
+    }
+  },
+
+  methods: {
+    // 操作选项
+    handleOpt(type){
+        let obj={}
+        if(type==='date'){
+            obj={
+                opt:type,
+                val:this.selectDate
+            }
+        }else if(type==='beforeDate'){
+            obj={
+                opt:type
+            }
+        }else if(type==='nextDate'){
+            obj={
+                opt:type
+            }
+        }else if(type==='beforeClassifyType'){
+            obj={
+                opt:type
+            }
+        }else if(type==='nextClassifyType'){
+            obj={
+                opt:type
+            }
+        }
+        this.$refs.chartDetailRef&&this.$refs.chartDetailRef.getHandles(obj);
+    },
+
+    refreshData() {
+      if(this.$refs.chartDetailRef) {
+        this.$refs.chartDetailRef.selectDate=''
+        this.$refs.chartDetailRef.getInfo()  
+      }
+    }
+  },
+
+  mounted() {
+  }
+}
+
+</script>
+
+<style lang="scss">
+    .el-date-editor--date{
+        width: 180px !important;
+        .el-input__wrapper{
+            background: #F6F6F6;
+            border: 1px solid #EBEBEB;
+            border-radius: 20px;
+            height: 40px;
+            box-shadow: none;
+        }
+    }
+    .position-analysis-detail-page-dialog{
+        .el-dialog__header{
+            border-bottom: 1px solid #E9E9E9;
+            margin-right: 0;
+        }
+
+    }
+</style>
+
+<style lang="scss" scoped>
+@import '~@/styles/theme-vars.scss';
+.position-analysis-detail-page{
+  min-height: calc(100vh - 410px);
+  .detail-top {
+    padding: 20px;
+    margin-bottom: 20px;
+    background: #fff;
+    border: 1px solid #ececec;
+    border-radius: 4px;
+    box-shadow: 0 3px 6px rgba(0,0,0,.05);
+    display: flex;
+    justify-content: space-between;
+  }
+  .detail-content {
+    padding: 20px;
+    background: #fff;
+    border-right: 2px solid #F2F2F2;
+  }
+}
+</style>

src/views/positionAnalysis_manage/list.vue

@@ -0,0 +1,82 @@
+<template>
+    <div class="position-analysis-index-page" v-loading="loading" element-loading-text="Loading...">
+        <el-tabs 
+            class="tabs-wrap"
+            v-model="activeType"
+        >
+            <el-tab-pane 
+                v-for="item in list"
+                :key="item.Exchange"
+                :label="item.Exchange" 
+                :name="item.Exchange"
+            >
+                <indexContent 
+                  :list="item.Items" 
+                  :num="item.Num" 
+                  :time="item.DataTime" 
+                  :exchange="item.Exchange"
+                  :now="item.CurrDate"
+                />
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script>
+import {apiPositionAnalysisList} from '@/api/modules/positionAnalysis'
+import indexContent from './components/indexContent.vue'
+export default {
+  components: { indexContent },
+  data() {
+    return {
+      activeType: '',
+      list: [],
+      loading: false,
+
+    }
+  },
+
+  methods: {
+    getList(){
+      this.loading=true
+      apiPositionAnalysisList().then(res=>{
+          this.loading=false
+          if(res.Ret!==200) return
+          this.list=res.Data||[]
+          this.activeType=res.Data[0]&&res.Data[0].Exchange
+      })
+    }
+  },
+
+  mounted() {
+    this.getList()
+  }
+}
+
+
+
+</script>
+
+<style lang="scss" scoped>
+.position-analysis-index-page{
+    min-height: 60vh;
+    padding: 20px;
+    background: #fff;
+    border: 1px solid #ececec;
+    border-radius: 4px;
+    box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
+    .tabs-wrap{
+        .el-tabs__nav-wrap::after{
+            display: none;
+        }
+        .el-tabs__item{
+            font-size: 16px;
+        }
+    }
+}
+</style>
+<style lang="scss">
+.position-analysis-index-page {
+  .el-tabs__nav-wrap::after { background-color: transparent; }
+}  
+</style>

src/views/ppt_manage/mixins/mixins.js

@@ -185,6 +185,26 @@ export default {
         series: data,
         yAxis: ydata
       };
+
+       //滚动相关性独立tooltip
+      if(this.chartInfo.Source === 4) {
+        const { LeadValue,LeadUnit } = this.relevanceChartData.CorrelationChartInfo;
+        let relevanceUnitEnMap = this.relevanceUnitEnMap;
+        this.options.tooltip = {
+          formatter: function() {
+            let str = `${Highcharts.dateFormat('%Y/%m/%d',this.x)}<br><p>相关性系数：${this.y.toFixed(4)}</p><br><p>领先${LeadValue+LeadUnit}</p>`
+            return str
+          },
+          formatterCh: function() {
+            let str = `${Highcharts.dateFormat('%Y/%m/%d',this.x)}<br><p>相关性系数：${this.y.toFixed(4)}</p><br><p>领先${LeadValue+LeadUnit}</p>`
+            return str
+          },
+          formatterEn: function() {
+            let str = `${Highcharts.dateFormat('%Y/%m/%d',this.x)}<br><p>Correlation coefficient：${this.y.toFixed(4)}</p><br><p>lead${LeadValue+relevanceUnitEnMap[LeadUnit]}</p>`
+            return str
+          }
+        }
+      }
     },
 
     /* 堆叠柱 堆叠面积 组合图 */
@@ -970,11 +990,11 @@ export default {
           },
           align: 'center',
         },
-        min: -1,
-        max: 1,
+        // min: -1,
+        // max: 1,
         opposite: false,
         tickWidth: 1,
-        tickInterval:0.2,
+        // tickInterval:0.2,
       }
 
       //处理series

src/views/ppt_manage/mixins/pptMixins.js

@@ -144,7 +144,7 @@ export default {
         this.dataList = [Data.EdbInfoList[0]];
         this.initCommodityData(res.Data)
         this.setCommodityLang(currentLang)
-      }else if([3,4].includes(this.chartInfo.Source)){
+      }else if([3].includes(this.chartInfo.Source)){//相关性
         this.relevanceChartData={
             ChartInfo:res.Data.ChartInfo,
 						EdbInfoList:res.Data.EdbInfoList,
@@ -161,6 +161,14 @@ export default {
         }
         this.initRelevanceChartData()
         this.changeRelevanceOptions(currentLang)
+      }else if(this.chartInfo.Source===4) {//滚动相关性换成曲线图绘图
+        this.dataList = [res.Data.DataResp];
+        this.relevanceChartData = {
+          CorrelationChartInfo: res.Data.CorrelationChartInfo
+        }
+        this.setDefaultChart([res.Data.DataResp]);
+        this.changeRelevanceOptions(currentLang)
+
       }else if([6,7,8].includes(this.chartInfo.Source)) {
         //拟合方程 标准差 百分比
         this.dataList = [res.Data.DataResp];
@@ -451,12 +459,6 @@ export default {
 
         if(!$(`#${refName}`)[0]) return
 
-        // 相关性图表判断当前图区域大小 动态设置x轴offset
-        if(options.isRelevanceChart){
-          const h=($(`#${refName}`)[0].offsetHeight-100)/2
-          options.xAxis.offset=-h
-        }
-
         if(is_linear)
           Highcharts.chart({
             // Highcharts 配置

src/views/predictEdb_manage/predictEdb.vue

@@ -557,7 +557,7 @@ export default {
 				{ name: '同比值',type: 32 },
 				{ name: '同差值',type: 33 },
 				{ name: 'N数值移动平均计算',type: 39 },
-				{ name: '累计值转月值/转季值',type: 'toMonthSeason' },
+				{ name: '累计值转月/季值',type: 'toMonthSeason' },
 				{ name: 'N数值环比值',type: 43 },
 				{ name: 'N数值环差值',type: 44 },
 				{ name: '升频',type: 45 },
@@ -577,7 +577,7 @@ export default {
 				{ name: 'N数值环比值',type: 43 },
 				{ name: 'N数值环差值',type: 44 },
 				{ name: '升频',type: 45 },
-				{ name: '累计值转月值/转季值',type: 'toMonthSeason' },
+				{ name: '累计值转月/季值',type: 'toMonthSeason' },
 				{ name: '累计值',type: 'accumulate' }
 			],
       isOnlyMe:false,//只看我的
@@ -1313,6 +1313,7 @@ export default {
 }
 </script>
 <style lang='scss' scoped>
+@import "~@/styles/theme-vars.scss";
 *{ box-sizing: border-box;}
 $mini-font: 12px; $normal-font: 14px;
 .predictEdb-container {
@@ -1384,7 +1385,7 @@ $mini-font: 12px; $normal-font: 14px;
 						margin-right: 2px;
 					}
 					.el-icon-view {
-						color: #409EFF;
+						color: #409eff;
 						font-size: 18px;
 						margin-left: 5px;
 					}
@@ -1395,7 +1396,7 @@ $mini-font: 12px; $normal-font: 14px;
 				display: flex;
 				align-items: center;
 				justify-content: center;
-				color: #409eff;
+				color: $theme-color;
 				font-size: 16px;
 				cursor: pointer;
 			}
@@ -1506,7 +1507,7 @@ $mini-font: 12px; $normal-font: 14px;
 								cursor: pointer;
 							}
 							.join_txt {
-								color: #409eff;
+								color: $theme-color;
 								cursor: pointer;
 							}
 						}
@@ -1529,7 +1530,7 @@ $mini-font: 12px; $normal-font: 14px;
 		.cpmputed-li {
 			width: 180px;
 			padding: 19px 0;
-			color: #409EFF;
+			color: $theme-color;
 			font-size: 16px;
 			background:#ECF5FF;
 			border-radius: 8px;
@@ -1542,11 +1543,11 @@ $mini-font: 12px; $normal-font: 14px;
 				margin-right:0;
 			}
 			&:hover {
-				background: #409EFF;
+				background: $theme-color;
 				color: #fff;
 			}
 			&.act {
-				background: #409EFF;
+				background: $theme-color;
 				color: #fff;
 			}
 		}
@@ -1555,6 +1556,7 @@ $mini-font: 12px; $normal-font: 14px;
 </style>
 
 <style lang="scss">
+@import "~@/styles/theme-vars.scss";
 .predictEdb-container {
 	.label-input .el-input__inner {
 		height: 25px;
@@ -1568,7 +1570,7 @@ $mini-font: 12px; $normal-font: 14px;
 
 	.el-tree__drop-indicator{
 		height:3px;
-		background-color:#409EFF;
+		background-color: $theme-color;
 	}
 	.el-tree-node__content {
 		margin-bottom: 14px !important;

src/views/report_manage/reportEn/reportEditor.vue

@@ -430,6 +430,7 @@ export default {
 					'undo',
 					'redo',
         ],
+        fontSize: ["12", "14", "16", "18", "20", "24", "28", "32", "36", "40"],
         height:300,
         fontSizeDefaultSelection: "16",
         quickInsertEnabled: false,

src/views/sandbox_manage/sandFlow/index.vue

@@ -184,7 +184,7 @@ export default {
 				const { Data } = await dataBaseInterface.uploadImgSvg(params);
 				let SandboxVersionCode = (this.sand_id && classify === this.sandInfo.ChartPermissionId)  ? this.sand_id : '';
 				
-				const { Ret } =	await sandInterface.sandSave({
+				const { Ret , Data : sandData} =	await sandInterface.sandSave({
 					SandboxVersionCode,
 					Name: name,
 					ChartPermissionId: Number(classify),
@@ -196,7 +196,19 @@ export default {
 				if(Ret !== 200) return;
 				this.$message.success(`${SandboxVersionCode ? '编辑成功' : '保存成功'}`);
 				this.lockLoding.close();
-				!SandboxVersionCode && window.close();
+				//!SandboxVersionCode && window.close();
+				//如果是新增,直接跳转到编辑页面
+				if(!SandboxVersionCode&&sandData.VersionCode){
+					this.sand_id = sandData.VersionCode
+					this.$router.push({
+						path: '/sandflow',
+						query: {
+						id: sandData.VersionCode,
+						type:'edit',
+						},
+					});
+					this.getGraphData();
+				}
 				
 				callback && callback();
 			},{

src/views/system_manage/operateAuthManage.vue

@@ -175,7 +175,8 @@
 
 <script>
 import { operateAuthInterface } from '@/api/modules/setApi';
-import { customInterence } from '@/api/modules/crmApi';
+// import { customInterence } from '@/api/modules/crmApi';
+import {dataBaseInterface} from '@/api/modules/chartApi'
 import mPage from '@/components/mPage';
 import mDialog from '@/components/mDialog';
 import edbSetDialog from './components/authSetDialog.vue';
@@ -285,10 +286,11 @@ export default {
     },
     /* 获取用户列表 */
     getUserList() {
-      customInterence.getSale({Status: 0,AllEnabled: true}).then(res => {
+      // customInterence.getSale({Status: 0,AllEnabled: true}).then(res => {
+      dataBaseInterface.getEdbChartAdminList({Source: this.default_tab}).then(res=>{
         if(res.Ret !== 200) return
 
-        this.userList = res.Data.List || [];
+        this.userList = res.Data || [];
       })
     },
     /* 获取分类列表 */
@@ -303,8 +305,10 @@ export default {
     changeTab({key}) {
       this.default_tab = key;
       this.searchForm.classification=[]
+      this.searchForm.user=''
       this.page_no = 1;
       this.getClassificationList()
+      this.getUserList()
       this.getTableData();
     },
 

src/vuex/index.js

@@ -21,6 +21,9 @@ const state = {
     "rai_researcher", //权益研究员
     "ficc_researcher", //ficc研究员
   ],
+  isCollapse: false,
+
+  breadSelfName: '',//面包屑自定义当前页面name
 };
 
 export default {

src/vuex/mutations.js

@@ -8,6 +8,13 @@ const mutations = {
   SET_DATA_AUTH(state, bool) {
     state.dataAuth = bool;
   },
+  SET_COLLAPSE(state,bool) {
+    state.isCollapse = bool;
+  },
+  
+  SET_TITLE(state,str) {
+    state.breadSelfName = str;
+  }
 };
 
 export default mutations;