一遍翻译修改完成

src/i18n.js

@@ -19,9 +19,10 @@ const messages= {
 
 const i18n = new VueI18n({
   locale:  localStorage.getItem('lang') || navigator.language || 'en', // set locale
+  fallbackLocale: 'en',
+  silentFallbackWarn:true ,
   messages:messages,
-  // fallbackLocale: 'en', // 默认语言设置，当其他语言没有的情况下，使用en作为默认语言
-
+  // 默认语言设置，当其他语言没有的情况下，使用en作为默认语言
 
 })
 // 配置elementUI 语言转换关系

src/lang/en/langModule/defaultParameter.js

@@ -6,7 +6,7 @@ name2:"Warning Parameters",
 
 sfkqqytjh: "Can retrieve the previous day's plan:",
 sfkqqytjh1: "Can retrieve the next day's plan:",
-bcsl: "Number of shifts:",
+bcsl: "Number of Spare Vehicles:",
 zlxsdws: "Decimal places for weight:",
 blxsdws: "Decimal places for ratio:",
 sfqyslht: "Enable feed contract:",
@@ -22,8 +22,8 @@ xlsfcz: "Does minor feed need to be weighed:",
 sfqysjtb: "Enable data synchronization:",
 rycsl: "Any number of vehicles:",
 hlzql: "Mixing accuracy rate:",
-yxslsjwc: "Allowed error in feeding time (minutes):",
-jtymip: "Group end domain name or IP:",
+yxslsjwc: "Allowed error in spreading time (minutes):",
+jtymip: "Group Domain Name or IP",
 tmrrl: "TMR capacity upper limit (%):",
 tmrrl1: "TMR capacity lower limit (%):",
 yhlyxwc: "Pre-mixed feed allowable error:",
@@ -45,7 +45,87 @@ msg12: "12. Leftover feed allocation method: ①Top limit allocation: Calculated
 msg121: "②Average allocation: The total leftover feed is allocated evenly. If the allocation value exceeds the percentage of the pen's raw material, the remaining value is accumulated to the pens that have not been fully allocated, and the final remaining leftover feed is not counted.",
 msg13: "13. Leftover feed allocation ratio to raw material: The amount of leftover feed to be allocated does not exceed the value calculated by this ratio, and is used in conjunction with the leftover feed allocation method. Only positive integers are allowed for input.",
 msg14: "14. Does minor feed need to be weighed: If yes is selected, the feed in the feed table can be selected for minor feed weighing, and the feeding plan can set whether to weigh in advance.",
-msg15: "15. Enable data synchronization: After enabling, the data synchronization button is opened on the daily execution page, which is used for data docking with third-party systems."
+  msg15: "15. Enable data synchronization: After enabling, the data synchronization button is opened on the daily execution page, which is used for data docking with third-party systems.",
+
+  jhzqlyjz: "Plan Accuracy Early Warning Value (%):",
+
+slfpzb: "Remaining Material Allocation Proportion of the Original Mixture",
+
+pfzqlyjz: "Formula Accuracy Early Warning Value (%):",
+
+nqzqlyjz: "Herd Accuracy Early Warning Value (%):",
+
+cczqlyjz: "Train Accuracy Early Warning Value (%):",
+
+hlzdtzzqlyj: "Automatic Mixing Transfer Accuracy Early Warning Value (%):",
+
+hlzdtzzqlyj1: "Manual Mixing Transfer Accuracy Early Warning Value (%):",
+
+mrcapjz: "Lactating Cow Feed Intake Average Deviation Early Warning Value (kg):",
+
+mrcayjz: "Lactating Cow Milk Production Average Deviation Early Warning Value (kg):",
+
+slsjpccyjz: "Spreading Time Deviation Early Warning Value (min):",
+
+ccpjhlyjz: "Exceeding Average Mixing Time Early Warning Value (min):",
+
+ccpjzhlyjz: "Exceeding Average Conversion Rate Early Warning Value (%)",
+
+ccpjgjnslcb: "Exceeding Average Cost of Milk per Kilogram of Feed (%)",
+
+nlsllccyjz: "Cow Pen Remaining Material Rate Exceeding Early Warning Value (%):",
+
+kcyjts: "Inventory Early Warning Days:",
+
+tit1: "1. Plan Accuracy Early Warning Value: If the plan accuracy is below this early warning value, it will be included in the statistical report.",
+
+tit2: "2. Formula Accuracy Early Warning Value: If the formula accuracy is below this early warning value, it will be included in the statistical report.",
+
+tit3: "3. Herd Accuracy Early Warning Value: If the herd accuracy is below this early warning value, it will be included in the statistical report.",
+
+tit4: "4. Train Accuracy Early Warning Value: If the train accuracy is below this early warning value, it will be included in the statistical report.",
+
+tit5: "5. Automatic Mixing Transfer Accuracy Early Warning Value: If the automatic mixing transfer accuracy is below this early warning value, it will be included in the statistical report.",
+
+tit6: "6. Manual Mixing Transfer Accuracy Early Warning Value: If the manual mixing transfer accuracy is below this early warning value, it will be included in the statistical report.",
+
+tit7: "7. Lactating Cow Feed Intake Average Deviation Early Warning Value: If the average deviation of lactating cow feed intake is above this early warning value, it will be included in the statistical report.",
+
+tit8: "8. Lactating Cow Milk Production Average Deviation Early Warning Value: If the average deviation of lactating cow milk production is above this early warning value, it will be included in the statistical report.",
+
+tit9: "9. Spreading Time Deviation Early Warning Value: If the spreading time deviation is above this early warning value, it will be included in the statistical report.",
+
+tit10: "10. Exceeding Average Mixing Time Early Warning Value: If the average mixing time is above this early warning value, it will be included in the statistical report.",
+
+tit11: "11. Exceeding Average Conversion Rate Early Warning Value: If the average conversion rate is above this early warning value, it will be included in the statistical report.",
+tit12: "12. Exceeding Average Cost of Milk per Kilogram of Feed: If the average cost of milk per kilogram of feed is above this early warning value, it will be included in the statistical report.",
+
+tit13: "13. Cow Pen Remaining Material Rate Exceeding Early Warning Value: If the cow pen remaining material rate is above this early warning value, it will be included in the statistical report.",
+
+tit14: "14. Inventory Early Warning Days: The inventory early warning module is based on the set number of days for statistics. It limits positive integers.",
+
+qz: "Silage",
+
+zrlwl: "Total Daily Feed Intake",
+
+bcl: "Do Not Process",
+
+
+//
+emsg1: "1. Plan Accuracy Early Warning Value: If the plan accuracy rate falls below this threshold, it will be included in the statistical report.",
+emsg2: "2. Formula Accuracy Early Warning Value: If the formula accuracy rate falls below this threshold, it will be included in the statistical report.",
+emsg3: "3. Herd Accuracy Early Warning Value: If the herd accuracy rate falls below this threshold, it will be included in the statistical report.",
+emsg4: "4. Train Accuracy Early Warning Value: If the train accuracy rate falls below this threshold, it will be included in the statistical report.",
+emsg5: "5. Automatic Mixing Transfer Accuracy Early Warning Value: If the automatic mixing transfer accuracy rate falls below this threshold, it will be included in the statistical report.",
+emsg6: "6. Manual Mixing Transfer Accuracy Early Warning Value: If the manual mixing transfer accuracy rate falls below this threshold, it will be included in the statistical report.",
+emsg7: "7. Lactating Cow Feed Intake Average Deviation Early Warning Value: If the average deviation of lactating cow feed intake exceeds this threshold, it will be included in the statistical report.",
+emsg8: "8. Lactating Cow Milk Yield Average Deviation Early Warning Value: If the average deviation of lactating cow milk yield exceeds this threshold, it will be included in the statistical report.",
+emsg9: "9. Spreading Time Deviation Early Warning Value: If the spreading time deviation exceeds this threshold, it will be included in the statistical report.",
+emsg10: "10. Exceeding Average Mixing Time Early Warning Value: If the average mixing time exceeds this threshold, it will be included in the statistical report.",
+emsg11: "11. Exceeding Average Conversion Rate Early Warning Value: If the average conversion rate exceeds this threshold, it will be included in the statistical report.",
+emsg12: "12. Exceeding Average Cost of Milk per Kilogram of Feed: If the average cost of milk per kilogram of feed exceeds this threshold, it will be included in the statistical report.",
+emsg13: "13. Cow Pen Remaining Material Rate Exceeding Early Warning Value: If the cow pen remaining material rate exceeds this threshold, it will be included in the statistical report.",
+emsg14: "14. Inventory Early Warning Days: The inventory early warning module conducts statistics based on the set number of days. It is limited to positive integers.",
 
 
 

src/lang/en/langModule/feedChart.js

@@ -3,14 +3,13 @@ export default{
   slflmc:"Feed Classification",
   slflbh:"Feed Classification Code",
   sldlflbh:'"Feed Category/Feed Classification/Feed Classification Code cannot be empty',
-  slflbh:"Feed Classification/Feed Classification Code cannot be empty",
   sldlno:"Feed Category cannot be empty",
   slflno:"Feed Classification cannot be empty",
   slbhno:"Feed Classification Code cannot be empty",
   slfltszi:" Cannot contain special characters",
   slflxx:"Please select feed classification",
 
-  
+
 sllb: "Feed Type",
 slly: "Feed Source",
 sz: "Setting",
@@ -58,12 +57,48 @@ df: "Starch (%DM)" ,
 zf: "Fat (%DM)",
 qxgl: "Cancel Association",
 
-    
+
 bzdwzlqsrzs: "Please enter a positive integer for the packaging unit weight.",
 djbllwxs: "Please keep the unit price to two decimal places.",
 tzzl050: "Please enter an integer between 0 and 50 for the transfer weight range.",
-  
 
+tHeader: [
+  "Feed Name",
+  "Feed Category",
+  "Unique Code",
+  "Feed Source",
+  "Plan Type",
+  "Allowed Error (kg)",
+  "Package Unit Weight (kg)",
+  "Unit Price",
+  "Jump Weight Range (kg)",
+  "Jump Delay",
+  "Confirm Start",
+  "Relay Position",
+  "Upper Limit",
+  "Reserved Field 01",
+  "Reserved Field 02",
+  "Reserved Field 03",
+],
+tHeader2: [
+  "Feed Name",
+  "Feed Category",
+  "Unique Code",
+  "Feed Source",
+  "Plan Type",
+  "Allowed Error (kg)",
+  "Package Unit Weight (kg)",
+  "Unit Price",
+  "Jump Weight Range (kg)",
+  "Jump Delay",
+  "Confirm Start",
+  "Relay Position",
+  "Upper Limit",
+  "Reserved Field 01",
+  "Reserved Field 02",
+  "Reserved Field 03",
+  "Error Message"
+]
 
 
-}
+}

src/lang/en/langModule/menus.js

@@ -79,5 +79,5 @@ export default {
    SQL管理:'SQL Management',
    测试:'Test',
    消息管理:'Message Management',
-   剩料配置:"scrap material allocation",
+   剩料配置:"Scrap material allocation",
 }

src/lang/en/langModule/message.js

@@ -241,7 +241,7 @@ msg223: "Driver name cannot be empty",
 msg224: "TMR equipment number/TMR equipment name/data collection card number/TMR equipment type/maximum mixing quantity cannot be empty",
 msg225: "TMR equipment name/data collection card number/TMR equipment type/maximum mixing quantity cannot be empty",
 msg226: "Data collection card number/TMR equipment type/maximum mixing quantity cannot be empty",
-msg227: "Repeat of msg226, ensure uniqueness for each message identifier",
+msg227: "Data collection card number/TMR equipment type/maximum mixing quantity cannot be empty",
 msg228: "TMR equipment number cannot be empty",
 msg229: "Equipment name cannot be empty",
 msg230: "Data collection card number cannot be empty",
@@ -330,7 +330,26 @@ msg309: "Are you sure to apply the current modified plan to",
 msg310: "Are you sure to clear all data below this operation number? If you clear the mixing truck data, the spreading truck data will also be cleared synchronously?",
 msg311: "Processing method",
 
-
+msg312: "System Built-in",
+msg313: "User Custom",
+msg314: "Feed Library",
+msg315: "Association",
+msg316: "Nutritional Value",
+msg317: "Settings",
+msg318: "Retrieve SAP Code",
+msg319: "Are you sure to reset this user's password to the default password 123456?",
+msg320: "Do you want to acquire UD feed?",
+msg321: "Are you sure to confirm the disassociation?",
+msg322: "Error message for feed table import",
+msg323: "Filling Specifications:",
+msg324: "Feed Table Import Template",
+msg325: "Positive Integer",
+msg326: "Integer between 0 and 50",
+msg327: "Raw Material Name",
+msg328: "Material Number",
+msg329: "Material Group",
+msg330: "Material Description",
+msg331: "Last Modified Date",
 
 
 

src/lang/en/langModule/premixedPlan.js

@@ -3,7 +3,7 @@ export default{
 xzcc:"Add",
 jscc:"Delete",
 sx:"Take Effect",
-jy:"Verification",
+jy1:"Disable",
 tmrbh:"TMR Number",
 sljhccgs:"Feed Distribution Plan with Batch Following",
 zdjbl:"Maximum Mixing Quantity”(KG)",
@@ -12,7 +12,7 @@ fljhcsgs:" Material Issuance Plan with Train Number Following",
 time:"Time",
 
 
-y:"Verification",
+jy:"Verification",
 zdsc:"Auto-generated",
 save:"Save",
 qkyfls:"Clear Assigned Pens",

src/lang/en/langModule/supplier.js

@@ -35,7 +35,7 @@ gysmz: "Supplier Name",
    zxz: "Min Value",
   zdz:"Max Value",
 
-  mc: "Pasture",
+  mc: "Ranch",
 sjlx: "Data Type",
 qqcs: "Query Parameters",
 xycs: "Response Parameters",

src/lang/zn/langModule/defaultParameter.js

@@ -1,3 +1,5 @@
+import { config } from "vue/types/umd";
+
 export default{
 
 name1:"功能参数",
@@ -83,7 +85,23 @@ qz:"青贮",
 zrlwl:"总日粮饲喂量",
 bcl:"不处理",
 
+  //
+emsg1: "1、计划准确率预警值：计划准确率低于此预警值则统计在统计报告中。",
+emsg2:"2、配方准确率预警值：配方准确率低于此预警值则统计在统计报告中。",
+emsg3:" 3、牛群准确率预警值：牛群准确率低于此预警值则统计在统计报告中。",
+emsg4:"  4、车次准确率预警值：车次准确率低于此预警值则统计在统计报告中。",
+emsg5:"  5、混料自动跳转准确率预警值：混料自动跳转准确率低于此预警值则统计在统计报告中。",
+emsg6:" 6、混料手动跳转准确率预警值：混料手动跳转准确率低于此预警值则统计在统计报告中。",
+emsg7:" 7、泌乳牛采食量平均值偏差预警值：泌乳牛采食量平均值偏差高于此预警值则统计在统计报告中。",
+emsg8:"8、泌乳牛产奶量平均值偏差预警值：泌乳牛产奶量平均值偏差高于此预警值则统计在统计报告中。",
+emsg9:"9、撒料时间偏差预警值：撒料时间偏差高于此预警值则统计在统计报告中。",
+emsg10:"10、超出平均混料时间预警值：平均混料时间高于此预警值则统计在统计报告中",
+emsg11:"11、超出平均转化率预警值：平均转换率高于此预警值则统计在统计报告中。",
+emsg12:"12、超出平均公斤奶饲料成本：平均公斤奶饲料成本高于此预警值则统计在统计报告中",
+emsg13:" 13、牛栏剩料率超出预警值：牛栏剩料率高于此预警值则统计在统计报告中",
+  emsg14: "14、库存预警天数：库存预警模块根据设置天数进行统计。限制正整数。",
 
+config:'是否确认恢复默认设置?'
 
 
 

src/lang/zn/langModule/feedChart.js

@@ -57,21 +57,22 @@ export default{
     zf:"脂肪（%DM）",
     qxgl:"取消关联",
 
-    // TODO:
-    bzdwzlqsrzs:"包装单位重量请输入正整数",
-    djbllwxs:"单价请保留两位小数",
-    tzzl050:"跳转重量域请输入大于等于0小于等于50的整数",
+    //
+    tHeader: [
+      '饲料名称', '饲料分类', '唯一编码',  '饲料来源', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03'
+    ],
+    tHeader2: [
+      '饲料名称', '饲料分类', '唯一编码', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03', '错误信息'
+    ],
 
 
 
-    
 
 
 
 
 
 
-    
 
 
 
@@ -96,4 +97,7 @@ export default{
 
 
 
-}
+
+
+
+}

src/lang/zn/langModule/message.js

@@ -338,6 +338,37 @@ msg308:"剩料计划",
 msg309:'是否确认将当前修改计划应用至',
 msg310:'您确定清空该操作序号以下的所有数据，如果您清空的是搅拌车数据，将会同步清空撒料车数据?',
 msg311:"处理方式",
+//
+
+msg312:'系统内置',
+msg313:'用户自定义',
+msg314:'饲料库',
+msg315:'关联',
+msg316:'营养价值',
+msg317:'设置',
+msg318:'获取SAP编码',
+msg319:'是否确认将此用户密码重置为默认密码123456？',
+msg320:'是否获取UD饲料?',
+msg321:'是否确认取消关联?',
+msg322:'饲料表导入报错信息',
+msg323:'填写规范:',
+msg324:'饲料表导入模板',
+msg325:'正整数',
+msg326:"0-50之间的整数",
+msg327:'原料名称',
+msg328:"物料号",
+msg329:"物料组",
+msg330:"物料描述",
+msg331:"最后修改日期",
+
+
+
+
+
+
+
+
+
 
 
 

src/lang/zn/langModule/premixedPlan.js

@@ -3,7 +3,7 @@ export default{
 xzcc:"新增车次",
 jscc:"减少车次",
 sx:"生效",
-jy:"禁用",
+jy1:"禁用",
 tmrbh:"TMR编号",
 sljhccgs:"撒料计划车次跟随:",
 zdjbl:"最大搅拌量(KG)",

src/utils/request.js

@@ -30,6 +30,8 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
   config => {
+    // en-US zh-CN
+    // config.headers['lang']=localStorage.getItem('lang') || navigator.language
     // do something before request is sent
     // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'  //此处是增加的代码，设置请求头的类型
     if (process.env.VUE_APP_BASE_API !== '/dev-api') {
@@ -47,8 +49,7 @@ service.interceptors.request.use(
       } else {
         config.headers['token'] = getToken()
       }
-      // en-US zh-CN
-      // config.headers['Language']=localStorage.getItem('lang') || navigator.language
+
 
     }
     console.log(config.headers,'hss')

src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -1,169 +1,319 @@
 <template>
-  <div class="app-container" style="width: 90%;">
-    <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="handleDescription" />
-    <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="270px" style="margin-top: 40px;margin-bottom:30px;">
+  <div class="app-container" style="width: 90%">
+    <div
+      class="el-icon-info"
+      style="font-size: 30px; float: right; color: #009c69"
+      @click="handleDescription"
+    />
+    <el-form
+      ref="createTemp"
+      :rules="rules"
+      :model="createTemp"
+      label-position="right"
+      label-width="270px"
+      style="margin-top: 40px; margin-bottom: 30px"
+    >
       <el-row>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.jhzqlyjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model.number="createTemp.remainOptRate" type="number" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" />
+          <el-form-item
+            :label="$t('defaultParameter.jhzqlyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model.number="createTemp.remainOptRate"
+              type="number"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.pfzqlyjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.pfzqlyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.nqzqlyjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.nqzqlyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.cczqlyjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.cczqlyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item 
-:label="$t('defaultParameter.hlzdtzzqlyj')"  prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.hlzdtzzqlyj')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.hlzdtzzqlyj1')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.hlzdtzzqlyj1')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.mrcapjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.mrcapjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.mrcayjz')"  prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.mrcayjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.slsjpccyjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.slsjpccyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.ccpjhlyjz')"  prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.ccpjhlyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.ccpjzhlyjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.ccpjzhlyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.ccpjgjnslcb')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.ccpjgjnslcb')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.nlsllccyjz')" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.nlsllccyjz')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item  
-:label="$t('defaultParameter.kcyjts')"  prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
-:placeholder="$t('defaultParameter.slfpzb')" type="text" />
+          <el-form-item
+            :label="$t('defaultParameter.kcyjts')"
+            prop="remainOptRate"
+          >
+            <el-input
+              ref="remainOptRate"
+              v-model="createTemp.remainOptRate"
+              :disabled="isRoleEdit == false"
+              class="filter-item"
+              :placeholder="$t('defaultParameter.slfpzb')"
+              type="text"
+            />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-      <el-button v-if="isRoleEdit" class="save" :disabled="isokDisable" @click="handleSave">{{$t('formulationEvaluation.save')}}</el-button>
-      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery"> 
- 
-{{$t('defaultParameter.hfmr')}}</el-button>
+    <div slot="footer" class="dialog-footer" style="bottom: 10px">
+      <el-button
+        v-if="isRoleEdit"
+        class="save"
+        :disabled="isokDisable"
+        @click="handleSave"
+        >{{ $t('formulationEvaluation.save') }}</el-button
+      >
+      <el-button
+        v-if="isRoleEdit"
+        class="warning"
+        :disabled="isokDisable"
+        @click="handleRecovery"
+      >
+        {{ $t('defaultParameter.hfmr') }}</el-button
+      >
     </div>
-    <el-dialog :title="textMap[description.dialogStatus]" :destroy-on-close="true" :visible.sync="description.dialogFormVisible" :close-on-click-modal="false" width="70%">
+    <el-dialog
+      :title="textMap[description.dialogStatus]"
+      :destroy-on-close="true"
+      :visible.sync="description.dialogFormVisible"
+      :close-on-click-modal="false"
+      width="70%"
+    >
       <div class="app-description dialogMinHeight">
         <div class="content">
-          
-{{$t('defaultParameter.msg1')}}
-          <br>
-           
-{{$t('defaultParameter.msg2')}}
-          <br>
-          {{$t('defaultParameter.msg3')}}
-          <br>
-          {{$t('defaultParameter.msg4')}}
-          <br>
-          {{$t('defaultParameter.msg5')}}
-          <br>
-          {{$t('defaultParameter.msg6')}}
-          <br>
-          {{$t('defaultParameter.msg7')}}
-          <br>
-          {{$t('defaultParameter.msg8')}}
-          <br>
-          {{$t('defaultParameter.msg9')}}
-          <br>
-          {{$t('defaultParameter.msg10')}}
-          <br>
-          {{$t('defaultParameter.msg11')}}
-          <br>
-          {{$t('defaultParameter.msg12')}}
-          <br>
-          {{$t('defaultParameter.msg13')}}
-          <br>
-          {{$t('defaultParameter.msg14')}}
+          {{ $t('defaultParameter.emsg1') }}
+          <br />
+
+          {{ $t('defaultParameter.emsg2') }}
+          <br />
+          {{ $t('defaultParameter.emsg3') }}
+          <br />
+          {{ $t('defaultParameter.emsg4') }}
+          <br />
+          {{ $t('defaultParameter.emsg5') }}
+          <br />
+          {{ $t('defaultParameter.emsg6') }}
+          <br />
+          {{ $t('defaultParameter.emsg7') }}
+          <br />
+          {{ $t('defaultParameter.emsg8') }}
+          <br />
+          {{ $t('defaultParameter.emsg9') }}
+          <br />
+          {{ $t('defaultParameter.emsg10') }}
+          <br />
+          {{ $t('defaultParameter.emsg11') }}
+          <br />
+          {{ $t('defaultParameter.emsg12') }}
+          <br />
+          {{ $t('defaultParameter.emsg13') }}
+          <br />
+          {{ $t('defaultParameter.emsg14') }}
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose" @click="description.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
+        <el-button
+          class="cancelClose"
+          @click="description.dialogFormVisible = false"
+          >{{ $t('common.closed') }}</el-button
+        >
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { GetDataByName, PostDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
+import {
+  GetDataByName,
+  PostDataByName,
+  GetDataByNames,
+  failproccess,
+  checkButtons,
+  ExecDataByConfig
+} from '@/api/common'
 import Cookies from 'js-cookie'
 import { MessageBox } from 'element-ui'
 export default {
@@ -171,43 +321,63 @@ export default {
   data() {
     return {
       isRoleEdit: [],
-      planBeforeDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }], // 是否可取前一天计划
-      planNextDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }], // 是否可取后一天计划
-      isSupplementList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }], // 是否启用补料
-      isLeftoverMaterialList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }], // 是否启用剩料
-      decimalPlacesList: [{ id: '0',  
-name:this.$t('supplier.zs') }, { id: '1',  
-name:this.$t('supplier.xs1') }, { id: '2', 
-name:this.$t('supplier.xs2') }, { id: '3', 
-name:this.$t('supplier.xs3') }], // 日计划报表小数点位数
-      isLockBullsList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }], // 启用饲料锁定牛头数
+      planBeforeDayList: [
+        { id: '1', name: this.$t('supplier.yes') },
+        { id: '0', name: this.$t('supplier.no') }
+      ], // 是否可取前一天计划
+      planNextDayList: [
+        { id: '1', name: this.$t('supplier.yes') },
+        { id: '0', name: this.$t('supplier.no') }
+      ], // 是否可取后一天计划
+      isSupplementList: [
+        { id: '1', name: this.$t('supplier.yes') },
+        { id: '0', name: this.$t('supplier.no') }
+      ], // 是否启用补料
+      isLeftoverMaterialList: [
+        { id: '1', name: this.$t('supplier.yes') },
+        { id: '0', name: this.$t('supplier.no') }
+      ], // 是否启用剩料
+      decimalPlacesList: [
+        { id: '0', name: this.$t('supplier.zs') },
+        { id: '1', name: this.$t('supplier.xs1') },
+        { id: '2', name: this.$t('supplier.xs2') },
+        { id: '3', name: this.$t('supplier.xs3') }
+      ], // 日计划报表小数点位数
+      isLockBullsList: [
+        { id: '1', name: this.$t('supplier.yes') },
+        { id: '0', name: this.$t('supplier.no') }
+      ], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
-      waterConditioningList: [{ id: '0',  
-name:this.$t('defaultParameter.qz')}, { id: '1',  
-name:this.$t('defaultParameter.bcl') }, { id: '2',  
-name:this.$t('defaultParameter.bcl') }], // 水分调节选项
-      priceCalculationList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }], // 是否启用库存管理
-      numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
-      feedontractList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }], // 是否启用饲料合同
-      leftoverMaterialList: [{ id: '0',  
-name:this.$t('supplier.defb') }, { id: '1', 
-name:this.$t('supplier.slfb') }],
+      waterConditioningList: [
+        { id: '0', name: this.$t('defaultParameter.qz') },
+        { id: '1', name: this.$t('defaultParameter.bcl') },
+        { id: '2', name: this.$t('defaultParameter.bcl') }
+      ], // 水分调节选项
+      priceCalculationList: [
+        { id: '1', name: this.$t('supplier.yes') },
+        { id: '0', name: this.$t('supplier.no') }
+      ], // 是否启用库存管理
+      numberList: [
+        { id: '0', name: '1' },
+        { id: '1', name: '2' },
+        { id: '2', name: '3' },
+        { id: '3', name: '4' }
+      ], // 班次数量
+      feedontractList: [
+        { id: '1', name: this.$t('supplier.yes') },
+        { id: '0', name: this.$t('supplier.no') }
+      ], // 是否启用饲料合同
+      leftoverMaterialList: [
+        { id: '0', name: this.$t('supplier.defb') },
+        { id: '1', name: this.$t('supplier.slfb') }
+      ],
       requestParams: [
-        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
+        {
+          name: 'getRemainFeedList',
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get('pastureid') }
+        }
       ],
       getdataListParm: {
         name: 'getysoptList',
@@ -229,11 +399,9 @@ name:this.$t('supplier.slfb') }],
         dialogStatus: ''
       },
       textMap: {
-         
-description:this.$t('supplier.cssm')
+        description: this.$t('supplier.cssm')
       },
       requestParam: {}
-
     }
   },
   created() {
@@ -243,20 +411,22 @@ description:this.$t('supplier.cssm')
   },
 
   methods: {
-
     getButtons() {
       const Edit = 'DefaultParameter'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      const isRoleEdit = checkButtons(
+        JSON.parse(sessionStorage.getItem('buttons')),
+        Edit
+      )
       this.isRoleEdit = isRoleEdit
     },
     getDownList() {
-      GetDataByNames(this.requestParams).then(response => {
+      GetDataByNames(this.requestParams).then((response) => {
         this.disposalList = response.data.getRemainFeedList.list
       })
     },
     getList() {
       this.listLoading = true
-      GetDataByName(this.getdataListParm).then(response => {
+      GetDataByName(this.getdataListParm).then((response) => {
         console.log('table1数据', response.data.list)
         if (response.data.list !== null) {
           this.createTemp = response.data.list[0]
@@ -274,38 +444,56 @@ description:this.$t('supplier.cssm')
       setTimeout(() => {
         this.isokDisable = false
       }, 1000)
-      this.requestParam.common = { 'returnmap': '0' }
+      this.requestParam.common = { returnmap: '0' }
       this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'updatesysopt', 'type': 'e', 'parammaps': {
-        pastureid: this.createTemp.pastureid,
-        isGetLastPlan: this.createTemp.isGetLastPlan,
-        isGetNextPlan: this.createTemp.isGetNextPlan,
-        isEnableSupplyFeed: this.createTemp.isEnableSupplyFeed,
-        isEnableRemainFeed: this.createTemp.isEnableRemainFeed,
-        reportDigit: this.createTemp.reportDigit,
-        isLockCount: this.createTemp.isLockCount,
-        remainOpt: this.createTemp.remainOpt,
-        waterOpt: this.createTemp.waterOpt,
-        overweightWarnRate: this.createTemp.overweightWarnRate,
-        overweightBanRate: this.createTemp.overweightBanRate,
-        repertoryWarn: this.createTemp.repertoryWarn,
-        isfeedstorage: this.createTemp.isfeedstorage,
-        times: this.createTemp.times,
-        isEnableContract: this.createTemp.isEnableContract,
-        remainOptDis: this.createTemp.remainOptDis,
-        remainOptRate: this.createTemp.remainOptRate
-      }}
-      this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
-        pastureid: this.createTemp.pastureid
-      }}
+      this.requestParam.data[0] = {
+        name: 'updatesysopt',
+        type: 'e',
+        parammaps: {
+          pastureid: this.createTemp.pastureid,
+          isGetLastPlan: this.createTemp.isGetLastPlan,
+          isGetNextPlan: this.createTemp.isGetNextPlan,
+          isEnableSupplyFeed: this.createTemp.isEnableSupplyFeed,
+          isEnableRemainFeed: this.createTemp.isEnableRemainFeed,
+          reportDigit: this.createTemp.reportDigit,
+          isLockCount: this.createTemp.isLockCount,
+          remainOpt: this.createTemp.remainOpt,
+          waterOpt: this.createTemp.waterOpt,
+          overweightWarnRate: this.createTemp.overweightWarnRate,
+          overweightBanRate: this.createTemp.overweightBanRate,
+          repertoryWarn: this.createTemp.repertoryWarn,
+          isfeedstorage: this.createTemp.isfeedstorage,
+          times: this.createTemp.times,
+          isEnableContract: this.createTemp.isEnableContract,
+          remainOptDis: this.createTemp.remainOptDis,
+          remainOptRate: this.createTemp.remainOptRate
+        }
+      }
+      this.requestParam.data[1] = {
+        name: 'updateFPbyFTChangeALL',
+        type: 'e',
+        parammaps: {
+          pastureid: this.createTemp.pastureid
+        }
+      }
 
-      ExecDataByConfig(this.requestParam).then(response => {
+      ExecDataByConfig(this.requestParam).then((response) => {
         console.log('保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
+          this.$notify({
+            title: this.$t('common.succes'),
+            message: this.$t('driver.saveSuccess'),
+            type: 'success',
+            duration: 2000
+          })
           this.getList()
         } else {
-          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({
+            title: this.$t('driver.saveFail'),
+            message: response.data,
+            type: 'warning',
+            duration: 2000
+          })
         }
       })
     },
@@ -315,25 +503,45 @@ description:this.$t('supplier.cssm')
       setTimeout(() => {
         this.isokDisable = false
       }, 1000)
-      MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
+      MessageBox.confirm(this.$t('defaultParameter.config'), {
+        confirmButtonText: this.$t('common.confirm'),
+        cancelButtonText: this.$t('common.cancel'),
+        type: 'warning'
       }).then(() => {
-        this.requestParam.common = { 'returnmap': '0' }
+        this.requestParam.common = { returnmap: '0' }
         this.requestParam.data = []
-        this.requestParam.data[0] = { 'name': 'updatesysoptinit', 'type': 'e', 'parammaps': {
-          pastureid: this.createTemp.pastureid
-        }}
-        this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
-          pastureid: this.createTemp.pastureid
-        }}
+        this.requestParam.data[0] = {
+          name: 'updatesysoptinit',
+          type: 'e',
+          parammaps: {
+            pastureid: this.createTemp.pastureid
+          }
+        }
+        this.requestParam.data[1] = {
+          name: 'updateFPbyFTChangeALL',
+          type: 'e',
+          parammaps: {
+            pastureid: this.createTemp.pastureid
+          }
+        }
 
-        ExecDataByConfig(this.requestParam).then(response => {
+        ExecDataByConfig(this.requestParam).then((response) => {
           console.log('保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
+            this.$notify({
+              title: this.$t('common.succes'),
+              message: this.$t('driver.saveSuccess'),
+              type: 'success',
+              duration: 2000
+            })
             this.getList()
           } else {
-            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({
+              title: this.$t('driver.saveFail'),
+              message: response.data,
+              type: 'warning',
+              duration: 2000
+            })
           }
         })
       })
@@ -346,10 +554,14 @@ description:this.$t('supplier.cssm')
 }
 </script>
 <style lang="scss" scoped>
-  .app-description{
-    display:flex; justify-content: center; align-items: center;font-size: 14px;line-height: 28px;
-    .content{
-      display:flex;
-    }
+.app-description {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 14px;
+  line-height: 28px;
+  .content {
+    display: flex;
   }
+}
 </style>

src/views/basicData/equipmentTMR/index.vue

@@ -176,7 +176,7 @@ export default {
       ],
       typeList: [], // TMR设备类型
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.yes')}, { id: 0,
 name:this.$t('supplier.no') }], // 是否启用
       jumpDelayList: [], // 跳转延时
       dataInterfaceList: [], // 数据接口
@@ -367,7 +367,7 @@ name:this.$t('supplier.no') }], // 是否启用
         this.$message({ type: 'error', message: this.$t('message.msg226'), duration: 2000 })
         return false
       } else if (this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg227'), duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg226'), duration: 2000 })
         return false
       } else if (this.table.temp.eqcode == '') {
         this.$message({ type: 'error', message: this.$t('message.msg228'), duration: 2000 })
@@ -514,7 +514,7 @@ name:this.$t('supplier.no') }], // 是否启用
         this.$message({ type: 'error', message: this.$t('message.msg226'), duration: 2000 })
         return false
       } else if (this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg227'), duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg226'), duration: 2000 })
         return false
       } else if (this.table.temp.eqcode == '') {
         this.$message({ type: 'error', message: this.$t('message.msg228'), duration: 2000 })

src/views/basicData/feedTable/index.vue

@@ -113,7 +113,7 @@
             <el-switch v-model="scope.row.enable" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
           </template>
         </u-table-column>
-        <u-table-column  :label="$t('errorAnalysis.cz')" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+        <u-table-column  :label="$t('errorAnalysis.cz')" align="center" min-width="200px" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <a class="correcting" @click="handleNutritive (row)">{{$t('feedChart.yyjz')}}</a>
             <span class="centerSpan">|</span>
@@ -159,7 +159,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="饲料类别：" prop="fclassid">
+              <el-form-item :label="$t('feedChart.sllb')" prop="fclassid">
                 <el-select v-model="create.temp.fclassid" filterable  :placeholder="$t('feedChart.sllb')" class="filter-item" style="width: 100%;" @change="changeFeedList">
                   <el-option v-for="item in feedTypeList" :key="item.id" :label="item.mixname" :value="item.id" />
                 </el-select>
@@ -199,7 +199,8 @@
           <el-row>
             <el-col :span="6">
               <el-form-item :label="$t('feedChart.wllx')" prop="sapMaterialtype">
-                <el-select v-model="create.temp.sapMaterialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
+                <el-select v-model="create.temp.sapMaterialtype" filterable
+                :placeholder="$t('feedChart.wllx')" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in materialtypeList" :key="item.id" :label="item.distName" :value="item.distCode" />
                 </el-select>
               </el-form-item>
@@ -228,12 +229,12 @@
           <el-row>
             <el-col :span="6">
               <el-form-item :label="$t('feedChart.yxwcs')" prop="allowratio">
-                <el-input ref="allowratio" v-model="create.temp.allowratio" class="filter-item" placeholder="正整数" type="text" />
+                <el-input ref="allowratio" v-model="create.temp.allowratio" class="filter-item" :placeholder="$t('message.msg325')" type="text" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item :label="$t('feedChart.tzzly')" prop="autozone">
-                <el-input ref="autozone" v-model="create.temp.autozone" :disabled="create.temp.autosecond=='0'" class="filter-item" placeholder="0-50之间的整数" type="text" />
+                <el-input ref="autozone" v-model="create.temp.autozone" :disabled="create.temp.autosecond=='0'" class="filter-item" :placeholder="$t('message.msg326')" type="text" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -286,7 +287,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item :label="$t('feedChart.byzd1')" prop="backup1">
-                <el-input ref="backup1" v-model="create.temp.backup1" class="filter-item" :placeholder="备用字段01" type="text" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" />
+                <el-input ref="backup1" v-model="create.temp.backup1" class="filter-item" :placeholder="$t('feedChart.byzd1')"  type="text" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -677,7 +678,7 @@
       </template>
       <div class="app-add">
         <div class="search" ref="search">
-          <el-input v-model="sapCode.table.getdataListParm.parammaps.MAKTX" placeholder="原料名称" style="width: 130px;" class="filter-item" clearable />
+          <el-input v-model="sapCode.table.getdataListParm.parammaps.MAKTX" :placeholder="$t('message.msg327')" style="width: 130px;" class="filter-item" clearable />
           <el-button class="successBorder" @click="handleSapCodeSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
@@ -702,11 +703,11 @@
             :row-height="rowHeight"
           >
             <u-table-column type="selection" align="center" width="50"/>
-            <u-table-column label="物料号" min-width="80px" align="center" prop="MATNR"/>
+            <u-table-column :label="$t('message.msg328')" min-width="80px" align="center" prop="MATNR"/>
             <u-table-column :label="$t('feedChart.wllx')" min-width="90px" align="center" prop="MTART" />
-            <u-table-column label="物料组" min-width="80px" align="center" prop="MATKL"/>
-            <u-table-column label="物料描述" min-width="90px" align="center" prop="MAKTX" />
-            <u-table-column label="最后修改日期" min-width="80px" align="center" prop="LAEDA" />
+            <u-table-column :label="$t('message.msg329')" min-width="80px" align="center" prop="MATKL"/>
+            <u-table-column :label="$t('message.msg330')" min-width="90px" align="center" prop="MAKTX" />
+            <u-table-column :label="$t('message.msg331')" min-width="80px" align="center" prop="LAEDA" />
           </u-table>
         </div>
         <div slot="footer" class="dialog-footer">
@@ -833,7 +834,7 @@ export default {
       enableList: [{ id: '1',
 name:this.$t('supplier.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 是否启用
-      feedSourcesList: [{ id: '0', name: '系统内置' }, { id: '1', name: '用户自定义' }], // 饲料来源
+      feedSourcesList: [{ id: '0', name: this.$t('message.msg312') }, { id: '1', name: this.$t('message.msg313') }], // 饲料来源
       confirmStartList: [{ id: '0',
 name:this.$t('supplier.jy') }, { id: '1', name: '启用' }], // 确认开始
       associationStatusList: [{ id: '1',
@@ -882,7 +883,7 @@ name:this.$t('supplier.yes')}], // 无上域
       create: {
         dialogFormVisible: false,
         dialogStatus: '',
-        temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '',feedgroupid:'',sapMaterialtype:'',sapGoods:'',sapCode:''},
+        temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: this.$t('message.msg313'), printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '',feedgroupid:'',sapMaterialtype:'',sapGoods:'',sapCode:''},
         rules: {
           printgroupid :[{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
           fname: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
@@ -981,11 +982,11 @@ name:this.$t('supplier.yes')}], // 无上域
       textMap: {
         create: this.$t('message.msg291'),
         update: this.$t('message.msg290'),
-        feedBank: '饲料库',
-        relation: '关联',
-        nutritive: '营养价值',
-        sapCode: '设置',
-        sapCode2: '获取SAP编码',
+        feedBank: this.$t('message.msg314'),
+        relation: this.$t('message.msg315'),
+        nutritive: this.$t('message.msg316'),
+        sapCode: this.$t('message.msg317'),
+        sapCode2: this.$t('message.msg318'),
       },
 
       isokDisable: false,
@@ -1068,16 +1069,14 @@ name:this.$t('supplier.yes')}], // 无上域
           this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg38') + res.data.err_count + this.$t('message.msg39'), type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {
              const list1 = res.data.result
-             const tHeader = [
-               '饲料名称', '饲料分类', '唯一编码', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03', '错误信息'
-             ]
+             const tHeader =this.$t('feedChart.tHeader2')
 
 
              const filterVal = [
                '饲料名称', '饲料分类', '唯一编码', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03',  'error_msg'
              ]
              const data1 = this.formatJson(filterVal, list1)
-             excel.export_json_to_excel({ header: tHeader, data: data1, filename: '饲料表导入报错信息', autoWidth: true, bookType: 'xlsx' })
+             excel.export_json_to_excel({ header: tHeader, data: data1, filename: this.$t('message.msg322'), autoWidth: true, bookType: 'xlsx' })
            })
         }
       } else {
@@ -1096,12 +1095,11 @@ name:this.$t('supplier.yes')}], // 无上域
       )
     },
     handleExport(item) {
-      if (item == 1) {
 
+      if (item == 1) {
         console.log('点击了导出模板')
         this.download.getdataListParm.parammaps = this.table.getdataListParm.parammaps
         console.log('点击了导出模板',this.download.getdataListParm)
-
         GetDataByName(this.download.getdataListParm).then(response => {
           if (response.data.list !== null) {
             this.download.list = response.data.list
@@ -1121,20 +1119,18 @@ name:this.$t('supplier.yes')}], // 无上域
           ]
           var excelDatas = [
             {
-              tHeader: [
-               '饲料名称', '饲料分类', '唯一编码',  '饲料来源', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03'
-             ],
+              tHeader:this.$t('feedChart.tHeader'),
               filterVal:  ['', '', '', '', '','', '', '', '', '', '', '', '', '', '', ''],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'
             }, {
-              tHeader: ['填写规范:'],
+              tHeader: [this.$t('message.msg323')],
               filterVal: ['obj1'],
               tableDatas: downloadList,
               sheetName: 'Sheet2'
             }
           ]
-          json2excel(excelDatas, '饲料表导入模板', true, 'xlsx')
+          json2excel(excelDatas, this.$t('message.msg324'), true, 'xlsx')
         })
 
 
@@ -1178,11 +1174,10 @@ name:this.$t('supplier.yes')}], // 无上域
           } else {
             this.download.list = []
           }
+
           var excelDatas = [
             {
-              tHeader: [
-               '饲料名称', '饲料分类', '唯一编码',  '饲料来源', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03'
-             ],
+              tHeader: this.$t('feedChart.tHeader'),
               filterVal: ['fname', 'fclass', 'feedcode', 'source', 'printgroup', 'allowratio', 'unitweight', 'uprice', 'autozone', 'autosecondnam', 'onfirmstartname', 'trgaddress', 'jmp', 'backup1', 'backup2', 'backup3'],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'
@@ -1266,7 +1261,7 @@ name:this.$t('supplier.yes')}], // 无上域
     },
 
     resetTemp() {
-      this.create.temp = { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '', jmp: '0',feedgroupid:'' }
+      this.create.temp = { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: this.$t('message.msg313'), printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '', jmp: '0',feedgroupid:'' }
     },
     // 计划类型
     changePlanList(item) {
@@ -1576,7 +1571,7 @@ name:this.$t('supplier.yes')}], // 无上域
     },
     disassociateData(row) {
       console.log('点击了取消关联')
-      MessageBox.confirm('是否确认取消关联?', {
+      MessageBox.confirm(this.$t('message.msg321'), {
         confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.isokDisable = true
@@ -2020,7 +2015,7 @@ name:this.$t('supplier.yes')}], // 无上域
       })
     },
     handleGetUd(){
-      MessageBox.confirm('是否获取UD饲料?', {
+      MessageBox.confirm(this.$t('message.msg320'), {
         confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         let url = 'authdata/gm/udfeed'
@@ -2059,4 +2054,7 @@ name:this.$t('supplier.yes')}], // 无上域
       }
     }
   }
+  .el-form-item__label{
+    padding: 0px 0px!important;
+  }
  </style>

src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -15,7 +15,7 @@
       </div>
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect">{{$t('premixedPlan.sx')}}
       </el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable">{{$t('premixedPlan.jy')}}
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable">{{$t('premixedPlan.jy1')}}
       </el-button>
       <el-button class="import" style="float: right;" @click="handleHistoryRecords">{{$t('dhedFormula.lsjl')}}</el-button>
     </div>
@@ -430,7 +430,7 @@
             fclassid: '',
             fclass: '',
             feedcode: '',
-            source: '用户自定义',
+            source: this.$t('message.msg313'),
             printgroupid: '1',
             printgroup: '无',
             unitweight: '',

src/views/systemManagement/user/index.vue

@@ -472,7 +472,7 @@ name:this.$t('supplier.no') }], // 是否启用
       }
     },
     handleResetPassword(row) {
-      MessageBox.confirm('是否确认将此用户密码重置为默认密码123456？', {
+      MessageBox.confirm(this.$t('message.msg319'), {
         confirmButtonText: this.$t('common.confirm'),
         cancelButtonText: this.$t('common.cancel'),
         type: 'warning'