Merge branch 'lang_dev_jw' into lang_dev

src/components/chart/chartListWrap.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="chart-list-cont">
-    <span>共{{ total }}张图表</span>
+    <span>{{$t('Chart.chart_count_start')}}{{ total }}{{$t('Chart.chart_count_end')}}</span>
     <div
       class="chartList-wrapper"
       ref="listRef"
@@ -24,7 +24,7 @@
             @click="$emit('detailShowHandle',chart)"
           />
           <div class="item-bottom">
-            <span>创建时间: {{ chart.CreateTime.slice(0,10) }}</span>
+            <span>{{$t('Common.create_time')}}: {{ chart.CreateTime.slice(0,10) }}</span>
             <div v-if="isShowBtn(chart)">
               <span
                 class="join_txt"
@@ -35,7 +35,7 @@
                   alt=""
                   style="width: 13px; height: 12px; vertical-align: middle"
                 />
-                加入我的图库
+                {{$t('Chart.chart_addmy_btn')}}
               </span>
             </div>
           </div>

src/lang/commonLang.js

@@ -203,7 +203,11 @@ export default {
     disable:{
       en:'Disable',
       zh:'禁用'
-    }
+    },
+    create_time:{
+      en:'Creation time',
+      zh:'创建时间'
+    },
   },
   Edb,
   Chart

src/lang/modules/EtaChart/commonLang.js

@@ -75,4 +75,20 @@ export default {
     zh:'删除',
     en:'Delete'
   },
+  search_chart_placeholder:{
+    zh:'请输入图表名称',
+    en:'Please enter a chart name'
+  },
+  classify_name_label:{
+    zh:'分类名称',
+    en:'Classification name'
+  },
+  chart_count_start:{
+    zh:'共',
+    en:'A total of'
+  },
+  chart_count_end:{
+    zh:'张图表',
+    en:'charts are temporarily uncharted'
+  },
 }

src/lang/modules/StatisticAnalysis/ChartRelevance.js

@@ -0,0 +1,31 @@
+/**
+ * 统计分析-相关性分析
+ */
+
+/* 英文 */
+export const ChartRelevanceEn = {
+    chart_add_btn:'Add chart',
+    catagory:'Catagory',
+    only_see_mine:'Just look at mine',
+    tab_type01:'correlation',
+    tab_type02:'Rolling correlation',
+    add_chart_classify:'Add chart category',
+    edit_chart_classify:'Edit chart category',
+
+};
+  
+/* 中文 */
+export const ChartRelevanceZh = {
+    chart_add_btn:'添加图表',
+    catagory:'目录',
+    only_see_mine:'只看我的',
+    tab_type01:'相关性',
+    tab_type02:'滚动相关性',
+    add_chart_classify:'添加图表分类',
+    edit_chart_classify:'编辑图表分类',
+
+};
+  
+/**
+* $t('StatisticAnalysis.ChartRelevance.XXX')
+*/

src/lang/modules/StatisticAnalysis/IndexEn.js

@@ -0,0 +1,9 @@
+
+import { ChartRelevanceEn } from "./ChartRelevance";
+
+export default {
+  // 统计分析
+  StatisticAnalysis: {
+    ChartRelevance:ChartRelevanceEn
+  },
+};

src/lang/modules/StatisticAnalysis/IndexZh.js

@@ -0,0 +1,8 @@
+import { ChartRelevanceZh } from "./ChartRelevance";
+
+export default {
+    // 统计分析
+    StatisticAnalysis: {
+      ChartRelevance:ChartRelevanceZh
+    },
+  };

src/views/chartRelevance_manage/relevance/list.vue

@@ -12,15 +12,15 @@
       <div class="main-left left" id="left" v-show="!isSlideLeft">
         <div class="datasheet_top">
           <el-button v-permission="permissionBtn.statisticPermission.corrAnalysis_addChart"
-            type="primary" @click="goAddChart">添加图表</el-button>
+            type="primary" @click="goAddChart">{{$t('StatisticAnalysis.ChartRelevance.chart_add_btn')}}</el-button>
         </div>
         <div
           style="padding: 0 20px; display: flex; justify-content: space-between"
         >
-          <span>目录</span>
+          <span>{{$t('StatisticAnalysis.ChartRelevance.catagory')}}</span>
           <el-checkbox v-model="isOnlyMe" @change="onlyMeHandler"
             v-permission="permissionBtn.statisticPermission.corrAnalysis_onlyMine"
-            >只看我的</el-checkbox
+            >{{$t('StatisticAnalysis.ChartRelevance.only_see_mine')}}</el-checkbox
           >
         </div>
         <div class="search-cont">
@@ -30,7 +30,7 @@
             :filterable="!search_txt"
             remote
             clearable
-            placeholder="请输入图表名称"
+            :placeholder="$t('Chart.search_chart_placeholder')"
             style="width: 100%; margin-top: 20px"
             :remote-method="searchHandle"
             @click.native="inputFocusHandle"
@@ -48,7 +48,7 @@
         <ul class="left-tab">
           <li
             :class="['tab', { act: classify_tab === index }]"
-            v-for="(tab, index) in ['相关性', '滚动相关性']"
+            v-for="(tab, index) in [$t('StatisticAnalysis.ChartRelevance.tab_type01'), $t('StatisticAnalysis.ChartRelevance.tab_type02')]"
             :key="tab"
             @click="changeTab(index)"
           >
@@ -131,7 +131,7 @@
               alt=""
               style="width: 16px; height: 16px; margin-right: 10px"
             />
-            <span>添加图表分类</span>
+            <span>{{$t('StatisticAnalysis.ChartRelevance.add_chart_classify')}}</span>
           </div>
         </div>
         <span
@@ -475,7 +475,7 @@ export default {
 
     /* 添加一级目录 */
     addLevelOneHandle() {
-      this.dialog_title = "添加图表分类";
+      this.dialog_title = this.$t('StatisticAnalysis.ChartRelevance.add_chart_classify')||"添加图表分类";
       this.classifyForm = {
         classify_name: "",
       };
@@ -484,7 +484,7 @@ export default {
 
     /* 编辑节点 */
     editNode(node, { ChartClassifyName, ChartClassifyId }) {
-      this.dialog_title = "编辑图表分类";
+      this.dialog_title = this.$t('StatisticAnalysis.ChartRelevance.edit_chart_classify')||"编辑图表分类";
       /* 编辑目录 */
       this.classifyForm = {
         classify_name: ChartClassifyName,

src/views/datasheet_manage/components/sheetClassifyDia.vue

@@ -16,11 +16,11 @@
 				ref="diaForm"
 				label-position="left"
 				hide-required-asterisk
-				label-width="80px"
+				label-width="150px"
 				:model="formData"
 				:rules="formRules">
 				
-          <el-form-item label="分类名称" prop="classify_name">
+          <el-form-item :label="$t('Chart.classify_name_label')" prop="classify_name">
             <el-input
             v-model="formData.classify_name"
             style="width: 80%"
@@ -29,8 +29,8 @@
 				</el-form>
 			</div>
 			<div class="dia-bot">
-				<el-button type="primary" style="margin-right:20px" @click="saveHandle">保存</el-button>
-				<el-button type="primary" plain @click="cancelHandle">取消</el-button>
+				<el-button type="primary" style="margin-right:20px" @click="saveHandle">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button type="primary" plain @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 	</div>