Merge branch 'lang_dev' of http://8.136.199.33:3000/eta_front/eta_front into lang_dev

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/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

@@ -207,7 +207,15 @@ export default {
     disable:{
       en:'Disable',
       zh:'禁用'
-    }
+    },
+    create_time:{
+      en:'Creation time',
+      zh:'创建时间'
+    },
+    add_btn:{
+      en:'Add',
+      zh:'新增'
+    },
   },
   Edb,
   Chart

src/lang/modules/EtaChart/commonLang.js

@@ -75,4 +75,45 @@ 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'
+  },
+  select_my_chart_classify:{
+    zh:'选择我的分类',
+    en:'Select My Category Add New category'
+  },
+
+  //操作提示文案
+  OptMsg:{
+    del_fail_tag:{
+      zh:'删除失败',
+      en:'Deletion failure'
+    },
+    classify_del_fail:{
+      zh:'该分类下关联表图表不可删除',
+      en:'Associated charts in this category cannot be deleted'
+    },
+    classify_del_confirm:{
+      zh:'确定删除当前分类吗？',
+      en:'Are you sure to delete the current category?'
+    },
+    chart_del_confirm:{
+      zh:'删除后该图表将不能再引用，确认删除吗？',
+      en:'After deletion, this chart will no longer be referenced. Are you sure to delete it?'
+    }
+
+  },
 }

src/lang/modules/StatisticAnalysis/ChartRelevance.js

@@ -0,0 +1,34 @@
+/**
+ * 统计分析-相关性分析
+ */
+
+/* 英文 */
+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',
+    classify_name_tips:"The category name cannot be empty",
+    opt_tip_btn:"Operation instruction",
+};
+  
+/* 中文 */
+export const ChartRelevanceZh = {
+    chart_add_btn:'添加图表',
+    catagory:'目录',
+    only_see_mine:'只看我的',
+    tab_type01:'相关性',
+    tab_type02:'滚动相关性',
+    add_chart_classify:'添加图表分类',
+    edit_chart_classify:'编辑图表分类',
+    classify_name_tips:"分类名称不能为空",
+    opt_tip_btn:"操作说明",
+
+};
+  
+/**
+* $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/lang/modules/systemManage/ChartSet.js

@@ -0,0 +1,81 @@
+/**
+ * 系统设置-图表配置
+ */
+
+/* 英文 */
+export const ChartSetEn = {
+    label01:'Chart Types',
+    label02:'ETA Chart Library Default Theme',
+    add_btn:'Add Custom Theme',
+    edit_btn:'Edit Custom Theme',
+    theme_name:'Theme Name',
+    theme_name_placeholder:'Please enter theme name',
+    alert_msg:'After deletion, all charts using this theme will adopt the ETA theme. Are you sure you want to proceed with the deletion?',
+
+    opt_label01:'Line Setting',
+    opt_label02:'Scatter Setting',
+    opt_label03:'Legend Setting',
+    opt_label04:'Title Setting',
+    opt_label05:'Annotation Text Settings (Source & Identification)',
+    opt_label06:'Horizontal Axis Setting',
+    opt_label07:'Vertical Axis Setting',
+    opt_label08:'Plot Area Setting',
+    opt_label09:'Bar Setting',
+    opt_label10:'Lines, Bar Setting',
+
+    config_opt01:'Color',
+    config_opt02:'Sequence',
+    config_opt03:'Line Style',
+    config_opt04:'Thickness',
+    config_opt05:'Smooth Line',
+    config_opt06:'Size',
+    config_opt07:'Position',
+    config_opt08:'Font Size',
+    config_opt09:'Alignment Method',
+    config_opt10:'Background Color',
+
+    unit01:'st Line',
+    unit02:'st Bar',
+    unit03:'st Series',
+};
+  
+/* 中文 */
+export const ChartSetZh = {
+    label01:'图表类型',
+    label02:'ETA图库默认主题',
+    add_btn:'添加自定义主题',
+    edit_btn:'编辑自定义主题',
+    theme_name:'主题名称',
+    theme_name_placeholder:'请输入主题名称',
+    alert_msg:'删除后，所有采用该主题的图表，将采用ETA主题，是否确定删除？',
+
+    opt_label01:'线条设置',
+    opt_label02:'散点设置',
+    opt_label03:'图例设置',
+    opt_label04:'标题设置',
+    opt_label05:'标记文字设置(来源，标识)',
+    opt_label06:'横轴设置',
+    opt_label07:'纵轴设置',
+    opt_label08:'绘图区设置',
+    opt_label09:'柱形设置',
+    opt_label10:'线条、柱形设置',
+
+    config_opt01:'颜色',
+    config_opt02:'顺序',
+    config_opt03:'线型',
+    config_opt04:'粗细',
+    config_opt05:'平滑线',
+    config_opt06:'大小',
+    config_opt07:'位置',
+    config_opt08:'字号',
+    config_opt09:'对齐方式',
+    config_opt10:'背景色',
+
+    unit01:'条',
+    unit02:'根',
+    unit03:'系列',
+};
+  
+/**
+* $t('SystemManage.ChartSet.XXX')
+*/

src/lang/modules/systemManage/ReportApprove.js

@@ -0,0 +1,78 @@
+/**
+ * 系统设置-审批流配置
+ */
+
+/* 英文 */
+export const ReportApproveEn = {
+    add_btn:"Add approval workflow",
+    placeholder01:'Please select an associated report',
+    placeholder02:'Please enter the approval workflow name',
+    tips01:'The system has not yet opened the approval process. Please open the approval process before proceeding with the operation!',
+
+    table_col01:'Approval Workflow Name',
+    table_col02:'Associated Report',
+    table_col03:'Creation Time',
+    config_text:'Process Configuration',
+    add_approve_user_btn:'Add approver',
+    initiator:'Initiator',
+    everyone:'Everyone',
+    is_end:'Process End',
+
+    reviewer:'Reviewer',
+    placeholder03:'Please select an approver',
+    approver_set:'Approver Setting',
+    select_appriver:'Select approver',
+    designate_personnel:'Designate Personnel',
+    select_user:'Select Personnel',
+    mutl_person:'During Multi-Person Approval',
+    approval_type01:'Sequential Approval ',
+    approval_type02:'Consensus (Need agreement from all approvers)',
+    approval_type03:'Or Sign (Approval or rejection by any one approver is sufficient)',
+    des01:'Multiple approvers review and approve in sequence; The node passes only when all approvers agree; Approve in order of selection',
+    des02:'The node passes only when all approvers agree; There is no sequence in approval.',
+    des03:'If any approver agrees, the node wil pass; There is no sequence in approval.',
+    warning_msg01:'Please select at least one person',
+    search_btn:'Search',
+    has_selected:'has been selected',
+    clear_btn:'Clear'
+
+};
+  
+/* 中文 */
+export const ReportApproveZh = {
+    add_btn:"添加审批流",
+    placeholder01:'请选择关联报告',
+    placeholder02:'请输入审批流名称',
+    tips01:'系统暂未开通审批流程，请开启审批流程后再进行操作！',
+    table_col01:'审批流名称',
+    table_col02:'关联报告',
+    table_col03:'创建时间',
+    config_text:'流程配置',
+    add_approve_user_btn:'添加审批人',
+    initiator:'发起人',
+    everyone:'所有人',
+    is_end:'流程结束',
+
+    reviewer:'审核人',
+    placeholder03:'请选择审批人',
+    approver_set:'审批人设置',
+    select_appriver:'选择审批人',
+    designate_personnel:'指定人员',
+    select_user:'选择人员',
+    mutl_person:'多人审批时',
+    approval_type01:'依次审批',
+    approval_type02:'会签（须所有审批人同意）',
+    approval_type03:'或签（一名审批人同意或拒绝即可）',
+    des01:'多个审批人依次进行审批；只有当所有审批人同意，该节点才能通过；按选择顺序审批',
+    des02:'所有审批人同意，该节点才能通过；审批无先后顺序',
+    des03:'任意一名审批人同意，该节点即通过；审批无先后顺序',
+    warning_msg01:'请至少选择一人',
+    search_btn:'搜索',
+    has_selected:'项',
+    clear_btn:'清空'
+
+};
+  
+/**
+* $t('SystemManage.ReportApprove.XXX')
+*/

src/lang/modules/systemManage/indexEn.js

@@ -6,6 +6,8 @@ import {EnAuthSetEn} from './EnAuthSet'
 import {BaseConfigEn} from './BaseConfig'
 import {OutLinkConfigEn} from './OutLinkConfig'
 import {DataSourceAccountEn} from './DataSourceAccount'
+import {ChartSetEn} from './ChartSet'
+import {ReportApproveEn} from './ReportApprove'
 
 export default {
   // 系统设置
@@ -17,7 +19,9 @@ export default {
     EnAuthSet:EnAuthSetEn,
     BaseConfig:BaseConfigEn,
     OutLinkConfig:OutLinkConfigEn,
-    DataSourceAccount:DataSourceAccountEn
+    DataSourceAccount:DataSourceAccountEn,
+    ChartSet:ChartSetEn,
+    ReportApprove:ReportApproveEn
   },
 };
 

src/lang/modules/systemManage/indexZh.js

@@ -6,6 +6,8 @@ import {EnAuthSetZh} from './EnAuthSet'
 import {BaseConfigZh} from './BaseConfig'
 import { OutLinkConfigZh } from "./OutLinkConfig";
 import{DataSourceAccountZh} from './DataSourceAccount'
+import { ChartSetZh } from "./ChartSet";
+import { ReportApproveZh } from "./ReportApprove";
 
 export default {
   // 系统设置
@@ -17,6 +19,8 @@ export default {
     EnAuthSet:EnAuthSetZh,
     BaseConfig:BaseConfigZh,
     OutLinkConfig:OutLinkConfigZh,
-    DataSourceAccount:DataSourceAccountZh
+    DataSourceAccount:DataSourceAccountZh,
+    ChartSet:ChartSetZh,
+    ReportApprove:ReportApproveZh
   },
 };

src/views/approve_manage/approveEdit.vue

@@ -3,11 +3,11 @@
     <div class="approve-edit-wrap approve-page-wrap" v-if="isETAApprove">
         <div class="head-box">
             <el-form :inline="true" :model="approveForm" ref="approve-form" :rules="formRules"
-                label-width="100px" label-position="left">
-                <el-form-item label="审批流名称" prop="name">
+                label-width="180px" label-position="left">
+                <el-form-item :label="$t('SystemManage.ReportApprove.table_col01')" prop="name">
                     <el-input v-model="approveForm.name" :disabled="this.$route.query.flowId" placeholder="请输入审批流名称"></el-input>
                 </el-form-item>
-                <el-form-item label="关联报告" prop="classify">
+                <el-form-item :label="$t('SystemManage.ReportApprove.table_col02')" prop="classify">
                     <el-cascader v-model="approveForm.classify"
                         placeholder="请选择关联报告" clearable
                         :disabled="this.$route.query.flowId"
@@ -17,13 +17,13 @@
                 </el-form-item>
             </el-form>
             <div class="form-btn">
-                <el-button type="primary" plain @click="$router.back()">取消</el-button>
+                <el-button type="primary" plain @click="$router.back()">{{$t('Dialog.cancel_btn')}}</el-button>
                 <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_save"
-                    type="primary" @click="checkFlow">保存</el-button>
+                    type="primary" @click="checkFlow">{{$t('Dialog.confirm_save_btn')}}</el-button>
             </div>
         </div>
         <div class="form-item" style="color:#606266;width:100px;">
-            <span style="color:#F56C6C;margin-right: 4px;">*</span>流程配置
+            <span style="color:#F56C6C;margin-right: 4px;">*</span>{{$t('SystemManage.ReportApprove.config_text')}}
         </div>
         <!-- 审批流画布 -->
         <div class="flow-editor-wrap">
@@ -34,7 +34,7 @@
         </div>
     </div>
     <div class="approve-page-wrap" v-else>
-        <tableNoData :text="pageLoading?'':'系统暂未开通审批流程，请开启审批流程后再进行操作！'"></tableNoData>
+        <tableNoData :text="pageLoading?'':$t('SystemManage.ReportApprove.tips01')"></tableNoData>
     </div>
 </template>
 

src/views/approve_manage/approveSetting.vue

@@ -3,15 +3,15 @@
     <div class="approve-setting-wrap approve-page-wrap" v-if="isETAApprove">
         <div class="head-box">
             <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_add"
-                type="primary" @click="$router.push('/approveEdit')">添加审批流</el-button>
+                type="primary" @click="$router.push('/approveEdit')">{{$t('SystemManage.ReportApprove.add_btn')}}</el-button>
             <el-cascader v-model="classify"
-                placeholder="请选择关联报告" clearable
+                :placeholder="$t('SystemManage.ReportApprove.placeholder01')" clearable
                 :options="classifyTree"
                 :props="{value:'ClassifyId',label:'ClassifyName',children:'Children'}"
                 @change="handleSearchChange"
                 style="margin-right: auto;margin-left: 15px;"></el-cascader>
             <el-input v-model="Keyword" @input="handleCurrentChange(1)"
-                placeholder="请输入审批流名称" prefix-icon="el-icon-search" clearable style="width:260px;"></el-input>
+                :placeholder="$t('SystemManage.ReportApprove.placeholder02')" prefix-icon="el-icon-search" clearable style="width:260px;"></el-input>
         </div>
         <div class="list-box">
             <el-table :data="tableData" @sort-change="sortChange" border>
@@ -23,12 +23,12 @@
                     :sortable="item.sortable"
                     align="center"
                 ></el-table-column>
-                <el-table-column label="操作" align="center">
+                <el-table-column :label="$t('Table.column_operations')" align="center">
                     <template slot-scope="{row}">
                         <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_edit"
-                            type="text" style="padding:0;" @click="handleEditFlow(row)">编辑</el-button>
+                            type="text" style="padding:0;" @click="handleEditFlow(row)">{{$t('Table.edit_btn')}}</el-button>
                         <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_remove"
-                            type="text" style="padding:0;color:red;" @click="handleDeleteFlow(row)">删除</el-button>
+                            type="text" style="padding:0;color:red;" @click="handleDeleteFlow(row)">{{$t('Table.delete_btn')}}</el-button>
                     </template>
                     
                 </el-table-column>
@@ -47,7 +47,7 @@
         </div>
     </div>
     <div class="approve-page-wrap" v-else>
-        <tableNoData :text="pageLoading?'':'系统暂未开通审批流程，请开启审批流程后再进行操作！'"></tableNoData>
+        <tableNoData :text="pageLoading?'':$t('SystemManage.ReportApprove.tips01')"></tableNoData>
     </div>
 </template>
 
@@ -57,6 +57,21 @@ import approveMixins from './mixins/approveMixins';
 import reportApproveConfig from "@/mixins/reportApproveConfig.js"
 export default {
     mixins:[approveMixins,reportApproveConfig],
+    computed:{
+        tableColumns(){
+            return [{
+                label:this.$t('SystemManage.ReportApprove.table_col01'),
+                key:'FlowName'
+            },{
+                label:this.$t('SystemManage.ReportApprove.table_col02'),
+                key:'ReportClassify'
+            },{
+                label:this.$t('SystemManage.ReportApprove.table_col03'),
+                key:'CreateTime',
+                sortable:'custom'
+            }]
+        }
+    },
     data() {
         return {
             /* 列表筛选项 */
@@ -68,17 +83,17 @@ export default {
             classify:'',
 
             tableData:[],
-            tableColumns:[{
-                label:'审批流名称',
-                key:'FlowName'
-            },{
-                label:'关联报告',
-                key:'ReportClassify'
-            },{
-                label:'创建时间',
-                key:'CreateTime',
-                sortable:'custom'
-            }],
+            // tableColumns:[{
+            //     label:'审批流名称',
+            //     key:'FlowName'
+            // },{
+            //     label:'关联报告',
+            //     key:'ReportClassify'
+            // },{
+            //     label:'创建时间',
+            //     key:'CreateTime',
+            //     sortable:'custom'
+            // }],
             page:1,
             pageSize:10,
             total:0,
@@ -128,14 +143,14 @@ export default {
             })
         },
         handleDeleteFlow(item){
-            this.$confirm("删除后不可恢复,确认删除吗?","提示",{
+            this.$confirm(this.$t('MsgPrompt.delete_info_msg'),this.$t('Confirm.prompt'),{
                 type:"warning"
             }).then(()=>{
                 approveInterence.deleteApproveFlow({
                     ReportApproveFlowId:item.ReportApproveFlowId
                 }).then(res=>{
                     if(res.Ret!==200) return 
-                    this.$message.success("删除成功")
+                    this.$message.success(this.$t('MsgPrompt.delete_msg'))
                     this.handleCurrentChange(1)
                 })
             }).catch(()=>{})

src/views/approve_manage/components/flowNode/addNode.vue

@@ -2,7 +2,7 @@
     <div class="add-node-wrap">
         <div class="add-btn" @click="handleAddApprove">
             <span> <i class="el-icon-circle-plus-outline"></i></span>
-            <span>添加审批人</span>
+            <span>{{$t('SystemManage.ReportApprove.add_approve_user_btn')}}</span>
         </div>
     </div>
 </template>

src/views/approve_manage/components/flowNode/approveNode.vue

@@ -3,7 +3,7 @@
         <div class="node-content">
             <div class="head">
                 <span class="icon"></span>
-                <span class="name">审核人</span>
+                <span class="name">{{$t('SystemManage.ReportApprove.reviewer')}}</span>
                 <span class="icon-btn" @click="removeNode"><i class="el-icon-close"></i></span>
             </div>
             <div class="content" @click="showDrawer">
@@ -14,7 +14,7 @@
                 </ul>
                 <span v-else style="color:#0052D9;display: flex;align-items: center;">
                     <img src="~@/assets/img/approve_m/select.png">
-                    请选择审批人
+                    {{$t('SystemManage.ReportApprove.placeholder03')}}
                 </span>
             </div>
         </div>
@@ -27,17 +27,17 @@
             >
             <div class="approve-drawer-wrap">
                 <div class="header">
-                    <p>审批人设置</p>
+                    <p>{{$t('SystemManage.ReportApprove.approver_set')}}</p>
                     <span class="close-icon" @click="drawerShow=false" style="cursor: pointer;"><i class="el-icon-close"></i></span>
                 </div>
                 <div class="drawer-content">
                     <div class="block">
-                        <p>选择审批人</p>
+                        <p>{{$t('SystemManage.ReportApprove.select_appriver')}}</p>
                         <div class="choose-box">
-                            <el-radio v-model="block1" :label="1">指定人员</el-radio>
+                            <el-radio v-model="block1" :label="1">{{$t('SystemManage.ReportApprove.designate_personnel')}}</el-radio>
                             <el-button @click="chooseDialogShow=true" type="primary">
                                 <i class="el-icon-circle-plus-outline" style="margin-right: 5px;"></i>
-                                选择人员
+                                {{$t('SystemManage.ReportApprove.select_user')}}
                             </el-button>
                         </div>
                         <draggable 
@@ -55,27 +55,27 @@
                     </div>
                     <div class="line"></div>
                     <div class="block" style="margin-top:30px;">
-                        <p>多人审批时</p>
+                        <p>{{$t('SystemManage.ReportApprove.mutl_person')}}</p>
                         <el-radio-group v-model="approveType">
                             <el-radio :label="1">
-                                依次审批
-                                <el-tooltip effect="dark" placement="top" content="多个审批人依次进行审批；只有当所有审批人同意，该节点才能通过；按选择顺序审批" >
+                                {{$t('SystemManage.ReportApprove.approval_type01')}}
+                                <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des01')" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
                                     </span>
                                 </el-tooltip>
                             </el-radio>
                             <el-radio :label="2">
-                                会签（须所有审批人同意）
-                                <el-tooltip effect="dark" placement="top" content="所有审批人同意，该节点才能通过；审批无先后顺序" >
+                                {{$t('SystemManage.ReportApprove.approval_type02')}}
+                                <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des02')" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
                                     </span>
                                 </el-tooltip>
                             </el-radio>
                             <el-radio :label="3">
-                                或签（一名审批人同意或拒绝即可）
-                                <el-tooltip effect="dark" placement="top" content="任意一名审批人同意，该节点即通过；审批无先后顺序" >
+                                {{$t('SystemManage.ReportApprove.approval_type03')}}
+                                <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des03')" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
                                     </span>
@@ -85,14 +85,14 @@
                     </div>
                 </div>
                 <div class="drawer-btn">
-                    <el-button type="primary" plain @click="drawerShow=false">取消</el-button>
-                    <el-button type="primary" @click="editApproveNode">确认</el-button>
+                    <el-button type="primary" plain @click="drawerShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+                    <el-button type="primary" @click="editApproveNode">{{$t('Dialog.confirm_btn')}}</el-button>
                 </div>
             </div>
         </el-drawer>
         <!-- 选择人员弹窗 -->
         <el-dialog 
-            title="选择人员"
+            :title="$t('SystemManage.ReportApprove.select_user')"
             width="600px"
             :visible.sync="chooseDialogShow"
             :modal-append-to-body="false"
@@ -107,8 +107,8 @@
                 />
             </div>
             <div class="dialog-btn">
-                <el-button type="primary" plain @click="chooseDialogShow=false">取消</el-button>
-                <el-button type="primary" @click="getChoosedList">确认</el-button>
+                <el-button type="primary" plain @click="chooseDialogShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="getChoosedList">{{$t('Dialog.confirm_btn')}}</el-button>
             </div>
         </el-dialog>
     </div>
@@ -151,7 +151,7 @@ export default {
         },
         getChoosedList(){
             if(!this.$refs["tree-trans"].choosedList.length){
-                this.$message.warning("请至少选择一人")
+                this.$message.warning(this.$t('SystemManage.ReportApprove.warning_msg01'))
                 return
             }
             this.choosedList = _.cloneDeep(this.$refs["tree-trans"].choosedList)||[]

src/views/approve_manage/components/flowNode/endNode.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="end-node-wrap node-wrap">
-        <div class="end-content">流程结束</div>
+        <div class="end-content">{{$t('SystemManage.ReportApprove.is_end')}}</div>
     </div>
 </template>
 

src/views/approve_manage/components/flowNode/startNode.vue

@@ -3,9 +3,9 @@
         <div class="node-content">
             <div class="head">
                 <span class="icon"></span>
-                <p class="name">发起人</p>
+                <p class="name">{{$t('SystemManage.ReportApprove.initiator')}}</p>
             </div>
-            <div class="content">所有人</div>
+            <div class="content">{{$t('SystemManage.ReportApprove.everyone')}}</div>
         </div>
         <AddNode :node="flowNode" v-on="$listeners"/>
     </div>

src/views/approve_manage/components/treeTransfer.vue

@@ -3,7 +3,7 @@
     <div class="tree-transfer">
         <div class="before-transfer transfer">
             <div class="search">
-                <el-input placeholder="搜索" suffix-icon="el-icon-search" style="width:100%;"
+                <el-input :placeholder="$t('SystemManage.ReportApprove.search_btn')" suffix-icon="el-icon-search" style="width:100%;"
                     v-model="searchText" @input="$refs['trans-tree'].filter(searchText)"></el-input>
             </div>
             <div class="content">
@@ -23,8 +23,8 @@
         </div>
         <div class="after-transfer transfer">
             <div class="head">
-                <span>已选{{choosedList.length}}项</span>
-                <span class="btn-text delete" @click="clearnItem">清空</span>
+                <span>{{$i18n.locale == 'zh' ?'已选':''}}{{choosedList.length}}{{$t('SystemManage.ReportApprove.has_selected')}}</span>
+                <span class="btn-text delete" @click="clearnItem">{{$t('SystemManage.ReportApprove.clear_btn')}}</span>
             </div>
             <draggable 
                 v-model="choosedList"

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
@@ -175,7 +175,7 @@
                   />
                 </div>
                 <span class="chart-author"
-                  >作者:{{ chartInfo.SysUserRealName }}</span
+                  >{{$t('MsgPrompt.author')}}:{{ chartInfo.SysUserRealName }}</span
                 >
               </div>
 
@@ -242,16 +242,16 @@
                 <span v-else>{{ scope.row[item.key] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" key="Copy" align="center" width="140">
+            <el-table-column :label="$t('Edb.Detail.e_opera')" key="Copy" align="center" width="140">
               <template slot-scope="scope">
                 <!-- <span @click="delTarget(scope.row)" class="deletesty">删除&nbsp;</span> -->
                 <span v-permission="permissionBtn.statisticPermission.corrAnalysis_copyData"
                     class="editsty" @click="copyCode(scope.row)">
-                  <i class="el-icon-document-copy" />&nbsp;复制数据</span
+                  <i class="el-icon-document-copy" />&nbsp;{{$t('Edb.detail_copydata_btn')}}</span
                 ><br />
                 <span v-permission="permissionBtn.statisticPermission.corrAnalysis_viewData"
                     class="editsty" @click="viewTarget(scope.row)"
-                  >查看数据</span
+                  >{{$t('Edb.detail_lookdata_btn')}}</span
                 >
               </template>
             </el-table-column>
@@ -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,
@@ -502,15 +502,15 @@ export default {
       const { DeleteStatus } = Data;
 
       DeleteStatus === 1
-        ? this.$confirm("该分类下关联表图表不可删除", "删除失败", {
-            confirmButtonText: "知道了",
+        ? this.$confirm(this.$t('Chart.OptMsg.classify_del_fail'), this.$t('Chart.OptMsg.del_fail_tag'), {
+            confirmButtonText: this.$t('MsgPrompt.known'),
             showCancelButton: false,
             type: "error",
           })
         : DeleteStatus === 0
-        ? this.$confirm("确定删除当前分类吗？", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
+        ? this.$confirm(this.$t('Chart.OptMsg.classify_del_confirm'), this.$t('Confirm.prompt'), {
+            // confirmButtonText: "确定",
+            // cancelButtonText: "取消",
             type: "warning",
           }).then(() => {
             this.delApi(ChartClassifyId, ChartInfoId);
@@ -645,9 +645,9 @@ export default {
     /* 删除图表 */
     delChartHandle() {
       const { ChartClassifyId, ChartInfoId } = this.chartInfo;
-      this.$confirm("删除后该图表将不能再引用，确认删除吗？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$confirm(this.$t('Chart.OptMsg.chart_del_confirm'), this.$t('Confirm.prompt'), {
+        // confirmButtonText: "确定",
+        // cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {

src/views/chartRelevance_manage/relevance/relevanceChartEditor.vue

@@ -9,10 +9,10 @@
     </span>
     <div class="left-cont" v-show="!isSlideLeft" id="left">
       <div class="left-top">
-        <el-button type="primary" plain @click="$router.back()">取消</el-button>
+        <el-button type="primary" plain @click="$router.back()">{{$t('Dialog.cancel_btn')}}</el-button>
         <div style="color:#409EFF;font-size: 16px;cursor: pointer;" @click="showExplain = true">
             <i class="el-icon-document" style="font-size:22px;"></i>
-            操作说明
+            {{$t('StatisticAnalysis.ChartRelevance.opt_tip_btn')}}
         </div>
       </div>
       <div class="left-min">

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: this.$t('Edb.Detail.e_name'),
-          key: 'EdbName',
-          enKey:'EdbNameEn',
-					inputTip:'点击输入英文指标名称',
-          minwidthsty: '150px',
-        },
-        {
-          label: this.$t('Edb.Detail.e_id'),
-          key: 'EdbCode',
-          widthsty: '120px',
-        },
-        {
-          label: this.$t('Edb.Detail.e_fre'),
-          key: 'Frequency',
-          enKey:'FrequencyEn',
-          minwidthsty: '60px',
-        },
-        {
-          label: this.$t('Edb.Detail.e_unit'),
-          key: 'Unit',
-          enKey:'UnitEn',
-					inputTip:'英文单位',
-          minwidthsty: '50px',
-        },
-        {
-          label: this.$t('Edb.Detail.e_start_time'),
-          key: 'StartDate',
-          minwidthsty: '100px',
-        },
-        {
-          label: this.$t('Edb.Detail.e_latest_date'),
-          key: 'LatestDate',
-          minwidthsty: '90px',
-        },
-        {
-          label: this.$t('Edb.Detail.e_latest_value'),
-          key: 'LatestValue',
-          minwidthsty: '90px',
-        },
-        {
-          label: this.$t('Edb.Detail.e_recent_time'),
-          key: 'ModifyTime',
-          minwidthsty: '100px',
-        },
-        {
-          label: this.$t('Edb.Detail.source'),
-          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.Detail.e_name'),
+          key: 'EdbName',
+          enKey:'EdbNameEn',
+					inputTip:'点击输入英文指标名称',
+          minwidthsty: '150px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_id'),
+          key: 'EdbCode',
+          widthsty: '120px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_fre'),
+          key: 'Frequency',
+          enKey:'FrequencyEn',
+          minwidthsty: '60px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_unit'),
+          key: 'Unit',
+          enKey:'UnitEn',
+					inputTip:'英文单位',
+          minwidthsty: '50px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_start_time'),
+          key: 'StartDate',
+          minwidthsty: '100px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_latest_date'),
+          key: 'LatestDate',
+          minwidthsty: '90px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_latest_value'),
+          key: 'LatestValue',
+          minwidthsty: '90px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_recent_time'),
+          key: 'ModifyTime',
+          minwidthsty: '100px',
+        },
+        {
+          label: this.$t('Edb.Detail.source'),
+          key: 'SourceName',
+        },
+      ]
+    }
+  },
   watch: {
     
     /* 奇怪柱状图数据  */

src/views/datasheet_manage/components/sheetClassifyDia.vue

@@ -16,21 +16,21 @@
 				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%"
-            placeholder="必填项"></el-input>
+            placeholder=""></el-input>
           </el-form-item>
 				</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>
@@ -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' },
+    //     ]
+    //   },
 
 		};
 	},

src/views/system_manage/chartTheme/components/optionsSection.vue

@@ -8,7 +8,7 @@
              <!-- 线条设置 -->
             <template v-if="key==='lineOptions'">
                 <li class="option-item">
-                  <label class="el-form-item__label">颜色</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt01')}}</label>
                   <el-color-picker
                     v-model="themeOptions[key].colors[themeOptions[key].colorIndex]"
                     show-alpha
@@ -18,7 +18,7 @@
                   />
                 </li>
                 <li class="option-item">
-                  <label class="el-form-item__label">顺序</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt02')}}</label>
                   <el-select 
                     v-model="themeOptions[key].colorIndex"
                     style="width: 90px"
@@ -26,7 +26,7 @@
                     <el-option 
                       v-for="(item,index) in themeOptions[key].colors" 
                       :key="index"
-                      :label="`第${index+1}${typeLabelMap[chartType].lineLabel}`"
+                      :label="`${$i18n.locale == 'zh'?'第':''}${index+1}${typeLabelMap[chartType].lineLabel}`"
                       :value="index"
                     />
                   </el-select>
@@ -35,7 +35,7 @@
                 <!-- 曲线额外配置 雷达 -->
                 <template v-if="[1,2,11].includes(chartType)">
                   <li class="option-item">
-                    <label class="el-form-item__label">线型</label>
+                    <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt03')}}</label>
                     <el-select 
                       v-model="themeOptions[key].dashStyle"
                       style="width: 90px"
@@ -52,7 +52,7 @@
                     </el-select>
                   </li>
                   <li class="option-item">
-                    <label class="el-form-item__label">粗细</label>
+                    <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt04')}}</label>
                     <el-input
                       v-model="themeOptions[key].lineWidth"
                       style="width: 90px"
@@ -62,7 +62,7 @@
                     />
                   </li>
                   <li class="option-item">
-                    <label class="el-form-item__label">平滑线</label>
+                    <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt05')}}</label>
                     <el-select 
                       v-model="themeOptions[key].lineType"
                       style="width: 90px"
@@ -76,7 +76,7 @@
                 <!-- 散点额外配置 -->
                 <template v-else-if="[5,10].includes(chartType)">
                   <li class="option-item">
-                    <label class="el-form-item__label">大小</label>
+                    <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt06')}}</label>
                     <el-input
                       v-model="themeOptions[key].radius"
                       style="width: 90px"
@@ -91,7 +91,7 @@
              <!-- 图例设置 -->
             <template v-else-if="key==='legendOptions'">
                 <li class="option-item">
-                  <label class="el-form-item__label">颜色</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt01')}}</label>
                   <el-color-picker
                     v-model="themeOptions[key].itemStyle.color"
                     show-alpha
@@ -100,7 +100,7 @@
                   />
                 </li>
                 <li class="option-item">
-                  <label class="el-form-item__label">位置</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt07')}}</label>
                   <el-select 
                     v-model="themeOptions[key].verticalAlign"
                     style="width: 90px"
@@ -114,7 +114,7 @@
                   </el-select>
                 </li>
                 <li class="option-item">
-                  <label class="el-form-item__label">字号</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt08')}}</label>
                   <el-input
                     v-model="themeOptions[key].itemStyle.fontSize"
                     style="width: 90px"
@@ -128,7 +128,7 @@
             <!-- 标题设置 -->
             <template v-else-if="key==='titleOptions'">
                 <li class="option-item">
-                  <label class="el-form-item__label">颜色</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt01')}}</label>
                   <el-color-picker
                     v-model="themeOptions[key].style.color"
                     show-alpha
@@ -137,7 +137,7 @@
                   />
                 </li>
                 <li class="option-item">
-                  <label class="el-form-item__label">字号</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt08')}}</label>
                   <el-input
                     v-model="themeOptions[key].style.fontSize"
                     style="width: 90px"
@@ -147,7 +147,7 @@
                   />
                 </li>
                 <li class="option-item">
-                  <label class="el-form-item__label">对齐方式</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt09')}}</label>
                   <el-radio-group v-model="themeOptions[key].align" size="small">
                     <el-radio-button 
                       v-for="item in alignPositions" 
@@ -164,7 +164,7 @@
             <!-- 标记文字 横轴 纵轴设置 -->
             <template v-else-if="['markerOptions','xAxisOptions','yAxisOptions'].includes(key)">
                 <li class="option-item">
-                  <label class="el-form-item__label">颜色</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt01')}}</label>
                   <el-color-picker
                     v-model="themeOptions[key].style.color"
                     show-alpha
@@ -173,7 +173,7 @@
                   />
                 </li>
                 <li class="option-item">
-                  <label class="el-form-item__label">字号</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt08')}}</label>
                   <el-input
                     v-model="themeOptions[key].style.fontSize"
                     style="width: 90px"
@@ -187,7 +187,7 @@
             <!-- 绘图区设置 -->
             <template v-else-if="key==='drawOption'">
                 <li class="option-item">
-                  <label class="el-form-item__label">背景色</label>
+                  <label class="el-form-item__label">{{$t('SystemManage.ChartSet.config_opt10')}}</label>
                   <el-color-picker
                     v-model="themeOptions[key].plotBackgroundColor"
                     show-alpha
@@ -214,6 +214,32 @@ export default {
     chartType() {
     }
   },
+  computed:{
+    labelMap(){
+      return new Map([
+        ['lineOptions',this.$t('SystemManage.ChartSet.opt_label01')],
+        ['scatterOptions',this.$t('SystemManage.ChartSet.opt_label02')],
+        ['legendOptions',this.$t('SystemManage.ChartSet.opt_label03')],
+        ['titleOptions',this.$t('SystemManage.ChartSet.opt_label04')],
+        ['markerOptions',this.$t('SystemManage.ChartSet.opt_label05')],
+        ['xAxisOptions',this.$t('SystemManage.ChartSet.opt_label06')],
+        ['yAxisOptions',this.$t('SystemManage.ChartSet.opt_label07')],
+        ['drawOption',this.$t('SystemManage.ChartSet.opt_label08')],
+      ])
+    },
+    typeLabelMap(){
+      return {
+        1: {label:this.$t('SystemManage.ChartSet.opt_label01'),lineLabel: this.$t('SystemManage.ChartSet.unit01')},
+        2: {label:this.$t('SystemManage.ChartSet.opt_label01'),lineLabel: this.$t('SystemManage.ChartSet.unit01')},
+        4: {label:this.$t('SystemManage.ChartSet.opt_label09'),lineLabel: this.$t('SystemManage.ChartSet.unit02')},
+        5: {label:this.$t('SystemManage.ChartSet.opt_label02'),lineLabel: this.$t('SystemManage.ChartSet.unit03')},
+        6: {label:this.$t('SystemManage.ChartSet.opt_label10'),lineLabel: this.$t('SystemManage.ChartSet.unit03')},
+        7: {label:this.$t('SystemManage.ChartSet.opt_label09'),lineLabel: this.$t('SystemManage.ChartSet.unit02')},
+        10: {label:this.$t('SystemManage.ChartSet.opt_label02'),lineLabel: this.$t('SystemManage.ChartSet.unit03')},
+        11: {label:this.$t('SystemManage.ChartSet.opt_label01'),lineLabel: this.$t('SystemManage.ChartSet.unit01')},
+      }
+    }
+  },
   data() {
     return {
       predefineColors,
@@ -238,26 +264,26 @@ export default {
         drawOption: defaultETAOptions.drawOption
       },
       lengendPositions: verticalPositions.filter(_ => _.value!=='middle'),
-      typeLabelMap: {
-        1: {label:'线条设置',lineLabel: '条'},
-        2: {label:'线条设置',lineLabel: '条'},
-        4: {label:'柱形设置',lineLabel: '根'},
-        5: {label:'散点设置',lineLabel: '系列'},
-        6: {label:'线条、柱形设置',lineLabel: '系列'},
-        7: {label:'柱形设置',lineLabel: '根'},
-        10: {label:'散点设置',lineLabel: '系列'},
-        11: {label:'线条设置',lineLabel: '条'},
-      },
-      labelMap: new Map([
-        ['lineOptions','线条设置'],
-        ['scatterOptions','散点设置'],
-        ['legendOptions','图例设置'],
-        ['titleOptions','标题设置'],
-        ['markerOptions','标记文字设置(来源，标识)'],
-        ['xAxisOptions','横轴设置'],
-        ['yAxisOptions','纵轴设置'],
-        ['drawOption','绘图区设置'],
-      ]),
+      // typeLabelMap: {
+      //   1: {label:'线条设置',lineLabel: '条'},
+      //   2: {label:'线条设置',lineLabel: '条'},
+      //   4: {label:'柱形设置',lineLabel: '根'},
+      //   5: {label:'散点设置',lineLabel: '系列'},
+      //   6: {label:'线条、柱形设置',lineLabel: '系列'},
+      //   7: {label:'柱形设置',lineLabel: '根'},
+      //   10: {label:'散点设置',lineLabel: '系列'},
+      //   11: {label:'线条设置',lineLabel: '条'},
+      // },
+      // labelMap: new Map([
+      //   ['lineOptions','线条设置'],
+      //   ['scatterOptions','散点设置'],
+      //   ['legendOptions','图例设置'],
+      //   ['titleOptions','标题设置'],
+      //   ['markerOptions','标记文字设置(来源，标识)'],
+      //   ['xAxisOptions','横轴设置'],
+      //   ['yAxisOptions','纵轴设置'],
+      //   ['drawOption','绘图区设置'],
+      // ]),
       configOptions: []
     }
   },
@@ -307,6 +333,8 @@ export default {
     margin-top: 20px;
     .option-item {
       margin: 10px 0;
+      display: flex;
+      align-items: center;
     }
   }
   .option-title{
@@ -321,8 +349,9 @@ export default {
     }
   }
   .el-form-item__label {
-    width: 70px;
+    width: 90px;
     text-align: left;
+    line-height: 1.5;
   }
 }
 </style>

src/views/system_manage/chartTheme/index.vue

@@ -4,7 +4,7 @@
       <div style="display: flex;gap:20px;">
         <div class="select-item">
           <div class="select-item">
-            <label>图表类型</label>
+            <label>{{$t('SystemManage.ChartSet.label01')}}</label>
             <el-select v-model="formData.chartType" style="margin-left: 15px;" @change="getThemeList();">
               <el-option
                 v-for="item in chartTypeOpts"
@@ -16,7 +16,7 @@
           </div>
         </div>
         <div class="select-item">
-          <label>ETA图库默认主题</label>
+          <label>{{$t('SystemManage.ChartSet.label02')}}</label>
           <el-select v-model="formData.theme" style="margin-left: 10px;">
             <el-option
               v-for="item in themeOpts"
@@ -28,7 +28,7 @@
         </div>
       </div>
 
-      <el-button type="primary" v-permission="permissionBtn.chartThemePermission.chartTheme_edit" @click="setConfigTheme">保存</el-button>
+      <el-button type="primary" v-permission="permissionBtn.chartThemePermission.chartTheme_edit" @click="setConfigTheme">{{$t('Dialog.confirm_save_btn')}}</el-button>
     </div>
 
     <!-- 主题列表 -->
@@ -43,8 +43,8 @@
             <div slot="header" class="item-top">
               <span class="text_oneLine">{{item.ChartThemeName}}</span>
               <div>
-                <el-button type="text" @click="editThemeHandle(item)" v-permission="permissionBtn.chartThemePermission.chartTheme_edit">编辑</el-button>
-                <span class="deletesty" @click="delThemeHandle(item,index)" v-permission="permissionBtn.chartThemePermission.chartTheme_del" v-if="!item.IsSystemTheme">删除</span>
+                <el-button type="text" @click="editThemeHandle(item)" v-permission="permissionBtn.chartThemePermission.chartTheme_edit">{{$t('Table.edit_btn')}}</el-button>
+                <span class="deletesty" @click="delThemeHandle(item,index)" v-permission="permissionBtn.chartThemePermission.chartTheme_del" v-if="!item.IsSystemTheme">{{$t('Table.delete_btn')}}</span>
               </div>
             </div>
             <div class="chart-img" :style="`backgroundImage:url(${item.ChartImage})`"></div>
@@ -54,7 +54,7 @@
           <div class="chart-img"></div>
           <div class="add-cont">
             <i class="el-icon-plus"/>
-            <el-button type="text" style="font-size:16px;">添加自定义主题</el-button>
+            <el-button type="text" style="font-size:16px;">{{$t('SystemManage.ChartSet.add_btn')}}</el-button>
           </div>
         </li>
       </ul>
@@ -64,16 +64,16 @@
 
    <!-- 弹窗 -->
     <m-dialog 
-      :title="`${addThemeForm.id?'编辑':'添加'}自定义主题`" 
+      :title="`${addThemeForm.id?$t('SystemManage.ChartSet.edit_btn'):$t('SystemManage.ChartSet.edit_btn')}`" 
       :show.sync="isOpenThemeDia" 
       width="650px"
     >
       <div style="padding:30px 60px">
         <div>
-          <label class="el-form-item__label">主题名称</label>
+          <label class="el-form-item__label">{{$t('SystemManage.ChartSet.theme_name')}}</label>
           <el-input 
             v-model="addThemeForm.themeName" 
-            placeholder="请输入主题名称"
+            :placeholder="$t('SystemManage.ChartSet.theme_name_placeholder')"
           />
         </div>
       </div>
@@ -82,11 +82,11 @@
           @click="saveThemeHandle"
           type="primary"
           style="width: 132px; height: 40px"
-          >保存</el-button>
+          >{{$t('Dialog.confirm_save_btn')}}</el-button>
         <el-button
         @click="isOpenThemeDia=false"
         style="width: 132px; height: 40px"
-        >取消</el-button>
+        >{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </m-dialog>
 
@@ -159,10 +159,10 @@ export default {
     },
 
     async delThemeHandle(item,index) {
-      await this.$confirm('删除后，所有采用该主题的图表，将采用ETA主题，是否确定删除？',
-       '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+      await this.$confirm(this.$t('SystemManage.ChartSet.alert_msg'),
+       this.$t('Confirm.prompt'), {
+          // confirmButtonText: '确定',
+          // cancelButtonText: '取消',
           type: 'warning'
       })
 
@@ -170,7 +170,7 @@ export default {
       if(res.Ret!==200) return 
 
       this.themeOpts.splice(index,1)
-      this.$message.success('删除成功')
+      this.$message.success(this.$t('MsgPrompt.delete_msg'))
     },
 
     editThemeHandle({ChartThemeId}) {
@@ -185,7 +185,7 @@ export default {
 
 
     async saveThemeHandle() {
-      if(!this.addThemeForm.themeName) return this.$message.warning('请输入主题名称')
+      if(!this.addThemeForm.themeName) return this.$message.warning(this.$t('SystemManage.ChartSet.theme_name_placeholder'))
 
       let res = await chartThemeInterface.addTheme({
         ChartThemeName: this.addThemeForm.themeName,
@@ -193,7 +193,7 @@ export default {
       })
 
       if(res.Ret !== 200) return
-      this.$message.success('添加成功')
+      this.$message.success(this.$t('MsgPrompt.add_msg'))
       this.isOpenThemeDia = false;
 
       this.getThemeList()

src/views/system_manage/chartTheme/themeSetting.vue

@@ -21,8 +21,8 @@
         </el-select>
       </div>
       <div>
-        <el-button type="primary" plain @click="$router.go(-1)">取消</el-button>
-        <el-button type="primary" @click="setThemeOptions">保存</el-button>
+        <el-button type="primary" plain @click="$router.go(-1)">{{$t('Dialog.cancel_btn')}}</el-button>
+        <el-button type="primary" @click="setThemeOptions">{{$t('Dialog.confirm_save_btn')}}</el-button>
       </div>
     </div> 
 
@@ -160,7 +160,7 @@ export default {
 
       if(res.Ret !==200) return
       this.getThemeList()
-      this.$message.success('保存成功')
+      this.$message.success(this.$t('MsgPrompt.saved_msg'))
     },
 
     /* 设置封面图片 */