品种管理,ETA图库补充翻译

src/lang/modules/EtaChart/En.js

@@ -95,6 +95,10 @@ export default {
      * 单位:Edb.Detail.e_unit
      * 保存:Dialog.confirm_save_btn
      */
-    data_transformation_hint: "Invalid data conversion, please check the value"
+    chart_set_radio: "Set to chart unit",
+    data_transformation_hint: "Invalid data conversion, please check the value",
+    data_transformation_hint2: "The indicator data contains negative numbers or zeros and cannot be logarithmically calculated",
+    data_transformation_list_hint: "Invalid data conversion, please check the value",
+    data_transformation_list_hint2: "The indicator data contains negative numbers or zeros and cannot be logarithmically calculated"
   }
 }

src/lang/modules/EtaChart/Zh.js

@@ -90,9 +90,13 @@ export default {
     multiply_by: "乘以",
     logarithm: "对数",
     /**
-     * 单位:Edb.Detail.e_unit
+     * 单位:Edb.Detail.e_unit,e_en_unit
      * 保存:Dialog.confirm_save_btn
      */
-    data_transformation_hint: "数据转换不合法，请检查数值"
+    chart_set_radio: "设置为图表单位",
+    data_transformation_hint: "数据转换不合法，请检查数值",
+    data_transformation_hint2: "指标数据含有负数或0，无法进行对数运算",
+    data_transformation_list_hint: "第{num}个数据转换不合法，请检查数值",
+    data_transformation_list_hint2: "第{num}个指标数据含有负数或0，无法进行对数运算"
   }
 }

src/lang/modules/ReportManagement/CommodityConfiguration.js

@@ -79,6 +79,11 @@ export const CommodityConfigurationZh = {
   variety_edit_succ_msg: "编辑成功",
   variety_public:"公有",
   variety_private:"私有",
+  /**
+   * 全选 Common.all_select
+   * 确定,取消 Dialog.confirm_btn,cancel_btn
+   * 设置成功 ReportManage.CategoryList.setup_successful
+   */
 };
 
 /*

src/views/dataEntry_manage/addChart.vue

@@ -632,26 +632,30 @@
 							<template slot-scope="{row,$index}">
 								<div class="expand-wrap">
 									<div class="data-change">
-										<el-checkbox v-model="updateData[$index].IsConvert">数据转换</el-checkbox>
+										<!-- 数据转换 -->
+										<el-checkbox v-model="updateData[$index].IsConvert">
+											{{ $t('EtaChartAddPage.data_transformation') }}
+										</el-checkbox>
+										<!-- 乘以/除以/对数 -->
 										<el-select v-model="updateData[$index].ConvertType">
-											<el-option label="乘以" :value="1"></el-option>
-											<el-option label="除以" :value="2"></el-option>
-											<el-option label="对数" :value="3"></el-option>
+											<el-option :label="$t('EtaChartAddPage.multiply_by')" :value="1"></el-option>
+											<el-option :label="$t('EtaChartAddPage.divide_by')" :value="2"></el-option>
+											<el-option :label="$t('EtaChartAddPage.logarithm')" :value="3"></el-option>
 										</el-select>
 									<el-input type="number" v-model="updateData[$index].ConvertValue"></el-input>
 									</div>
 									<div class="unit-change">
-										<label>单位</label>
+										<label>{{ $t('Edb.Detail.e_unit') }}</label>
 										<el-input v-model="updateData[$index].ConvertUnit"></el-input>
-										<label>英文单位</label>
+										<label>{{ $t('Edb.Detail.e_en_unit') }}</label>
 										<el-input v-model="updateData[$index].ConvertEnUnit"></el-input>
 									</div>
-									<!--柱形图-->
+									<!--柱形图:设置为图表单位-->
 									<div class="use-change" v-if="chartInfo.ChartType===7">
-										<el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
+										<el-radio v-model="useUnit" :label="$index">{{ $t('EtaChartAddPage.chart_set_radio') }}</el-radio>
 									</div>
 									<div class="confirm-btn">
-										<el-button type="text" @click="changeTableData($index)">保存</el-button>
+										<el-button type="text" @click="changeTableData($index)">{{ $t('Dialog.confirm_save_btn') }}</el-button>
 									</div>
 								</div>
 							</template>
@@ -874,12 +878,14 @@ export default {
 							const {IsConvert,ConvertType,ConvertValue} = this.updateData[i]
 							//计算方式是否合法
 							if(IsConvert&&!this.checkConver(ConvertType,ConvertValue)){
-								return this.$message.warning(`第${i+1}个指标数据转换不合法，请检查数值`)
+								//提示语:第${i+1}个指标数据转换不合法，请检查数值
+								return this.$message.warning(this.$t('EtaChartAddPage.data_transformation_list_hint',{num:i+1}))
 							}
 							//如果类型为对数，检测数据是否包含负数
 							if(IsConvert&&ConvertType===3){
 								if(!this.checkEdbData(this.tableData[i].DataList)){
-									return this.$message.warning(`第${i+1}个指标数据含有负数或0，无法进行对数运算，请检查`)
+									//提示语:第${i+1}个指标数据含有负数或0，无法进行对数运算，请检查
+									return this.$message.warning(this.$t('EtaChartAddPage.data_transformation_list_hint2',{num:i+1}))
 								}
 							}
 						}

src/views/dataEntry_manage/editChart.vue

@@ -636,26 +636,30 @@
 							<template slot-scope="{row,$index}">
 								<div class="expand-wrap">
 									<div class="data-change">
-										<el-checkbox v-model="updateData[$index].IsConvert">数据转换</el-checkbox>
+										<!-- 数据转换 -->
+										<el-checkbox v-model="updateData[$index].IsConvert">
+											{{ $t('EtaChartAddPage.data_transformation') }}
+										</el-checkbox>
+										<!-- 乘以/除以/对数 -->
 										<el-select v-model="updateData[$index].ConvertType">
-											<el-option label="乘以" :value="1"></el-option>
-											<el-option label="除以" :value="2"></el-option>
-											<el-option label="对数" :value="3"></el-option>
+											<el-option :label="$t('EtaChartAddPage.multiply_by')" :value="1"></el-option>
+											<el-option :label="$t('EtaChartAddPage.divide_by')" :value="2"></el-option>
+											<el-option :label="$t('EtaChartAddPage.logarithm')" :value="3"></el-option>
 										</el-select>
 									<el-input type="number" v-model="updateData[$index].ConvertValue"></el-input>
 									</div>
 									<div class="unit-change">
-										<label>单位</label>
+										<label>{{ $t('Edb.Detail.e_unit') }}</label>
 										<el-input v-model="updateData[$index].ConvertUnit"></el-input>
-										<label>英文单位</label>
+										<label>{{ $t('Edb.Detail.e_en_unit') }}</label>
 										<el-input v-model="updateData[$index].ConvertEnUnit"></el-input>
 									</div>
-									<!--柱形图-->
+									<!--柱形图:设置为图表单位-->
 									<div class="use-change" v-if="chartInfo.ChartType===7">
-										<el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
+										<el-radio v-model="useUnit" :label="$index">{{ $t('EtaChartAddPage.chart_set_radio') }}</el-radio>
 									</div>
 									<div class="confirm-btn">
-										<el-button type="text" @click="changeTableData($index)">保存</el-button>
+										<el-button type="text" @click="changeTableData($index)">{{ $t('Dialog.confirm_save_btn') }}</el-button>
 									</div>
 								</div>
 							</template>
@@ -985,12 +989,14 @@ export default {
 							const {IsConvert,ConvertType,ConvertValue} = this.updateData[i]
 							//计算方式是否合法
 							if(IsConvert&&!this.checkConver(ConvertType,ConvertValue)){
-								return this.$message.warning(`第${i+1}个指标数据转换不合法，请检查数值`)
+								//提示语:第${i+1}个指标数据转换不合法，请检查数值
+								return this.$message.warning(this.$t('EtaChartAddPage.data_transformation_list_hint',{num:i+1}))
 							}
 							//如果类型为对数，检测数据是否包含负数
 							if(IsConvert&&ConvertType===3){
 								if(!this.checkEdbData(this.tableData[i].DataList)){
-									return this.$message.warning(`第${i+1}个指标数据含有负数或0，无法进行对数运算，请检查`)
+									//提示语:第${i+1}个指标数据含有负数或0，无法进行对数运算，请检查
+									return this.$message.warning(this.$t('EtaChartAddPage.data_transformation_list_hint2',{num:i+1}))
 								}
 							}
 						}

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -182,13 +182,15 @@ export default {
 			//计算方式是否合法
 			if(!this.checkConver(ConvertType,ConvertValue)){
 				this.updateData[index].IsConvert = false
-				return this.$message.warning("数据转换不合法，请检查数值")
+				//提示语:数据转换不合法，请检查数值
+				return this.$message.warning(this.$t('EtaChartAddPage.data_transformation_hint'))
 			}
 			//如果类型为对数，检测数据是否包含负数
 			if(ConvertType===3){
 				if(!this.checkEdbData(this.tableData[index].DataList||[])){
 					this.updateData[index].IsConvert = false
-					return this.$message.warning("指标数据含有负数或0，无法进行对数运算")
+					//提示语:指标数据含有负数或0，无法进行对数运算
+					return this.$message.warning(this.$t('EtaChartAddPage.data_transformation_hint2'))
 				}
 			}
 			//柱形图单独设置

src/views/report_manage/reportVarietyV2.vue

@@ -101,7 +101,7 @@
         <!-- 品种编辑弹窗 -->
         <el-dialog 
             :modal-append-to-body='false' 
-            :title="!editBreedData.id?$t('ReportManage.CommodityConfiguration.edit_variety'):$t('ReportManage.CommodityConfiguration.add_variety')" 
+            :title="!editBreedData.id?$t('ReportManage.CommodityConfiguration.add_variety'):$t('ReportManage.CommodityConfiguration.edit_variety')" 
             :visible.sync="showEditBreed" 
             :close-on-click-modal="false"
             :center="true" 
@@ -143,7 +143,7 @@
                             </div>
                         </el-tooltip>
                         <div class="auth-list-box">
-                            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+                            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">{{ $t('Common.all_select') }}</el-checkbox>
                             <el-checkbox-group style="padding:20px" v-model="checkedList" @change="handleCheckedAuthChange">
                                 <el-checkbox style="display:block;margin-bottom:10px" v-for="item in checkOpts" :label="item.PermissionId" :key="item.PermissionId">{{item.PermissionName}}</el-checkbox>
                             </el-checkbox-group>   
@@ -151,8 +151,8 @@
                     </div>
                 </el-form>
                 <div style="text-align: center;margin-top:40px">
-                    <el-button type="primary" plain @click="showEditBreed=false">取消</el-button>
-                    <el-button type="primary" @click="handleConfirmEidtBreed">确定</el-button>
+                    <el-button type="primary" plain @click="showEditBreed=false">{{ $t('Dialog.cancel_btn') }}</el-button>
+                    <el-button type="primary" @click="handleConfirmEidtBreed">{{ $t('Dialog.confirm_btn') }}</el-button>
                 </div>
             </div>
         </el-dialog>
@@ -278,7 +278,7 @@ export default {
             }
             const res=this.typeVal==1?await reportVarietyInterence.editVariety(params):await reportVarietyENInterence.editVariety(params)
             if(res.Ret===200){
-                this.$message.success(`编辑成功`)
+                this.$message.success(this.$t('ReportManage.CommodityConfiguration.variety_edit_succ_msg'))
                 this.getList()
             }
         },
@@ -291,7 +291,7 @@ export default {
             }
             const res=this.typeVal==1?await reportVarietyInterence.setEnable(params):await reportVarietyENInterence.setEnable(params)
             if(res.Ret===200){
-                this.$message.success(`设置成功`)
+                this.$message.success(this.$t('ReportManage.CategoryList.setup_successful'))
                 this.getList()
             }
         },
@@ -386,7 +386,7 @@ export default {
             }
             const res=this.typeVal==1?await reportVarietyInterence.sortVariety(params):await reportVarietyENInterence.sortVariety(params)
             if(res.Ret===200){
-                this.$message.success('移动成功')
+                this.$message.success(this.$t('ReportManage.CategoryList.move_successful'))
             }
             this.getList()
         },
@@ -402,7 +402,7 @@ export default {
 
         async handleConfirmEidtBreed(){
             if(!this.editBreedData.name){
-                this.$message.warning('请填写品种名称')
+                this.$message.warning($t('ReportManage.CommodityConfiguration.variety_name_check_hint'))
                 return
             }
             let params={
@@ -427,7 +427,12 @@ export default {
                 res=this.editBreedData.id?await reportVarietyENInterence.editVariety(params):await reportVarietyENInterence.addVariety(params)
             }
             if(res.Ret===200){
-                this.$message.success(`${this.editBreedData.id?'编辑':"新增"}成功`)
+                //this.$message.success(`${this.editBreedData.id?'编辑':"新增"}成功`)
+                this.$message.success(
+                    this.editBreedData.id
+                    ?this.$t('ReportManage.CommodityConfiguration.variety_edit_succ_msg')
+                    :this.$t('ReportManage.CommodityConfiguration.variety_add_succ_msg')
+                )
                 this.getList()
                 this.showEditBreed=false
             }