Merge branch 'lang_dev' into lang_db

src/lang/commonLang.js

@@ -275,7 +275,19 @@ export default {
     un_share_msg: {
       en: 'Unshare successful',
       zh: '取消成功'
-    }
+    },
+    upload_success_msg: {
+      en: 'Upload successful.',
+      zh: '上传成功'
+    },
+    upload_some_msg: {
+      en: 'Partial data upload successful!',
+      zh: '部分数据上传成功！'
+    },
+    upload_fail_msg: {
+      en: 'Upload failed!',
+      zh: '上传失败！'
+    },
   },
   Common: {
     category: {

src/lang/modules/DataSources/En.js

@@ -59,6 +59,8 @@ export default {
     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',
+    upload_tip_msg: 'A total of {success_count} data entries have been successfully imported this time.',
+    upload_tip_msg2: 'A total of {success_count} data entries were successfully imported this time, with {fail_count} failures.',
 
     col_status_1:'Completed',
     col_status_2:'Incomplete',

src/lang/modules/DataSources/Zh.js

@@ -59,6 +59,8 @@ export default {
     step_three:'3、第三步，完成导入。若有导入失败数据，下载',
     upload_size_msg:'文件大小不得超过10M',
     down_fail_list2: '下载失败列表',
+    upload_tip_msg: '本次共成功导入{success_count}条数据',
+    upload_tip_msg2: '本次共成功导入{success_count}条数据，失败{fail_count}条',
 
     col_status_1:'完成',
     col_status_2:'未完成',

src/lang/modules/EtaBase/commonLang.js

@@ -668,6 +668,10 @@ export default {
     select_menu_name: {
       zh: '请选择分类名称',
       en: 'Please select category name'
+    },
+    input_select_edb: {
+      zh: '请选择指标',
+      en: 'Please select Indicator'
     }
   },
   
@@ -1150,6 +1154,19 @@ export default {
     del_menu_confirm: {
       zh: '确定删除当前目录吗?',
       en: 'Are you sure you want to delete the current directory?'
+    },
+
+    edb_not_enougth_info: {
+      zh: '指标信息请填写完整！',
+      en: 'Please fill in the indicator information completely!'
+    },
+    date_haved_msg: {
+      zh: '该日期已存在',
+      en: 'The date already exists.'
+    },
+    date_have_value_msg: {
+      zh: '该日期已存在数据值{val}，确认修改?',
+      en: 'Data value {val} already exists for this date, Do you confirm the modification?'
     }
   }
   

src/views/dataEntry_manage/components/insertData.vue

@@ -143,21 +143,22 @@ export default {
       if (res.Ret === 200) {
         // 0成功 1部分失败 -1全部失败
         let str = `
-						<h2 style="margin-bottom:30px">上传成功</h2>
-						<p>本次共成功导入${res.Data.SuccessCount}条数据</p>
+						<h2 style="margin-bottom:30px">${this.$t('MsgPrompt.upload_success_msg')}</h2>
+						<p> ${this.$t('ManualEntryPage.upload_tip_msg',{success_count:res.Data.SuccessCount})}</p>
 					`;
+            // 本次共成功导入${res.Data.SuccessCount}条数据
         if (res.Data.Status === 1) {
           // this.$message.warning('部分导入失败')
           str = `
-							<h2 style="margin-bottom:30px">部分数据上传成功！</h2>
-							<p>本次共成功导入${res.Data.SuccessCount}条数据，失败${res.Data.FailCount}条</p>
-							<a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>下载失败列表</a>
+							<h2 style="margin-bottom:30px">${this.$t('MsgPrompt.upload_some_msg')}</h2>
+							<p>${this.$t('ManualEntryPage.upload_tip_msg2',{success_count:res.Data.SuccessCount,fail_count:res.Data.FailCount})}</p>
+							<a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>${this.$t('ManualEntryPage.down_fail_list2')}</a>
 						`;
         } else if (res.Data.Status === -1) {
           // this.$message.success("导入成功!");
           str = `
-							<h2 style="margin-bottom:30px">上传失败！</h2>
-							<a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>下载失败列表</a>
+							<h2 style="margin-bottom:30px">${this.$t('MsgPrompt.upload_fail_msg')}</h2>
+							<a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>${this.$t('ManualEntryPage.down_fail_list2')}</a>
 						`;
         }
         this.$alert(str, "", {

src/views/dataEntry_manage/dataEntry.vue

@@ -451,7 +451,7 @@ export default {
         } else {
           e.timeVal = this.tempTime;
         }
-        this.$message.warning("该日期已存在");
+        this.$message.warning(/* "该日期已存在"  */this.$t('Edb.MsgPrompt.date_haved_msg'));
       } else {
         if (!this.tempTime) {
           // 新增行
@@ -519,14 +519,14 @@ export default {
       // 在没有选择指标的列操作
       if (!e.TradeCode) {
         e.item.Close = "";
-        this.$message.warning("请选择指标");
+        this.$message.warning(/* "请选择指标"  */this.$t('Edb.InputHolderAll.input_select_edb'));
         return;
       }
 
       // 没有选择日期
       if (!e.item.Dt) {
         e.item.Close = "";
-        this.$message.warning("请选择日期");
+        this.$message.warning(/* "请选择日期" */this.$t('Edb.InputHolderAll.input_date'));
         return;
       }
       // 判断值是否改变
@@ -574,8 +574,8 @@ export default {
         }
       } else if (checkRes.Data.Status === 1) {
         this.$confirm(
-          "该日期已存在数据值" + checkRes.Data.Close + "，确认修改?",
-          "提示",
+          this.$t('Edb.MsgPrompt.date_have_value_msg',{val:checkRes.Data.Close}),
+          /* "提示" */this.$t('Dialog.warn_tit'),
           {
             type: "warning",
           }

src/views/dataEntry_manage/thirdBase/BAIINFOTargetbase.vue

@@ -268,7 +268,7 @@
               <el-cascader
                 style="width: 80%"
                 :key="cascaderKey"
-                placeholder="请选择分类名称"
+                :placeholder="$t('Edb.InputHolderAll.select_menu_name')"
                 v-model="classifyForm.classifys_id"
                 :options="cascaderList"
                 :props="{
@@ -348,7 +348,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" },
         ],
       }, //可编辑信息校验
       frequencyArr: ["日度", "周度", "旬度", "月度", "季度", "年度"],
@@ -928,7 +928,7 @@ export default {
       if (type === "index") {
         //检查classifys_id
         if (!classifys_id.length) {
-          this.$message.warning("请选择分类");
+          this.$message.warning(/* "请选择分类" */ this.$t('Edb. InputHolderAll.select_menu_name'));
           return;
         }
         //编辑指标

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

@@ -143,7 +143,7 @@ import { steelInterface } from "@/api/modules/thirdBaseApi";
               })
           
           }else{
-            this.$message.error("指标信息请填写完整！")
+            this.$message.error(/* "指标信息请填写完整！" */ this.$t('Edb.MsgPrompt.edb_not_enougth_info'))
             let errorElDom = this.$refs.edbFormDataListRef.fields.filter((item) => {
               return item.validateState === 'error';
             });

src/views/dataEntry_manage/thirdBase/smmTargetbase.vue

@@ -900,7 +900,7 @@ export default {
       if (type === "index") {
         //检查classifys_id
         if (!classifys_id.length) {
-          this.$message.warning("请选择分类");
+          this.$message.warning(/* "请选择分类" */ this.$t('Edb. InputHolderAll.select_menu_name'));
           return;
         }
         //编辑指标(移动指标)
@@ -1113,7 +1113,7 @@ export default {
         })
         .then((res) => {
           if (res.Ret !== 200) return;
-          this.$message.success("移动成功！");
+          this.$message.success(/* "移动成功！" */this.$t('MsgPrompt.move_success_msg'));
           this.getClassify();
         });
     },