Shan9312 9 ماه پیش
والد
کامیت
edf5b090ce

BIN
dist-tmr-翻译-测试线-20240621.zip


+ 14 - 2
src/lang/zn/langModule/message.js

@@ -5,7 +5,7 @@ msg3:"请选择配方",
 msg4:"是否确认复制此信息?",
 msg5:"导入成功",
 msg6:"饲料顺序不可为负数或小数",
-msg7:'饲料名称/重量/搅拌延时/允许延时偏差不能为空', 
+msg7:'饲料名称/重量/搅拌延时/允许延时偏差不能为空',
 msg8:'重量请输入正数,最多保留四位小数',
 msg9:'配方名称不可输入特殊字符',
 msg10:"生效成功",
@@ -294,6 +294,18 @@ msg266:'请输入自然数,最多保留俩位小数',
 msg267: '请选择饲料表信息',
 msg268:'请选择一条信息',
 
+//
+msg269:'任意车数量不能为空或为0',
+msg270:'角色名称不能为空',
+msg271:'角色名称不可重复',
+msg272: '用户名称/角色不能为空',
+msg273:'用户名称不能为空',
+msg274:'角色不能为空',
+msg275:'请选择用户信息',
+msg276:'重置密码成功',
+
+
+
 
 
 
@@ -397,4 +409,4 @@ msg268:'请选择一条信息',
 
 
 
-}
+}

+ 29 - 29
src/views/basicData/defaultParameter/function/index.vue

@@ -143,7 +143,7 @@
       <el-row>
         <!-- <el-col :span="12">
           <el-form-item label="设备运转标准时间(分钟):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+            <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> -->
@@ -165,7 +165,7 @@
       <el-row>
         <!-- <el-col :span="12">
           <el-form-item label="设备运转标准时间(分钟):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+            <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> -->
@@ -267,53 +267,53 @@ export default {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
+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.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 是否可取后一天计划
       isSupplementList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
+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.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', 
+      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.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' },{ id: '4', name: '5' },{ id: '5', name: '6' }], // 班次数量
       feedontractList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 是否启用饲料合同
-      leftoverMaterialList: [{ id: '0',  
-name:this.$t('supplier.defb') }, { id: '1', 
+      leftoverMaterialList: [{ id: '0',
+name:this.$t('supplier.defb') }, { id: '1',
 name:this.$t('supplier.slfb') }],
-      weightDecimalPlacesList: [{ 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') }, { id: '4',  
+      weightDecimalPlacesList: [{ 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') }, { id: '4',
 name:this.$t('supplier.xs4') }], // 重量小数点位数
-      rateDecimalPlacesList:  [{ id: '0',  
-name:this.$t('supplier.zs') }, { id: '1',  
-name:this.$t('supplier.xs1') }, { id: '2', 
+      rateDecimalPlacesList:  [{ id: '0',
+name:this.$t('supplier.zs') }, { id: '1',
+name:this.$t('supplier.xs1') }, { id: '2',
 name:this.$t('supplier.xs2') }],//比例小数点位数
       smallMaterialList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 小料是否称量
       dataSynchronizationList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.yes')}, { id: '0',
 name:this.$t('supplier.no') }], // 是否启用数据同步
-      accuracyList: [{ id: '1',  
-name:this.$t('supplier.pfyxwczql') }, { id: '0',  
+      accuracyList: [{ id: '1',
+name:this.$t('supplier.pfyxwczql') }, { id: '0',
 name:this.$t('supplier.pfyxwczql1') }],  //混料准确率
-      yhautosecondList:[{ id: '1',  
+      yhautosecondList:[{ id: '1',
 name:this.$t('supplier.jy') }, { id: '2', name: '3秒' }, { id: '3', name: '6秒' }, { id: '4', name: '9秒' }],  //预混跳转延时
       requestParams: [
         { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
@@ -337,7 +337,7 @@ name:this.$t('supplier.jy') }, { id: '2', name: '3秒' }, { id: '3', name: '6秒
         dialogStatus: ''
       },
       textMap: {
-         
+
 description:this.$t('supplier.cssm')
       },
       isokDisable: false,
@@ -383,7 +383,7 @@ description:this.$t('supplier.cssm')
         this.isokDisable = false
       }, 1000)
       if(this.createTemp.anyCar == '' || this.createTemp.anyCar == 0){
-        this.$message({ type: 'error', message: '任意车数量不能为空或为0', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg269'), duration: 2000 })
       }
       this.requestParam.common = { 'returnmap': '0' }
       this.requestParam.data = []

+ 3 - 3
src/views/systemManagement/role/index.vue

@@ -330,7 +330,7 @@ name:this.$t('supplier.no') }], // 是否启用
       this.table.temp.createmp = row.createmp
       // 检验角色名称/角色是否为空
       if (this.table.temp.rolename == '') {
-        this.$message({ type: 'error', message: '角色名称不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg270'), duration: 2000 })
         return false
       }
       this.isokDisable = true
@@ -347,7 +347,7 @@ name:this.$t('supplier.no') }], // 是否启用
         } else {
           const isRepeat = new RegExp('Duplicate entry')
           if (isRepeat.test(response.data)) {
-            this.$message({ type: 'error', message: '角色名称不可重复', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg271'), duration: 2000 })
           } else {
             this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
@@ -392,7 +392,7 @@ name:this.$t('supplier.no') }], // 是否启用
       this.table.temp.remark = row.remark
       // 检验角色名称/角色是否为空
       if (this.table.temp.rolename == '') {
-        this.$message({ type: 'error', message: '角色名称不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg270'), duration: 2000 })
         return false
       }
       this.isokDisable = true

+ 8 - 8
src/views/systemManagement/user/index.vue

@@ -295,13 +295,13 @@ name:this.$t('supplier.no') }], // 是否启用
       this.table.temp.roleid = row.roleid
       // 检验用户名称/角色是否为空
       if (this.table.temp.username == '' && this.table.temp.roleid == '') {
-        this.$message({ type: 'error', message: '用户名称/角色不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:this.$t('message.msg272'), duration: 2000 })
         return false
       } else if (this.table.temp.username == '') {
-        this.$message({ type: 'error', message: '用户名称不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg273'), duration: 2000 })
         return false
       } else if (this.table.temp.roleid == '') {
-        this.$message({ type: 'error', message: '角色不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg274'), duration: 2000 })
         return false
       }
       // 检验手机号是否为11位数字
@@ -371,13 +371,13 @@ name:this.$t('supplier.no') }], // 是否启用
       this.table.temp.id = row.id
       // 校验用户名称/角色是否为空
       if (this.table.temp.username == '' && this.table.temp.roleid == '') {
-        this.$message({ type: 'error', message: '用户名称/角色不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:this.$t('message.msg272'), duration: 2000 })
         return false
       } else if (this.table.temp.username == '') {
-        this.$message({ type: 'error', message: '用户名称不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg273'), duration: 2000 })
         return false
       } else if (this.table.temp.roleid == '') {
-        this.$message({ type: 'error', message: '角色不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg274'), duration: 2000 })
         return false
       }
       console.log(this.table.temp.phone)
@@ -445,7 +445,7 @@ name:this.$t('supplier.no') }], // 是否启用
     form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择用户信息', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg275'), duration: 2000 })
       } else {
         MessageBox.confirm( this.$t('common.delMsg'), {
           confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
@@ -487,7 +487,7 @@ name:this.$t('supplier.no') }], // 是否启用
           this.dialogFormVisible = false
           this.$notify({
             title: this.$t('common.succes'),
-            message: '重置密码成功',
+            message: this.$t('message.msg276'),
             type: 'success',
             duration: 2000
           })