翻译bug

src/lang/en/langModule/dailyExecutionPlan.js

@@ -41,13 +41,13 @@ zztb:"Synchronizing",
 
 bcbl:"Shift Ratio(%)",
 dcczzd:"Single Vehicle Operating Weight",
-planTypeList: [{ lable: 'Pre-mixed Plan', value: '4' }, { lable: 'Spreading Plan', value: '0' }, { lable: 'Remaining Material Plan', value: '3' }, { lable: 'Spreading Plan - Mixing', value: '1' }, { lable: 'Spreading Plan - Spreading', value: '2' }, { lable: 'Pre-weighing Plan', value: '5' }],
+planTypeList: [{ lable: 'Premix Plan', value: '4' }, { lable: 'Feed Spreading Plan', value: '0' }, { lable: 'Leftover Feed Plan', value: '3' }, { lable: ' Feed Spreading Plan - Mixing', value: '1' }, { lable: 'Feed Spreading Plan - Spreading', value: '2' }, { lable: 'Pre-weighing Plan', value: '5' }],
 
 printingTypeList: [{ lable: 'Concentrate Feed', value: '1' }, { lable: 'Forklift', value: '2' }],
 
-planningDimensionList: [{ lable: 'Material Issuance Order”', value: '0' }, { lable: 'TMR', value: '1' }],
+planningDimensionList: [{ lable: 'Material Issuance Order', value: '0' }, { lable: 'TMR', value: '1' }],
 
-exportTypeList: [{ lable: 'Material Feeding and Printing', value: '0' }, { lable: 'Cumulative Batch Feeding', value: '1' }, { lable: 'Feed Distribution and Printing', value: '2' }, { lable: 'Feed Dispensing and Printing', value: '3' }, { lable: 'Cumulative Dispensing of Feed', value: '4' }, { lable: 'Packaging Printing', value: '5' }, { lable: 'Actual Printing”', value: '6' }], 
+exportTypeList: [{ lable: 'Material Feeding and Printing', value: '0' }, { lable: 'Cumulative Batch Feeding', value: '1' }, { lable: 'Feed Distribution and Printing', value: '2' }, { lable: 'Feed Dispensing and Printing', value: '3' }, { lable: 'Cumulative Dispensing of Feed', value: '4' }, { lable: 'Packaging Printing', value: '5' }, { lable: 'Actual Printing”', value: '6' }],
 
 iscompletedList: [{ lable: 'Yes', value: '1' },{ lable: 'No', value: '0' }  ],
 

src/lang/en/langModule/message.js

@@ -286,6 +286,49 @@ msg266: "Please enter a natural number, up to two decimal places",
 msg267: "Please select feed table information",
 msg268: "Please select a piece of information",
 
+msg269: "The number of any vehicle cannot be empty or zero",
+msg270: "The role name cannot be empty",
+msg271: "The role name cannot be duplicated",
+msg272: "Username/role cannot be empty",
+msg273: "Username cannot be empty",
+msg274: "Role cannot be empty",
+msg275: "Please select user information",
+msg276: "Password reset successful",
+msg277: "There are pens that have not been assigned, the unassigned pens are as follows:",
+msg278: "All pens have been fully assigned",
+msg279: "Do you want to change the TMR equipment?",
+msg280: "Note: Changing the TMR spreading equipment will result in different loading weights. Please select the processing method.",
+msg281: "1. The excess feed is evenly deducted from each pen that has been allocated.",
+msg282: "2. The excess feed is deducted from the last pen going forward.",
+msg283: "3. Clear the allocated spreader truck.",
+msg284: "The loading volume has exceeded the vehicle capacity",
+msg285: "The loading volume must not exceed the vehicle capacity",
+msg286: "cubic meters, please confirm",
+msg287: "The loading volume must not be less than the vehicle capacity",
+msg288: "Regenerating the plan will clear the existing plan first, are you sure to confirm the regeneration?",
+msg289: "Clear the allocated pens",
+msg290: "Edit",
+msg291: "Add New",
+msg292: "There are pens that have not been allocated, it is recommended to allocate them in a timely manner, the unallocated pens are as follows:",
+msg293: "All pens have been fully allocated",
+msg294: "Transfer surplus feed",
+msg295: "Continue feeding",
+msg296: "Total",
+msg297: "Delete record",
+msg298: "Newly generated",
+msg299: "SAP upload",
+msg300: "Mixing data upload",
+msg301: "Surplus feed upload",
+msg302: "Spreading data upload",
+msg303: "Copy plan",
+msg304: "Apply",
+msg305: "Pen formula",
+msg306: "Spreading plan",
+msg307: "Premix plan",
+msg308: "Surplus feed plan",
+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",
 
 
 

src/lang/en/langModule/premixedPlan.js

@@ -3,7 +3,7 @@ export default{
 xzcc:"Add",
 jscc:"Delete",
 sx:"Take Effect",
-jy:"Disable",
+jy:"Verification",
 tmrbh:"TMR Number",
 sljhccgs:"Feed Distribution Plan with Batch Following",
 zdjbl:"Maximum Mixing Quantity”(KG)",
@@ -52,7 +52,7 @@ tljh:"Feed Push Plan",
 scc:"Delete",
 slclfs:"Leftover Material Disposal Method",
 ztls:"Transfer to Pens",
-cci:"batch:",
+cci:"Train:",
 lsname:"Pens Name:",
 
 fuzhi:'Copy',

src/lang/zn/langModule/message.js

@@ -303,6 +303,60 @@ msg273:'用户名称不能为空',
 msg274:'角色不能为空',
 msg275:'请选择用户信息',
 msg276:'重置密码成功',
+msg277:'当前有未分配栏舍，未分配栏舍如下：',
+msg278: '已分配完：当前栏舍已分配完善',
+msg279:'是否要改变TMR设备？',
+msg280:'注：更换TMR撒料设备，变更后的装载重量不同，请选择处理方式',
+msg281:'1、多出的饲料平均从已分配的各栏舍中扣减。',
+msg282:'2、多出的饲料从最后一个栏舍依次往前扣减',
+msg283:'3、清空已分配的撒料车。',
+msg284:'装载量已超过车辆容量',
+msg285:'装载量不可超过车辆容量',
+msg286:'m³,请确认',
+msg287:'装载量不可低于车辆容量',
+msg288:'重新生成计划会将原有计划清空再生成，是否确认重新生成?',
+msg289:'清空已分配的栏舍',
+msg290:'编辑',
+msg291:'新增',
+msg292:'当前有栏舍未分配，建议及时进行分配，未分配栏舍如下：',
+msg293:'已分配完：当前栏舍已分配完善',
+msg294:'转投剩料',
+msg295:'继续饲喂',
+msg296:'总计',
+msg297:'删除记录',
+msg298:'新生成',
+msg299:'SAP上传',
+msg300:'搅拌数据上传',
+msg301:'剩料上传',
+msg302:'撒料上传',
+msg303:'复制计划',
+msg304:'应用',
+msg305:"栏舍配方",
+msg306:"撒料计划",
+msg307:"预混计划",
+msg308:"剩料计划",
+msg309:'是否确认将当前修改计划应用至',
+msg310:'您确定清空该操作序号以下的所有数据，如果您清空的是搅拌车数据，将会同步清空撒料车数据?',
+msg311:"处理方式",
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

src/utils/request.js

@@ -37,6 +37,7 @@ service.interceptors.request.use(
       config.withCredentials = false
     }
 
+
     if (store.getters.token) {
       // let each request carry token
       // ['Authorization'] is a custom headers key
@@ -46,8 +47,13 @@ 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')
     return config
+
   },
   error => {
     // do something with request error

src/views/basicData/feedTable/index.vue

@@ -831,19 +831,19 @@ export default {
         name: 'getSysoptEnable', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), inforname: 'isSmallMaterial' }
       },
       enableList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 是否启用
       feedSourcesList: [{ id: '0', name: '系统内置' }, { id: '1', name: '用户自定义' }], // 饲料来源
-      confirmStartList: [{ id: '0',  
+      confirmStartList: [{ id: '0',
 name:this.$t('supplier.jy') }, { id: '1', name: '启用' }], // 确认开始
       associationStatusList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 关联状态
       jumpDelayList: [], // 跳转延时
       feedTypeList: [], // 饲料分类
       planTypeList: [], // 计划类型
       smallMaterialList: [], // 小料秤
-      jmpList: [{ id: '0',  
+      jmpList: [{ id: '0',
 name:this.$t('supplier.no') }, { id: '1',
 name:this.$t('supplier.yes')}], // 无上域
       materialtypeList:[],//物料类型
@@ -979,8 +979,8 @@ name:this.$t('supplier.yes')}], // 无上域
       },
 
       textMap: {
-        create: '新增',
-        update: '编辑',
+        create: this.$t('message.msg291'),
+        update: this.$t('message.msg290'),
         feedBank: '饲料库',
         relation: '关联',
         nutritive: '营养价值',

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -373,7 +373,7 @@
                   <span>{{ scope.row.fname }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="处理方式" prop="useinbar" min-width="130px" align="center">
+              <el-table-column :label="$t('message.msg311')" prop="useinbar" min-width="130px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.useinbar }}</span>
                 </template>
@@ -656,9 +656,9 @@
     </div>
   </div>
     <!-- 新生成 -->
-    <el-dialog :title="textMap[newGeneration.dialogStatus]" :destroy-on-close="true" :visible.sync="newGeneration.dialogFormVisible" :close-on-click-modal="false" width="30%">
+    <el-dialog :title="textMap[newGeneration.dialogStatus]" :destroy-on-close="true" :visible.sync="newGeneration.dialogFormVisible" :close-on-click-modal="false" width="35%">
       <div class="newGeneration" v-loading="newGenerationLoading" >
-        <el-form ref="temp" :rules="newGeneration.rules" :model="newGeneration.temp" label-position="right" label-width="100px" style="width: 100%;margin:0 auto 50px">
+        <el-form ref="temp" :rules="newGeneration.rules" :model="newGeneration.temp" label-position="right" label-width="120px" style="width: 100%;margin:0 auto 50px">
           <el-row v-if="newGeneration.dialogStatus== 'newGeneration'">
             <el-col :span="24">
               <el-form-item :label="$t('dailyExecutionPlan.sjfw')"   prop="inputDatetime">
@@ -1119,15 +1119,15 @@ export default {
         isDataSynchronization: false
       },
       textMap: {
-        newGeneration: '新生成',
+        newGeneration: this.$t('message.msg298'),
         historyRecord: this.$t('message.msg34'),
         revisePlan: this.$t('message.msg220'),
-        copy: '复制计划',
-        deleteRecord:'删除记录',
-        sapUpload:'SAP上传',
-        udload1:'搅拌数据上传',
-        udload2:'剩料上传',
-        udload3:'撒料上传',
+        copy: this.$t('message.msg303'),
+        deleteRecord:this.$t('message.msg297'),
+        sapUpload:this.$t('message.msg299'),
+        udload1:this.$t('message.msg300'),
+        udload2:this.$t('message.msg301'),
+        udload3:this.$t('message.msg302'),
       },
       isokDisable: false,
       requestParam: {},
@@ -1545,7 +1545,7 @@ export default {
     },
     lpplantype: function(cellValue) {
       if (cellValue.lpplantype == 0) {
-        return '撒料计划'
+        return this.$t('message.msg306')
       } else if (cellValue.lpplantype == 1) {
         return '撒料计划-混料'
       } else if (cellValue.lpplantype == 2) {
@@ -1553,7 +1553,7 @@ export default {
       } else if (cellValue.lpplantype == 3) {
         return '剩料计划'
       } else if (cellValue.lpplantype == 4) {
-        return '预混计划'
+        return this.$t('message.msg307')
       } else if (cellValue.lpplantype == 5) {
         return '预称重计划'
       }
@@ -1717,7 +1717,7 @@ export default {
               arr.push(this.table2.list[i])
             }
             // arr.push({ 'sort': '小计', 'weight': a.toFixed(parseInt(Cookies.get('decimal'))) })
-            arr.push({ 'sort': '总计', 'weight': c.toFixed(parseInt(Cookies.get('decimal'))) })
+            arr.push({ 'sort': this.$t('message.msg296'), 'weight': c.toFixed(parseInt(Cookies.get('decimal'))) })
             this.table2.list = arr
           }
           if (this.table3.getdataListParm.parammaps.lpplantype == 2) {
@@ -1734,7 +1734,7 @@ export default {
               cc = cc + parseFloat(this.table2.list[i].weight)
               arr.push(this.table2.list[i])
             }
-            arr.push({ 'sort': '总计', 'weight': cc.toFixed(parseInt(Cookies.get('decimal'))) })
+            arr.push({ 'sort': this.$t('message.msg296'), 'weight': cc.toFixed(parseInt(Cookies.get('decimal'))) })
             this.table2.list = arr
             console.log('this.table2.list', this.table2.list)
             console.log(this.table3.getdataListParm.parammaps.lpplantype)
@@ -1784,7 +1784,7 @@ export default {
               c = c + parseFloat(this.table3.list[i].weight)
               arr.push(this.table3.list[i])
             }
-            arr.push({ 'sort': '总计', 'weight': c.toFixed(parseInt(Cookies.get('decimal'))) })
+            arr.push({ 'sort': this.$t('message.msg296'), 'weight': c.toFixed(parseInt(Cookies.get('decimal'))) })
             this.table3.list = arr
           }
           this.table3.pageNum = response.data.pageNum
@@ -2308,7 +2308,7 @@ export default {
                   // 预混计划4
                   // 预称重计划5
                   if (targetRow3.lpplantype == 0) {
-                    that.$set(targetRow3, 'mylpplantype', '撒料计划')
+                    that.$set(targetRow3, 'mylpplantype', this.$t('message.msg306'))
                   } else if (targetRow3.lpplantype == 1) {
                     that.$set(targetRow3, 'mylpplantype', '撒料计划-混料')
                   } else if (targetRow3.lpplantype == 2) {
@@ -2316,12 +2316,12 @@ export default {
                   } else if (targetRow3.lpplantype == 3) {
                     that.$set(targetRow3, 'mylpplantype', '剩料计划')
                   } else if (targetRow3.lpplantype == 4) {
-                    that.$set(targetRow3, 'mylpplantype', '预混计划')
+                    that.$set(targetRow3, 'mylpplantype', this.$t('message.msg307'))
                   } else if (targetRow3.lpplantype == 5) {
                     that.$set(targetRow3, 'mylpplantype', '预称重计划')
                   }
                   if (targetRow2.lpplantype == 0) {
-                    that.$set(targetRow2, 'mylpplantype', '撒料计划')
+                    that.$set(targetRow2, 'mylpplantype', this.$t('message.msg306'))
                   } else if (targetRow2.lpplantype == 1) {
                     that.$set(targetRow2, 'mylpplantype', '撒料计划-混料')
                   } else if (targetRow2.lpplantype == 2) {
@@ -2329,7 +2329,7 @@ export default {
                   } else if (targetRow2.lpplantype == 3) {
                     that.$set(targetRow2, 'mylpplantype', '剩料计划')
                   } else if (targetRow2.lpplantype == 4) {
-                    that.$set(targetRow2, 'mylpplantype', '预混计划')
+                    that.$set(targetRow2, 'mylpplantype', this.$t('message.msg307'))
                   } else if (targetRow2.lpplantype == 5) {
                     that.$set(targetRow2, 'mylpplantype', '预称重计划')
                   }
@@ -3102,7 +3102,7 @@ export default {
     },
     handleRowEmpty(row,plan){
       console.log(row,'row')
-      MessageBox.confirm('您确定清空该操作序号以下的所有数据，如果您清空的是搅拌车数据，将会同步清空撒料车数据?', {
+      MessageBox.confirm(this.$t('message.msg310'), {
         confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log(this.selectList)

src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue

@@ -14,18 +14,18 @@
         </div>
       </template>
       <el-row class="dialogMinHeight">
-        <el-button class="successBorder" size="medium" style="position: absolute;z-index: 1;right: 2px;top: 2px;" @click="saveData()">应用</el-button>
+        <el-button class="successBorder" size="medium" style="position: absolute;z-index: 1;right: 2px;top: 2px;" @click="saveData()">{{$t('message.msg304')}}</el-button>
         <el-tabs v-model="parentActiveName" type="border-card" @tab-click="handleClick">
-          <el-tab-pane label="栏舍配方" name="栏舍配方">
+          <el-tab-pane :label="$t('message.msg305')" name="栏舍配方">
             <DhedFormula ref="DhedFormula" :parent-date="date" />
           </el-tab-pane>
-          <el-tab-pane label="撒料计划" name="撒料计划">
+          <el-tab-pane :label="$t('message.msg306')" name="撒料计划">
             <MaterialIssuancePlan ref="MaterialIssuancePlan" :parent-date="date" />
           </el-tab-pane>
-          <el-tab-pane label="预混计划" name="预混计划">
+          <el-tab-pane :label="$t('message.msg307')" name="预混计划">
             <PremixedPlan ref="PremixedPlan" :parent-date="date" />
           </el-tab-pane>
-          <el-tab-pane label="剩料计划" name="剩料计划">
+          <el-tab-pane :label="$t('message.msg308')" name="剩料计划">
             <SurplusMaterialPlan ref="SurplusMaterialPlan" :parent-date="date" />
           </el-tab-pane>
         </el-tabs>
@@ -52,13 +52,13 @@ export default {
   },
   props: {
     show: { type: Boolean, default: false }, // 弹框可见标志
-    parentActiveName: { type: String, defalut: '栏舍配方'},
+    parentActiveName: { type: String, defalut: ''},
     parentDate: { type: String, defalut: '' }
   },
   data() {
     return {
       dialogFull: false,
-      typeList: [{ id: '1', effect: 'dark', label: this.$t('message.msg193') }, { id: '2', effect: 'plain', label: '撒料计划' }, { id: '3', effect: 'plain', label: '预混计划' }],
+      typeList: [{ id: '1', effect: 'dark', label: this.$t('message.msg193') }, { id: '2', effect: 'plain', label: this.$t('message.msg306') }, { id: '3', effect: 'plain', label: this.$t('message.msg307') }],
       visible: this.show,
       dialogFormVisible: false,
       dialogStatus: '',
@@ -91,7 +91,7 @@ export default {
       handler(newVal, oldVal) {
         console.log('newVal-date', newVal)
         this.date = newVal
-        this.title = '修改计划——' + this.date
+        this.title = this.$t('message.msg220')+ this.date
       }
     },
     parentActiveName: {
@@ -114,7 +114,7 @@ export default {
     },
     saveData() {
       console.log('点击了应用')
-      MessageBox.confirm('是否确认将当前修改计划应用至' + this.date, {
+      MessageBox.confirm(this.$t('message.msg309') + this.date, {
         confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'updatedownloadedplanDone'
@@ -136,7 +136,7 @@ export default {
     },
     handleClick(item) {
       console.log(item.name)
-      if (item.name == '撒料计划') {
+      if (item.name == this.$t('message.msg306')) {
         this.$refs.MaterialIssuancePlan.getButtons()
         this.$refs.MaterialIssuancePlan.getIsDisplay()
         this.$refs.MaterialIssuancePlan.getList()

src/views/formulationPlan/dailyExecutionPlan/typePage/premixedPlan.vue

@@ -73,7 +73,7 @@
             <el-time-picker v-if="scope.row.Edit" v-model="scope.row.ptime" type="datetime" :placeholder="$t('dhedFormula.xzrq')" format="HH:mm" value-format="HH:mm" style="display: inline-block;width: 95%;" />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('dhedFormula.dcczzd')" min-width="80px" align="center">
+        <el-table-column :label="$t('dailyExecutionPlan.dcczzd')" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.maxweight }}</span>
           </template>

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -43,8 +43,8 @@
         row-key="id"
         @selection-change="handleSelect"
       >
-        <el-table-column type="selection" width="50" />
-        <el-table-column :label="$t('errorAnalysis.projname')" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
+        <el-table-column type="selection" width="50px" />
+        <el-table-column :label="$t('errorAnalysis.projname')" width="90px" align="center" class-name="small-padding fixed-width" fixed="">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
           </template>
@@ -143,7 +143,7 @@
     </div>
 
     <!-- 自动生成 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="automaticGeneration.dialogFormVisible" :close-on-click-modal="false" width="30%">
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="automaticGeneration.dialogFormVisible" :close-on-click-modal="false" width="40%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -157,13 +157,13 @@
         </div>
       </template>
       <div class="app-automaticGeneration" style="margin: 0 auto;">
-        <div style="width: 210px;margin:60px auto 120px;font-weight: 16px;">
+        <div style="margin:60px auto 120px;font-weight: 16px;">
           {{$t('premixedPlan.qxzzdscfa1')}};<br>
           {{$t('premixedPlan.qxzzdscfa2')}};<br>
           {{$t('premixedPlan.qxzzdscfa3')}};<br>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button style="right:240px;" class="cancelClose" @click="automaticGeneration.dialogFormVisible = false;">{{$t('common.closed')}}</el-button>
+          <el-button class="cancelClosess" @click="automaticGeneration.dialogFormVisible = false;">{{$t('common.closed')}}</el-button>
           <el-button style="right:130px;" class="save" :disabled="isokDisable" @click="continueData(0)">{{$t('premixedPlan.jxsc')}}   </el-button>
           <el-button style="right:20px;" class="save" :disabled="isokDisable" @click="continueData(1)">{{$t('premixedPlan.cxsc')}}   </el-button>
         </div>
@@ -189,7 +189,10 @@
         </keep-alive>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
+        <el-button class="cancelClose
+        cancelClose1"
+        :lang="$i18n.locale"
+        @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -259,7 +262,9 @@
           </el-row>
         </el-form>
         <div v-if="create.dialogStatus !=='update' && !isDispaly" slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
+          <el-button class="cancelClose"
+          :lang="$i18n.locale"
+          @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="distributionAndSpreading()">{{$t('premixedPlan.fpsl')}} </el-button>
         </div>
         <!-- 栏舍 -->
@@ -389,7 +394,7 @@
                     </div>
                   </div>
                   <div class="arr-t" :style="{'background':element.background}">
-                    <i class="el-icon-close" style="position: absolute;right: 0;" @click="handleFLDelete(element)" />
+                    <i class="el-icon-close"  @click="handleFLDelete(element)" />
                     <el-popover
                       placement="bottom"
                       width="400"
@@ -410,7 +415,9 @@
             </div>
           </div>
           <div slot="footer" class="dialog-footer" style="height: 55px;">
-            <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">{{$t('common.closed')}}</el-button>
+            <el-button class="cancelClose"
+            :lang="$i18n.locale"
+            :disabled="isokDisable" @click="close()" style="top:40px;">{{$t('common.closed')}}</el-button>
             <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">{{$t('errorAnalysis.confirm')}}</el-button>
           </div>
         </div>
@@ -419,8 +426,8 @@
     <!-- 校验 -->
     <el-dialog :title="textMap[check.dialogStatus]" :destroy-on-close="true" :visible.sync="check.dialogFormVisible" :close-on-click-modal="false" width="30%">
       <div class="check">
-        <p v-if="check.temp.isDistribution == 0">当前有未分配栏舍，未分配栏舍如下：</p>
-        <p v-else>已分配完：当前栏舍已分配完善</p>
+        <p v-if="check.temp.isDistribution == 0">{{$t('message.msg277')}}</p>
+        <p v-else>{{$t('message.msg278')}}</p>
         <div v-for="(item,index) in check.temp.ftlist" :key="index">
           <b v-if="item.arrList !== null && item.arrList !== undefined && item.arrList.length>0">{{item.ftname}}:</b>
           <span v-if="item.arrList !== null && item.arrList !== undefined && item.arrList.length>0">
@@ -437,15 +444,16 @@
 
     <!-- 更改TMR编号 -->
     <el-dialog :title="textMap[tmrNumber.dialogStatus]" :destroy-on-close="true" :visible.sync="tmrNumber.dialogFormVisible" :close-on-click-modal="false" width="30%">
-        <h3 style="text-align: center;">是否要改变TMR设备？</h3>
+        <h3 style="text-align: center;">{{$t('message.msg279')}}</h3>
       <div class="tmrNumber" style="padding: 10px 30px;">
-        <p>注：更换TMR撒料设备，变更后的装载重量不同，请选择处理方式</p>
-        <el-radio v-model="tmrNumber.radio" label="0">1、多出的饲料平均从已分配的各栏舍中扣减。</el-radio><br/><br/>
-        <el-radio v-model="tmrNumber.radio" label="1">2、多出的饲料从最后一个栏舍依次往前扣减。</el-radio><br/><br/>
-        <el-radio v-model="tmrNumber.radio" label="2">3、清空已分配的撒料车。</el-radio>
+        <p>{{$t('message.msg280')}}</p>
+        <el-radio v-model="tmrNumber.radio" label="0">{{$t('message.msg281')}}</el-radio><br/><br/>
+        <el-radio v-model="tmrNumber.radio" label="1">{{$t('message.msg282')}}</el-radio><br/><br/>
+        <el-radio v-model="tmrNumber.radio" label="2">{{$t('message.msg283')}}</el-radio>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" :disabled="isokDisable" @click="closeTmrNumber">{{$t('feedChart.no')}}</el-button>
+        <el-button class="cancelClose"
+        :lang="$i18n.locale" :disabled="isokDisable" @click="closeTmrNumber">{{$t('feedChart.no')}}</el-button>
         <el-button class="save" :disabled="isokDisable" @click="tmrNumberData()">{{$t('feedChart.yes')}}</el-button>
       </div>
     </el-dialog>
@@ -477,7 +485,8 @@
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
+        <el-button class="cancelClose"
+        :lang="$i18n.locale" @click="allEmpty.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
         <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
@@ -548,11 +557,11 @@ export default {
       textMap: {
         automaticGeneration: this.$t('message.msg111'),
         historyRecord: this.$t('message.msg34'),
-        create: '新增',
-        update: '编辑',
+        create: this.$t('message.msg291'),
+        update: this.$t('message.msg290'),
         check: this.$t('message.msg111'),
         tmrNumber:'',
-        allEmpty:'清空已分配的栏舍'
+        allEmpty:this.$t('message.msg289')
       },
       check: {
         dialogFormVisible: false,
@@ -1358,21 +1367,21 @@ export default {
           // 当超过车辆容量100%时
           var tip = ''
           if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.tmrvolume)){
-            tip = '装载量已超过车辆容量' + this.create.temp.tmrvolume + 'm³,请确认'
+            tip = this.$t('message.msg284') + this.create.temp.tmrvolume + this.$t('message.msg286')
             MessageBox.confirm(tip, {
               confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
           }else if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.maxVolume)){
-            tip = '装载量不可超过车辆容量' + this.create.temp.maxVolume + 'm³,请确认'
+            tip = this.$t('message.msg285') + this.create.temp.maxVolume + this.$t('message.msg286')
             MessageBox.confirm(tip, {
               confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
           }else if(parseFloat(this.create.temp.volume) < parseFloat(this.create.temp.minVolume)){
-            tip = '装载量不可低于车辆容量' + this.create.temp.minVolume + 'm³,请确认'
+            tip = this.$t('message.msg287') + this.create.temp.minVolume + this.$t('message.msg286')
             MessageBox.confirm(tip, {
               confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
@@ -1591,7 +1600,7 @@ export default {
         })
       } else {
         console.log('点击重新生成')
-        MessageBox.confirm('重新生成计划会将原有计划清空再生成，是否确认重新生成?', {
+        MessageBox.confirm(this.$t('message.msg288'), {
           confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.automaticGeneration.dialogFormVisible = false
@@ -1905,6 +1914,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.cancelClosess{
+  left: 20px !important;
+}
+.cancelClose{
+   &:lang(en) {
+      right:173px;
+    }
+}
   .list{min-width: 60px;display: inline-block;margin: 5px 5px;text-align: center;
     .tmrname{
       width:100%;padding: 5px 5px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;

src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -175,7 +175,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item :label="$t('premixedPlan.slclfs')"  prop="treatmethod">
-                <el-select v-model="create.temp.treatmethod" filterable placeholder="剩料处理方式" class="filter-item"
+                <el-select v-model="create.temp.treatmethod" filterable :placeholder="$t('premixedPlan.slclfs')"  class="filter-item"
                   style="width: 100%;" @change="changeResidueDisposal">
                   <el-option v-for="item in residueDisposalList" :key="item.value" :label="item.label"
                     :value="item.label" />
@@ -186,7 +186,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item :label="$t('premixedPlan.ztls')"  prop="useinbarid">
-                <el-select v-model="create.temp.useinbarid" filterable placeholder="转投栏舍" class="filter-item"
+                <el-select v-model="create.temp.useinbarid" filterable :placeholder="$t('premixedPlan.ztls')" class="filter-item"
                   style="width: 100%;" @change="changeTransferbars" :disabled='isDis'>
                   <el-option v-for="item in transferbarsList" :key="item.id" :label="item.bname" :value="item.id" />
                 </el-select>
@@ -231,7 +231,7 @@
           <el-date-picker v-model="history.getdataListParm.parammaps.date" type="date" placeholder="请选择历史记录时间"
             :clearable="false" style="width: 180px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
             @change="changeDate" />
-          <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
+          <!-- <el-button class="successBorder" @click="handleApplication">{{$t('message.msg304')}}</el-button> -->
         </div>
         <div class="table">
           <el-table :key="history.tableKey" v-loading="history.listLoading" :element-loading-text="$t('common.tableMsg')"
@@ -273,7 +273,7 @@
                 <span>{{ scope.row.rtime }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('premixedPlan.slclfs')"min-width="130px" align="center">
+            <el-table-column :label="$t('premixedPlan.slclfs')" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.treatmethod }}</span>
               </template>
@@ -297,8 +297,8 @@
     <el-dialog :title="textMap[check.dialogStatus]" :destroy-on-close="true" :visible.sync="check.dialogFormVisible"
       :close-on-click-modal="false" width="30%">
       <div class="check">
-        <p v-if="check.temp.isDistribution == '0'">当前有栏舍未分配，建议及时进行分配，未分配栏舍如下：</p>
-        <p v-else>已分配完：当前栏舍已分配完善</p>
+        <p v-if="check.temp.isDistribution == '0'">{{$t('message.msg292')}}</p>
+        <p v-else>{{$t('message.msg293')}}</p>
         {{ check.temp.bnames }}
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
@@ -358,10 +358,10 @@
         barsList: [], // 栏舍
         residueDisposalList: [{
           value: '0',
-          label: '转投剩料'
+          label: this.$t('message.msg294')
         }, {
           value: '1',
-          label: '继续饲喂'
+          label: this.$t('message.msg295')
         }], // 剩料处理方式
         TMRNumberList: [], // TMR编号
         barsNamesIdTempArr: [],
@@ -508,8 +508,8 @@
           }
         },
         textMap: {
-          create: '新增',
-          update: '编辑',
+          create: this.$t('message.msg291'),
+          update: this.$t('message.msg290'),
           history: this.$t('message.msg34'),
           check: this.$t('message.msg111')
         },

src/views/login/index.vue

@@ -155,6 +155,7 @@ export default {
     translate(val) {
       this.$i18n.locale = val
       localStorage.setItem('lang',val)
+      location.reload();
     },
     showPwd() {
       if (this.passwordType === 'password') {

src/views/systemManagement/role/index.vue

@@ -210,19 +210,19 @@ name:this.$t('supplier.no') }], // 是否启用
       // tableData: [
       //   {
       //     id: 1, page: '配方计划', pageCheck: false,
-      //     fnList: [this.$t('pushingplan.watch'), '编辑'],
+      //     fnList: [this.$t('pushingplan.watch'), this.$t('message.msg290')],
       //     fnCheck: { see: false, edit: false },
       //     childList: [
-      //       { p_id: 1, id: 31, page: '配方模板', pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }},
-      //       { p_id: 1, id: 32, page: this.$t('message.msg193'), pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }}
+      //       { p_id: 1, id: 31, page: '配方模板', pageCheck: false, fnList: [this.$t('pushingplan.watch'), this.$t('message.msg290')], fnCheck: { see: false, edit: false }},
+      //       { p_id: 1, id: 32, page: this.$t('message.msg193'), pageCheck: false, fnList: [this.$t('pushingplan.watch'), this.$t('message.msg290')], fnCheck: { see: false, edit: false }}
       //     ]
       //   }, {
       //     id: 2, page: '栏舍生产', pageCheck: false,
-      //     fnList: [this.$t('pushingplan.watch'), '编辑'],
+      //     fnList: [this.$t('pushingplan.watch'), this.$t('message.msg290')],
       //     fnCheck: { see: false, edit: false },
       //     childList: [
-      //       { p_id: 2, id: 33, page: '栏舍产奶量', pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }},
-      //       { p_id: 2, id: 34, page: '栏舍剩料量', pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }}
+      //       { p_id: 2, id: 33, page: '栏舍产奶量', pageCheck: false, fnList: [this.$t('pushingplan.watch'), this.$t('message.msg290')], fnCheck: { see: false, edit: false }},
+      //       { p_id: 2, id: 34, page: '栏舍剩料量', pageCheck: false, fnList: [this.$t('pushingplan.watch'), this.$t('message.msg290')], fnCheck: { see: false, edit: false }}
       //     ]
       //   }
       // ],