浏览代码

myeta模块over

Karsa 1 年之前
父节点
当前提交
4dfa1e2d91

+ 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() {

+ 8 - 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: {

+ 29 - 1
src/lang/modules/EtaChart/commonLang.js

@@ -485,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: "跨品种分析",
+    },
+  },
 }

+ 64 - 1
src/lang/modules/MyEta/En.js

@@ -12,6 +12,69 @@ export default {
     option_op_rename:'Rename',
     option_op_copy:'Copy',
     add_myclassify_btn: 'Create my catagory',
-    label_share_user: ' Shared by'
+    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'
   }
 }

+ 65 - 1
src/lang/modules/MyEta/Zh.js

@@ -12,6 +12,70 @@ export default {
     option_op_rename:'重命名',
     option_op_copy:'复制',
     add_myclassify_btn: '添加我的分类',
-    label_share_user: '分享人'
+    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;
             });
         },

+ 1 - 1
src/views/mychart_manage/components/chartDetailDia.vue

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

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

+ 11 - 11
src/views/mychart_manage/index.vue

@@ -369,10 +369,10 @@ 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: '', //移动到 当前选中图表
@@ -625,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 = {
@@ -699,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');
     },
 
     /* 操作 */
@@ -941,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,
         },
       ];