Merge branch 'custom'

src/routes/modules/dataRoutes.js

@@ -310,13 +310,19 @@ export default [
         path: 'selfData',
         component: () => import("@/views/dataEntry_manage/thirdBase/selfDataBase.vue"),
         name: "自有数据",
-        hidden: false
+        hidden: false,
+        meta:{
+          name_en:"Proprietary Data"
+        }
       },  
       {
         path: "bloomberg",
         component: () => import("@/views/dataEntry_manage/thirdBase/bloombergSource.vue"),
         name: "Bloomberg",
-        hidden: false
+        hidden: false,
+        meta:{
+          name_en:"Bloomberg"
+        }
       },
       {
         path: "zczx",

src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue

@@ -132,7 +132,6 @@
                 :span="21"
                 style="padding: 20px 0;"
               >
-                <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
                     <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>

src/views/chartRelevance_manage/fittingEquation/fittingEquationList.vue

@@ -156,7 +156,6 @@
                 :span="21"
                 style="padding: 20px 0;"
               >
-                <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
                     <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>

src/views/chartRelevance_manage/relevance/list.vue

@@ -154,13 +154,6 @@
         <div class="chart-detail-wrapper" v-if="chartInfo.ChartInfoId">
           <el-row class="bottom-min">
             <el-col :span="21" style="padding: 20px 0">
-              <div
-                class="chartEn-mark"
-                v-show="chartInfo.IsEnChart"
-                style="top: 0; left: 0"
-              >
-                En
-              </div>
               <div class="chart-show-cont" v-if="!chartInfo.WarnMsg">
                 <div class="chartWrapper" id="chartWrapper">
                   <h2 class="chart-title">

src/views/chartRelevance_manage/statistic/statisticFeatureList.vue

@@ -142,7 +142,6 @@
                 :span="21"
                 style="padding: 20px 0;"
               >
-                <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
                     <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>

src/views/dataEntry_manage/chartSetting.vue

@@ -391,7 +391,6 @@
                   style="padding-bottom: 30px;"
                 >
                 
-                  <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                   <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                     <div class="chartWrapper" id="chartWrapper">
                       <h2 

src/views/dataEntry_manage/codecount/index.vue

@@ -67,7 +67,8 @@
 									label: 'ClassifyName',
 									value: 'ClassifyId',
 									children: 'Children',
-									checkStrictly: true
+									checkStrictly: true,
+									emitPath: false,
 								}"
 								@change="menuChange"
 								clearable
@@ -359,7 +360,7 @@ export default {
 				EdbName: edb_name,
 				Frequency: frequency,
 				Unit: unit,
-				ClassifyId: menu&&menu[menu.length-1]
+				ClassifyId: menu
 			}
 			
 			const { Ret,Data } = this.$route.query.edbid ? await dataBaseInterface.editCountCode({ ...params,EdbInfoId: Number(this.$route.query.edbid) }) : await dataBaseInterface.addCountCode(params);

src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -10,7 +10,7 @@
 				:min-width="item.minwidthsty"
 				align="center">
 				<template slot="header" slot-scope="scope">
-					<div class="chartEn-mark" style="top: -10px;" v-show="scope.$index ==0 && tableData[0] && tableData[0].IsEnEdb" >En</div>
+					<!-- <div class="chartEn-mark" style="top: -10px;" v-show="scope.$index ==0 && tableData[0] && tableData[0].IsEnEdb" >En</div> -->
 					<span>{{item.label}}</span>
 				</template>	
 				<template slot-scope="scope">

src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -228,7 +228,7 @@ export default {
 				this.formData = {
 					date: backData.date.split(','),
 					edb_name: backData.targetName,
-					menu: backData.menu,
+					menu: backData.menu[backData.menu.length-1],
 					frequency: backData.frequency,
 					unit: backData.unit,
 					self_variate: backData.from_arr[0].FromEdbInfoId,
@@ -278,7 +278,8 @@ export default {
 				label: 'ClassifyName',
 				value: 'ClassifyId',
 				children: 'Children',
-				checkStrictly: true
+				checkStrictly: true,
+				emitPath: false,
 			},
 			/* frequencyArr, */
 			fre_options: ['天','周','月','季','年'],
@@ -534,7 +535,7 @@ export default {
 					Source: this.type,
 					EdbName: edb_name,
 					Unit: unit,
-					ClassifyId: menu[menu.length - 1],
+					ClassifyId: menu,
 					Frequency: frequency,
 					Formula: date.join(','),
 					EdbInfoIdArr: [

src/views/futures_manage/commodityChartBase.vue

@@ -146,7 +146,6 @@
                 :span="21"
                 style="padding: 20px 0;"
               >
-                <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
                     <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>

src/views/mychart_manage/components/chartDetailDia.vue

@@ -220,7 +220,6 @@
           </div>
           <div class="cont-bottom" v-loading="refreshLoading">
 
-            <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: unset;left:unset;">En</div>
             <div class="chart-show-cont">
               <div class="chartWrapper" id="chartWrapper">
                 <template v-if="!chartInfo.WarnMsg">

src/views/mychart_manage/index.vue

@@ -198,7 +198,6 @@
             >
               <el-card class="public-chart-item">
                 <div slot="header" class="item-top">
-                  <div class="chartEn-mark" v-show="chart.IsEnChart" style="top: -10px;left: -10px;">En</div>
                   <span class="text_oneLine" :style="{'padding-left':chart.IsEnChart?'24px':''}">{{ chart_lang === 'en' ? (chart.ChartNameEn||chart.ChartName) : chart.ChartName }}</span>
                   <img
                     v-if="ispublic === 0"