Browse Source

Merge branch 'lang_dev' into lang_db

bding 1 year ago
parent
commit
5b817fc496

+ 3 - 2
src/components/pubDialog.vue

@@ -23,7 +23,7 @@
       class="form-cont"
       label-position="left"
       :hide-required-asterisk="isHideRequired"
-      label-width="80px"
+      label-width="120px"
       :model="formData"
       :rules="formRules"
     >
@@ -74,6 +74,7 @@
 </template>
 
 <script>
+import bus from "@/api/bus";
 export default {
   props: {
     isShow: {
@@ -119,7 +120,7 @@ export default {
     },
     confimTxt: {
       type: Array,
-      default: ()=>['保存', '取消'],
+      default: ()=>[/* '保存' */bus.$i18nt.t('Dialog.confirm_save_btn'), /* '取消' */bus.$i18nt.t('Dialog.cancel_btn')],
     },
   },
   data() {

+ 12 - 0
src/lang/commonLang.js

@@ -222,6 +222,14 @@ export default {
     refresh_success_msg: {
       en: 'Refresh successful',
       zh: '刷新成功'
+    },
+    operate_success_msg: {
+      en: 'Operation successful',
+      zh: '操作成功'
+    },
+    move_success_msg: {
+      en: 'Move successful',
+      zh: '移动成功'
     }
   },
   Common: {
@@ -269,6 +277,10 @@ export default {
       en: 'No Information',
       zh: '暂无信息'
     },
+    download_btn:{
+      en: 'Download',
+      zh: '下载'
+    },
     no_chart_msg: {
       en: 'No Charts',
       zh: '暂无图表'

+ 99 - 0
src/lang/modules/DataReport/GlStatisticTable.js

@@ -0,0 +1,99 @@
+/**
+ * ETA逻辑
+ */
+
+/* 英文 */
+export const GlStatisticTableEn = {
+    type01:'Data Source Detail Table',
+    type02:'Data Source Statistics Table',
+    type03:'Delete Indicator Table',
+    type04:'Indicator Information Change Table',
+    placeholder01:'Terminal Coding',
+    placeholder02:'Creator',
+    placeholder03:'Frequency',
+    placeholder04:'Indicator ID/Indicator Name',
+    custom_table:'Custom Column',
+    table_tips01:'Indicator full name in data source',
+    table_tips02:'The last time indicator changed',
+    table_tips03:'Earliest date of change in indicator data',
+    table_tips04:'Whether a scheduled refresh task is configured for this indicator today',
+    table_tips05:'Whether the indicator is initiated a refresh task',
+    table_tips06:'The last time to be refreshed',
+    table_tips07:'1、Number of indicators need to be updated at regular intervals on this terminal today<br>2、Number of indicators need to be updated today = number of indicators updated today + number of indicators failed updated today',
+    table_tips08:'1、Number of indicators initiating update tasks on this terminal today<br>2、Number of indicators initiating update tasks today=Number of indicators update successfully + Number of indicators failed updated today',
+    table_tips09:'Number of indicators updated successfully on this terminal today',
+    table_tips10:'Number of indicators failed updated on this terminal today',
+    table_tips11:'Number of indicators for which the terminal successfully initiated update tasks but indicator data did not change today',
+    table_tips12:'Number of indicators for which  terminal data changed today',
+    table_tips13:'Name saved in ETA indicators',
+
+    change_placeholder:'Please select change type',
+    change_type01:'Change of Basic Information',
+    change_type02:'Change of Data Item',
+    change_type03:'New Indicator',
+    update_fail_title:'Details of failed updated indicators',
+    terminal_name:'Terminal Name',
+    update_success_num:'Number of indicators updated successfully',
+    update_fail_num:'Number of indicators failed updated',
+    inspection_step:'Inspection Steps',
+    frequency:'Frequency',
+    num:'Quantities',
+    reason:'Reason',
+    reason_html:`<div>1、On the Mysteel terminal, use the indicator code to query whether the indicator exists, avoiding the failure of updating due to the change of indicator code.</div>
+    <div>2、Verify the Mtsteel terminal account is logged in.</div>
+    <div>3、Open Excel, if "Mysteel Data 2.0" plug-in does not exist, exit all Excel and WPS, in the Mysteel terminal, the top navigation bar, select Tools -> Excel plug-in repair -> click to repair,  then complete the Mysteel Data 2.0 plug-in installation.</div>
+    <div>4、Open Excel, select the "Mysteel Data 2.0" plug-in, check whether the login status is normal</div>
+    <div>5、Open an Excel in the file directory, select the "Mysteel Data 2.0" plug-in, click on the "Update All Pages" button, wait ten seconds, check if the bottom left corner of the Excel indicates that the quota is over limited</div>`,
+    edb_detail_title:'Indicator Detail',
+    dir_path:'Folder Path'
+};
+  
+/* 中文 */
+export const GlStatisticTableZh = {
+    type01:'数据源明细表',
+    type02:'数据源统计表',
+    type03:'删除指标表',
+    type04:'指标信息变更表',
+    placeholder01:'终端编码',
+    placeholder02:'创建人',
+    placeholder03:'频度',
+    placeholder04:'指标ID/指标名称',
+    custom_table:'自定义列',
+    table_tips01:'指标在数据源的全称',
+    table_tips02:'指标最近一次数据发生变化的时间',
+    table_tips03:'指标数据发生变化的最早日期',
+    table_tips04:'该指标今日是否设置了定时刷新任务',
+    table_tips05:'该指标是否发起了刷新任务',
+    table_tips06:'指标最近一次执行刷新任务的时间',
+    table_tips07:'1、今日该终端需定时刷新的指标数量<br>2、今日需刷新指标数=今日已更新指标数+今日更新失败指标数',
+    table_tips08:'1、今日该终端发起刷新任务的指标数量<br>2、今日发起刷新任务指标数=今日已刷新成功指标数+今日刷新失败指标数',
+    table_tips09:'今日该终端刷新成功的指标数量',
+    table_tips10:'今日该终端刷新失败的指标数量',
+    table_tips11:'今日该终端成功发起刷新任务,但指标数据未变化的指标数量',
+    table_tips12:'今日该终端数据发生变化的指标数量',
+    table_tips13:'指标在ETA指标库保存的指标名称',
+
+    change_placeholder:'请选择变更类型',
+    change_type01:'基础信息变更',
+    change_type02:'数据明细变更',
+    change_type03:'新增指标',
+    update_fail_title:'更新失败指标详情',
+    terminal_name:'终端名称',
+    update_success_num:'已成功刷新指标数',
+    update_fail_num:'更新失败指标数',
+    inspection_step:'排查步骤',
+    frequency:'频度',
+    num:'数量',
+    reason:'原因',
+    reason_html:`<div>1、在钢联终端上,用指标编码查询下是否存在该指标,避免因为指标编码变更的原因导致刷新失败。</div>
+    <div>2、核实钢联终端账号处于登录状态。</div>
+    <div>3、打开Excel,如果“钢联数据2.0”插件不存在,则需要先退出所有Excel和WPS,在钢联终端:最上面的导航栏选择工具->Excel插件修复->点击一键修复,完成钢联数据2.0插件安装。</div>
+    <div>4、打开Excel,选中“钢联数据2.0”插件,查看登录状态是否正常。</div>
+    <div>5、打开文件目录下的一个Excel,选中“钢联数据2.0”插件,点击“更新所有页”按钮后,等待十几秒,查看Excel左下角是否提示额度超限。</div>`,
+    edb_detail_title:'指标详情',
+    dir_path:'文件夹路径'
+};
+  
+/**
+  * $t('DataReportManage.GlStatisticTable.XXX')
+*/

+ 8 - 0
src/lang/modules/DataReport/indexEn.js

@@ -0,0 +1,8 @@
+import { GlStatisticTableEn } from "./GlStatisticTable";
+
+export default {
+    // 数据报表管理----模块
+    DataReportManage: {
+        GlStatisticTable:GlStatisticTableEn
+    },
+  };

+ 9 - 0
src/lang/modules/DataReport/indexZh.js

@@ -0,0 +1,9 @@
+import { GlStatisticTableZh } from "./GlStatisticTable";
+
+
+export default {
+  // 数据报表管理----模块
+  DataReportManage: {
+    GlStatisticTable:GlStatisticTableZh
+  },
+};

+ 46 - 2
src/lang/modules/EtaChart/commonLang.js

@@ -84,6 +84,14 @@ export default {
     zh:'删除',
     en:'Delete'
   },
+  chart_remove_btn: {
+    zh:'移出',
+    en:'Remove'
+  },
+  chart_copyto_btn: {
+    zh:'复制到',
+    en:'Copy to'
+  },
   search_chart_placeholder:{
     zh:'请输入图表名称',
     en:'Please enter a chart name'
@@ -178,7 +186,15 @@ export default {
     edb_haved_msg: {
       zh:'录入指标已存在',
       en:'The entered indicator already exists'
-    }
+    },
+    copy_tit_success: {
+      zh:'复制标题成功',
+      en:'Title copied successfully'
+    },
+    copy_tit_fail: {
+      zh:'复制标题失败',
+      en:'Failed to copy the title'
+    },
 
 
   },
@@ -469,5 +485,33 @@ export default {
       zh: '请输入内容',
       en: 'Please input content'
     },
-  }
+  },
+
+  /* 所有source */
+  AllChartSource: {
+    eta_chart: {
+      en: "ETA Gallery",
+      zh: "ETA图库",
+    },
+    commodity_chart: {
+      en: "Commodity Price Curve",
+      zh: "商品价格曲线",
+    },
+    correla_chart: {
+      en: "Correlation Chart",
+      zh: "相关性图表",
+    },
+    equation_chart: {
+      en: "Fit Equation Curve",
+      zh: "拟合方程曲线",
+    },
+    statis_chart: {
+      en: "Statistical Features",
+      zh: "统计特征",
+    },
+    cross_chart: {
+      en: "Intercommodity Analysis",
+      zh: "跨品种分析",
+    },
+  },
 }

+ 80 - 0
src/lang/modules/MyEta/En.js

@@ -0,0 +1,80 @@
+/* myeta模块 
+  $t('MyEtaPage.xxx')
+*/
+export default {
+  /* myeta页面 */
+  MyEtaPage: {
+    choose_chart_btn: 'Select chart',
+    tab_public: 'Public Gallery',
+    tab_my: 'My Gallery',
+    option_view_person: 'Visible only to yourself',
+    option_view_all: 'Visible to all',
+    option_op_rename:'Rename',
+    option_op_copy:'Copy',
+    add_myclassify_btn: 'Create my catagory',
+    label_share_user: ' Shared by',
+
+    //选择图表弹窗
+    label_choose_chart: 'Select chart',
+    label_update_time: 'Latest Updates',
+    label_see_mine: 'Only mine',
+
+    /* 分类弹窗 */
+    label_add_classify: 'Add catagory',
+    label_classify_name: 'Category Name',
+    label_copy_classify: 'Choose a catagory for copied chart',
+    label_copy_to: 'Copy to',
+    label_rename_classify: 'Rename Catagory',
+    ph_classify:'Please enter the category name',
+    ph_menu:'Please select a catagory',
+  },
+
+  /* 图库框架 */
+  ChartFramePage: {
+    add_frame_btn: 'Add frame',
+    ph_search:'Please enter a frame name',
+    tab_public: 'Public Frame',
+    tab_my:'My Frame',
+    option_view_person: 'Visible only to yourself',
+    option_view_all: 'Visible to all',
+    option_op_rename: 'Rename',
+    label_create_time: 'Creation Time',
+    label_update_time: 'Update Time',
+    detail_copy_img: 'Copy picture',
+    del_confirm_msg:' It cannot be recovered after deletion. Do you confirm the deletion?',
+
+    //重命名弹窗
+    label_rename:'Rename the frame',
+    label_frame_name: 'Frame Name',
+
+    //复制弹窗
+    label_copy_mine: 'Copy to My Gallery'
+  },
+
+  /* 图库框架编辑 */
+  ChartFrameEditorPage: {
+    add_node: 'Add node',
+    edit_node:'Edit node',
+    op_redo:'Recover',
+    op_restore:'Cancel',
+    op_size:'Font Size',
+    op_bold:'Bold',
+    op_lta:'Italics',
+    op_underline:'下划线',
+    op_color:'Font Color',
+    op_align:'Text Alignment',
+    op_fill:'Fillling Color',
+    op_border:'Border Color',
+    op_linewid:'Wireframe Width',
+    op_linesty:'Border Style',
+    op_start_arrow:'Start Arrow',
+    op_end_arrow:'End Arrow',
+    no_link_msg:'The gallery linked to this node contains no charts',
+    no_classify:'This node has not selected a chart category',
+
+    //节点名称
+    label_node_name:'节点名称',
+    label_label_link:'Node Link',
+    ph_link: 'Please select a node link'
+  }
+}

+ 81 - 0
src/lang/modules/MyEta/Zh.js

@@ -0,0 +1,81 @@
+/* myeta模块 
+  $t('MyEtaPage.xxx')
+*/
+export default {
+  /* myeta页面 */
+  MyEtaPage: {
+    choose_chart_btn: '选择图表',
+    tab_public: '公共图库',
+    tab_my: '我的图库',
+    option_view_person: '仅自己可见',
+    option_view_all: '所有人可见',
+    option_op_rename:'重命名',
+    option_op_copy:'复制',
+    add_myclassify_btn: '添加我的分类',
+    label_share_user: '分享人',
+
+    //选择图表弹窗
+    label_choose_chart: '选择图表',
+    label_update_time: '最近更新',
+    label_see_mine: '只看我的',
+
+    /* 分类弹窗 */
+    label_add_classify: '新增分类',
+    label_classify_name: '分类名称',
+    label_copy_classify: '复制图表分类',
+    label_copy_to: '复制到',
+    label_rename_classify: '重命名分类',
+    ph_classify:'请输入分类名称',
+    ph_menu:'请选择目录',
+
+  },
+
+  /* 图库框架 */
+  ChartFramePage: {
+    add_frame_btn: '添加框架',
+    ph_search:'请输入框架名称',
+    tab_public: '公共框架',
+    tab_my:'我的框架',
+    option_view_person: '仅自己可见',
+    option_view_all: '所有人可见',
+    option_op_rename: '重命名',
+    label_create_time: '创建时间',
+    label_update_time: '更新时间',
+    detail_copy_img: '复制图片',
+    del_confirm_msg:'删除后不可恢复,确认删除吗?',
+
+    //重命名弹窗
+    label_rename:'重命名框架',
+    label_frame_name: '框架名称',
+
+    //复制弹窗
+    label_copy_mine: '复制到我的图库'
+  },
+
+  /* 图库框架编辑 */
+  ChartFrameEditorPage: {
+    add_node: '添加节点',
+    edit_node:'编辑节点',
+    op_redo:'撤销',
+    op_restore:'恢复',
+    op_size:'字号',
+    op_bold:'加粗',
+    op_lta:'斜体',
+    op_underline:'下划线',
+    op_color:'字体颜色',
+    op_align:'文本对齐',
+    op_fill:'填充颜色',
+    op_border:'边框颜色',
+    op_linewid:'线框宽度',
+    op_linesty:'边框样式',
+    op_start_arrow:'开始箭头',
+    op_end_arrow:'结束箭头',
+    no_link_msg:'该节点链接的图库没有图表',
+    no_classify_msg:'该节点没有选择图分类',
+
+    //节点名称
+    label_node_name:'节点名称',
+    label_label_link:'节点链接',
+    ph_link: '请选择节点链接'
+  }
+}

+ 2 - 2
src/views/chartFrame_manage/components/frameContainer.vue

@@ -77,8 +77,8 @@ export default {
     },
     computed:{
         contextMenu(){//右键菜单,根据权限配置
-            const editOption = {label: '编辑',key: 'edit',icon: 'el-icon-edit'}
-            const deleteOption = {label: '删除',key: 'del',icon: 'el-icon-delete'}
+            const editOption = {label: /* '编辑' */this.$t('Table.edit_btn'),key: 'edit',icon: 'el-icon-edit'}
+            const deleteOption = {label: /* '删除' */this.$t('Table.delete_btn'),key: 'del',icon: 'el-icon-delete'}
             let MenuArr = []
             if(this.permissionBtn.isShowBtn('chartFramePermission','chartframe_my_editNode')){
                 MenuArr.push(editOption)

+ 14 - 14
src/views/chartFrame_manage/components/frameToolBar.vue

@@ -3,7 +3,7 @@
     <div class="frame-tool-bar-wrap">
         <div class="cell-style">
             <!-- 撤销 -->
-            <ToolItem tooltip="撤销" toolkey="undo">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_redo')" toolkey="undo">
                 <div class="tool-item" @click="handleGraphHistory('undo')">
                     <img :src="require(`@/assets/icons/chartFrame/undo.svg`)"
                         :class="{'img-disabled':!canUndo,'actived':canUndo}">
@@ -12,7 +12,7 @@
                 
             </ToolItem>
             <!-- 恢复 -->
-            <ToolItem tooltip="恢复" toolkey="undo">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_restore')" toolkey="undo">
                 <div class="tool-item" @click="handleGraphHistory('redo')">
                     <img :src="require(`@/assets/icons/chartFrame/redo.svg`)"
                         :class="{'img-disabled':!canRedo,'actived':canRedo}">
@@ -21,7 +21,7 @@
             </ToolItem>
             <!-- 字体 暂定-->
             <!-- 字号 -->
-            <ToolItem tooltip="字号" toolkey="fontSize">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_size')" toolkey="fontSize">
                 <el-dropdown @command="changeStyle" trigger="click" class="tool-item">
                     <span class="el-dropdown-link tool-item"> 
                         <span>{{nodeStyle.fontSize}}px</span>
@@ -35,7 +35,7 @@
                 </el-dropdown>
             </ToolItem>
             <!-- 加粗 -->
-            <ToolItem tooltip="加粗" toolkey="fontWeight">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_bold')" toolkey="fontWeight">
                 <span class="tool-item">
                     <span class="item-text" :class="{'text-disabled':!isSelectNode,'text-actived':isSelectNode}"
                         :style="'font-size: 16px;font-weight: bold;'"
@@ -44,7 +44,7 @@
                 </span>
             </ToolItem>
             <!-- 斜体 -->
-            <ToolItem tooltip="斜体" toolkey="fontstyle">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_lta')"  toolkey="fontstyle">
                 <span class="tool-item">
                     <span style="font-style: italic;" class="item-text"
                         @click="changeStyleToggle('label/fontStyle')">
@@ -55,7 +55,7 @@
                 </span>
             </ToolItem>
             <!-- 下划线 -->
-            <ToolItem tooltip="下划线" toolkey="textDecoration">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_underline')" toolkey="textDecoration">
                 <span class="tool-item">
                     <span style="text-decoration: underline;" class="item-text"
                         @click="changeStyleToggle('label/textDecoration')">
@@ -66,7 +66,7 @@
                 </span>
             </ToolItem>
             <!-- 字体颜色 -->
-            <ToolItem tooltip="字体颜色" toolkey="textDecoration">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_color')" toolkey="textDecoration">
                 <span class="tool-item">
                     <label for="label/fill" :style="`color:${color}`">
                         <img :src="require(`@/assets/icons/chartFrame/fontColor.svg`)"
@@ -80,7 +80,7 @@
             </ToolItem>
             <!-- 文本行高 暂定-->
             <!-- 文本对齐 -->
-            <ToolItem tooltip="文本对齐" toolkey="textAligh">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_align')"  toolkey="textAligh">
                 <el-dropdown @command="changeTextStyle" trigger="click" class="tool-item">
                     <span class="el-dropdown-link tool-item"> 
                         <img :src="require(`@/assets/icons/chartFrame/textAlign.svg`)"
@@ -95,7 +95,7 @@
                 </el-dropdown>
             </ToolItem>
             <!-- 节点颜色填充 -->
-            <ToolItem tooltip="填充颜色" toolkey="fillColor">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_fill')"   toolkey="fillColor">
                 <span class="tool-item">
                     <label for="body/fill" :style="`color:${fillColor}`">
                         <img :src="require(`@/assets/icons/chartFrame/fillColor.svg`)"
@@ -108,7 +108,7 @@
                 </span>
             </ToolItem>
             <!-- 节点/线条边框颜色 -->
-            <ToolItem tooltip="边框颜色" toolkey="borderColor">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_border')"    toolkey="borderColor">
                 <span class="tool-item">
                     <label for="storke" :style="`color:${borderColor}`">
                         <img :src="require(`@/assets/icons/chartFrame/stokeColor.svg`)"
@@ -121,7 +121,7 @@
                 </span>
             </ToolItem>
             <!-- 节点/线条边框宽度 -->
-            <ToolItem tooltip="线框宽度" toolkey="stokeWidth">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_linewid')" toolkey="stokeWidth">
                 <el-dropdown @command="changeCellStyle" trigger="click" class="tool-item">
                     <span class="el-dropdown-link tool-item"> 
                         <i class="el-icon-minus"></i>
@@ -135,7 +135,7 @@
                 </el-dropdown>
             </ToolItem>
             <!-- 节点/线条边框样式 -->
-            <ToolItem tooltip="边框样式" toolkey="stokeWidth">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_linesty')" toolkey="stokeWidth">
                 <el-dropdown @command="changeCellStyle" trigger="click" class="tool-item">
                     <span class="el-dropdown-link tool-item"> 
                         <img :src="require(`@/assets/icons/chartFrame/stokeStyle.svg`)"
@@ -154,7 +154,7 @@
                 </el-dropdown>
             </ToolItem>
             <!-- 开始箭头 -->
-            <ToolItem tooltip="开始箭头" toolkey="stokeWidth">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_start_arrow')" toolkey="stokeWidth">
                 <el-dropdown trigger="click" @command="changeStyle" class="tool-item">
                     <div class="el-dropdown-link">
                         <img :src="require(`@/assets/icons/chartFrame/arrow-left.svg`)"
@@ -173,7 +173,7 @@
                 </el-dropdown>
             </ToolItem>
             <!-- 结束箭头 -->
-            <ToolItem tooltip="结束箭头" toolkey="stokeWidth">
+            <ToolItem :tooltip="$t('ChartFrameEditorPage.op_end_arrow')" toolkey="stokeWidth">
                 <el-dropdown trigger="click" @command="changeStyle" class="tool-item">
                     <div class="el-dropdown-link">
                         <img :src="require(`@/assets/icons/chartFrame/arrow-right.svg`)"

+ 16 - 16
src/views/chartFrame_manage/frameEditor.vue

@@ -2,12 +2,12 @@
     <!-- 添加编辑框架 -->
     <div class="frame-editor-wrap">
         <div class="option-wrap">
-            <el-input style="width:240px;" placeholder="请输入框架名称" v-model.trim="frameDetail.FrameworkName"></el-input>
-            <el-button type="primary" plain style="margin-left:auto;" @click="returnListPage">返回</el-button>
+            <el-input style="width:240px;" :placeholder="$t('ChartFramePage.ph_search')" v-model.trim="frameDetail.FrameworkName"></el-input>
+            <el-button type="primary" plain style="margin-left:auto;" @click="returnListPage"><!-- 返回 -->{{$t('Dialog.back_btn')}}</el-button>
             <el-button type="primary" style="margin-left:20px;" @click="handleEditNode({})"
-                v-if="permissionBtn.isShowBtn('chartFramePermission','chartframe_my_editNode')">添加节点</el-button>
+                v-if="permissionBtn.isShowBtn('chartFramePermission','chartframe_my_editNode')"><!-- 添加节点 -->{{$t('ChartFrameEditorPage.add_node')}}</el-button>
             <el-button type="primary" style="margin-left:20px;" @click="saveFrame"
-                v-if="permissionBtn.isShowBtn('chartFramePermission','chartframe_my_saveFrame')">保存</el-button>
+                v-if="permissionBtn.isShowBtn('chartFramePermission','chartframe_my_saveFrame')"><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
         </div>
         <div class="editor-wrap">
             <!-- 沙盘图组件 -->
@@ -20,7 +20,7 @@
         </div>
         <!-- 添加/编辑节点弹窗 -->
         <el-dialog
-            :title="modifyNode.nodeId?'编辑节点':'添加节点'"
+            :title="modifyNode.nodeId?$t('ChartFrameEditorPage.edit_node'):$t('ChartFrameEditorPage.add_node')"
             :visible.sync="isModifyNodeDialogShow"
             :close-on-click-modal="false"
             :modal-append-to-body="false"
@@ -35,11 +35,11 @@
                     :model="modifyNode"
                     :rules="rules"
                 >
-                    <el-form-item label="节点名称" prop="nodeName">
-                        <el-input v-model="modifyNode.nodeName" placeholder="请输入节点名称" style="width:217px;"></el-input>
+                    <el-form-item :label="$t('ChartFrameEditorPage.label_node_name')" prop="nodeName">
+                        <el-input v-model="modifyNode.nodeName" :placeholder="$t('Edb.InputHolderAll.input_common',{label:$t('ChartFrameEditorPage.label_node_name')})" style="width:217px;"></el-input>
                     </el-form-item>
-                    <el-form-item label="节点链接" prop="nodeLink">
-                        <el-select v-model="modifyNode.nodeLink" value-key="MyChartClassifyId" placeholder="请选择节点链接" clearable style="width:217px;">
+                    <el-form-item :label="$t('ChartFrameEditorPage.label_label_link')" prop="nodeLink">
+                        <el-select v-model="modifyNode.nodeLink" value-key="MyChartClassifyId" :placeholder="$t('ChartFrameEditorPage.ph_link')" clearable style="width:217px;">
                             <el-option v-for="item in myList" 
                                 :key="item.MyChartClassifyId"
                                 :label="item.MyChartClassifyName"
@@ -53,8 +53,8 @@
                 </el-form>
             </div>
             <div class="dialog-footer">
-                <el-button @click="isModifyNodeDialogShow=false">取消</el-button>
-                <el-button type="primary" @click="editNode">确定</el-button>
+                <el-button @click="isModifyNodeDialogShow=false"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="editNode"><!-- 确定 -->{{$t('Dialog.confirm_btn')}}</el-button>
             </div>
 
         </el-dialog>
@@ -104,7 +104,7 @@ export default {
             }
             if(!this.$refs.container) return
             this.$refs.container.editNode(this.modifyNode)
-            this.$message.success(`${this.modifyNode.nodeId ? '编辑' : '添加'}节点成功`);
+            this.$message.success(`${this.modifyNode.nodeId ? this.$t('MsgPrompt.edit_msg') : this.$t('MsgPrompt.add_msg2')}`);
             this.isModifyNodeDialogShow = false;
         },
         //跳转至my eta
@@ -114,7 +114,7 @@ export default {
         //保存框架:内容验证->生成缩略图->获取节点信息,内容信息->编辑/添加框架
         async saveFrame(){
             if(!this.frameDetail.FrameworkName.length){
-                return this.$message.warning("请输入框架名称")
+                return this.$message.warning(/* "请输入框架名称" */this.$t('ChartFramePage.ph_search'))
             }
             if(!this.$refs.container.graph.toJSON().cells.length){
                 return this.$message.warning('请绘制画布内容');
@@ -122,7 +122,7 @@ export default {
 
             this.lockLoding = this.$loading({
                 lock: true,
-                text: '保存中...',
+                text: `${this.$t('MsgPrompt.saveing_msg')}...`,
                 target: '.frame-editor-wrap',
                 spinner: 'el-icon-loading',
                 background: 'rgba(255, 255, 255, 0.8)'
@@ -148,7 +148,7 @@ export default {
                 chartFrameInterface.editFrame({...this.frameDetail,...{ChartFrameworkId:Number(this.frameId)}}).then(res=>{
                     this.lockLoding.close();
                     if(res.Ret!==200) return 
-                    this.$message.success("编辑成功")
+                    this.$message.success(/* "编辑成功" */this.$t('MsgPrompt.edit_msg'))
                 })
             }else{
                 //add 
@@ -157,7 +157,7 @@ export default {
                     if(res.Ret!==200) return 
                     this.frameId = res.Data?res.Data.ChartFrameworkId:0
                     this.frameDetail = res.Data||{FrameworkName:'',FrameworkContent:''}
-                    this.$message.success("新增成功")
+                    this.$message.success(/* "新增成功" */ this.$t('MsgPrompt.add_msg'))
                     //切换至编辑页
                     this.$router.replace({path:'/editframe',query:{frameId:this.frameId}})
                 })

+ 37 - 35
src/views/chartFrame_manage/index.vue

@@ -12,12 +12,12 @@
             <span class="move-btn resize" v-drag id="resize"></span>
             <div class="btn-wrap">
                 <el-button type="primary" @click="$router.push('/addframe')" 
-                v-permission="permissionBtn.chartFramePermission.chartframe_my_editFrame">添加框架</el-button>
+                v-permission="permissionBtn.chartFramePermission.chartframe_my_editFrame"><!-- 添加框架 -->{{$t('ChartFramePage.add_frame_btn')}}</el-button>
             </div>
             <div class="search-wrap">
                 <el-select style="width:100%"
                     filterable remote
-                    placeholder="请输入框架名称"
+                    :placeholder="$t('ChartFramePage.ph_search')"
                     v-model.trim="searchText"
                     :remote-method="searchHandle"
                     value-key="ChartFrameworkId"
@@ -34,12 +34,12 @@
             </div>
             <div class="catalog-list">
                 <div class="public-catalog">
-                    <p @click="expandPublic = !expandPublic" class="title">公共框架<span><i :class="{'el-icon-arrow-down':!expandPublic,'el-icon-arrow-up':expandPublic}"></i></span></p>
+                    <p @click="expandPublic = !expandPublic" class="title"><!-- 公共框架 -->{{$t('ChartFramePage.tab_public')}}<span><i :class="{'el-icon-arrow-down':!expandPublic,'el-icon-arrow-up':expandPublic}"></i></span></p>
                     <div class="catalog-tree" v-show="expandPublic">
                         <el-tree
                             ref="catalogTree"
                             class="catalog-tree other-tree"
-                            empty-text="暂无分类"
+                            :empty-text="$t('Common.no_classify_msg')"
                             :data="publicFrameList"
                             node-key="nodeKeyId"
                             :expand-on-click-node="false"
@@ -53,7 +53,7 @@
                     </div>
                 </div>
                 <div class="my-list">
-                    <p>我的框架</p>
+                    <p><!-- 我的框架 -->{{$t('ChartFramePage.tab_my')}}</p>
                     <draggable
                         v-model="myFrameList"
                         class="classify-ul"
@@ -88,7 +88,7 @@
                                         >
                                         <div style="display: flex;align-items: center;">
                                             <img src="~@/assets/img/chart_m/Group.png">
-                                            <span style="margin-left:5px">仅自己可见</span>
+                                            <span style="margin-left:5px"><!-- 仅自己可见 -->{{$t('ChartFramePage.option_view_person')}}</span>
                                         </div>
                                     </el-dropdown-item>
                                     <el-dropdown-item 
@@ -97,7 +97,7 @@
                                         >
                                         <div style="display: flex;align-items: center;">
                                             <img src="~@/assets/img/chart_m/User.png">
-                                            <span style="margin-left:5px">所有人可见</span>
+                                            <span style="margin-left:5px"><!-- 所有人可见 -->{{$t('ChartFramePage.option_view_all')}}</span>
                                         </div>
                                         
                                     </el-dropdown-item>
@@ -111,9 +111,9 @@
                                 </span>
                                 <el-dropdown-menu slot="dropdown">
                                     <el-dropdown-item v-if="permissionBtn.isShowBtn('chartFramePermission','chartframe_my_rename')"
-                                        :command="{key:'edit'}">重命名</el-dropdown-item>
+                                        :command="{key:'edit'}"><!-- 重命名 -->{{$t('ChartFramePage.option_op_rename')}}</el-dropdown-item>
                                     <el-dropdown-item v-if="permissionBtn.isShowBtn('chartFramePermission','chartframe_my_delFrame')"
-                                        :command="{key:'del'}">删除</el-dropdown-item>
+                                        :command="{key:'del'}"><!-- 删除 -->{{$t('Table.delete_btn')}}</el-dropdown-item>
                                 </el-dropdown-menu>
                             </el-dropdown>
                            
@@ -124,7 +124,7 @@
         </div>
         <div class="detail-wrap page-block-wrap" id="detail-right">
             <div class="empty" v-if="!currentFrame.ChartFrameworkId&&currentList.length===0">
-                <tableNoData text="暂无数据"/>
+                <tableNoData :text="$t('Table.prompt_slogan')"/>
             </div>
             <template v-else>
                 <div class="list" v-if="model==='list'">
@@ -140,28 +140,28 @@
                             :style="`background-image:url(${item.FrameworkImg?item.FrameworkImg:require('@/assets/img/document_m/default-img.png')})`"></div>
                         <div style="height:1px;background:#ECECEC;margin:10px -10px;"></div>
                         <div class="item-time">
-                            创建时间:{{item.CreateTime}}
+                            <!-- 创建时间 -->{{$t('ChartFramePage.label_create_time')}}:{{item.CreateTime}}
                         </div>
                     </div>
                     <div class="empty" v-if="currentList.length===0">
-                        <tableNoData text="暂无数据"/>
+                        <tableNoData :text="$t('Table.prompt_slogan')"/>
                     </div>
                 </div>
                 <div class="detail" v-else>
                     <div class="top-info">
-                        <span>更新时间:{{currentFrame.ModifyTime}}</span>
+                        <span><!-- 更新时间 -->{{$t('ChartFramePage.label_update_time')}}:{{currentFrame.ModifyTime}}</span>
                         <span class="title text_oneLine">{{currentFrame.FrameworkName}}</span>
                         <div class="tool">
                             <el-button type="text" @click="handleOption('edit',currentFrame)" 
-                                v-if="frameType==='my'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_my_editFrame')">编辑</el-button>
+                                v-if="frameType==='my'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_my_editFrame')"><!-- 编辑 -->{{$t('Table.edit_btn')}}</el-button>
 
                             <el-button type="text" @click="handleOption('copy',currentFrame)" :disabled="!currentFrame.FrameworkContent"
-                                v-if="frameType==='my'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_my_copyImg')">复制图片</el-button>
+                                v-if="frameType==='my'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_my_copyImg')"><!-- 复制图片 -->{{$t('ChartFramePage.detail_copy_img')}}</el-button>
                             <el-button type="text" @click="handleOption('copy',currentFrame)" :disabled="!currentFrame.FrameworkContent"
-                                v-if="frameType==='public'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_public_copyImg')">复制图片</el-button>
+                                v-if="frameType==='public'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_public_copyImg')"><!-- 复制图片 -->{{$t('ChartFramePage.detail_copy_img')}}</el-button>
 
                             <el-button type="text" @click="handleOption('del',currentFrame)" style="color:red;"
-                                v-if="frameType==='my'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_my_delFrame')">删除</el-button>
+                                v-if="frameType==='my'&&permissionBtn.isShowBtn('chartFramePermission','chartframe_my_delFrame')"><!-- 删除 -->{{$t('Table.delete_btn')}}</el-button>
                         </div>
                     </div>
                     <div class="frame-wrap">
@@ -176,7 +176,7 @@
         </div>
         <!-- 重命名弹窗 -->
         <el-dialog
-            title="重命名框架"
+            :title="$t('ChartFramePage.label_rename')"
             :visible.sync="isRenameDialogShow"
             :close-on-click-modal="false"
             :modal-append-to-body="false"
@@ -187,13 +187,13 @@
         >
             <div class="dialog-container">
                 <div>
-                    <span style="margin-right:5px;">框架名称</span>
+                    <span style="margin-right:5px;"><!-- 框架名称 -->{{$t('ChartFramePage.label_frame_name')}}</span>
                     <el-input v-model.trim="modifyFrame.FrameworkName" placeholder="请输入框架名称"></el-input>
                 </div>
             </div>
             <div class="dialog-footer">
-                <el-button @click="isRenameDialogShow=false">取消</el-button>
-                <el-button type="primary" @click="renameFrame">确定</el-button>
+                <el-button @click="isRenameDialogShow=false"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="renameFrame"><!-- 确定 -->{{$t('Dialog.confirm_btn')}}</el-button>
             </div>
         </el-dialog>
         <!-- my eta图表详情弹窗 -->
@@ -208,7 +208,7 @@
         />
         <!-- my eta图表复制到弹窗 -->
         <el-dialog
-            title="复制到我的图库"
+            :title="$t('ChartFramePage.label_copy_mine')"
             :visible.sync="isCopyDialogShow"
             :close-on-click-modal="false"
             :modal-append-to-body="false"
@@ -235,8 +235,8 @@
                 </div>
             </div>
             <div class="dialog-footer">
-                <el-button @click="isCopyDialogShow=false">取消</el-button>
-                <el-button type="primary" @click="copyToClass">确定</el-button>
+                <el-button @click="isCopyDialogShow=false"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="copyToClass"><!-- 确定 -->{{$t('Dialog.confirm_btn')}}</el-button>
             </div>
         </el-dialog>
     </div>
@@ -441,7 +441,8 @@ export default {
                 NextChartFrameworkId:this.nextFrame?this.nextFrame.ChartFrameworkId:0,
             }).then(res=>{
                 if(res.Ret!==200) return 
-                this.$message.success("移动成功")
+                // this.$message.success("移动成功")
+                this.$message.success(this.$t('MsgPrompt.move_success_msg'))
                 this.getMyList()
             })
         },
@@ -462,7 +463,8 @@ export default {
                     if(res.Ret!==200) return
                     this.getPublicList()
                     this.getMyList()
-                    this.$message.success(`操作成功`)
+                    // this.$message.success(`操作成功`)
+                    this.$message.success(this.$t('MsgPrompt.operate_success_msg'))
                 })
             }
         },
@@ -489,7 +491,7 @@ export default {
         copyFrameImg(data){
             this.lockLoding = this.$loading({
                 lock: true,
-                text: '复制图片中...',
+                text: `${this.$t('ChartFramePage.detail_copy_img')}...`,
                 target: '.frame-container-wrap',
                 spinner: 'el-icon-loading',
                 background: 'rgba(255, 255, 255, 0.8)'
@@ -500,16 +502,16 @@ export default {
             },1,'svg')
         },
         deleteFrame(data){
-            this.$confirm("删除后不可恢复,确认删除吗?","提示",{
-                confirmButtonText:"确定",
-                cancelButtonText:"取消",
+            this.$confirm(this.$t('ChartFramePage.del_confirm_msg'),this.$t('Dialog.warn_tit'),{
+                confirmButtonText:/* "确定" */this.$t('Dialog.confirm_btn'),
+                cancelButtonText:/* "取消" */this.$t('Dialog.cancel_btn'),
                 type:"warning"
             }).then(()=>{
                 chartFrameInterface.deleteFrame({
                     ChartFrameworkId:data.ChartFrameworkId
                 }).then(res=>{
                     if(res.Ret!==200) return
-                    this.$message.success("删除成功")
+                    this.$message.success(/* "删除成功"  */this.$t('MsgPrompt.delete_msg'))
                     this.getPublicList()
                     this.getMyList()
                     this.currentFrame = {}
@@ -529,7 +531,7 @@ export default {
                 this.getPublicList()
                 await this.getMyList()
                 this.currentFrame = this.myFrameList.find(item=>item.ChartFrameworkId===this.modifyFrame.ChartFrameworkId)||{}
-                this.$message.success("编辑成功")
+                this.$message.success(/* "编辑成功" */this.$t('MsgPrompt.edit_msg'))
                 this.isRenameDialogShow = false
             })
             
@@ -537,7 +539,7 @@ export default {
         //点击框架内节点
         handleShowDialog({id,nodeLink}){
             if(!id){
-                this.$message.warning("该节点没有选择图分类")
+                this.$message.warning(/* "该节点没有选择图分类" */ this.$t('ChartFrameEditorPage.no_classify_msg'))
                 return
             }
             //请求接口看有没有数据
@@ -557,7 +559,7 @@ export default {
                         this.myETADetailDialogShow = true
                     }
                 }else{
-                    this.$message.warning('该节点链接的图库没有图表')
+                    this.$message.warning(/* '该节点链接的图库没有图表' */ this.$t('ChartFrameEditorPage.no_link_msg'))
                 }
             })
         },
@@ -590,7 +592,7 @@ export default {
             })
             .then((res) => {
                 if (res.Ret !== 200) return;
-                this.$message.success('复制成功');
+                this.$message.success(/* '复制成功' */this.$t('MsgPrompt.copy_success_msg'));
                 this.isCopyDialogShow = false;
             });
         },

+ 3 - 3
src/views/dataSource_manage/components/DelEDBTable.vue

@@ -32,7 +32,7 @@
                 </template>
             </el-table-column>
             <div slot="empty">
-                <tableNoData text="暂无数据"/>
+                <tableNoData :text="$t('Confirm.prompt_slogan')"/>
             </div>
         </el-table>
         <el-pagination
@@ -140,8 +140,8 @@ export default {
         // table说明文案
         getTableHeadTips(key){
             const tipsMap={
-                EdbNameSource:'指标在数据源的全称',
-                ErDataUpdateDate:'指标数据发生变化的最早日期',
+                EdbNameSource:this.$t('DataReportManage.GlStatisticTable.table_tips01')||'指标在数据源的全称',
+                ErDataUpdateDate:this.$t('DataReportManage.GlStatisticTable.table_tips03')||'指标数据发生变化的最早日期',
             }
             return tipsMap[key]
         },

+ 11 - 11
src/views/dataSource_manage/components/DetailTable.vue

@@ -4,7 +4,7 @@
         <div class="filter-box">
             <el-select
                 v-model="filterState.terminalCode"
-                placeholder="终端编码"
+                :placeholder="$t('DataReportManage.GlStatisticTable.placeholder01')"
                 multiple
                 clearable
                 collapse-tags
@@ -20,7 +20,7 @@
             </el-select> 
             <el-cascader
                 v-model="filterState.user"
-                placeholder="创建人"
+                :placeholder="$t('DataReportManage.GlStatisticTable.placeholder02')"
                 :options="sysUserOpts"
                 :props="props"
                 collapse-tags
@@ -32,7 +32,7 @@
             />
             <el-select
                 v-model="filterState.frequency"
-                placeholder="频度"
+                :placeholder="$t('DataReportManage.GlStatisticTable.placeholder03')"
                 multiple
                 clearable
                 collapse-tags
@@ -47,7 +47,7 @@
                 />
             </el-select>
             <el-input
-                placeholder="指标ID/指标名称"
+                :placeholder="$t('DataReportManage.GlStatisticTable.placeholder04')"
                 prefix-icon="el-icon-search"
                 v-model="filterState.keyword"
                 clearable
@@ -94,7 +94,7 @@
                 </template>
             </el-table-column>
             <div slot="empty">
-                <tableNoData text="暂无数据"/>
+                <tableNoData :text="$t('Confirm.prompt_slogan')"/>
             </div>
         </el-table>
         <el-pagination
@@ -247,12 +247,12 @@ export default {
         // table说明文案
         getTableHeadTips(key){
             const tipsMap={
-                EdbNameSource:'指标在数据源的全称',
-                DataUpdateTime:'指标最近一次数据发生变化的时间',
-                ErDataUpdateDate:'指标数据发生变化的最早日期',
-                NeedRefresh:'该指标今日是否设置了定时刷新任务',
-                HasRefresh:'该指标是否发起了刷新任务',
-                UpdateTime:'指标最近一次执行刷新任务的时间'
+                EdbNameSource:this.$t('DataReportManage.GlStatisticTable.table_tips01')||'指标在数据源的全称',
+                DataUpdateTime:this.$t('DataReportManage.GlStatisticTable.table_tips02')||'指标最近一次数据发生变化的时间',
+                ErDataUpdateDate:this.$t('DataReportManage.GlStatisticTable.table_tips03')||'指标数据发生变化的最早日期',
+                NeedRefresh:this.$t('DataReportManage.GlStatisticTable.table_tips04')||'该指标今日是否设置了定时刷新任务',
+                HasRefresh:this.$t('DataReportManage.GlStatisticTable.table_tips05')||'该指标是否发起了刷新任务',
+                UpdateTime:this.$t('DataReportManage.GlStatisticTable.table_tips06')||'指标最近一次执行刷新任务的时间'
             }
             return tipsMap[key]
         },

+ 37 - 19
src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -4,7 +4,7 @@
             <div class="filter-box">
                 <el-select
                     v-model="filterState.changeType"
-                    placeholder="请选择变更类型"
+                    :placeholder="$t('DataReportManage.GlStatisticTable.change_placeholder')"
                     clearable
                     style="width:250px"
                     @change="handleRefreshList"
@@ -52,7 +52,7 @@
                 </template>
             </el-table-column>
             <div slot="empty">
-                <tableNoData text="暂无数据"/>
+                <tableNoData :text="$t('Confirm.prompt_slogan')"/>
             </div>
         </el-table>
         <el-pagination
@@ -74,6 +74,24 @@ import {apiDataSource} from '@/api/modules/dataSource'
 import SetTableCols from './SetTableCols.vue'
 export default {
     components:{SetTableCols},
+    computed:{
+        changeTypeOpt(){
+            return [
+                {
+                    label:this.$t('DataReportManage.GlStatisticTable.change_type01')||'基础信息变更',
+                    value:1,
+                },
+                {
+                    label:this.$t('DataReportManage.GlStatisticTable.change_type02')||'数据明细变更',
+                    value:0,
+                },
+                {
+                    label:this.$t('DataReportManage.GlStatisticTable.change_type03')||'新增指标',
+                    value:2,
+                }
+            ]
+        }
+    },
     data() {
         return {
             tipsKeysArr:['EdbNameSource','EdbName','ErDataUpdateDate'],
@@ -90,20 +108,20 @@ export default {
                 sortType:'',
                 changeType:''
             },
-            changeTypeOpt:[
-                {
-                    label:'基础信息变更',
-                    value:1,
-                },
-                {
-                    label:'数据明细变更',
-                    value:0,
-                },
-                {
-                    label:'新增指标',
-                    value:2,
-                }
-            ],
+            // changeTypeOpt:[
+            //     {
+            //         label:'基础信息变更',
+            //         value:1,
+            //     },
+            //     {
+            //         label:'数据明细变更',
+            //         value:0,
+            //     },
+            //     {
+            //         label:'新增指标',
+            //         value:2,
+            //     }
+            // ],
 
             showSetTableCols:false,
         }
@@ -189,9 +207,9 @@ export default {
         // table说明文案
         getTableHeadTips(key){
             const tipsMap={
-                EdbNameSource:'指标在数据源的全称',
-                EdbName:'指标在ETA指标库保存的指标名称',
-                ErDataUpdateDate:'指标数据发生变化的最早日期',
+                EdbNameSource:this.$t('DataReportManage.GlStatisticTable.table_tips01')||'指标在数据源的全称',
+                EdbName:this.$t('DataReportManage.GlStatisticTable.table_tips13')||'指标在ETA指标库保存的指标名称',
+                ErDataUpdateDate:this.$t('DataReportManage.GlStatisticTable.table_tips03')||'指标数据发生变化的最早日期',
             }
             return tipsMap[key]
         },

+ 20 - 20
src/views/dataSource_manage/components/GLRefreshFailDetail.vue

@@ -1,6 +1,6 @@
  <template>
     <el-dialog
-        title="更新失败指标详情"
+        :title="$t('DataReportManage.GlStatisticTable.update_fail_title')"
         :visible.sync="show"
         :close-on-click-modal="false"
         :append-to-body="true"
@@ -11,17 +11,17 @@
     >
         <div class="gl-refresh-fail-detail-wrap">
             <div style="margin-bottom:20px">
-                <span>终端名称:{{info.Name}}</span>
-                <span style="display:inline-block;margin-left:20px">文件夹路径:{{info.DirPath}}</span>
+                <span>{{$t('DataReportManage.GlStatisticTable.terminal_name')}}:{{info.Name}}</span>
+                <span style="display:inline-block;margin-left:20px">{{$t('DataReportManage.GlStatisticTable.dir_path')}}:{{info.DirPath}}</span>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div>
-                    <span>已成功刷新指标数:{{info.UpdateSuccessNum}}</span>
-                    <span>更新失败指标数:{{info.UpdateFailedNum}}</span>
+                    <span>{{$t('DataReportManage.GlStatisticTable.update_success_num')}}:{{info.UpdateSuccessNum}}</span>
+                    <span>{{$t('DataReportManage.GlStatisticTable.update_fail_num')}}:{{info.UpdateFailedNum}}</span>
                 </div>
                 <div style="display:flex;align-items:center;color:#409EFF;cursor: pointer;" @click="showBZ=true">
                     <img src="~@/assets/img/data_m/icon01.png" alt="">
-                    <span>排查步骤</span>
+                    <span>{{$t('DataReportManage.GlStatisticTable.inspection_step')}}</span>
                 </div>
             </div>
             <el-table
@@ -30,13 +30,13 @@
                 height="500"
             >
                 <el-table-column
-                    label="频度"
+                    :label="$t('DataReportManage.GlStatisticTable.frequency')"
                     prop="Frequency"
                     align="center"
                 >
                 </el-table-column>
                 <el-table-column
-                    label="数量"
+                    :label="$t('DataReportManage.GlStatisticTable.num')"
                     prop="Num"
                     align="center"
                 >
@@ -45,20 +45,20 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="原因"
+                    :label="$t('DataReportManage.GlStatisticTable.reason')"
                     prop="SourceUpdateFailedReason"
                     align="center"
                 >
                 </el-table-column>
                 <div slot="empty">
-                    <tableNoData text="暂无数据"/>
+                    <tableNoData :text="$t('Confirm.prompt_slogan')"/>
                 </div>
             </el-table>
         </div>
 
         <!-- 排查步骤说明 -->
         <el-dialog
-            title="排查步骤"
+            :title="$t('DataReportManage.GlStatisticTable.inspection_step')"
             :visible.sync="showBZ"
             :close-on-click-modal="false"
             :center="true"
@@ -66,18 +66,18 @@
             :append-to-body="true"
             width="500px"
         > 
-            <div style="padding-bottom:30px;line-height:2;color:#333">
-                <div>1、在钢联终端上,用指标编码查询下是否存在该指标,避免因为指标编码变更的原因导致刷新失败。</div>
+            <div style="padding-bottom:30px;line-height:2;color:#333" :v-html="$t('DataReportManage.GlStatisticTable.reason_html')">
+                <!-- <div>1、在钢联终端上,用指标编码查询下是否存在该指标,避免因为指标编码变更的原因导致刷新失败。</div>
                 <div>2、核实钢联终端账号处于登录状态。</div>
                 <div>3、打开Excel,如果“钢联数据2.0”插件不存在,则需要先退出所有Excel和WPS,在钢联终端:最上面的导航栏选择工具->Excel插件修复->点击一键修复,完成钢联数据2.0插件安装。</div>
                 <div>4、打开Excel,选中“钢联数据2.0”插件,查看登录状态是否正常。</div>
-                <div>5、打开文件目录下的一个Excel,选中“钢联数据2.0”插件,点击“更新所有页”按钮后,等待十几秒,查看Excel左下角是否提示额度超限。</div>
+                <div>5、打开文件目录下的一个Excel,选中“钢联数据2.0”插件,点击“更新所有页”按钮后,等待十几秒,查看Excel左下角是否提示额度超限。</div> -->
             </div>
         </el-dialog>
 
         <!-- 失败详情 -->
         <el-dialog
-            title="指标详情"
+            :title="$t('DataReportManage.GlStatisticTable.edb_detail_title')"
             :visible.sync="showEDBList"
             :close-on-click-modal="false"
             :center="true"
@@ -87,10 +87,10 @@
         >
             <div class="gl-refresh-fail-edb-list-wrap">
                 <p class="info"> 
-                    <span>终端名称:{{info.Name}} </span>
-                    <span>文件夹路径:{{info.DirPath}} </span>
-                    <span>频度:{{activeFrequency}} </span>
-                    <span>原因:{{activeReason}} </span>
+                    <span>{{$t('DataReportManage.GlStatisticTable.terminal_name')}}:{{info.Name}} </span>
+                    <span>{{$t('DataReportManage.GlStatisticTable.dir_path')}}:{{info.DirPath}} </span>
+                    <span>{{$t('DataReportManage.GlStatisticTable.frequency')}}:{{activeFrequency}} </span>
+                    <span>{{$t('DataReportManage.GlStatisticTable.reason')}}:{{activeReason}} </span>
                 </p>
                 <el-table
                     :data="edbList"
@@ -105,7 +105,7 @@
                         align="center"
                     />
                     <div slot="empty">
-                        <tableNoData text="暂无数据"/>
+                        <tableNoData :text="$t('Confirm.prompt_slogan')"/>
                     </div>
                 </el-table>
                 <el-pagination

+ 3 - 3
src/views/dataSource_manage/components/SetTableCols.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog
-      title="自定义列"
+      :title="$t('DataReportManage.GlStatisticTable.custom_table')"
       :visible.sync="show"
       :modal-append-to-body="false"
       :close-on-click-modal="false"
@@ -25,8 +25,8 @@
             </div>
         </draggable>
         <div style="text-align:center;margin:30px 0">
-            <el-button type="primary" plain @click="handleClose">取消</el-button>
-            <el-button type="primary" @click="handleSave">确定</el-button>
+            <el-button type="primary" plain @click="handleClose">{{$t('Dialog.cancel_btn')}}</el-button>
+            <el-button type="primary" @click="handleSave">{{$t('Dialog.confirm_btn')}}</el-button>
         </div>
     </el-dialog>
 </template>

+ 7 - 7
src/views/dataSource_manage/components/StatisticTable.vue

@@ -38,7 +38,7 @@
                 </template>
             </el-table-column>
             <div slot="empty">
-                <tableNoData text="暂无数据"/>
+                <tableNoData :text="$t('Confirm.prompt_slogan')"/>
             </div>
         </el-table>
         <el-pagination
@@ -147,12 +147,12 @@ export default {
         // table说明文案
         getTableHeadTips(key){
             const tipsMap={
-                NeedRefreshNum:'1、今日该终端需定时刷新的指标数量<br>2、今日需刷新指标数=今日已更新指标数+今日更新失败指标数',
-                HasRefreshNum:'1、今日该终端发起刷新任务的指标数量<br>2、今日发起刷新任务指标数=今日已刷新成功指标数+今日刷新失败指标数',
-                RefreshSuccessNum:'今日该终端刷新成功的指标数量',
-                RefreshFailedNum:'今日该终端刷新失败的指标数量',
-                UpdateFailedNum:'今日该终端成功发起刷新任务,但指标数据未变化的指标数量',
-                UpdateSuccessNum:' 今日该终端数据发生变化的指标数量'
+                NeedRefreshNum:this.$t('DataReportManage.GlStatisticTable.table_tips07')||'1、今日该终端需定时刷新的指标数量<br>2、今日需刷新指标数=今日已更新指标数+今日更新失败指标数',
+                HasRefreshNum:this.$t('DataReportManage.GlStatisticTable.table_tips08')||'1、今日该终端发起刷新任务的指标数量<br>2、今日发起刷新任务指标数=今日已刷新成功指标数+今日刷新失败指标数',
+                RefreshSuccessNum:this.$t('DataReportManage.GlStatisticTable.table_tips09')||'今日该终端刷新成功的指标数量',
+                RefreshFailedNum:this.$t('DataReportManage.GlStatisticTable.table_tips10')||'今日该终端刷新失败的指标数量',
+                UpdateFailedNum:this.$t('DataReportManage.GlStatisticTable.table_tips11')||'今日该终端成功发起刷新任务,但指标数据未变化的指标数量',
+                UpdateSuccessNum:this.$t('DataReportManage.GlStatisticTable.table_tips12')||' 今日该终端数据发生变化的指标数量'
             }
             return tipsMap[key]
         },

+ 16 - 6
src/views/dataSource_manage/dataSourceListGL.vue

@@ -40,14 +40,24 @@ export default {
             this.time=this.$moment().format('YYYY-MM-DD')
         }  
     },
+    computed:{
+        navOpt(){
+            return [
+                {name:this.$t('DataReportManage.GlStatisticTable.type01'),key:'DetailTable'},
+                {name:this.$t('DataReportManage.GlStatisticTable.type02'),key:'StatisticTable'},
+                {name:this.$t('DataReportManage.GlStatisticTable.type03'),key:'DelEDBTable'},
+                {name:this.$t('DataReportManage.GlStatisticTable.type04'),key:'EDBInfoChangeTable'}
+            ]
+        }
+    },
     data() {
         return {
-            navOpt:[
-                {name:'数据源明细表',key:'DetailTable'},
-                {name:'数据源统计表',key:'StatisticTable'},
-                {name:'删除指标表',key:'DelEDBTable'},
-                {name:'指标信息变更表',key:'EDBInfoChangeTable'}
-            ],
+            // navOpt:[
+            //     {name:'数据源明细表',key:'DetailTable'},
+            //     {name:'数据源统计表',key:'StatisticTable'},
+            //     {name:'删除指标表',key:'DelEDBTable'},
+            //     {name:'指标信息变更表',key:'EDBInfoChangeTable'}
+            // ],
             activeNav:'DetailTable',
             time:this.$moment().format('YYYY-MM-DD')||''
         }

+ 58 - 51
src/views/mychart_manage/components/chartDetailDia.vue

@@ -19,7 +19,7 @@
         }}</span>
       </div>
       <div class="nodata" v-if="isNoChart">
-        <tableNoData text="暂无图表"/>
+        <tableNoData :text="$t('Common.no_chart_msg')"/>
       </div>
       <template v-else>
         <div class="header">
@@ -57,7 +57,7 @@
           <div class="top-right" v-if="chartInfo.Button">
             <span v-permission="permissionBtn.myETAPermission.myChart_move"
                 class="collected" @click="removeMychart(chartInfo)" v-if="classifyUserId === roleId">
-              <i class="el-icon-remove-outline"></i>移出
+              <i class="el-icon-remove-outline"></i><!-- 移出 -->{{$t('Chart.chart_remove_btn')}}
             </span>
             <el-popover
               v-permission="permissionBtn.myETAPermission.myChart_share"
@@ -69,12 +69,12 @@
               v-model="showPopConfirmMap['url']">
               <p>{{hintText}}</p>
               <div style="text-align: right; margin: 0">
-                <el-button size="mini" type="text" @click="closePop('url')">取消</el-button>
-                <el-button type="primary" size="mini" @click="copyChart('url')">确定</el-button>
+                <el-button size="mini" type="text" @click="closePop('url')"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" size="mini" @click="copyChart('url')"><!-- 确定 -->{{$t('Dialog.confirm_btn')}}</el-button>
               </div>
               <span class="span-item shareLink" style="margin-left: 7px;" slot="reference"
                 @click="copyChartConfirm('url')" :data-clipboard-text="linkUrl"  v-if="!chartInfo.Disabled">
-                <i class="el-icon-share"/>&nbsp;分享
+                <i class="el-icon-share"/>&nbsp;<!-- 分享 -->{{$t('Chart.chart_share_btn')}}
               </span>
             </el-popover>
             <span v-permission="permissionBtn.myETAPermission.myChart_copyTo"
@@ -89,11 +89,11 @@
                   vertical-align: middle;
                 "
               />
-              复制到
+              <!-- 复制到 -->{{$t('Chart.chart_copyto_btn')}}
             </span>
             <span v-permission="permissionBtn.myETAPermission.myChart_refresh"
                 class="span-item" @click="refreshHandle" style="margin-left: 7px;">
-              <span><i class="el-icon-refresh" style="font-size: 15px;"/>&nbsp;刷新 </span>
+              <span><i class="el-icon-refresh" style="font-size: 15px;"/>&nbsp;<!-- 刷新 -->{{$t('Edb.detail_refresh_btn')}} </span>
             </span>
             <span
                 class="span-item"
@@ -106,7 +106,7 @@
                     alt=""
                     style="width: 13px; height: 12px; vertical-align: middle"
                 />
-                加入我的图库
+                <!-- 加入我的图库 -->{{$t('Chart.chart_addmy_btn')}}
             </span>
             <span
               v-permission="permissionBtn.myETAPermission.myChart_edit"
@@ -115,7 +115,7 @@
               v-if="chartInfo.Button.IsEdit"
               @click="editChartHandle"
             >
-              <span> <i class="el-icon-edit" />&nbsp;编辑 </span>
+              <span> <i class="el-icon-edit" />&nbsp;<!-- 编辑 -->{{$t('Chart.chart_edit_btn')}} </span>
             </span>
             <span
               v-permission="permissionBtn.myETAPermission.myChart_save"
@@ -124,7 +124,7 @@
               @click="saveChartMapHandle"
               v-if="[1,2,5].includes(chartInfo.Source)"
             >
-              <span> <i class="el-icon-collection" />&nbsp;保存 </span>
+              <span> <i class="el-icon-collection" />&nbsp;<!-- 保存 -->{{$t('Chart.chart_save_btn')}} </span>
             </span>
             <span
               v-permission="permissionBtn.myETAPermission.myChart_otherSave"
@@ -133,7 +133,7 @@
               v-if="chartInfo.Button.IsCopy"
               @click="saveChartOtherHandle"
             >
-              <span> <i class="el-icon-document-add" />&nbsp;另存为 </span>
+              <span> <i class="el-icon-document-add" />&nbsp;<!-- 另存为 -->{{$t('Chart.chart_copy_btn')}} </span>
             </span>
             <el-popover
               v-permission="permissionBtn.myETAPermission.myChart_copyOffice"
@@ -145,8 +145,8 @@
               v-model="showPopConfirmMap['office']">
               <p>{{hintText}}</p>
               <div style="text-align: right; margin: 0">
-                <el-button size="mini" type="text" @click="closePop('office')">取消</el-button>
-                <el-button type="primary" size="mini" @click="copyChart('office')">确定</el-button>
+                <el-button size="mini" type="text" @click="closePop('office')"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" size="mini" @click="copyChart('office')"><!-- 确定 -->{{$t('Dialog.confirm_btn')}}</el-button>
               </div>
               <span
               slot="reference"
@@ -155,7 +155,7 @@
               @click="copyChartConfirm('office')"
               v-if="!chartInfo.Disabled"
             >
-              <i class="el-icon-document-copy" />&nbsp;复制至office
+              <i class="el-icon-document-copy" />&nbsp;<!-- 复制至office -->{{$t('Chart.chart_copyoffice')}}
             </span>
             </el-popover>
             <el-popover
@@ -168,8 +168,8 @@
               v-model="showPopConfirmMap['微信']">
               <p>{{hintText}}</p>
               <div style="text-align: right; margin: 0">
-                <el-button size="mini" type="text" @click="closePop('微信')">取消</el-button>
-                <el-button type="primary" size="mini" @click="copyChart('微信')">确定</el-button>
+                <el-button size="mini" type="text" @click="closePop('微信')"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" size="mini" @click="copyChart('微信')"><!-- 确定 -->{{$t('Dialog.confirm_btn')}}</el-button>
               </div>
               <span
                 slot="reference"
@@ -178,7 +178,7 @@
                 @click="copyChartConfirm('微信')"
                 v-if="!chartInfo.Disabled"
               >
-                <img style="width: 13px; height: 12px;vertical-align: middle" src="~@/assets/img/chart_m/WeChat.jpg" />&nbsp;复制至微信
+                <img style="width: 13px; height: 12px;vertical-align: middle" src="~@/assets/img/chart_m/WeChat.jpg" />&nbsp;<!-- 复制至微信 -->{{$t('Chart.chart_copywx')}}
               </span>
             </el-popover>
             <span
@@ -187,11 +187,11 @@
               style="margin-left: 7px"
               @click="openEnNameDia"
             >
-              <span> <img style="width: 16px;vertical-align: middle" :src="$icons.to_en" />&nbsp;设置英文名称 </span>
+              <span> <img style="width: 16px;vertical-align: middle" :src="$icons.to_en" />&nbsp;<!-- 设置英文名称 -->{{$t('Edb.detail_en_btn')}} </span>
             </span>
             <el-popconfirm
               v-permission="permissionBtn.myETAPermission.myChart_del"
-              title="删除后该图表将不能再引用,确认删除吗?"
+              :title="$t('Chart.OptMsg.chart_del_confirm')"
               icon="el-icon-info"
               @onConfirm="delChartHandle"
               v-if="chartInfo.Button.IsEdit"
@@ -201,7 +201,7 @@
                 class="span-item"
                 style="color: #ff4040"
               >
-                <i class="el-icon-delete" style="color: #ff4040" />&nbsp;删除
+                <i class="el-icon-delete" style="color: #ff4040" />&nbsp;<!-- 删除 -->{{$t('Chart.chart_del_btn')}}
               </span>
             </el-popconfirm>
           </div>
@@ -336,7 +336,7 @@
                     color: ${ JSON.parse(chartInfo.SourcesFrom).color };
                     fontSize: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
                   `"
-                  >来源:{{JSON.parse(chartInfo.SourcesFrom).text}}</span>
+                  ><!-- 来源 -->{{$t('Chart.Detail.source')}}:{{JSON.parse(chartInfo.SourcesFrom).text}}</span>
               </div>
               
                <!-- 公历农历切换 只用于季节性图 -->
@@ -346,8 +346,8 @@
                 class="calendar-cont"
                 @change="getPreviewChartInfo"
               >
-                <el-radio-button label="公历" />
-                <el-radio-button label="农历" />
+                <el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
+								<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
               </el-radio-group>
 
               <!-- 图表说明 -->
@@ -360,7 +360,7 @@
                   fontSize: ${ JSON.parse(chartInfo.Instructions).fontSize }px
                 `"
               ></div>
-              <div class="chart-author">作者:{{chartInfo.SysUserRealName}}</div>
+              <div class="chart-author"><!-- 作者 -->{{$t('Chart.Detail.author')}}:{{chartInfo.SysUserRealName}}</div>
             </div>
 
           </div>
@@ -380,10 +380,10 @@
                 <div class="options-cont">
                   //堆叠图 或组合图中的堆叠类型 非第一项隐藏配置
                   <template v-if="showYOptionsHandle(props.row,props.$index)">
-                      <el-checkbox v-model="props.row.IsOrder">逆序</el-checkbox>
+                      <el-checkbox v-model="props.row.IsOrder">{{$t('Chart.Detail.re_order')}}</el-checkbox>
                       <el-radio-group v-model="props.row.IsAxis" size="mini">
-                        <el-radio-button :label="1">左轴</el-radio-button>
-                        <el-radio-button :label="0">右轴</el-radio-button>
+                        <el-radio-button :label="1">{{$t('Chart.Detail.l_axis')}}</el-radio-button></el-radio-button>
+                        <el-radio-button :label="0">{{$t('Chart.Detail.r_axis')}}</el-radio-button>
                         //指标有右轴时才可以选右2轴 不然没有右2这个概念的意义
                         <el-radio-button 
                           v-if="[1,6].includes(chartInfo.ChartType)"
@@ -391,7 +391,7 @@
                           :disabled="(tableData.findIndex(_ => _.IsAxis===0) === -1) 
                           || (tableData.findIndex(_ => _.IsAxis===0) === props.$index 
                               && tableData.filter(_ => _.IsAxis===0).length === 1)"
-                        >右2轴</el-radio-button>
+                        >t('Chart.Detail.rtwo_axis')}}</el-radio-button>
                       </el-radio-group>
                   </template>
                   <div style="min-width: 250px">
@@ -399,7 +399,7 @@
                       v-model="props.row.EdbInfoType"
                       :label="1"
                       @change="getPreviewChartInfo"
-                      >标准指标</el-radio
+                      >{{$t('Chart.Detail.stand_lead')}}</el-radio
                     >
                     <div style="margin-top: 22px">
                       <el-radio
@@ -407,10 +407,10 @@
                         :label="0"
                         style="margin-right: 10px"
                         @change="getPreviewChartInfo"
-                        >领先指标</el-radio
+                        >{{$t('Chart.Detail.leading_lead')}}</el-radio
                       >
                       <template v-if="props.row.EdbInfoType === 0">
-                        领先
+                        {{$t('EtaChartAddPage.label_lead')}}
                         <el-input
                           style="width: 60px"
                           size="mini"
@@ -440,7 +440,7 @@
                   </div>
                   <div>
                     <div style="display: flex">
-                      <span style="margin-right: 3px">线条颜色:</span>
+                      <span style="margin-right: 3px">{{$t('Chart.Detail.line_color')}}:</span>
                       <el-color-picker
                         v-model="props.row.ChartColor"
                         size="mini"
@@ -453,7 +453,7 @@
                       v-if="chartInfo.ChartType === 1 
                       || (chartInfo.ChartType === 6 && props.row.ChartStyle==='spline')"
                     >
-                      线条粗细
+                      {{$t('Chart.Detail.line_size')}}
                       <el-input
                         style="width: 60px"
                         size="mini"
@@ -464,7 +464,7 @@
                     </div>
                   </div>
                   <div v-if="chartInfo.ChartType === 6">
-                    <span style="margin-right: 3px">生成样式:</span>
+                    <span style="margin-right: 3px"><{{$t('Chart.label_create_sty')}}:</span>
                     <el-select
                       v-model="props.row.ChartStyle"
                       placeholder="请选择生成样式"
@@ -482,13 +482,13 @@
                   </div>
                   <div class="copy-excel">
                     <span class="editsty" @click="copyCode(props.row)" v-if="isAllowCopyData">
-                      <i class="el-icon-document-copy" />&nbsp;复制数据</span
+                      <i class="el-icon-document-copy" />&nbsp;{{$t('Edb.detail_copydata_btn')}}</span
                     >
                     <span 
                       class="editsty" v-if="isAllowCheckData"
                       @click="viewTarget(props.row)"
                       style="display:block;margin-top:15px;"
-                    >&nbsp;查看数据</span>
+                    >&nbsp;{{$t('Edb.detail_lookdata_btn')}}</span>
                   </div>
                 </div>
               </template>
@@ -515,23 +515,23 @@
               </template>
             </el-table-column>
             <el-table-column
-              label="操作"
+              :label="$t('Table.column_operations')"
               key="Copy"
               align="center"
               width="110"
             >
               <template slot-scope="scope">
                 <span class="editsty" @click="copyCode(scope.row)" v-if="isAllowCopyData">
-                  <i class="el-icon-document-copy" />&nbsp;复制数据</span
+                  <i class="el-icon-document-copy" />&nbsp;<!-- 复制数据 -->{{$t('Edb.detail_copydata_btn')}}</span
                 >
                 <span v-if="isAllowCheckData"
                   class="editsty"
                   @click="viewTarget(scope.row)"
-                >查看数据</span>
+                ><!-- 查看数据 -->{{$t('Edb.detail_lookdata_btn')}}</span>
               </template>
             </el-table-column>
             <div slot="empty">
-              <tableNoData text="暂无指标" size="mini"/>
+              <tableNoData :text="$t('Table.no_edb_msg')" size="mini"/>
             </div>
           </el-table>
         </div>
@@ -691,7 +691,7 @@ export default {
       showChart: false,
       chartInfo: {},
 
-      dateTip: '请选择时间段',
+      dateTip: /* '请选择时间段' */ this.$t('Chart.choose_time'),
       season_year: [], //季节图时间段
       calendar_type: '', //公历农历选择项
       drawImg: '', //用于复制后的图标图片存储
@@ -822,7 +822,7 @@ export default {
           ? `${this.chartInfo.StartDate}~至今`
           : this.chartInfo.DateType === 20
           ?`最近${this.chartInfo.StartYear}年`
-          :'请选择时间段';
+          :/* '请选择时间段' */ this.$t('Chart.choose_time');
 
     },
 
@@ -926,7 +926,7 @@ export default {
     changeYear(item) {
       this.year_select = item.value;
       this.select_date = '';
-      this.dateTip = '请选择时间段';
+      this.dateTip = /* '请选择时间段' */ this.$t('Chart.choose_time');
   
       this.getPreviewChartInfo();
     },
@@ -1031,7 +1031,8 @@ export default {
         input.select();
         document.execCommand('copy');
         document.body.removeChild(input);
-        this.$message.success('复制链接成功')
+        // this.$message.success('复制链接成功')
+        this.$message.success(this.$t('Chart.OptMsg.copy_link_success'))
       }else{
         this.copyChartHandle(type)
       }
@@ -1122,7 +1123,8 @@ export default {
 			})
 
 			if(Ret!==200) return
-			this.$message.success('保存成功');
+			// this.$message.success('保存成功');
+			this.$message.success(this.$t('MsgPrompt.saved_msg'));
 			//关联图表和图片
 			this.setChartImage();
 		},300),
@@ -1203,7 +1205,8 @@ export default {
 
       dataBaseInterface.chartSave(params).then((res) => {
         if (res.Ret === 200) {
-          this.$message.success('保存成功');
+          // this.$message.success('保存成功');
+          this.$message.success(this.$t('MsgPrompt.saved_msg'));
           sessionStorage.removeItem('myChartbeforeOptions');
           //关联图表和图片
           this.setChartImage();
@@ -1384,13 +1387,15 @@ export default {
     shareUrl() {
       var clipboard = new this.Clipboard('.shareLink')
       clipboard.on('success', e => {
-        this.$message.success('复制链接成功')
+        // this.$message.success('复制链接成功')
+        this.$message.success(this.$t('Chart.OptMsg.copy_link_success'))
         e.clearSelection() // 释放内存
         clipboard.destroy()
       })
       // // 浏览器不支持
       clipboard.on('error', e => {
-        this.$message.warning('浏览器暂不支持')
+        // this.$message.warning('浏览器暂不支持')
+        this.$message.warning(this.$t('MsgPrompt.browser_not_support'))
         // 释放内存
         clipboard.destroy()
       })
@@ -1411,14 +1416,16 @@ export default {
       }) */
       try{
         copyFit(this.chartInfo.ChartName||'')
-        this.$message.success("复制标题成功")
+        // this.$message.success("复制标题成功")
+        this.$message.success(this.$t('Chart.OptMsg.copy_tit_success'))
       }catch(e){
-        this.$message.warning("复制标题失败")
+        // this.$message.warning("复制标题失败")
+        this.$message.warning(this.$t('Chart.OptMsg.copy_tit_fail'))
       }
     },
 
     init() {
-      this.dateTip = '请选择时间段';
+      this.dateTip = /* '请选择时间段' */ this.$t('Chart.choose_time');
 			sessionStorage.removeItem('myChartbeforeOptions');
     },
 

+ 12 - 12
src/views/mychart_manage/components/chooseChart.vue

@@ -17,11 +17,11 @@
           :src="$icons.choose_ico"
           style="color: #fff; width: 16px; height: 16px; margin-right: 5px"
         />
-        <span style="font-size: 16px">选择图表</span>
+        <span style="font-size: 16px"><!-- 选择图表 -->{{$t('MyEtaPage.label_choose_chart')}}</span>
       </div>
       <div class="dialog-top">
         <el-input
-          placeholder="图表名称"
+          :placeholder="$t('Chart.Detail.chart_name')"
           v-model="search_txt"
           style="width: 100%"
           @input="searchHandle"
@@ -31,14 +31,14 @@
         </el-input>
         <div style="margin-top: 10px">
           <el-radio-group v-model="chart_source" @change="searchHandle" style="margin-right:15px;">
-						<el-radio :label="1">ETA图库</el-radio>
-						<el-radio :label="2">商品价格曲线</el-radio>
-						<el-radio :label="3">相关性图表</el-radio>
-						<el-radio :label="6">拟合方程曲线</el-radio>
-						<el-radio :label="7">统计特征</el-radio>
-						<el-radio :label="10">跨品种分析</el-radio>
+						<el-radio :label="1"><!-- ETA图库 -->{{$t('Chart.AllChartSource.eta_chart')}}</el-radio>
+						<el-radio :label="2"><!-- 商品价格曲线 -->{{$t('Chart.AllChartSource.commodity_chart')}}</el-radio>
+						<el-radio :label="3"><!-- 相关性图表 -->{{$t('Chart.AllChartSource.correla_chart')}}</el-radio>
+						<el-radio :label="6"><!-- 拟合方程曲线 -->{{$t('Chart.AllChartSource.equation_chart')}}</el-radio>
+						<el-radio :label="7"><!-- 统计特征 -->{{$t('Chart.AllChartSource.statis_chart')}}</el-radio>
+						<el-radio :label="10"><!-- 跨品种分析 -->{{$t('Chart.AllChartSource.cross_chart')}}</el-radio>
 					</el-radio-group>
-          <el-checkbox v-model="isShowMe"  @change="searchHandle">只看我的</el-checkbox>
+          <el-checkbox v-model="isShowMe"  @change="searchHandle"><!-- 只看我的 -->{{$t('MyEtaPage.label_see_mine')}}</el-checkbox>
         </div>
       </div>
       <div class="choose-dialog-min">
@@ -62,14 +62,14 @@
               </div>
               <img :src="chart.ChartImage" alt="" class="chart-img" />
               <div class="item-bottom">
-                <span class="last-time">最近更新:{{ chart.ModifyTime.substr(0,10) }}</span>
+                <span class="last-time"><!-- 最近更新 -->{{$t('MyEtaPage.label_update_time')}}:{{ chart.ModifyTime.substr(0,10) }}</span>
                 <span class="join_txt" @click="addMychartHandle(chart)">
                   <img
                     :src="$icons.chart_join_ico"
                     alt=""
                     style="width: 13px; height: 12px; vertical-align: middle"
                   />
-                  加入我的图库
+                  <!-- 加入我的图库 -->{{$t('Chart.chart_addmy_btn')}}
                 </span>
                 <!-- <span style="color: #3BB737;" v-else>已加入</span> -->
               </div>
@@ -77,7 +77,7 @@
           </el-col>
         </div>
         <div v-else class="nodata">
-          <tableNoData text="暂无图表"/>
+          <tableNoData :text="$t('Common.no_chart_msg')"/>
         </div>
       </div>
     </el-dialog>

+ 35 - 54
src/views/mychart_manage/index.vue

@@ -23,7 +23,7 @@
             alt=""
             style="width: 14px; height: 14px"
           />
-          选择图表
+          <!-- 选择图表 -->{{$t('MyEtaPage.choose_chart_btn')}}
         </span>
         <el-select
           v-model="search_txt"
@@ -31,7 +31,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,33 +48,14 @@
       </div>
       <div class="left-bottom">
         <div class="public-classify" v-if="publicClassifyList.length">
-          <h3 @click="expandPublic = !expandPublic" class="classify-type">公共图库<span><i :class="{'el-icon-arrow-down':!expandPublic,'el-icon-arrow-up':expandPublic}"></i></span></h3>
-          <!-- <ul class="public-ul">
-            <li
-              :class="[
-                'classify-item',
-                { 'act': item.MyChartClassifyId === select_classify && item.fromPublic === ispublic },
-              ]"
-              v-for="item in publicClassifyList"
-              :key="item.MyChartClassifyId"
-              @click="chooseClassify(item)"
-            >
-              <span>
-                {{ item.MyChartClassifyName }}
-              </span>
-             
-              <div class="right-item right-item-box" >
-                <el-dropdown @command="handleCommand" trigger="click" v-if="isShowDropPublic">
-                  <span class="el-dropdown-link"> 
-                    <i class="el-icon-more" style="font-size: 16px;transform: rotate(90deg);cursor: pointer"/>
-                  </span>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="{key:'copy'}" :disabled="select_classify_userid === roleId">复制</el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </div>
-            </li>
-          </ul> -->
+          <h3 
+            @click="expandPublic = !expandPublic" 
+            class="classify-type"
+          > 
+            <!-- 公共图库 -->{{$t('MyEtaPage.tab_public')}}
+            <span><i :class="{'el-icon-arrow-down':!expandPublic,'el-icon-arrow-up':expandPublic}"></i></span>
+          </h3>
+         
           <div class="tree-wrap" v-show="expandPublic">
                 <el-tree
                     ref="catalogTree"
@@ -93,7 +74,7 @@
                                 <i class="el-icon-more" style="font-size: 16px;transform: rotate(90deg);cursor: pointer"/>
                             </span>
                             <el-dropdown-menu slot="dropdown">
-                                <el-dropdown-item :command="{key:'copy'}" :disabled="select_classify_userid === roleId">复制</el-dropdown-item>
+                                <el-dropdown-item :command="{key:'copy'}" :disabled="select_classify_userid === roleId"><!-- 复制 -->{{$t('MyEtaPage.option_op_copy')}}</el-dropdown-item>
                             </el-dropdown-menu>
                             </el-dropdown>
                         </div>
@@ -102,7 +83,7 @@
             </div>
         </div>
         <div class="classify" v-if="classifyList.length">
-          <h3 class="classify-type">我的图库</h3>
+          <h3 class="classify-type"><!-- 我的图库 -->{{$t('MyEtaPage.tab_my')}}</h3>
           <draggable
             v-model="classifyList"
             class="classify-ul"
@@ -146,7 +127,7 @@
                     >
                     <img v-if="item.IsPublic === 0" src="~@/assets/img/chart_m/Group_act.png">
                     <img v-else src="~@/assets/img/chart_m/Group.png">
-                    仅自己可见</el-dropdown-item>
+                    <!-- 仅自己可见 -->{{$t('MyEtaPage.option_view_person')}}</el-dropdown-item>
                     <el-dropdown-item 
                     :command="{key:'public',IsCompanyPublic:undefined,item}" 
                     :class="item.IsPublic === 1 ? 'el-dropdown-menu-item-chat-act' : ''"
@@ -154,7 +135,7 @@
                     >
                     <img v-if="item.IsPublic === 1" src="~@/assets/img/chart_m/User_act.png">
                     <img v-else src="~@/assets/img/chart_m/User.png">
-                    所有人可见</el-dropdown-item>
+                    <!-- 所有人可见 -->{{$t('MyEtaPage.option_view_all')}}</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
                 <el-dropdown @command="handleCommand" trigger="click" v-if="isShowDropMine">
@@ -163,9 +144,9 @@
                   </span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item v-if="permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_rename')"
-                        :command="{key:'edit'}">重命名</el-dropdown-item>
+                        :command="{key:'edit'}"><!-- 重命名 -->{{$t('MyEtaPage.option_op_rename')}}</el-dropdown-item>
                     <el-dropdown-item v-if="permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_delete')"
-                        :command="{key:'del'}">删除</el-dropdown-item>
+                        :command="{key:'del'}"><!-- 删除 -->{{$t('Table.delete_btn')}}</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -178,7 +159,7 @@
             alt=""
             style="width: 16px; height: 16px; margin-right: 10px"
           />
-          <span>添加我的分类</span>
+          <span><!-- 添加我的分类 -->{{$t('MyEtaPage.add_myclassify_btn')}}</span>
         </div>
       </div>
     </div>
@@ -190,8 +171,8 @@
       <div class="chart-public-cont" v-if="haveData">
         
         <div class="cont-top">
-          <span>共{{ total }}张图表</span>
-          <span v-if="ispublic === 1">分享人: {{ RealName }}</span>
+          <span>{{$t('Chart.total_chart_show',{limit:total})}}</span>
+          <span v-if="ispublic === 1"><!-- 分享人 -->{{$t('MyEtaPage.label_share_user')}}: {{ RealName }}</span>
         </div>
         <div
           class="chart-public-list"
@@ -235,7 +216,7 @@
                 />
                 <div class="item-bottom">
                   <span class="last-time"
-                    >创建时间: {{ chart.CreateTime.slice(0,10) }}</span
+                    ><!-- 创建时间 -->{{$t('Chart.list_chart_time')}}: {{ chart.CreateTime.slice(0,10) }}</span
                   >
                   <div v-if="select_classify_userid === roleId">
                     <span v-permission="permissionBtn.myETAPermission.myChart_move"
@@ -244,7 +225,7 @@
                         class="el-icon-remove-outline"
                         style="font-size: 14px"
                       ></i>
-                      移出
+                      <!-- 移出 -->{{$t('Chart.chart_remove_btn')}}
                     </span>
                   </div>
                 </div>
@@ -254,8 +235,8 @@
         </div>
       </div>
       <div v-else class="nodata">
-        <span v-if="ispublic === 1" class="sharer">分享人: {{ RealName }}</span>
-        <tableNoData text="暂无图表"/>
+        <span v-if="ispublic === 1" class="sharer"><!-- 分享人 -->{{$t('MyEtaPage.label_share_user')}}: {{ RealName }}</span>
+        <tableNoData :text="$t('Common.no_chart_msg')"/>
       </div>
     </div>
 
@@ -388,11 +369,11 @@ export default {
       },
       addRules: {
         name: [
-          { required: true, message: '分类名称不能为空', trigger: 'blur' },
+          { required: true, message: /* '分类名称不能为空'  */this.$t('Edb.Valids.common_msg',{label: this.$t('MyEtaPage.label_classify_name')}), trigger: 'blur' },
         ],
         classify: [
-          { required: true, message: '复制分类不能为空', trigger: 'blur' },
-        ],
+          { required: true, message: /* '复制分类不能为空' */this.$t('Edb.Valids.common_msg',{label: this.$t('MyEtaPage.label_classify_name')}), trigger: 'blur' },
+        ]
       }, //添加分类规则
       move_id: '', //移动到 当前选中图表
 
@@ -644,14 +625,14 @@ export default {
 
     /* 添加分类 */
     addClassify() {
-      this.dia_title = '新增分类';
+      this.dia_title = /* '新增分类' */this.$t('MyEtaPage.label_add_classify');
       this.dialogKeyArrs = [
         {
-          label: '分类名称',
+          label: /* '分类名称' */this.$t('MyEtaPage.label_classify_name'),
           prop: 'name',
           type: 'input',
           maxlen: 10,
-          placeholder: '请输入分类名称',
+          placeholder: /* '请输入分类名称' */this.$t('MyEtaPage.ph_classify'),
         },
       ];
       this.formData = {
@@ -718,14 +699,14 @@ export default {
       };
       this.dialogKeyArrs = [
         {
-          label: '分类名称',
+          label: /* '分类名称' */this.$t('MyEtaPage.label_classify_name'),
           prop: 'name',
           type: 'input',
           maxlen: 10,
-          placeholder: '请输入分类名称',
+          placeholder: /* '请输入分类名称' */this.$t('MyEtaPage.ph_classify'),
         },
       ];
-      this.dia_title = '重命名分类';
+      this.dia_title = /* '重命名分类'  */this.$t('MyEtaPage.label_rename_classify');
     },
 
     /* 操作 */
@@ -960,14 +941,14 @@ export default {
       //   return this.$message.warning(
       //     '当前图表所属多个分类,请选中具体分类移动'
       //   );
-      this.dia_title = '复制图表分类';
+      this.dia_title = /* '复制图表分类' */ this.$t('MyEtaPage.label_copy_classify');
       this.move_id = id;
       this.dialogKeyArrs = [
         {
-          label: '复制到',
+          label: /* '复制到' */ this.$t('MyEtaPage.label_copy_to'),
           prop: 'classify',
           type: 'select',
-          placeholder: '请选择目录',
+          placeholder: /* '请选择目录' */ this.$t('MyEtaPage.ph_menu'),
           multiple: true,
         },
       ];

+ 1 - 1
src/views/toolBox_manage/FederalReserveWatch.vue

@@ -8,7 +8,7 @@
                 type="date"
                 placeholder="选择日期" @change="getSheetDetail">
             </el-date-picker>
-            <el-button type="text" @click="downloadSheet" :loading="isDownload">下载</el-button>
+            <el-button type="text" @click="downloadSheet" :loading="isDownload">{{$t('Common.download_btn')}}</el-button>
         </div>
         <div class="table-box">
             <div class="sheet-wrap">