数据源bug修复

src/lang/commonLang.js

@@ -242,6 +242,14 @@ export default {
     move_success_msg: {
       en: 'Move successful',
       zh: '移动成功'
+    },
+    move_out_msg: {
+      en: 'Removed successful',
+      zh: '移出成功'
+    },
+    clean_classify_msg: {
+      en: 'Category Cleared Successfully',
+      zh: '清除分类成功'
     }
   },
   Common: {
@@ -308,7 +316,23 @@ export default {
     copy_excel: {
       en: 'Copy Excel Data',
       zh: '复制excel数据',
-    }
+    },
+    switch_to_en_v: {
+      en: 'Switch to English version',
+      zh: '切换英文版',
+    },
+    switch_to_zh_v: {
+      en: 'Switch to Chinese version',
+      zh: '切换中文版',
+    },
+    switch_to_en: {
+      en: 'Switch to English',
+      zh: '切换英文',
+    },
+    switch_to_zh: {
+      en: 'Switch to Chinese',
+      zh: '切换中文',
+    },
   },
   Edb,
   Chart,

src/lang/modules/DataSources/En.js

@@ -58,7 +58,10 @@ export default {
     step_two:'2. Step Two: Upload data. Click on "Import Data" to upload the completed template and confirm the import. ',
     step_three:'Step Three: Complete the import. If there is any data that failed to import, download ',
     upload_size_msg:'The file size must not exceed 10MB',
-    down_fail_list2: 'Download Failure List'
+    down_fail_list2: 'Download Failure List',
+
+    col_status_1:'Completed',
+    col_status_2:'Incomplete',
   },
 
   /* 期货数据库页面 */
@@ -102,7 +105,9 @@ export default {
     label_edb_classify:'Affiliated Category',
     ph_edbid:'Indicator ID can not be empty',
     ph_classify:'Affiliated Category can not be empty',
-    add_loading_msg:'The loading time is approximately five minutes; closing the popup will not affect the loading process'
+    add_loading_msg:'The loading time is approximately five minutes; closing the popup will not affect the loading process',
+    add_max_msg: 'The number of additions has reached the upper limit (upper limit 100)!',
+    ph_classify_name: 'Please select a category name',
   },
 
   /* un数据页面 */

src/lang/modules/DataSources/Zh.js

@@ -58,7 +58,10 @@ export default {
     step_two:'2、第二步，上传数据。点击“导入数据”，上传已经填写好的模板，确认导入。',
     step_three:'3、第三步，完成导入。若有导入失败数据，下载',
     upload_size_msg:'文件大小不得超过10M',
-    down_fail_list2: '下载失败列表'
+    down_fail_list2: '下载失败列表',
+
+    col_status_1:'完成',
+    col_status_2:'未完成',
   },
 
   /* 期货数据库页面 */
@@ -101,7 +104,9 @@ export default {
     label_edb_classify:'所属分类',
     ph_edbid:'指标ID不能为空',
     ph_classify:'所属分类不能为空',
-    add_loading_msg:'加载时间大概五分钟，关闭弹窗不影响加载'
+    add_loading_msg:'加载时间大概五分钟，关闭弹窗不影响加载',
+    add_max_msg: '添加数量已达上限（上限100）！',
+    ph_classify_name: '请选择分类名称',
   },
 
   /* un数据页面 */

src/lang/modules/EtaChart/commonLang.js

@@ -198,6 +198,14 @@ export default {
     add_mine_success: {
       zh:'已加入我的图库',
       en:'Successfully added to my gallery'
+    },
+    del_classify_chart_msg: {
+      zh:'若删除该分类，则分类下关联的所有图表将被全部删除, 是否继续?',
+      en:'If you delete this category, all charts associated with the category will be deleted. Do you want to continue?'
+    },
+    del_classify_link_msg: {
+      zh:'该图分类已添加节点链接，不允许删除！',
+      en:'This chart category has added node links and cannot be deleted!'
     }
 
 

src/lang/modules/MyEta/En.js

@@ -73,8 +73,10 @@ export default {
     no_classify:'This node has not selected a chart category',
 
     //节点名称
-    label_node_name:'节点名称',
+    label_node_name:'Node Name',
     label_label_link:'Node Link',
-    ph_link: 'Please select a node link'
+    ph_link: 'Please select a node link',
+
+    no_graph_msg: 'Please draw canvas content'
   }
 }

src/lang/modules/MyEta/Zh.js

@@ -76,6 +76,8 @@ export default {
     //节点名称
     label_node_name:'节点名称',
     label_label_link:'节点链接',
-    ph_link: '请选择节点链接'
+    ph_link: '请选择节点链接',
+
+    no_graph_msg: '请绘制画布内容'
   }
 }

src/utils/svgToblob.js

@@ -22,15 +22,15 @@
           const data = [new ClipboardItem({ [blob.type]: blob })];
           await navigator.clipboard.write(data).then(
             () => {
-              bus.$message.success('复制成功！')
+              bus.$message.success(/* '复制成功！' */bus.$i18nt.t('MsgPrompt.copy_success_msg'))
             },
             () => {
-              bus.$message.warning('浏览器暂不支持')
+              bus.$message.warning(/* '浏览器暂不支持' */bus.$i18nt.t('MsgPrompt.browser_not_support'))
             }
           );
         })
       }else {
-        bus.$message.warning('当前协议暂不支持，仅支持https协议')
+        bus.$message.warning(/* '当前协议暂不支持，仅支持https协议' */ bus.$i18nt.t('MsgPrompt.http_not_support'))
       }
     }	
  

src/views/chartFrame_manage/frameEditor.vue

@@ -117,7 +117,7 @@ export default {
                 return this.$message.warning(/* "请输入框架名称" */this.$t('ChartFramePage.ph_search'))
             }
             if(!this.$refs.container.graph.toJSON().cells.length){
-                return this.$message.warning('请绘制画布内容');
+                return this.$message.warning(/* '请绘制画布内容' */this.$t('ChartFrameEditorPage.no_graph_msg'));
             }
 
             this.lockLoding = this.$loading({

src/views/chartFrame_manage/index.vue

@@ -188,7 +188,7 @@
             <div class="dialog-container">
                 <div>
                     <span style="margin-right:5px;"><!-- 框架名称 -->{{$t('ChartFramePage.label_frame_name')}}</span>
-                    <el-input v-model.trim="modifyFrame.FrameworkName" placeholder="请输入框架名称"></el-input>
+                    <el-input v-model.trim="modifyFrame.FrameworkName" :placeholder="$t('ChartFramePage.ph_search')"></el-input>
                 </div>
             </div>
             <div class="dialog-footer">
@@ -520,7 +520,7 @@ export default {
         },
         renameFrame(){
             if(!this.modifyFrame.FrameworkName.length){
-                this.$message.warning("请输入框架名称")
+                this.$message.warning(/* "请输入框架名称" */this.$t('ChartFramePage.ph_search'))
                 return
             }
             chartFrameInterface.reNameFrame({

src/views/dataEntry_manage/chartSetting.vue

@@ -27,8 +27,8 @@
             @click="$router.push({path: '/addchart'})" type="primary"
           ><!-- 添加图表 -->{{$t('Chart.add_chart_btn')}}</el-button>
 
-          <!-- <change-lang v-permission="permissionBtn.chartLibPermission.chartLib_switchEn"
-            :lang="currentLang" @changeLang="changeLanguage" style="margin-left: 10px;"/> -->
+          <change-lang v-permission="permissionBtn.chartLibPermission.chartLib_switchEn"
+            :lang="currentLang" @changeLang="changeLanguage" style="margin-left: 10px;"/>
 
         </div>
         

src/views/dataEntry_manage/components/changeLang.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="changeLang-box" >
     <div class="changeLang-item" @click="changeLang">
-      <el-button type="primary" v-if="showButton">{{lang==='ch'?'切换英文版':'切换中文版'}}</el-button>
+      <el-button type="primary" v-if="showButton">{{lang==='ch'?$t('Common.switch_to_en_v'):$t('Common.switch_to_zh_v')}}</el-button>
       <template v-else>
         <img src="../../../assets/img/icons/changeLang.png" />
-        <span v-show="lang=='en'">切换中文</span>
-        <span v-show="lang=='ch'">切换英文</span>
+        <span v-show="lang=='en'"><!-- 切换中文 -->{{ $t('Common.switch_to_zh') }}</span>
+        <span v-show="lang=='ch'"><!-- 切换英文 -->{{ $t('Common.switch_to_en') }}</span>
 
       </template>
     </div>

src/views/dataEntry_manage/dataEntry.vue

@@ -107,12 +107,12 @@
                       <span
                         v-if="data[item] === '未完成'"
                         style="color: #ff0000"
-                        >{{ data[item] }}</span
+                        >{{ $t('ManualEntryPage.col_status_2') }}</span
                       >
                       <span
                         v-else-if="data[item] === '完成'"
                         style="color: #4ac526"
-                        >{{ data[item] }}</span
+                        >{{$t('ManualEntryPage.col_status_1')}}</span
                       >
                       <span v-else>{{ data[item] }}</span>
                     </template>

src/views/dataEntry_manage/databaseList.vue

@@ -17,8 +17,12 @@
 			</div>
 			<div class="top-right">
 
-				<!-- <change-lang v-permission="permissionBtn.edbDataPermission.edbData_switchEn"
-					:lang="currentLang" style="height: 32px;" @changeLang="changeLanguage"/> -->
+				<change-lang 
+					v-permission="permissionBtn.edbDataPermission.edbData_switchEn"
+					:lang="currentLang" 
+					style="height: 32px;" 
+					@changeLang="changeLanguage"
+				/>
 
 				<el-select
 					v-model="search_txt"

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -312,7 +312,7 @@ export const chartSetMixin = {
         notEdit:true
       },
       {
-        label:/* '英文图表名称' */this.$t('Chart.Detail.chart_name'),
+        label:/* '英文图表名称' */this.$t('Chart.Detail.chart_en_name'),
         value:this.chartInfo.ChartNameEn,
         key:'ChartNameEn',
         id:this.chartInfo.ChartInfoId,
@@ -502,10 +502,7 @@ export const chartSetMixin = {
 
 			if(res.Ret !==200) return
 
-			this.$message({
-				message:res.Msg,
-				type:"success"
-			})
+			this.$message.success(this.$t('MsgPrompt.edit_msg'))
       this.getChartInfo()
 			this.setEnName = false
     },

src/views/dataEntry_manage/thirdBase/BAIINFOTargetbase.vue

@@ -907,7 +907,7 @@ export default {
       if (type === "classify") {
         //检查classify_name
         if (!classify_name.length) {
-          this.$message.warning("请输入分类名称");
+          this.$message.warning(/* "请输入分类名称" */ this.$t('Edb.InputHolderAll.input_common',{label: this.$t('SteelChemicalPage.label_classify_name')}));
           return;
         }
         //添加分类
@@ -941,7 +941,8 @@ export default {
         });
       }
       if (res.Ret !== 200) return;
-      this.$message.success(`${optionType}成功`);
+      // this.$message.success(`${optionType}成功`);
+      this.$message.success(`${title.includes("添加")?this.$t('MsgPrompt.add_msg2'):this.$t('MsgPrompt.edit_msg')}`);
       this.getClassify();
       this.cancelDialogHandle();
       //判断是分类还是指标,请求对应详情

src/views/dataEntry_manage/thirdBase/SCITargetbase.vue

@@ -813,7 +813,7 @@ export default {
       if (type === "classify") {
         //检查classify_name
         if (!classify_name.length) {
-          this.$message.warning("请输入分类名称");
+          this.$message.warning(/* "请输入分类名称" */ this.$t('Edb.InputHolderAll.input_common',{label: this.$t('SteelChemicalPage.label_classify_name')}));
           return;
         }
         //添加分类
@@ -845,7 +845,8 @@ export default {
       }
 
       if (res.Ret !== 200) return;
-      this.$message.success(`${optionType}成功`);
+      // this.$message.success(`${optionType}成功`);
+      this.$message.success(`${title.includes("添加")?this.$t('MsgPrompt.add_msg2'):this.$t('MsgPrompt.edit_msg')}`);
       this.getClassify();
       this.cancelDialogHandle();
     },

src/views/dataEntry_manage/thirdBase/components/batchAddEdbDia.vue

@@ -186,7 +186,7 @@ import { steelInterface } from "@/api/modules/thirdBaseApi";
         this.$refs.edbFormDataListRef.validate(valid=>{
           if(valid){
             if(this.edbForm.edbDataList.length>=100){
-              this.$message.warning('添加数量已达上限（上限100）！')
+              this.$message.warning(/* '添加数量已达上限（上限100）！' */this.$t('SteelChemicalPage.add_max_msg'))
               return 
             }
             let lastItem = this.edbForm.edbDataList[this.edbForm.edbDataList.length-1]

src/views/dataEntry_manage/thirdBase/smmTargetbase.vue

@@ -231,7 +231,7 @@
             <el-input
               v-model="classifyForm.classify_name"
               style="width: 80%"
-              placeholder="请输入分类名称"
+              :placeholder="$t('Edb.InputHolderAll.input_common',{label: $t('SteelChemicalPage.label_classify_name')})"
             />
           </el-form-item>
           <el-form-item :label="$t('SteelChemicalPage.label_classify_name')" prop="classifys_id" v-else>
@@ -315,7 +315,7 @@ export default {
       }, //弹窗可编辑信息
       classifyFormRules: {
         classify_name: [
-          { required: true, message: "分类名称不能为空", trigger: "blur" },
+          { required: true, message: /* "分类名称不能为空"  */this.$t('Edb.InputHolderAll.input_common',{label: this.$t('SteelChemicalPage.label_classify_name')}), trigger: "blur" },
         ],
       }, //可编辑信息校验
     };
@@ -798,8 +798,8 @@ export default {
       //如果分类下有子分类或指标
       let hintText =
         Children && Children.length
-          ? this.$t('SteelChemicalPage.del_classify_msg')
-          : "删除分类不可恢复，确定删除吗？";
+          ? this.$t('SteelChemicalPage.del_classify_only_msg')
+          : this.$t('SteelChemicalPage.del_classify_msg');
       this.$confirm(hintText,this.$t('Dialog.warn_tit'), {
         type: "warning",
       })
@@ -826,7 +826,7 @@ export default {
         })
         .then((res) => {
           if (res.Ret !== 200) return;
-          this.$message.success("清除分类成功");
+          this.$message.success(/* "清除分类成功" */this.$t('MsgPrompt.clean_classify_msg'));
           this.getClassify();
         });
     },
@@ -879,7 +879,7 @@ export default {
       if (type === "classify") {
         //检查classify_name
         if (!classify_name.length) {
-          this.$message.warning("请输入分类名称");
+          this.$message.warning(/* "请输入分类名称" */this.$t('Edb.InputHolderAll.input_common',{label: this.$t('SteelChemicalPage.label_classify_name')}));
           return;
         }
         //添加分类
@@ -911,7 +911,8 @@ export default {
       }
 
       if (res.Ret !== 200) return;
-      this.$message.success(`${optionType}成功`);
+      // this.$message.success(`${optionType}成功`);
+      this.$message.success(`${title.includes("添加")?this.$t('MsgPrompt.add_msg2'):this.$t('MsgPrompt.edit_msg')}`);
       this.getClassify();
       this.cancelDialogHandle();
     },

src/views/dataEntry_manage/thirdBase/steelChemicalbase.vue

@@ -302,7 +302,7 @@ export default {
       },
       classifyFormRules: {
         classify_name: [
-          { required: true, message: "分类名称不能为空", trigger: "blur" },
+          { required: true, message: /* "分类名称不能为空"  */this.$t('Edb.InputHolderAll.input_common',{label: this.$t('SteelChemicalPage.label_classify_name')}), trigger: "blur" },
         ],
       },
 
@@ -753,8 +753,8 @@ export default {
     width: 5px !important;
   }
   .left-cont {
-    min-width: 300px;
-    width: 300px;
+    min-width: 330px;
+    width: 330px;
     flex-shrink: 0;
     margin-right: 20px;
     padding: 30px 0;

src/views/mychart_manage/components/chartDetailDia.vue

@@ -193,6 +193,8 @@
               v-permission="permissionBtn.myETAPermission.myChart_del"
               :title="$t('Chart.OptMsg.chart_del_confirm')"
               icon="el-icon-info"
+              :confirm-button-text="$t('Dialog.confirm_btn')"
+              :cancel-button-text="$t('Dialog.cancel_btn')"
               @onConfirm="delChartHandle"
               v-if="chartInfo.Button.IsEdit"
             >
@@ -1313,7 +1315,7 @@ export default {
         );
       mychartInterface.del({ MyChartId: item.MyChartId,MyChartClassifyId: this.select_classify }).then((res) => {
         if (res.Ret !== 200) return;
-        this.$message.success('移出成功');
+        this.$message.success(/* '移出成功' */this.$t('MsgPrompt.move_out_msg'));
         item.IsAdd = false;
 				sessionStorage.removeItem('myChartbeforeOptions');
 

src/views/mychart_manage/components/classifyDeleteCheck.vue

@@ -11,10 +11,10 @@
     >
         <div slot="title" style="display: flex; align-items: center;">
             <i style="color:#FF8A00;font-size: 16px;" class="el-icon-warning"></i>
-            <span style="font-size: 16px;color:#333;margin-left: 5px;">提示</span>
+            <span style="font-size: 16px;color:#333;margin-left: 5px;"><!-- 提示 -->{{$t('Dialog.warn_tit')}}</span>
         </div>
         <div class="dialog-container">
-            <p>该图分类已添加节点链接，不允许删除！</p>
+            <p><!-- 该图分类已添加节点链接，不允许删除！ -->{{ $t('Chart.OptMsg.del_classify_link_msg') }}</p>
             <div class="frame-list">
                 <p class="frame-item" v-for="(item,index) in detailArr" :key="index" @click="goToFrameList(item)">
                     {{index+1}}、{{item.FrameworkName}}({{item.NodeName}})
@@ -22,8 +22,8 @@
             </div>
         </div>
         <div class="dialog-footer">
-            <el-button @click="$emit('close')">取消</el-button>
-            <el-button type="primary" @click="$emit('close')">确定</el-button>
+            <el-button @click="$emit('close')"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
+            <el-button type="primary" @click="$emit('close')"><!-- 确定 -->{{$t('Dialog.confirm_btn')}}</el-button>
         </div>
     </el-dialog>
 </template>

src/views/mychart_manage/index.vue

@@ -643,19 +643,19 @@ export default {
 
     /* 添加分类回调 */
     addClassifyBack(params, title) {
-      title === '新增分类' &&
+      title === this.$t('MyEtaPage.label_add_classify') &&
         mychartInterface
           .addClassify({
             MyChartClassifyName: params.name,
           })
           .then((res) => {
             if (res.Ret !== 200) return;
-            this.$message.success('新增成功');
+            this.$message.success(/* '新增成功' */this.$t('MsgPrompt.add_msg'));
             this.isClassifyDia = false;
             this.getClassify();
           });
 
-      title === '重命名分类' &&
+      title === this.$t('MyEtaPage.label_rename_classify') &&
         mychartInterface
           .editClassify({
             MyChartClassifyName: params.name,
@@ -663,13 +663,13 @@ export default {
           })
           .then((res) => {
             if (res.Ret !== 200) return;
-            this.$message.success('编辑成功');
+            this.$message.success(/* '编辑成功' */this.$t('MsgPrompt.edit_msg'));
             this.isClassifyDia = false;
             this.getClassify();
             this.getPublicClassify();
           });
 
-      title === '复制图表分类' &&
+      title === this.$t('MyEtaPage.label_copy_classify') &&
         mychartInterface
           .copyMyChart({
             ChartInfoId: this.move_id,
@@ -677,7 +677,7 @@ export default {
           })
           .then((res) => {
             if (res.Ret !== 200) return;
-            this.$message.success('复制成功');
+            this.$message.success(/* '复制成功' */this.$t('MsgPrompt.copy_success_msg'));
             this.isClassifyDia = false;
             // this.isOpenDetail = false;
             // this.select_classify = '';
@@ -716,7 +716,7 @@ export default {
         MyChartClassifyId: this.select_classify
       }).then(res => {
         if(res.Ret !== 200) return;
-        this.$message.success('复制成功');
+        this.$message.success(/* '复制成功' */this.$t('MsgPrompt.copy_success_msg'));
         this.getClassify();
       });
 
@@ -727,7 +727,7 @@ export default {
         MyChartClassifyId: this.select_classify
       }).then(res => {
         if(res.Ret !== 200) return;
-        this.$message.success('设置成功');
+        this.$message.success(/* '设置成功' */this.$t('MsgPrompt.set_success_msg'));
         if(key === 'own'){
           item.IsPublic=0
           item.IsCompanyPublic=0
@@ -744,7 +744,7 @@ export default {
           IsCompanyPublic:IsCompanyPublic
         }).then(res=>{
           if(res.Ret !== 200) return;
-          this.$message.success('操作成功');
+          this.$message.success(/* '操作成功' */this.$t('MsgPrompt.operate_success_msg'));
           item.IsCompanyPublic=IsCompanyPublic
           // 不想请求接口
           // this.getPublicClassify();
@@ -794,11 +794,9 @@ export default {
             return
         }
         this.$confirm(
-          '若删除该分类，则分类下关联的所有图表将被全部删除, 是否继续?',
-          '提示',
+          /* '若删除该分类，则分类下关联的所有图表将被全部删除, 是否继续?' */this.$t('Chart.OptMsg.del_classify_chart_msg'),
+          /* '提示' */this.$t('Dialog.warn_tit'),
           {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
             type: 'warning',
           }
         )
@@ -809,7 +807,7 @@ export default {
               })
               .then((res) => {
                 if (res.Ret !== 200) return;
-                this.$message.success('删除成功');
+                this.$message.success(/* '删除成功' */ this.$t('MsgPrompt.delete_msg'));
                 this.getClassify();
                 this.getPublicClassify();
               });
@@ -930,7 +928,7 @@ export default {
         })
         .then((res) => {
           if (res.Ret !== 200) return;
-          this.$message.success('移出成功');
+          this.$message.success(/* '移出成功' */this.$t('MsgPrompt.move_out_msg'));
           this.page_no = 1;
           this.getChartList();
         });

src/views/predictEdb_manage/predictEdb.vue

@@ -14,8 +14,12 @@
 							type="primary" @click="addEdbHandle"><!-- 添加指标 -->{{$t('EtaBasePage.add_edb_btn')}}</el-button>
 						<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_calcuEdb"
 							type="primary" @click="addComputedHandler" style="margin-right:10px;"><!-- 计算指标 -->{{$t('EtaBasePage.calculation_edb_btn')}}</el-button>
-						<!-- <change-lang v-permission="permissionBtn.predictEdbPermission.edbPreData_switchEn"
-							:lang="currentLang" style="height: 32px;" @changeLang="changeLangHandle"/> -->
+						<change-lang 
+							v-permission="permissionBtn.predictEdbPermission.edbPreData_switchEn"
+							:lang="currentLang" 
+							style="height: 32px;" 
+							@changeLang="changeLangHandle"
+						/>
 				</div>
 				<div class="search-cont" v-loading="searchLoading">
 					<el-select