comit

src/components/chart/chartDetailHandlesWrap.vue

@@ -1,13 +1,13 @@
 <template>
   <ul class="right-actions">
-    <li>操作</li>
+    <li>{{$t('Table.column_operations')}}</li>
     <li
       class="span-item shareLink"
       @click="copyChartConfirm('url')"
       :data-clipboard-text="linkUrl"
       v-if="!chartInfo.Disabled&&isShowBtn('share')"
     >
-      <i class="el-icon-share" />&nbsp;分享
+      <i class="el-icon-share" />&nbsp;{{$t('Chart.chart_share_btn')}}
     </li>
     <li v-if="isShowBtn('addMyChart')"
         class="span-item" @click="addMychartHandle(chartInfo)">
@@ -15,22 +15,22 @@
         :src="$icons.chart_join_ico"
         alt=""
         style="width: 13px; height: 12px; vertical-align: middle"
-      />加入我的图库
+      />{{$t('Chart.chart_addmy_btn')}}
     </li>
     <li v-if="isShowBtn('refresh')"
         class="span-item" @click="refreshHandle">
       <span
-        ><i class="el-icon-refresh" style="margin-left: 0" />&nbsp;刷新
+        ><i class="el-icon-refresh" style="margin-left: 0" />&nbsp;{{$t('Edb.detail_refresh_btn')}}
       </span>
     </li>
     <li class="span-item" v-if="['/commordityChartBase'].includes($route.path)">
       <span @click="saveChartHandle">
-        <i class="el-icon-collection" />&nbsp;保存
+        <i class="el-icon-collection" />&nbsp;{{$t('Chart.chart_save_btn')}}
       </span>
     </li>
     <li class="span-item" v-if="chartInfo.Button.IsCopy&&isShowBtn('otherSave')">
       <span @click="saveChartOtherHandle">
-        <i class="el-icon-document-add" />&nbsp;另存为
+        <i class="el-icon-document-add" />&nbsp;{{$t('Chart.chart_copy_btn')}}
       </span>
     </li>
     <li class="span-item" v-if="chartInfo.Button.IsEdit&&isShowBtn('edit')" @click="editChartHandle">
@@ -38,14 +38,14 @@
         src="~@/assets/img/set_m/edit.png"
         alt=""
         style="width: 13px; height: 12px"
-      />&nbsp;编辑
+      />&nbsp;{{$t('Chart.chart_edit_btn')}}
     </li>
     <li
       class="span-item copy"
       @click="copyChartConfirm('office')"
       v-if="!chartInfo.Disabled&&isShowBtn('copyOffice')"
     >
-      <i class="el-icon-document-copy" />&nbsp;复制至office
+      <i class="el-icon-document-copy" />&nbsp;{{$t('Chart.chart_copyoffice')}}
     </li>
     <li
       class="span-item copy"
@@ -55,14 +55,14 @@
       <img
         style="width: 13px; height: 12px; vertical-align: middle"
         src="~@/assets/img/chart_m/WeChat.jpg"
-      />&nbsp;复制至微信
+      />&nbsp;{{$t('Chart.chart_copywx')}}
     </li>
     <li v-if="isShowBtn('enNameSetting')"
         class="span-item copy" @click="openEnNameDia">
       <img
         style="width: 16px; vertical-align: middle"
         :src="$icons.to_en"
-      />&nbsp;设置英文名称
+      />&nbsp;{{$t('Edb.detail_en_btn')}}
     </li>
     <li
       class="span-item"
@@ -70,7 +70,7 @@
       @click="delChartHandle"
       v-if="chartInfo.Button.IsEdit&&isShowBtn('del')"
     >
-      <i class="el-icon-delete" style="color: #ff4040" />&nbsp;删除
+      <i class="el-icon-delete" style="color: #ff4040" />&nbsp;{{$t('Chart.chart_del_btn')}}
     </li>
   </ul>
 </template>

src/lang/commonLang.js

@@ -200,6 +200,10 @@ export default {
       en:'Creation time',
       zh:'创建时间'
     },
+    add_btn:{
+      en:'Add',
+      zh:'新增'
+    },
   },
   Edb,
   Chart

src/lang/modules/EtaBase/commonLang.js

@@ -107,6 +107,14 @@ export default {
     zh:'刷新状态',
     en:'Update Status'
   },
+  e_latest_time:{
+    zh:'最新日期',
+    en:'LatestDate'
+  },
+  e_latest_val:{
+    zh:'最新值',
+    en:'LatestValue'
+  },
   time_interval: {
     zh:'时间段',
     en: 'Time Period'

src/lang/modules/EtaChart/commonLang.js

@@ -55,4 +55,8 @@ export default {
     zh:'张图表',
     en:'charts are temporarily uncharted'
   },
+  select_my_chart_classify:{
+    zh:'选择我的分类',
+    en:'Select My Category Add New category'
+  },
 }

src/lang/modules/StatisticAnalysis/ChartRelevance.js

@@ -11,6 +11,7 @@ export const ChartRelevanceEn = {
     tab_type02:'Rolling correlation',
     add_chart_classify:'Add chart category',
     edit_chart_classify:'Edit chart category',
+    classify_name_tips:"The category name cannot be empty",
 
 };
   
@@ -23,6 +24,7 @@ export const ChartRelevanceZh = {
     tab_type02:'滚动相关性',
     add_chart_classify:'添加图表分类',
     edit_chart_classify:'编辑图表分类',
+    classify_name_tips:"分类名称不能为空",
 
 };
   

src/views/chartRelevance_manage/relevance/list.vue

@@ -175,7 +175,7 @@
                   />
                 </div>
                 <span class="chart-author"
-                  >作者:{{ chartInfo.SysUserRealName }}</span
+                  >{{$t('MsgPrompt.author')}}:{{ chartInfo.SysUserRealName }}</span
                 >
               </div>
 

src/views/dataEntry_manage/components/addMyClassifyDia.vue

@@ -12,7 +12,7 @@
     >
       <div slot="title" style="display: flex; alignitems: center">
         <!-- <img :src="title=='添加'?$icons.add:title=='编辑'?$icons.edit:''" style="color:#fff;width:16px;height:16px;marginRight:5px;"> -->
-        <span style="font-size: 16px">选择我的分类</span>
+        <span style="font-size: 16px">{{$t('Chart.select_my_chart_classify')}}</span>
       </div>
       <div class="dialog-min">
         <div class="classify-cont">
@@ -29,14 +29,14 @@
         </div>
         <span class="add-cont" @click="addClassify">
           <i class="el-icon-circle-plus-outline" />
-          新增
+          {{$t('Common.add_btn')}}
         </span>
       </div>
       <div class="dia-bot">
         <el-button type="primary" style="margin-right: 20px" @click="saveHandle"
-          >保存</el-button
+          >{{$t('Dialog.confirm_save_btn')}}</el-button
         >
-        <el-button type="primary" plain @click="cancelHandle">取消</el-button>
+        <el-button type="primary" plain @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </el-dialog>
 

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -78,57 +78,57 @@ export const chartSetMixin = {
         '周': 'W',
         '天': 'D',
       },
-      tableColums: [
-        {
-          label: '指标名称',
-          key: 'EdbName',
-          enKey:'EdbNameEn',
-					inputTip:'点击输入英文指标名称',
-          minwidthsty: '150px',
-        },
-        {
-          label: '指标ID',
-          key: 'EdbCode',
-          widthsty: '120px',
-        },
-        {
-          label: '更新频度',
-          key: 'Frequency',
-          enKey:'FrequencyEn',
-          minwidthsty: '60px',
-        },
-        {
-          label: '单位',
-          key: 'Unit',
-          enKey:'UnitEn',
-					inputTip:'英文单位',
-          minwidthsty: '50px',
-        },
-        {
-          label: '起始时间',
-          key: 'StartDate',
-          minwidthsty: '100px',
-        },
-        {
-          label: '最新日期',
-          key: 'LatestDate',
-          minwidthsty: '90px',
-        },
-        {
-          label: '最新值',
-          key: 'LatestValue',
-          minwidthsty: '90px',
-        },
-        {
-          label: '最近更新',
-          key: 'ModifyTime',
-          minwidthsty: '100px',
-        },
-        {
-          label: '数据来源',
-          key: 'SourceName',
-        },
-      ],//表格列
+      // tableColums: [
+      //   {
+      //     label: '指标名称',
+      //     key: 'EdbName',
+      //     enKey:'EdbNameEn',
+			// 		inputTip:'点击输入英文指标名称',
+      //     minwidthsty: '150px',
+      //   },
+      //   {
+      //     label: '指标ID',
+      //     key: 'EdbCode',
+      //     widthsty: '120px',
+      //   },
+      //   {
+      //     label: '更新频度',
+      //     key: 'Frequency',
+      //     enKey:'FrequencyEn',
+      //     minwidthsty: '60px',
+      //   },
+      //   {
+      //     label: '单位',
+      //     key: 'Unit',
+      //     enKey:'UnitEn',
+			// 		inputTip:'英文单位',
+      //     minwidthsty: '50px',
+      //   },
+      //   {
+      //     label: '起始时间',
+      //     key: 'StartDate',
+      //     minwidthsty: '100px',
+      //   },
+      //   {
+      //     label: '最新日期',
+      //     key: 'LatestDate',
+      //     minwidthsty: '90px',
+      //   },
+      //   {
+      //     label: '最新值',
+      //     key: 'LatestValue',
+      //     minwidthsty: '90px',
+      //   },
+      //   {
+      //     label: '最近更新',
+      //     key: 'ModifyTime',
+      //     minwidthsty: '100px',
+      //   },
+      //   {
+      //     label: '数据来源',
+      //     key: 'SourceName',
+      //   },
+      // ],//表格列
       tableData: [],//表格指标数据
 			options: {}, //配置options
       leftIndex: -1, //左侧上下限对应下标
@@ -195,6 +195,61 @@ export const chartSetMixin = {
       radarChartData: {}
 		}
 	},
+  computed:{
+    tableColums(){
+      return [
+        {
+          label: this.$t('Edb.e_name'),
+          key: 'EdbName',
+          enKey:'EdbNameEn',
+					inputTip:'点击输入英文指标名称',
+          minwidthsty: '150px',
+        },
+        {
+          label: this.$t('Edb.e_id'),
+          key: 'EdbCode',
+          widthsty: '120px',
+        },
+        {
+          label: this.$t('Edb.e_fre'),
+          key: 'Frequency',
+          enKey:'FrequencyEn',
+          minwidthsty: '60px',
+        },
+        {
+          label: this.$t('Edb.e_unit'),
+          key: 'Unit',
+          enKey:'UnitEn',
+					inputTip:'英文单位',
+          minwidthsty: '50px',
+        },
+        {
+          label: this.$t('Edb.e_start_time'),
+          key: 'StartDate',
+          minwidthsty: '100px',
+        },
+        {
+          label: this.$t('Edb.e_latest_time'),
+          key: 'LatestDate',
+          minwidthsty: '90px',
+        },
+        {
+          label: '最新值',
+          key: 'LatestValue',
+          minwidthsty: '90px',
+        },
+        {
+          label: '最近更新',
+          key: 'ModifyTime',
+          minwidthsty: '100px',
+        },
+        {
+          label: '数据来源',
+          key: 'SourceName',
+        },
+      ]
+    }
+  },
   watch: {
     
     /* 奇怪柱状图数据  */

src/views/datasheet_manage/components/sheetClassifyDia.vue

@@ -24,7 +24,7 @@
             <el-input
             v-model="formData.classify_name"
             style="width: 80%"
-            placeholder="必填项"></el-input>
+            placeholder=""></el-input>
           </el-form-item>
 				</el-form>
 			</div>
@@ -64,14 +64,23 @@ export default {
 			}
 		}
 	},
+	computed:{
+		formRules(){
+			return {
+				classify_name:[
+					{ required: true, message: this.$t('StatisticAnalysis.ChartRelevance.classify_name_tips'), trigger: 'blur' },
+				]
+			}
+		}
+	},
 	data () {
 		return {			
 			formData: {},
-      formRules: {
-        classify_name:[
-          { required: true, message: '分类名称不能为空', trigger: 'blur' },
-        ]
-      },
+    //   formRules: {
+    //     classify_name:[
+    //       { required: true, message: '分类名称不能为空', trigger: 'blur' },
+    //     ]
+    //   },
 
 		};
 	},