Browse Source

提示语翻译

Shan9312 10 months ago
parent
commit
c105003d43
71 changed files with 973 additions and 784 deletions
  1. 1 1
      src/components/index.vue
  2. 7 3
      src/lang/en/langModule/common.js
  3. 7 0
      src/lang/zn/langModule/common.js
  4. 4 2
      src/lang/zn/langModule/driver.js
  5. 5 5
      src/views/basicData/defaultParameter/earlyWarning/index.vue
  6. 5 5
      src/views/basicData/defaultParameter/function/index.vue
  7. 5 5
      src/views/basicData/defaultParameter/index2.vue
  8. 14 14
      src/views/basicData/driver/index.vue
  9. 12 12
      src/views/basicData/equipmentTMR/index.vue
  10. 12 12
      src/views/basicData/feedClassification/index.vue
  11. 30 30
      src/views/basicData/feedTable/index.vue
  12. 13 14
      src/views/basicData/forkliftManagement/index.vue
  13. 17 17
      src/views/basicData/groupColumn/index.vue
  14. 12 12
      src/views/basicData/livestockCategory/index.vue
  15. 12 12
      src/views/basicData/managementGPS/index.vue
  16. 6 6
      src/views/basicData/standardParameters/index.vue
  17. 12 12
      src/views/basicData/supplier/index.vue
  18. 3 3
      src/views/changpwd/changpwd/index.vue
  19. 9 9
      src/views/console/apisql/index.vue
  20. 9 9
      src/views/console/dept/index.vue
  21. 9 9
      src/views/console/dict/index.vue
  22. 8 8
      src/views/console/menu/index.vue
  23. 11 11
      src/views/console/role/index.vue
  24. 7 7
      src/views/console/user/index.vue
  25. 1 1
      src/views/dashboard/group/index.vue
  26. 4 4
      src/views/dashboard/pasture/index.vue
  27. 34 34
      src/views/formulationPlan/dailyExecutionPlan/index.vue
  28. 3 3
      src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue
  29. 2 2
      src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue
  30. 40 40
      src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue
  31. 12 12
      src/views/formulationPlan/dailyExecutionPlan/typePage/premixedPlan.vue
  32. 21 21
      src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue
  33. 3 3
      src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue
  34. 14 14
      src/views/formulationPlan/dhedFormula/index.vue
  35. 2 2
      src/views/formulationPlan/formulaDistribution/index.vue
  36. 37 37
      src/views/formulationPlan/materialIssuancePlan/index.vue
  37. 17 17
      src/views/formulationPlan/premixedPlan/index.vue
  38. 8 8
      src/views/formulationPlan/pushMaterialPlan/index.vue
  39. 57 57
      src/views/formulationPlan/recipeTemplate/index.vue
  40. 30 30
      src/views/formulationPlan/surplusMaterialPlan/index.vue
  41. 7 7
      src/views/inventoryManagement/feedContract/index.vue
  42. 7 7
      src/views/inventoryManagement/inventoryList/index.vue
  43. 2 2
      src/views/inventoryManagement/laborConsumption/index.vue
  44. 3 3
      src/views/inventoryManagement/systemConsumption/index.vue
  45. 7 7
      src/views/inventoryManagement/warehousing/index.vue
  46. 2 2
      src/views/inventoryManagement/warning/index.vue
  47. 177 0
      src/views/leftoverManagement/index.vue
  48. 17 17
      src/views/shedProduction/dungScores/index.vue
  49. 12 12
      src/views/shedProduction/dutyRecord/index.vue
  50. 18 18
      src/views/shedProduction/fecalScreen/index.vue
  51. 17 17
      src/views/shedProduction/formulaDryMatter/index.vue
  52. 18 18
      src/views/shedProduction/materialRemainingRecord/index.vue
  53. 18 18
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  54. 18 18
      src/views/shedProduction/performance/index.vue
  55. 17 17
      src/views/shedProduction/physicalConditionScore/index.vue
  56. 1 1
      src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue
  57. 1 1
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  58. 1 1
      src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue
  59. 1 1
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue
  60. 4 4
      src/views/statisticalAnalysis/hardwareTest/index.vue
  61. 21 21
      src/views/systemManagement/boardEchartManagement/index.vue
  62. 21 21
      src/views/systemManagement/boardEchartManagement2/index.vue
  63. 3 3
      src/views/systemManagement/dataSynchronization/index.vue
  64. 9 9
      src/views/systemManagement/labelManagement/index.vue
  65. 4 4
      src/views/systemManagement/notificationManagement/index.vue
  66. 10 10
      src/views/systemManagement/operationManagement/group/index.vue
  67. 8 8
      src/views/systemManagement/operationManagement/pasture/index.vue
  68. 2 2
      src/views/systemManagement/ranchInformation/index.vue
  69. 1 1
      src/views/systemManagement/reminderSettings/index.vue
  70. 15 15
      src/views/systemManagement/role/index.vue
  71. 16 16
      src/views/systemManagement/user/index.vue

+ 1 - 1
src/components/index.vue

@@ -905,7 +905,7 @@ export default {
     handleChartDate() {
       console.log('点击了确认时间')
       MessageBox.confirm('是否调整以下所有图表查询时间?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this
         var startTime = parseTime(this.tab.chartDate[0], '{y}-{m}-{d}')

+ 7 - 3
src/lang/en/langModule/common.js

@@ -30,7 +30,11 @@ export default {
     to:'to',
     reset:'Reset',
     query:'Query',
-    tableMsg:"Give me a moment"
-
-
+    tableMsg:"Give me a moment",
+    noMsg:"No data available",
+    delMsg:'Are you sure you want to delete this information?',
+    cancelMsg:'Deletion canceled',
+    delSuccess:"Delete successful",
+    delfail:"Delete failed",
+    succes:'Success'
 }

+ 7 - 0
src/lang/zn/langModule/common.js

@@ -30,7 +30,14 @@ export default {
     to:'至',
     reset:'重置',
     query:'查询',
+    //
     tableMsg:"给我一点时间",
+    noMsg:"暂无数据",
+    delMsg:'是否确认删除此信息?',
+    cancelMsg:"已取消删除",
+    delSuccess:"删除成功",
+    delfail:"删除失败",
+    succes:'成功'
 
   }
 

+ 4 - 2
src/lang/zn/langModule/driver.js

@@ -38,11 +38,13 @@ export default{
   udname:"ud名称",
 
   messageNote:"当前内容未保存,请点击取消或保存继续进行操作",
-
-
   message1:'栏舍名称/栏舍编号/牛舍类型/牛群不能为空',
   message2:"栏舍名称不能为空 ",
   message3:"栏舍编号不能为空 ",
+  //
+  qxzjsyxx:"请选择驾驶员信息",
+  saveFail: '保存失败',
+  saveSuccess:"保存成功"
 
 
 

+ 5 - 5
src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -246,10 +246,10 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -260,7 +260,7 @@ export default {
         this.isokDisable = false
       }, 1000)
       MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.common = { 'returnmap': '0' }
         this.requestParam.data = []
@@ -274,10 +274,10 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       })

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

@@ -365,10 +365,10 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -379,7 +379,7 @@ export default {
         this.isokDisable = false
       }, 1000)
       MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.common = { 'returnmap': '0' }
         this.requestParam.data = []
@@ -393,10 +393,10 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       })

+ 5 - 5
src/views/basicData/defaultParameter/index2.vue

@@ -238,10 +238,10 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -252,7 +252,7 @@ export default {
         this.isokDisable = false
       }, 1000)
       MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.common = { 'returnmap': '0' }
         this.requestParam.data = []
@@ -266,10 +266,10 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       })

+ 14 - 14
src/views/basicData/driver/index.vue

@@ -210,10 +210,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -274,10 +274,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('编辑保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -294,8 +294,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDriver'
@@ -304,14 +304,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -321,10 +321,10 @@ export default {
     form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择驾驶员信息', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('driver.qxzjsyxx'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm(this.$t('common.delMsg') , {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -338,9 +338,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 12 - 12
src/views/basicData/equipmentTMR/index.vue

@@ -419,10 +419,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -568,10 +568,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -592,8 +592,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.appoinObj={};
@@ -611,14 +611,14 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('删除保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -631,7 +631,7 @@ export default {
         this.$message({ type: 'error', message: '请选择TMR设备信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -650,9 +650,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 12 - 12
src/views/basicData/feedClassification/index.vue

@@ -252,10 +252,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -336,10 +336,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -356,8 +356,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -374,14 +374,14 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('删除保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -394,7 +394,7 @@ export default {
         this.$message({ type: 'error', message: '请选择饲料分类信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -413,9 +413,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 30 - 30
src/views/basicData/feedTable/index.vue

@@ -1056,7 +1056,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {
@@ -1354,7 +1354,7 @@ export default {
           }
           postJson(url,data).then(response => {
             if(response.msg == 'fail'){
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
               if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
               if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
@@ -1364,11 +1364,11 @@ export default {
               PostDataByName(this.requestParam).then(response => {
                 console.log('新增保存发送参数', this.requestParam)
                 if (response.msg !== 'fail') {
-                  this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+                  this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
                   this.create.dialogFormVisible = false
                   this.getList()
                 } else {
-                  this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                  this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
                   if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
                   if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
                   if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
@@ -1470,7 +1470,7 @@ export default {
           }
           postJson(url,data).then(response => {
             if(response.msg == 'fail'){
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
               if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
               if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
@@ -1480,11 +1480,11 @@ export default {
               PostDataByName(this.requestParam).then(response => {
                 console.log('新增保存发送参数', this.requestParam)
                 if (response.msg !== 'fail') {
-                  this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+                  this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
                   this.create.dialogFormVisible = false
                   this.getList()
                 } else {
-                  this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                  this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
                   if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
                   if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
                   if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
@@ -1570,7 +1570,7 @@ export default {
     disassociateData(row) {
       console.log('点击了取消关联')
       MessageBox.confirm('是否确认取消关联?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.isokDisable = true
         setTimeout(() => {
@@ -1584,11 +1584,11 @@ export default {
         PostDataByName(this.requestParam).then(response => {
           console.log('取消关联保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.getRelationList()
             this.getList()
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       }).catch(() => {
@@ -1598,7 +1598,7 @@ export default {
     relationData(row) {
       console.log('点击了关联保存')
       MessageBox.confirm('是否确认关联?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.isokDisable = true
         setTimeout(() => {
@@ -1629,11 +1629,11 @@ export default {
         PostDataByName(this.requestParam).then(response => {
           console.log('关联保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.getRelationList()
             this.getList()
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       }).catch(() => {
@@ -1767,11 +1767,11 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('关联保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
           this.nutritive.dialogFormVisible = false
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -1779,8 +1779,8 @@ export default {
     // 行内删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -1797,14 +1797,14 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('删除保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -1818,7 +1818,7 @@ export default {
         this.$message({ type: 'error', message: '请选择饲料表信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam = {}
           this.requestParam.common = { 'returnmap': '0' }
@@ -1836,9 +1836,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -1949,11 +1949,11 @@ export default {
         PostDataByName(data).then(response => {
           console.log('新增保存发送参数', data)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.sapCode.dialogFormVisible = false
             this.getList()
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
             if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
             if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
@@ -1984,11 +1984,11 @@ export default {
           }
           postJson(url,data).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.sapCode2.dialogFormVisible = false
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -2014,7 +2014,7 @@ export default {
     },
     handleGetUd(){
       MessageBox.confirm('是否获取UD饲料?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         let url = 'authdata/gm/udfeed'
         let data = {
@@ -2022,10 +2022,10 @@ export default {
         }
         postJson(url,data).then(response => {
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       })

+ 13 - 14
src/views/basicData/forkliftManagement/index.vue

@@ -172,8 +172,7 @@ export default {
     getList() {
       this.table.listLoading = true
       GetDataByName(this.table.getdataListParm).then(response => {
-        if (response.data !== null && response.data.list !== null) {
-          console.log('table数据', response.data.list)
+        if (response.data  && response.data.list ) {
           for (let i = 0; i < response.data.list.length; i++) {
             this.$set(response.data.list[i], 'Edit', false) // 编辑
             this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
@@ -282,7 +281,7 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const isRepeat = new RegExp('Duplicate entry :code')
@@ -295,7 +294,7 @@ export default {
             this.$notify({ type: 'error', message: '数据采集编号不可重复,请重新录入', duration: 2000 })
             return false
           }
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -385,7 +384,7 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const isRepeat = new RegExp('Duplicate entry :code')
@@ -398,7 +397,7 @@ export default {
             this.$notify({ type: 'error', message: '数据采集编号不可重复,请重新录入', duration: 2000 })
             return false
           }
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -416,8 +415,8 @@ export default {
 
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -426,14 +425,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -446,7 +445,7 @@ export default {
         this.$message({ type: 'error', message: '请选择设备信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -460,9 +459,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 17 - 17
src/views/basicData/groupColumn/index.vue

@@ -453,7 +453,7 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const isRepeat = new RegExp('Duplicate entry :bar_bcode')
@@ -461,7 +461,7 @@ export default {
             this.$notify({ type: 'error', message: '栏舍编号不可重复,请重新录入', duration: 2000 })
             return false
           }
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -558,7 +558,7 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const isRepeat = new RegExp('Duplicate entry :bar_bcode')
@@ -566,7 +566,7 @@ export default {
             this.$notify({ type: 'error', message: '栏舍编号不可重复,请重新录入', duration: 2000 })
             return false
           }
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -583,8 +583,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -601,14 +601,14 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('删除保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -621,7 +621,7 @@ export default {
         this.$message({ type: 'error', message: '请选择舍组栏信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -640,9 +640,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -735,11 +735,11 @@ export default {
           }
           postJson(url,data).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.sapCode2.dialogFormVisible = false
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -765,7 +765,7 @@ export default {
     },
     handleGetUd(){
       MessageBox.confirm('是否获取UD栏舍?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         let url = 'authdata/gm/udbar'
         let data = {
@@ -773,10 +773,10 @@ export default {
         }
         postJson(url,data).then(response => {
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       })

+ 12 - 12
src/views/basicData/livestockCategory/index.vue

@@ -263,10 +263,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -352,10 +352,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -372,8 +372,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -390,14 +390,14 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('删除保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -410,7 +410,7 @@ export default {
         this.$message({ type: 'error', message: '请选择牲畜类别信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -429,9 +429,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 12 - 12
src/views/basicData/managementGPS/index.vue

@@ -258,10 +258,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -331,10 +331,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -352,8 +352,8 @@ export default {
 
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -363,14 +363,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -383,7 +383,7 @@ export default {
         this.$message({ type: 'error', message: '请选择信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -397,9 +397,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 6 - 6
src/views/basicData/standardParameters/index.vue

@@ -584,11 +584,11 @@ export default {
             PostDataByName(this.requestParam).then(response => {
               console.log('新增保存发送参数', this.requestParam)
               if (response.msg !== 'fail') {
-                this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+                this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
                 this.table1.dialogFormVisible = false
                 this.getList()
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             })
           }
@@ -708,12 +708,12 @@ export default {
             PostDataByName(this.requestParam).then(response => {
               console.log('新增保存发送参数', this.requestParam)
               if (response.msg !== 'fail') {
-                this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+                this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
                 this.table2.dialogFormVisible = false
                 this.getList2()
                 this.activeName = 'second'
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
                 if (this.table2.temp.bzonemin == '0') { this.table2.temp.bzonemin = '' }
                 if (this.table2.temp.bzonemax == '0') { this.table2.temp.bzonemax = '' }
                 if (this.table2.temp.bztwomin == '0') { this.table2.temp.bztwomin = '' }
@@ -862,7 +862,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {
@@ -902,7 +902,7 @@ export default {
     handleImportSuccess2(res, file) {
       this.getList2()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 12 - 12
src/views/basicData/supplier/index.vue

@@ -244,10 +244,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -323,10 +323,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('编辑保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -345,8 +345,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -363,14 +363,14 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('删除保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -383,7 +383,7 @@ export default {
         this.$message({ type: 'error', message: '请选择供应商信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam = {}
           this.requestParam.common = { 'returnmap': '0' }
@@ -401,9 +401,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 3 - 3
src/views/changpwd/changpwd/index.vue

@@ -99,7 +99,7 @@ export default {
             console.log('保存发送参数', this.resetForm)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '保存失败',
+                title: this.$t('driver.saveFail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
@@ -110,7 +110,7 @@ export default {
               }, 1000)
               this.$notify({
                 title: '',
-                message: '保存成功',
+                message: this.$t('driver.saveSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -133,7 +133,7 @@ export default {
       //           this.logout() // 调用跳转到登陆页的方法
       //         }, 1000)
       //         this.$notify({
-      //           title: '成功',
+      //           title: this.$t('common.succes'),
       //           message: '修改成功',
       //           type: 'success',
       //           duration: 2000

+ 9 - 9
src/views/console/apisql/index.vue

@@ -447,7 +447,7 @@ export default {
             this.getList()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -481,7 +481,7 @@ export default {
             this.getList()
             this.resetRequestParam()
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -535,7 +535,7 @@ export default {
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '修改成功',
               type: 'success',
               duration: 2000
@@ -561,7 +561,7 @@ export default {
       this.requestParam.params[11] = row.id
       PostDataByName(this.requestParam).then(() => {
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -578,7 +578,7 @@ export default {
         this.resetRequestParam()
         this.dialogFormVisible = false
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '复制成功',
           type: 'success',
           duration: 2000
@@ -587,8 +587,8 @@ export default {
     },
     form_delete(row) {
       MessageBox.confirm('sql名称:' + row.sqlname, '确认删除?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteapisql'
@@ -599,8 +599,8 @@ export default {
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({
-            title: '成功',
-            message: '删除成功',
+            title: this.$t('common.succes'),
+           message: this.$t('common.delSuccess'),
             type: 'success',
             duration: 2000
           })

+ 9 - 9
src/views/console/dept/index.vue

@@ -296,13 +296,13 @@ export default {
               this.getList()
               this.dialogFormVisible = false
               this.$notify({
-                title: '成功',
+                title: this.$t('common.succes'),
                 message: '新增成功',
                 type: 'success',
                 duration: 2000
               })
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -338,7 +338,7 @@ export default {
             this.deptform.isPasture = '0'
 
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -383,7 +383,7 @@ export default {
             this.getList()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '修改成功',
               type: 'success',
               duration: 2000
@@ -409,7 +409,7 @@ export default {
 
       PostDataByName(this.requestParam).then(() => {
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -418,8 +418,8 @@ export default {
     },
     form_delete(row) {
       MessageBox.confirm('部门名称:' + row.deptname, '确认删除?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParamDel.name = 'deletedept'
@@ -429,8 +429,8 @@ export default {
           this.getList()
           this.dialogFormVisible = false
           this.$notify({
-            title: '成功',
-            message: '删除成功',
+            title: this.$t('common.succes'),
+           message: this.$t('common.delSuccess'),
             type: 'success',
             duration: 2000
           })

+ 9 - 9
src/views/console/dict/index.vue

@@ -280,7 +280,7 @@ export default {
             this.getList()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -308,7 +308,7 @@ export default {
             this.deptform.orderby = '0'
             this.deptform.enable = 1
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -347,7 +347,7 @@ export default {
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '修改成功',
               type: 'success',
               duration: 2000
@@ -368,7 +368,7 @@ export default {
       this.requestParam.params[5] = row.id
       PostDataByName(this.requestParam).then(() => {
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -377,8 +377,8 @@ export default {
     },
     form_delete(row) {
       MessageBox.confirm('名称:' + row.label, '确认删除?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteDictList'
@@ -389,8 +389,8 @@ export default {
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({
-            title: '成功',
-            message: '删除成功',
+            title: this.$t('common.succes'),
+           message: this.$t('common.delSuccess'),
             type: 'success',
             duration: 2000
           })
@@ -398,7 +398,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消删除'
+          message: this.$t('common.cancelMsg')
         })
       })
     }

+ 8 - 8
src/views/console/menu/index.vue

@@ -327,7 +327,7 @@ export default {
             this.getList()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -363,7 +363,7 @@ export default {
             }
             this.resetRequestParam()
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -414,7 +414,7 @@ export default {
             this.getList()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '修改成功',
               type: 'success',
               duration: 2000
@@ -439,7 +439,7 @@ export default {
       this.requestParam.params[10] = row.id
       PostDataByName(this.requestParam).then(() => {
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -448,8 +448,8 @@ export default {
     },
     form_delete(row) {
       MessageBox.confirm('菜单名称:' + row.name, '确认删除?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteMenu'
@@ -459,8 +459,8 @@ export default {
           this.getList()
           this.dialogFormVisible = false
           this.$notify({
-            title: '成功',
-            message: '删除成功',
+            title: this.$t('common.succes'),
+           message: this.$t('common.delSuccess'),
             type: 'success',
             duration: 2000
           })

+ 11 - 11
src/views/console/role/index.vue

@@ -275,7 +275,7 @@ export default {
             this.getList()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -299,7 +299,7 @@ export default {
             this.getList()
             this.resetRequestParam()
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '新增成功',
               type: 'success',
               duration: 2000
@@ -336,7 +336,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(() => {
         this.dialogMenuVisible = false
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -369,7 +369,7 @@ export default {
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({
-              title: '成功',
+              title: this.$t('common.succes'),
               message: '修改成功',
               type: 'success',
               duration: 2000
@@ -387,7 +387,7 @@ export default {
       this.requestParam.params[3] = row.id
       PostDataByName(this.requestParam).then(() => {
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -396,8 +396,8 @@ export default {
     },
     form_delete(row) {
       MessageBox.confirm('名称:' + row.name, '确认删除?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteRole'
@@ -408,8 +408,8 @@ export default {
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({
-            title: '成功',
-            message: '删除成功',
+            title: this.$t('common.succes'),
+           message: this.$t('common.delSuccess'),
             type: 'success',
             duration: 2000
           })
@@ -444,13 +444,13 @@ export default {
               this.getList()
               this.dialogDataRoleVisible = false
               this.$notify({
-                title: '成功',
+                title: this.$t('common.succes'),
                 message: '设置成功',
                 type: 'success',
                 duration: 2000
               })
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }

+ 7 - 7
src/views/console/user/index.vue

@@ -325,7 +325,7 @@ export default {
                 this.getList()
                 this.$notify({
                   title: '',
-                  message: '保存成功',
+                  message: this.$t('driver.saveSuccess'),
                   type: 'success',
                   duration: 2000
                 })
@@ -357,7 +357,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(() => {
         this.dialogRoleVisible = false
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -409,7 +409,7 @@ export default {
       this.requestParam.params[4] = row.id
       PostDataByName(this.requestParam).then(() => {
         this.$notify({
-          title: '成功',
+          title: this.$t('common.succes'),
           message: '修改成功',
           type: 'success',
           duration: 2000
@@ -418,8 +418,8 @@ export default {
     },
     form_delete(row) {
       MessageBox.confirm('确认删除?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteUser'
@@ -430,8 +430,8 @@ export default {
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({
-            title: '成功',
-            message: '删除成功',
+            title: this.$t('common.succes'),
+           message: this.$t('common.delSuccess'),
             type: 'success',
             duration: 2000
           })

+ 1 - 1
src/views/dashboard/group/index.vue

@@ -974,7 +974,7 @@ export default {
           this.row3.chart2.chartLine_data = response.data.list
           this.row3.chart2.total = response.data.total
           if (this.row3.chart2.chartLine_data.data1.length == 0) {
-            this.row3.chart2.chartLine_data.title = '暂无数据'
+            this.row3.chart2.chartLine_data.title = this.$t('common.noMsg')
           } else {
             this.row3.chart2.chartLine_data.title = ''
           }

+ 4 - 4
src/views/dashboard/pasture/index.vue

@@ -1153,7 +1153,7 @@ export default {
           this.row3.chart1.chartLine_data.data1 = []
         }
         if (this.row3.chart1.chartLine_data.data1.length == 0) {
-          this.row3.chart1.chartLine_data.title = '暂无数据'
+          this.row3.chart1.chartLine_data.title = this.$t('common.noMsg')
         } else {
           this.row3.chart1.chartLine_data.title = ''
         }
@@ -1228,7 +1228,7 @@ export default {
           this.row3.chart2.chartLine_data.data1 = []
         }
         if (this.row3.chart2.chartLine_data.data1.length == 0) {
-          this.row3.chart2.chartLine_data.title = '暂无数据'
+          this.row3.chart2.chartLine_data.title = this.$t('common.noMsg')
         } else {
           this.row3.chart2.chartLine_data.title = ''
         }
@@ -1294,7 +1294,7 @@ export default {
           this.row4.chart1.chartLine_data.data1 = []
         }
         if (this.row4.chart1.chartLine_data.data1.length == 0) {
-          this.row4.chart1.chartLine_data.title = '暂无数据'
+          this.row4.chart1.chartLine_data.title = this.$t('common.noMsg')
         } else {
           this.row4.chart1.chartLine_data.title = ''
         }
@@ -1359,7 +1359,7 @@ export default {
           this.row4.chart2.chartLine_data.data1 = []
         }
         if (this.row4.chart2.chartLine_data.data1.length == 0) {
-          this.row4.chart2.chartLine_data.title = '暂无数据'
+          this.row4.chart2.chartLine_data.title = this.$t('common.noMsg')
         } else {
           this.row4.chart2.chartLine_data.title = ''
         }

+ 34 - 34
src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -1309,7 +1309,7 @@ export default {
            if (response.msg === 'fail') {
               this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: '上传成功', type: 'success', duration: 2000 })
 
             }
 
@@ -1496,9 +1496,9 @@ export default {
       this.requestParam.parammaps.enable = row.enable
       PostDataByName(this.requestParam).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         }
       })
@@ -1884,11 +1884,11 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('新生成保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               this.isokDisable = false
               this.newGenerationLoading = false
             } else {
-              this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.newGeneration.dialogFormVisible = false
               this.getList()
               this.isokDisable = false
@@ -2413,9 +2413,9 @@ export default {
           this.requestParam.parammaps.stopTime = parseTime(this.newGeneration.temp.copyInputDatetime[1], '{y}-{m}-{d}')
           PostDataByName(this.requestParam).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.newGeneration.dialogFormVisible = false
               this.getList()
             }
@@ -2467,7 +2467,7 @@ export default {
     },
     handleDataSynchronization() {
       MessageBox.confirm('是否确认同步数据?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam = {}
         this.requestParam.pastureid = Cookies.get('pastureid')
@@ -2489,8 +2489,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -2500,21 +2500,21 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleRowSort(row){
       this.$prompt('由于混料车和撒料车是一体的,插入顺序不能隔开', '排序', {
         inputPlaceholder:'请输入您要插入的位置',
         confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.cancel'),
         inputPattern: /^\d+$/ ,
         inputErrorMessage: '请检查插入位置序号是否正确'
       }).then(({ value }) => {
@@ -2528,7 +2528,7 @@ export default {
           if (response.msg === 'fail') {
             this.$notify({ title: '失败', message: response.data, type: 'error', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: '成功', type: 'success', duration: 2000 })
             this.getList()
           }
         })
@@ -2619,8 +2619,8 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -2653,7 +2653,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '生效成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: '生效成功', type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -2665,8 +2665,8 @@ export default {
         this.$message({type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -2699,7 +2699,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '禁用成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: '禁用成功', type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -2806,7 +2806,7 @@ export default {
         this.$message({ type: 'error', message: '请选择计划', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -2820,9 +2820,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -3042,11 +3042,11 @@ export default {
           }
           postJson(url,data).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.sapUpload.dialogFormVisible = false
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -3066,11 +3066,11 @@ export default {
           }
           postJson(url,data).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.sapUpload.dialogFormVisible = false
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -3090,11 +3090,11 @@ export default {
           }
           postJson(url,data).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.sapUpload.dialogFormVisible = false
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -3103,7 +3103,7 @@ export default {
     handleRowEmpty(row,plan){
       console.log(row,'row')
       MessageBox.confirm('您确定清空该操作序号以下的所有数据,如果您清空的是搅拌车数据,将会同步清空撒料车数据?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log(this.selectList)
         this.requestParam.common = { 'returnmap': '0' }
@@ -3142,7 +3142,7 @@ export default {
         this.$message({ type: 'error', message: '请先选择计划', duration: 2000 })
       } else {
         MessageBox.confirm('您是否确定勾选的状态改为已执行的计划?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           let arr = []
@@ -3156,9 +3156,9 @@ export default {
           postJson(url,data).then(response => {
             console.log('快速完成保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 3 - 3
src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue

@@ -115,7 +115,7 @@ export default {
     saveData() {
       console.log('点击了应用')
       MessageBox.confirm('是否确认将当前修改计划应用至' + this.date, {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'updatedownloadedplanDone'
         this.requestParam.parammaps = {}
@@ -123,9 +123,9 @@ export default {
         this.requestParam.parammaps.date = this.date
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.closeDialog()
             this.$parent.getList()
           }

+ 2 - 2
src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue

@@ -571,9 +571,9 @@ export default {
       }}
       ExecDataByConfig(this.requestParam).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         }
       })

+ 40 - 40
src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -797,9 +797,9 @@ export default {
     handleRowDelete(row) {
       console.log(row, '点击了行删除')
       if (row.arrList.length == 0) {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this.selectList = []
@@ -813,15 +813,15 @@ export default {
           const data = this.requestParam
           postJson(url, data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.table.getdataListParm.parammaps.refresh = 1
               this.getList()
             }
           })
         }).catch(() => {
-          this.$message({ type: 'info', message: '已取消删除' })
+          this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
         })
       } else {
         this.$message({
@@ -1088,13 +1088,13 @@ export default {
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
           this.$notify({
-            title: '保存失败',
+            title: this.$t('driver.saveFail'),
             message: response.data,
             type: 'warning',
             duration: 2000
           })
         } else {
-          // this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          // this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
         }
         this.getCreateList1()
       })
@@ -1131,7 +1131,7 @@ export default {
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
           this.$notify({
-            title: '删除失败',
+            title: this.$t('common.delfail'),
             message: response.data,
             type: 'warning',
             duration: 2000
@@ -1139,7 +1139,7 @@ export default {
         } else {
           this.$notify({
             title: '',
-            message: '删除成功',
+           message: this.$t('common.delSuccess'),
             type: 'success',
             duration: 2000
           })
@@ -1193,8 +1193,8 @@ export default {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
               this.$notify({
-                title: '成功',
-                message: '保存成功',
+                title: this.$t('common.succes'),
+                message: this.$t('driver.saveSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -1202,7 +1202,7 @@ export default {
               this.isDispaly = true
             } else {
               this.$notify({
-                title: '保存失败',
+                title: this.$t('driver.saveFail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
@@ -1371,9 +1371,9 @@ export default {
         const data2 = this.requestParam
         postJson(url2, data2).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           }
           this.getCreateList1()
         })
@@ -1405,21 +1405,21 @@ export default {
           if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.tmrvolume)){
             tip = '装载量已超过车辆容量' + this.create.temp.tmrvolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), confirmButtonText: 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³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), confirmButtonText: 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³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
@@ -1444,8 +1444,8 @@ export default {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
           this.$notify({
-            title: '成功',
-            message: '保存成功',
+            title: this.$t('common.succes'),
+            message: this.$t('driver.saveSuccess'),
             type: 'success',
             duration: 2000
           })
@@ -1455,7 +1455,7 @@ export default {
           this.getList()
         } else {
           this.$notify({
-            title: '保存失败',
+            title: this.$t('driver.saveFail'),
             message: response.data,
             type: 'warning',
             duration: 2000
@@ -1480,13 +1480,13 @@ export default {
         postJson(url, data).then(response => {
           console.log('新增保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            // this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            // this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.isDispaly = false
             this.dialogFull = false
             this.create.dialogFormVisible = false
             this.getList()
           } else {
-            // this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            // this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       } else {
@@ -1509,8 +1509,8 @@ export default {
           console.log('新增保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
             this.$notify({
-              title: '成功',
-              message: '保存成功',
+              title: this.$t('common.succes'),
+              message: this.$t('driver.saveSuccess'),
               type: 'success',
               duration: 2000
             })
@@ -1520,7 +1520,7 @@ export default {
             this.getList()
           } else {
             this.$notify({
-              title: '保存失败',
+              title: this.$t('driver.saveFail'),
               message: response.data,
               type: 'warning',
               duration: 2000
@@ -1563,10 +1563,10 @@ export default {
       postJson(url, data).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           this.getCreateList2()
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
         }
       })
     },
@@ -1589,10 +1589,10 @@ export default {
        postJson(url, data).then(response => {
          console.log('拖动保存发送参数', this.requestParam)
          if (response.msg === 'fail') {
-           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+           this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
          } else {
            this.getCreateList2()
-           this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+           this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
          }
        })
     },
@@ -1625,9 +1625,9 @@ export default {
             return false
           }
         }
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           console.log(this.selectList)
@@ -1661,7 +1661,7 @@ export default {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '删除失败',
+                title: this.$t('common.delfail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
@@ -1669,7 +1669,7 @@ export default {
             } else {
               this.$notify({
                 title: '',
-                message: '删除成功',
+               message: this.$t('common.delSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -1764,8 +1764,8 @@ export default {
         })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1815,8 +1815,8 @@ export default {
         })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1903,7 +1903,7 @@ export default {
     },
     handleAllEmpty(){
       MessageBox.confirm('执行该操作会将现有车次已分配的撒料栏舍全部清空,是否要执行该操作?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam = {}
         this.requestParam.common = { 'returnmap': '0' }

+ 12 - 12
src/views/formulationPlan/dailyExecutionPlan/typePage/premixedPlan.vue

@@ -387,11 +387,11 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
           this.dropState = false
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -500,11 +500,11 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
           this.dropState = false
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -528,8 +528,8 @@ export default {
     // 行内删除
     handleRowDelete(row) {
       console.log(row, '点击了行删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -540,14 +540,14 @@ export default {
         this.requestParam.parammaps.date = this.date
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     // 减少车次
@@ -556,7 +556,7 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -571,9 +571,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 21 - 21
src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue

@@ -952,15 +952,15 @@ export default {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '保存失败',
+                title: this.$t('driver.saveFail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
               })
             } else {
               this.$notify({
-                title: '成功',
-                message: '保存成功',
+                title: this.$t('common.succes'),
+                message: this.$t('driver.saveSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -1282,15 +1282,15 @@ export default {
             console.log('保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '保存失败',
+                title: this.$t('driver.saveFail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
               })
             } else {
               this.$notify({
-                title: '成功',
-                message: '保存成功',
+                title: this.$t('common.succes'),
+                message: this.$t('driver.saveSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -1324,9 +1324,9 @@ export default {
     // 行内删除
     handleRowDelete(row) {
       console.log(row, '点击了行删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.selectList = []
@@ -1339,15 +1339,15 @@ export default {
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
             this.$notify({
-              title: '删除失败',
+              title: this.$t('common.delfail'),
               message: response.data,
               type: 'warning',
               duration: 2000
             })
           } else {
             this.$notify({
-              title: '成功',
-              message: '删除成功',
+              title: this.$t('common.succes'),
+             message: this.$t('common.delSuccess'),
               type: 'success',
               duration: 2000
             })
@@ -1357,7 +1357,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消删除'
+          message: this.$t('common.cancelMsg')
         })
       })
     },
@@ -1371,8 +1371,8 @@ export default {
         })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           console.log(this.selectList)
@@ -1400,7 +1400,7 @@ export default {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '删除失败',
+                title: this.$t('common.delfail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
@@ -1408,7 +1408,7 @@ export default {
             } else {
               this.$notify({
                 title: '',
-                message: '删除成功',
+               message: this.$t('common.delSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -1446,8 +1446,8 @@ export default {
         })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1507,8 +1507,8 @@ export default {
         })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {

+ 3 - 3
src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -422,7 +422,7 @@ export default {
     },
     handleNextLast() {
       MessageBox.confirm('是否确认进行当前干物质调节操作', '提示', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         // beforeClose: (action, instance, done) => {
         //   console.log(action, instance, done)
         //   this.closeDialog()
@@ -457,9 +457,9 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('新生成保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.closeDialog()
             this.$emit('getIsDisplay')
           }

+ 14 - 14
src/views/formulationPlan/dhedFormula/index.vue

@@ -2425,18 +2425,18 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('编辑保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           if(obj.data.length>0){
             const url = 'authdata/fpdetail/edit'
             const data = obj
             postJson(url, data).then(response => {
               if(response.msg !== 'fail'){
-                this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+                this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               }
             })
           }else{
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           }
           this.getList()
           for (let i = 0; i < this.headerList.length; i++) {
@@ -3128,7 +3128,7 @@ export default {
     handleApplication() {
       console.log('点击了应用')
       MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'applyFPdate'
         this.requestParam.parammaps = {}
@@ -3136,9 +3136,9 @@ export default {
         this.requestParam.parammaps.date = this.history.getdataListParm.parammaps.date
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.getHistoryIsDisplay()
             this.getList()
           }
@@ -3305,7 +3305,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {
@@ -3344,13 +3344,13 @@ export default {
     },
     handleSynchronous(){
       MessageBox.confirm('是否进行软件牛头数同步?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         const url = 'authdata/ud/feedp/sync'
         const data = {}
         postJson(url, data).then(response => {
           if(response.msg !== 'fail'){
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           }
         })
       }).catch(() => {
@@ -3407,9 +3407,9 @@ export default {
       }
       postJson(url, data).then(response => {
         if(response.msg !== 'fail'){
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
         }else{
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
         this.isproportion = false
       })
@@ -3422,7 +3422,7 @@ export default {
     handleRestore(row){
       // 恢复
       MessageBox.confirm('是否进行恢复?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
       const dataList = this.history.list
       const result = dataList.filter(obj => obj.barname === row.barname);
@@ -3476,10 +3476,10 @@ export default {
        }
        postJson(url, data).then(response => {
          if(response.msg !== 'fail'){
-           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+           this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
            this.getDateList()
          }else{
-           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+           this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
          }
          this.isproportion = false
        })

+ 2 - 2
src/views/formulationPlan/formulaDistribution/index.vue

@@ -508,9 +508,9 @@ export default {
         postJson(url,this.requestParam).then(response => {
           console.log('配方下发保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.formulaDistribution.dialogFormVisible = false
             this.formulaDistribution.pasture.dialogFormVisible = false
             this.getList()

+ 37 - 37
src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -838,8 +838,8 @@ export default {
     handleRowDelete(row) {
       console.log(row, '点击了行删除')
       if (row.arrList.length == 0) {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.selectList = []
           this.requestParam = {}
@@ -851,15 +851,15 @@ export default {
           const data = this.requestParam
           postJson(url, data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.table.getdataListParm.parammaps.refresh = 1
               this.getList()
             }
           })
         }).catch(() => {
-          this.$message({ type: 'info', message: '已取消删除' })
+          this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
         })
       } else {
         this.$message({ type: 'error', message: '本车次已添加栏舍不可删除', duration: 2000 })
@@ -1083,10 +1083,10 @@ export default {
       }
       ExecDataByConfig(this.requestParam).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           // this.isDropState = false
-          // this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          // this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
         }
         this.getCreateList1()
 
@@ -1110,9 +1110,9 @@ export default {
       const data = this.requestParam
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
           this.getCreateList1()
         }
       })
@@ -1147,11 +1147,11 @@ export default {
           postJson(url, data).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.create.temp.id = response.data.Id
               this.isDispaly = true
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
           this.getCreateList1()
@@ -1315,9 +1315,9 @@ export default {
         const data2 = this.requestParam
         postJson(url2, data2).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           }
           this.getCreateList1()
         })
@@ -1360,21 +1360,21 @@ export default {
           if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.tmrvolume)){
             tip = '装载量已超过车辆容量' + this.create.temp.tmrvolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), confirmButtonText: 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³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), confirmButtonText: 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³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
@@ -1396,13 +1396,13 @@ export default {
       postJson(url, data).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.isDispaly = false
           this.dialogFull = false
           this.create.dialogFormVisible = false
           this.getList()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -1441,7 +1441,7 @@ export default {
         postJson(url, data).then(response => {
           console.log('新增保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.isDispaly = false
             this.dialogFull = false
             this.create.dialogFormVisible = false
@@ -1449,7 +1449,7 @@ export default {
             // window.location.reload()
 
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       }
@@ -1486,10 +1486,10 @@ export default {
       postJson(url, data).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           this.getCreateList2()
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
         }
       })
     },
@@ -1512,10 +1512,10 @@ export default {
       postJson(url, data).then(response => {
         console.log('拖动保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           this.getCreateList2()
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
         }
       })
     },
@@ -1540,8 +1540,8 @@ export default {
             return false
           }
         }
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -1555,9 +1555,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.table.getdataListParm.parammaps.refresh = 1
               this.getList()
             }
@@ -1582,17 +1582,17 @@ export default {
         postJson(url, data).then(response => {
           console.log('新增保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.automaticGeneration.dialogFormVisible = false
             this.getIsDisplay()
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       } else {
         console.log('点击重新生成')
         MessageBox.confirm('重新生成计划会将原有计划清空再生成,是否确认重新生成?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.automaticGeneration.dialogFormVisible = false
           this.requestParam = {}
@@ -1603,11 +1603,11 @@ export default {
           postJson(url, data).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.automaticGeneration.dialogFormVisible = false
               this.getIsDisplay()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }).catch(() => {
@@ -1678,8 +1678,8 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1711,7 +1711,7 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
             this.selectList[i].sel = 0
@@ -1815,7 +1815,7 @@ export default {
       this.allEmpty.dialogFormVisible = true
 
       // MessageBox.confirm('执行该操作会将现有车次已分配的撒料栏舍全部清空,是否要执行该操作?', {
-      //   confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      //   confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       // }).then(() => {
       //
       // })

+ 17 - 17
src/views/formulationPlan/premixedPlan/index.vue

@@ -554,11 +554,11 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
           this.dropState = false
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -672,11 +672,11 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
           this.dropState = false
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -725,7 +725,7 @@ export default {
     handleApplication() {
       console.log('点击了应用')
       MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'applyFPdate'
         this.requestParam.parammaps = {}
@@ -733,9 +733,9 @@ export default {
         this.requestParam.parammaps.date = this.history.getdataListParm.parammaps.date
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.getHistoryIsDisplay()
             this.getList()
           }
@@ -765,8 +765,8 @@ export default {
     // 行内删除
     handleRowDelete(row) {
       console.log(row, '点击了行删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -776,14 +776,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     // 减少车次
@@ -792,7 +792,7 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -806,9 +806,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -820,7 +820,7 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
             // this.$set(this.selectList[i], 'enable', '1')
@@ -853,7 +853,7 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
             // this.$set(this.selectList[i], 'enable', '1')

+ 8 - 8
src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -249,9 +249,9 @@ export default {
           // data.date = parseTime(this.create.temp.date,'{h}:{i}:{s}')
           postJson(url,data).then(response => {
             if(response.msg == 'fail'){
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }else{
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
               this.getList()
             }
@@ -280,9 +280,9 @@ export default {
           // data.date = parseTime(this.create.temp.date,'{h}:{i}:{s}')
           postJson(url,data).then(response => {
             if(response.msg == 'fail'){
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }else{
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
               this.getList()
             }
@@ -296,9 +296,9 @@ export default {
       data.id = row.id
       postJson(url,data).then(response => {
         if(response.msg == 'fail'){
-          this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
         }else{
-          this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
           this.getList()
         }
       })
@@ -315,9 +315,9 @@ export default {
       // data.date = parseTime(this.create.temp.date,'{h}:{i}:{s}')
       postJson(url,data).then(response => {
         if(response.msg == 'fail'){
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }else{
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         }

+ 57 - 57
src/views/formulationPlan/recipeTemplate/index.vue

@@ -1450,17 +1450,17 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
           let data = {}
           data.name = 'insertFeedtemplethistory'
           data.parammaps = this.table.temp
           PostDataByName(data).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         } else {
@@ -1468,7 +1468,7 @@ export default {
           if (isRepeat.test(response.data)) {
             this.$notify({ type: 'error', message: '配方编码不可重复,请重新录入', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         }
       })
@@ -1598,14 +1598,14 @@ export default {
           PostDataByName(this.requestParam3).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             } else {
               const isRepeat = new RegExp('Duplicate entry :feedtemplet.tCode')
               if (isRepeat.test(response.data)) {
                 this.$notify({ type: 'error', message: '配方编码不可重复,请重新录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -1614,7 +1614,7 @@ export default {
           if (isRepeat.test(response.data)) {
             this.$notify({ type: 'error', message: '配方编码不可重复,请重新录入', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         }
       })
@@ -1634,8 +1634,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         const url = 'authdata/feedtemplet/del'
         const data = {
@@ -1644,15 +1644,15 @@ export default {
         }
         postJson(url, data).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
             this.isDetail = false
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -1664,8 +1664,8 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择配方', duration: 2000 })
       } else {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -1683,9 +1683,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -1699,7 +1699,7 @@ export default {
         this.$message({ type: 'error', message: '请选择配方', duration: 2000 })
       } else {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -1943,7 +1943,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {
@@ -1985,7 +1985,7 @@ export default {
     handleApplication() {
       console.log('点击了应用')
       MessageBox.confirm('是否确认将' + this.template.table.getdataListParm.parammaps.date + '的数据应用到当前?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'applyFTdate'
         this.requestParam.parammaps = {}
@@ -1993,9 +1993,9 @@ export default {
         this.requestParam.parammaps.date = this.template.table.getdataListParm.parammaps.date
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.getTemplateDialogList()
             this.getList()
           }
@@ -2465,21 +2465,21 @@ export default {
       const data = this.requestParam
       postJson(url, data).then(response => {
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList2()
           this.getList3()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
       // ExecDataByConfig(this.requestParam).then(response => {
       //   console.log('新增保存发送参数', this.requestParam)
       //   if (response.msg !== 'fail') {
-      //     this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+      //     this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
       //     this.getList2()
       //     this.getList3()
       //   } else {
-      //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+      //     this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
       //   }
       // })
     },
@@ -2695,23 +2695,23 @@ export default {
           const data = this.requestParam
           postJson(url, data).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList2()
               this.getList3()
               this.dropState = false
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
           // ExecDataByConfig(this.requestParam).then(response => {
           //   console.log('新增保存发送参数', this.requestParam)
           //   if (response.msg !== 'fail') {
-          //     this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          //     this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           //     this.getList2()
           //     this.getList3()
           //     this.dropState = false
           //   } else {
-          //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          //     this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           //   }
           // })
         },
@@ -2734,8 +2734,8 @@ export default {
     // 详情删除
     handleRowDelete2(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log(this.table2.list.length)
         let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
@@ -2817,25 +2817,25 @@ export default {
         const data = this.requestParam
         postJson(url, data).then(response => {
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList2()
             this.getList3()
           } else {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
         // ExecDataByConfig(this.requestParam).then(response => {
         //   console.log('新增保存发送参数', this.requestParam)
         //   if (response.msg === 'fail') {
-        //     this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+        //     this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
         //   } else {
-        //     this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+        //     this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
         //     this.getList2()
         //     this.getList3()
         //   }
         // })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange2(val) {
@@ -2851,8 +2851,8 @@ export default {
       if (this.selectList2.length == 0) {
         this.$message({ type: 'error', message: '请选择配方详情', duration: 2000 })
       } else {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.table2.list.length - this.selectList2.length)
           let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
@@ -2897,11 +2897,11 @@ export default {
             const data = this.requestParam
             postJson(url, data).then(response => {
               if (response.msg !== 'fail') {
-                this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+                this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
                 this.getList2()
                 this.getList3()
               } else {
-                this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
               }
             })
           } else {
@@ -2930,7 +2930,7 @@ export default {
             ExecDataByConfig(this.requestParam).then(response => {
               console.log('删除保存发送参数', this.requestParam)
               if (response.msg === 'fail') {
-                this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
               } else {
                 const url = 'authdata/ftdetai/del'
                 const data = {}
@@ -2940,11 +2940,11 @@ export default {
                 data.parammaps.type = this.table2.getdataListParm.parammaps.fttypeid
                 postJson(url, data).then(response => {
                   if (response.msg !== 'fail') {
-                    this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+                    this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
                     this.getList2()
                     this.getList3()
                   } else {
-                    this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+                    this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
                   }
                 })
               }
@@ -2958,8 +2958,8 @@ export default {
     handleSplitPremix(row) {
       console.log('点击了拆分预混料')
       MessageBox.confirm('是否确认拆分当前预混料?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'splitFTpre'
@@ -2973,9 +2973,9 @@ export default {
         this.requestParam.parammaps.fweight = row.fweight
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.getList2()
             this.getList3()
           }
@@ -2983,7 +2983,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消删除'
+          message: this.$t('common.cancelMsg')
         })
       })
     },
@@ -3141,10 +3141,10 @@ export default {
             if (tname.test(response.data)) {
               this.$message({ type: 'error', message: '预混配方已存在,不可重复生成', duration: 2000 })
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           } else {
-            this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.detail.dialogFormVisible = false
             this.getList3()
             this.getList2()
@@ -3237,10 +3237,10 @@ export default {
             if (tname.test(response.data)) {
               this.$message({ type: 'error', message: '预混配方已存在,不可重复生成', duration: 2000 })
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           } else {
-            this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.detail.dialogFormVisible = false
             this.getList3()
             this.getList2()
@@ -3341,7 +3341,7 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           let ids = []
           for (let i = 0; i < this.selectList.length; i++) {
@@ -3369,7 +3369,7 @@ export default {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           let ids = []
           for (let i = 0; i < this.selectList.length; i++) {
@@ -3413,7 +3413,7 @@ export default {
     },
     handleGetUd(){
       MessageBox.confirm('是否上传配方?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         let url = 'authdata/gm/udfeedtemplet/push'
         let data = {
@@ -3421,10 +3421,10 @@ export default {
         }
         postJson(url,data).then(response => {
           if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         })
       })

+ 30 - 30
src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -1071,9 +1071,9 @@
       //   ExecDataByConfig(this.requestParam).then(response => {
       //     console.log('新增保存发送参数', this.requestParam)
       //     if (response.msg === 'fail') {
-      //       this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+      //       this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
       //     } else {
-      //       this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+      //       this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
       //       this.getList()
       //       this.dropState = false
       //     }
@@ -1324,15 +1324,15 @@
               console.log('新增保存发送参数', this.requestParam)
               if (response.msg === 'fail') {
                 this.$notify({
-                  title: '保存失败',
+                  title: this.$t('driver.saveFail'),
                   message: response.data,
                   type: 'warning',
                   duration: 2000
                 })
               } else {
                 this.$notify({
-                  title: '成功',
-                  message: '保存成功',
+                  title: this.$t('common.succes'),
+                  message: this.$t('driver.saveSuccess'),
                   type: 'success',
                   duration: 2000
                 })
@@ -1670,9 +1670,9 @@
       //   ExecDataByConfig(this.requestParam).then(response => {
       //     console.log('新增保存发送参数', this.requestParam)
       //     if (response.msg === 'fail') {
-      //       this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+      //       this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
       //     } else {
-      //       this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+      //       this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
       //       this.getList()
       //       this.dropState = false
       //     }
@@ -1939,15 +1939,15 @@
               console.log('保存发送参数', this.requestParam)
               if (response.msg === 'fail') {
                 this.$notify({
-                  title: '保存失败',
+                  title: this.$t('driver.saveFail'),
                   message: response.data,
                   type: 'warning',
                   duration: 2000
                 })
               } else {
                 this.$notify({
-                  title: '成功',
-                  message: '保存成功',
+                  title: this.$t('common.succes'),
+                  message: this.$t('driver.saveSuccess'),
                   type: 'success',
                   duration: 2000
                 })
@@ -1983,9 +1983,9 @@
       // 行内删除
       handleRowDelete(row) {
         console.log(row, '点击了行删除')
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this.selectList = []
@@ -1997,15 +1997,15 @@
           PostDataByName(this.requestParam).then(response => {
             if (response.msg === 'fail') {
               this.$notify({
-                title: '删除失败',
+                title: this.$t('common.delfail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
               })
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
+                title: this.$t('common.succes'),
+               message: this.$t('common.delSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -2015,7 +2015,7 @@
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '已取消删除'
+            message: this.$t('common.cancelMsg')
           })
         })
       },
@@ -2029,8 +2029,8 @@
           })
         } else {
           MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
+            confirmButtonText: this.$t('common.confirm'),
+            confirmButtonText: this.$t('common.cancel'),
             type: 'warning'
           }).then(() => {
             console.log(this.selectList)
@@ -2057,7 +2057,7 @@
               console.log('删除保存发送参数', this.requestParam)
               if (response.msg === 'fail') {
                 this.$notify({
-                  title: '删除失败',
+                  title: this.$t('common.delfail'),
                   message: response.data,
                   type: 'warning',
                   duration: 2000
@@ -2065,7 +2065,7 @@
               } else {
                 this.$notify({
                   title: '',
-                  message: '删除成功',
+                 message: this.$t('common.delSuccess'),
                   type: 'success',
                   duration: 2000
                 })
@@ -2120,8 +2120,8 @@
       handleApplication() {
         console.log('点击了应用')
         MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.confirm'),
+          confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this.requestParam.name = 'applyFPdate'
@@ -2131,15 +2131,15 @@
           PostDataByName(this.requestParam).then(response => {
             if (response.msg === 'fail') {
               this.$notify({
-                title: '保存失败',
+                title: this.$t('driver.saveFail'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
               })
             } else {
               this.$notify({
-                title: '成功',
-                message: '保存成功',
+                title: this.$t('common.succes'),
+                message: this.$t('driver.saveSuccess'),
                 type: 'success',
                 duration: 2000
               })
@@ -2181,8 +2181,8 @@
           })
         } else {
           MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
+            confirmButtonText: this.$t('common.confirm'),
+            confirmButtonText: this.$t('common.cancel'),
             type: 'warning'
           }).then(() => {
             for (let i = 0; i < this.selectList.length; i++) {
@@ -2241,8 +2241,8 @@
           })
         } else {
           MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
+            confirmButtonText: this.$t('common.confirm'),
+            confirmButtonText: this.$t('common.cancel'),
             type: 'warning'
           }).then(() => {
             for (let i = 0; i < this.selectList.length; i++) {

+ 7 - 7
src/views/inventoryManagement/feedContract/index.vue

@@ -460,7 +460,7 @@ export default {
               if (contractcode.test(response.data)) {
                 this.$message({ type: 'error', message: '该合同已存在,不可重复生成', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             } else {
               this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
@@ -529,7 +529,7 @@ export default {
           }}
           ExecDataByConfig(this.requestParam).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
@@ -565,8 +565,8 @@ export default {
     },
 
     handleRowDelete(row) {
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log('点击了删除')
         this.requestParam.common = { 'returnmap': '0' }
@@ -581,14 +581,14 @@ export default {
         }}
         ExecDataByConfig(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
             this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleExport(item) {
@@ -664,7 +664,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 7 - 7
src/views/inventoryManagement/inventoryList/index.vue

@@ -455,7 +455,7 @@ export default {
               if (inventorydate.test(response.data)) {
                 this.$message({ type: 'error', message: '当前日期已盘点,不可重复录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             } else {
               this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
@@ -496,8 +496,8 @@ export default {
       })
     },
     handleRowDelete(row) {
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteBigInventory'
         this.requestParam.parammaps = {}
@@ -505,14 +505,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleInventoryList() {
@@ -617,7 +617,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 2 - 2
src/views/inventoryManagement/laborConsumption/index.vue

@@ -522,7 +522,7 @@ export default {
           }}
           ExecDataByConfig(this.requestParam).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
@@ -621,7 +621,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 3 - 3
src/views/inventoryManagement/systemConsumption/index.vue

@@ -292,10 +292,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -324,7 +324,7 @@ export default {
           }
         }
         MessageBox.confirm('是否确认审核系统用量?', '提示', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.common = { 'returnmap': '0' }
           this.requestParam.data = []

+ 7 - 7
src/views/inventoryManagement/warehousing/index.vue

@@ -826,7 +826,7 @@ export default {
             }
           }
 
-          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.isokDisable = true
             setTimeout(() => {
@@ -870,7 +870,7 @@ export default {
             console.log('点击了新增入库单保存', this.requestParam)
             ExecDataByConfig(this.requestParam).then(response => {
               if (response.msg === 'fail') {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               } else {
                 this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
                 this.create.dialogFormVisible = false
@@ -965,7 +965,7 @@ export default {
               }
             }
           }
-          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.isokDisable = true
             setTimeout(() => {
@@ -1010,7 +1010,7 @@ export default {
             console.log('点击了新增入库单保存', this.requestParam)
             ExecDataByConfig(this.requestParam).then(response => {
               if (response.msg === 'fail') {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               } else {
                 this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
                 this.create.dialogFormVisible = false
@@ -1112,7 +1112,7 @@ export default {
         this.$set(arr[i], 'msg', '饲料名称与系统不匹配')
       }
       console.log(sum)
-      this.$message({ title: '成功', message: '导入成功:' + sum + '条!', type: 'success', duration: 2000 })
+      this.$message({ title: this.$t('common.succes'), message: '导入成功:' + sum + '条!', type: 'success', duration: 2000 })
       this.$notify({ title: '失败', message: '导入失败:' + arr.length + '条!', type: 'danger', duration: 2000 })
       if (arr.length > 0) {
         const ExcelDatas1 = [
@@ -1156,7 +1156,7 @@ export default {
       }}
       ExecDataByConfig(this.requestParam).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
@@ -1237,7 +1237,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 2 - 2
src/views/inventoryManagement/warning/index.vue

@@ -344,10 +344,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('编辑保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getTab1List()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },

+ 177 - 0
src/views/leftoverManagement/index.vue

@@ -0,0 +1,177 @@
+<template>
+  <div class="container">
+    <div class="header-box">
+      <p> 剩料计划</p>
+      <el-button type="primary" plain class="add-btn" @click="dialogVisible = true">新 增</el-button>
+    </div>
+
+    <div class="table">
+      <el-table
+       element-loading-text="给我一点时间"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;"
+        class="elTable table-fixed"
+        >
+        <el-table-column
+          label="序号"
+          width="60"
+          type="index"
+          >
+        </el-table-column>
+        <el-table-column
+          label="替代方案"
+          prop="name"
+          width="180">
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              class="miniSuccess"
+              icon="el-icon-edit-outline"
+              @click="handleEdit(scope.$index, scope.row)"></el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)"></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--  -->
+      <el-pagination
+      class="page"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page.sync="currentPage1"
+      :page-size="100"
+      layout="total, prev, pager, next"
+      :total="1000">
+    </el-pagination>
+     </div>
+
+     <!-- 新增删除提示 -->
+     <el-dialog
+        title="剩料新增"
+        :visible.sync="dialogVisible"
+        width="30%"
+       >
+        <div>
+          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="替代方案" prop="name">
+              <el-select v-model="ruleForm.name" placeholder="请选择替代方案">
+                <el-option label="日料" value="1"></el-option>
+                <el-option label="豆bo" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button class="add-btn" @click="dialogVisible = false">取 消</el-button>
+          <el-button class="add-btn" type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+      </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    GetDataByName,
+    GetDataByNames
+  } from '@/api/common'
+  import Cookies from 'js-cookie'
+  import {
+    MessageBox
+  } from 'element-ui'
+  export default {
+    name: 'LeftoverManagement',
+    data() {
+      return {
+        tableData: [{
+          id:1,
+          num: '1',
+          name: '日粮',
+        }, {
+          id:2,
+          num: '2',
+          name: '豆泊',
+        }, {
+          id:3,
+          num: '3',
+          name: '日粮',
+        }],
+        currentPage1: 1,
+        dialogVisible:false,
+        //
+        ruleForm: {
+          name: '',
+        },
+        rules:{
+          name: [
+            { required: true, message: '请选择替代方案', trigger: 'change' }
+          ]
+        }
+      }
+    },
+    created() {},
+    methods: {
+      handleEdit(index, row) {
+        console.log(index, row);
+        // 获取当前数据,点击编辑
+        this.ruleForm = row;
+        this.dialogVisible = true;
+      },
+      handleDelete(index, row) {
+        console.log(index, row);
+        this.$confirm('确定删除当前剩料配置吗?', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonText: this.$t('common.cancel'),
+          type: 'warning'
+        }).then(() => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: this.$t('common.cancelMsg')
+          });
+        })
+      },
+      //
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+      }
+
+    },
+
+  }
+</script>
+
+<style lang="scss" scoped>
+  .header-box{
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .container{
+    padding: 15px;
+    min-height:600px;
+    margin-left:10px;
+    .add-btn{
+      width:90px;
+      height:40px;
+    }
+    .page{
+      margin-top:20px;
+    }
+  }
+</style>

+ 17 - 17
src/views/shedProduction/dungScores/index.vue

@@ -587,7 +587,7 @@ export default {
               if (isRepeat.test(response.data)) {
                 this.$notify({ type: 'error', message: '同一栏舍不可重复录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -605,11 +605,11 @@ export default {
       PostDataByName(this.requestParam2).then(response => {
         console.log('新增保存发送参数', this.requestParam1)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -647,7 +647,7 @@ export default {
               if (isRepeat.test(response.data)) {
                 this.$notify({ type: 'error', message: '同一栏舍不可重复录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -702,7 +702,7 @@ export default {
               if (isRepeat.test(response.data)) {
                 this.$notify({ type: 'error', message: '同一栏舍不可重复录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -713,8 +713,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDungscore'
@@ -723,14 +723,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -743,7 +743,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -757,9 +757,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -773,7 +773,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
       } else  {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -798,9 +798,9 @@ export default {
           }
           ExecDataByConfig(send_data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -884,7 +884,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 12 - 12
src/views/shedProduction/dutyRecord/index.vue

@@ -565,10 +565,10 @@ export default {
           if (dutyrecordUniq.test(response.data)) {
             this.$message({ type: 'error', message: '当前日期已分配驾驶员不可重复分配', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         } else {
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         }
@@ -611,10 +611,10 @@ export default {
           if (dutyrecordUniq.test(response.data)) {
             this.$message({ type: 'error', message: '当前日期已分配驾驶员不可重复分配', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         } else {
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         }
@@ -625,8 +625,8 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       this.selectList = []
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDutyrecord'
@@ -635,14 +635,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -655,7 +655,7 @@ export default {
         this.$message({ type: 'error', message: '请选择值班记录', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -669,9 +669,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 18 - 18
src/views/shedProduction/fecalScreen/index.vue

@@ -558,9 +558,9 @@ export default {
             } else {
               const checkStr = new RegExp('Duplicate entry :pbto')
               if (checkStr.test(response.data)) {
-                this.$notify({ title: '保存失败', message: '同一栏舍不可重复录入', type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: '同一栏舍不可重复录入', type: 'warning', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -578,11 +578,11 @@ export default {
       PostDataByName(this.requestParam2).then(response => {
         console.log('新增保存发送参数', this.requestParam1)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -616,7 +616,7 @@ export default {
               this.getList()
               this.getNoteTakerList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -662,7 +662,7 @@ export default {
               this.saveData()
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -672,8 +672,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDungsieve'
@@ -682,14 +682,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -702,7 +702,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -716,9 +716,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -732,7 +732,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
       } else  {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -757,9 +757,9 @@ export default {
           }
           ExecDataByConfig(send_data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -841,7 +841,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 17 - 17
src/views/shedProduction/formulaDryMatter/index.vue

@@ -558,7 +558,7 @@ export default {
               if (barid.test(response.data)) {
                 this.$message({ type: 'error', message: '该栏舍该班次今日配方干物质已存在,不可重复生成', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -573,11 +573,11 @@ export default {
       PostDataByName(this.requestParam2).then(response => {
         console.log('新增保存发送参数', this.requestParam1)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -621,7 +621,7 @@ export default {
               if (barid.test(response.data)) {
                 this.$message({ type: 'error', message: '该栏舍该班次今日配方干物质已存在,不可重复生成', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -674,7 +674,7 @@ export default {
               this.saveData()
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -684,8 +684,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteFtdry'
@@ -694,14 +694,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -714,7 +714,7 @@ export default {
         this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -728,9 +728,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -744,7 +744,7 @@ export default {
         this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
       } else  {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -774,9 +774,9 @@ export default {
                 this.$notify({ type: 'warning', message: '该栏舍该班次今日配方干物质已存在,不可重复生成', duration: 2000 })
                 return
               }
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -861,7 +861,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 18 - 18
src/views/shedProduction/materialRemainingRecord/index.vue

@@ -507,7 +507,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
               this.getList()
             } else {
@@ -515,7 +515,7 @@ export default {
               if (barid.test(response.data)) {
                 this.$message({ type: 'error', message: '该栏舍该班次今日剩料量已存在,不可重复生成', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -551,7 +551,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.resetTemp()
               this.getList()
               this.getNoteTakerList()
@@ -560,7 +560,7 @@ export default {
               if (barid.test(response.data)) {
                 this.$message({ type: 'error', message: '该栏舍该班次今日剩料量已存在,不可重复生成', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -609,11 +609,11 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -623,8 +623,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteBarfeedremain'
@@ -633,14 +633,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -653,7 +653,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -667,9 +667,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -683,7 +683,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
       } else if (this.selectList.length == 1) {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.name = 'copybarfeedremain'
           this.requestParam.parammaps = {}
@@ -696,9 +696,9 @@ export default {
                 this.$notify({ type: 'warning', message: '该栏舍该班次今日剩料量已存在,不可重复生成', duration: 2000 })
                 return
               }
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -800,7 +800,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 18 - 18
src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -596,9 +596,9 @@ export default {
             } else {
               const checkStr = new RegExp('Duplicate entry :btop')
               if (checkStr.test(response.data)) {
-                this.$notify({ title: '保存失败', message: '同一栏舍同一班次不可重复录入', type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: '同一栏舍同一班次不可重复录入', type: 'warning', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -613,11 +613,11 @@ export default {
       PostDataByName(this.requestParam2).then(response => {
         console.log('新增保存发送参数', this.requestParam1)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -651,7 +651,7 @@ export default {
               this.getList()
               this.getNoteTakerList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -707,7 +707,7 @@ export default {
               this.saveData()
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -717,8 +717,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deletePennsieve'
@@ -727,14 +727,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -747,7 +747,7 @@ export default {
         this.$message({ type: 'error', message: '请选择宾州筛', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -761,9 +761,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -777,7 +777,7 @@ export default {
         this.$message({ type: 'error', message: '请选择宾州筛质', duration: 2000 })
       } else  {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -802,9 +802,9 @@ export default {
           }
           ExecDataByConfig(send_data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -887,7 +887,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 18 - 18
src/views/shedProduction/performance/index.vue

@@ -660,7 +660,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
               this.getList()
             } else {
@@ -668,7 +668,7 @@ export default {
               if (barid.test(response.data)) {
                 this.$message({ type: 'error', message: '该栏舍今日生产性能已存在,不可重复生成', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
               if (this.create.temp.cowsum == '0') { this.create.temp.cowsum = '' }
               if (this.create.temp.tem == '0') { this.create.temp.tem = '' }
@@ -805,7 +805,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.resetTemp()
               this.create.noteTakerList = []
               this.getNoteTakerList()
@@ -814,7 +814,7 @@ export default {
               if (barid.test(response.data)) {
                 this.$message({ type: 'error', message: '该栏舍今日生产性能已存在,不可重复生成', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
               if (this.create.temp.cowsum == '0') { this.create.temp.cowsum = '' }
               if (this.create.temp.tem == '0') { this.create.temp.tem = '' }
@@ -967,11 +967,11 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.create.dialogFormVisible = false
               this.getList()
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               if (this.create.temp.dayspre == '0') { this.create.temp.dayspre = '' }
               if (this.create.temp.fetal == '0') { this.create.temp.fetal = '' }
               if (this.create.temp.cowsum == '0') { this.create.temp.cowsum = '' }
@@ -985,8 +985,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteBarmilk'
@@ -995,14 +995,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -1015,7 +1015,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -1029,9 +1029,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -1045,7 +1045,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍', duration: 2000 })
       } else if (this.selectList.length == 1) {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.name = 'copybarmilk'
           this.requestParam.parammaps = {}
@@ -1058,9 +1058,9 @@ export default {
                 this.$notify({ type: 'warning', message: '该栏舍今日生产性能已存在,不可重复生成', duration: 2000 })
                 return
               }
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -1144,7 +1144,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 17 - 17
src/views/shedProduction/physicalConditionScore/index.vue

@@ -613,7 +613,7 @@ export default {
               if (isRepeat.test(response.data)) {
                 this.$notify({ type: 'error', message: '同一栏舍不可重复录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -631,11 +631,11 @@ export default {
       PostDataByName(this.requestParam2).then(response => {
         console.log('新增保存发送参数', this.requestParam1)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.create.dialogFormVisible = false
           this.getList()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -673,7 +673,7 @@ export default {
               if (isRepeat.test(response.data)) {
                 this.$notify({ type: 'error', message: '同一栏舍不可重复录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -730,7 +730,7 @@ export default {
               if (isRepeat.test(response.data)) {
                 this.$notify({ type: 'error', message: '同一栏舍不可重复录入', duration: 2000 })
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
             }
           })
@@ -741,8 +741,8 @@ export default {
     // 删除
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteBodyscore'
@@ -751,14 +751,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -771,7 +771,7 @@ export default {
         this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -785,9 +785,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -801,7 +801,7 @@ export default {
         this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
       } else  {
         MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -826,9 +826,9 @@ export default {
           }
           ExecDataByConfig(send_data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -911,7 +911,7 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
           this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {

+ 1 - 1
src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue

@@ -1309,7 +1309,7 @@ export default {
     handleChartDate() {
       console.log('点击了确认时间')
       MessageBox.confirm('是否调整以下所有图表查询时间?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this
         var startTime = parseTime(this.chartDate[0], '{y}-{m}-{d}')

+ 1 - 1
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -1964,7 +1964,7 @@ export default {
     handleAllDate() {
       console.log('点击了确认时间')
       MessageBox.confirm('是否调整以下所有图表查询时间?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var startDate = ''
         var endDate = ''

+ 1 - 1
src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue

@@ -731,7 +731,7 @@ export default {
     handleChartDate() {
       console.log('点击了确认时间')
       MessageBox.confirm('是否调整以下所有图表查询时间?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this
         var startTime = parseTime(this.tab.chartDate[0], '{y}-{m}-{d}')

+ 1 - 1
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -1070,7 +1070,7 @@ export default {
     handleAllDate() {
       console.log('点击了确认时间')
       MessageBox.confirm('是否调整以下所有图表查询时间?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var startDate = ''
         var endDate = ''

+ 4 - 4
src/views/statisticalAnalysis/hardwareTest/index.vue

@@ -140,7 +140,7 @@ export default {
           this.requestParam.parammaps.tmrid = this.temp.tmrid
           GetDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
               if (response.data.list !== null) {
                 this.temp.feedstr = response.data.list[0].feedstr
               } else {
@@ -148,7 +148,7 @@ export default {
               }
               this.temp.startW = this.temp.stopW
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -167,14 +167,14 @@ export default {
       this.requestParam.parammaps.tmrid = this.temp.tmrid
       GetDataByName(this.requestParam).then(response => {
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           // if (response.data.list !== null) {
           //   this.temp.feedstr = response.data.list[0].feedstr
           // } else {
           //   this.temp.feedstr = ''
           // }
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     }

+ 21 - 21
src/views/systemManagement/boardEchartManagement/index.vue

@@ -546,10 +546,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -731,10 +731,10 @@ export default {
 
       ExecDataByConfig(send_data3).then(response => {
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -777,10 +777,10 @@ export default {
       PostDataByName(send_data3).then(response => {
         console.log('新增保存发送参数', send_data3)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList2()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -808,8 +808,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteDashboard'
         this.requestParam.parammaps = {}
@@ -817,14 +817,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleRowDelete2(row) {
@@ -843,7 +843,7 @@ export default {
         console.log(res)
         if (res.data.list[0].cou > 0) {
           MessageBox.confirm('当前图表已被引用,是否进行删除?', {
-            confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+            confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.requestParam.name = 'deleteChart'
             this.requestParam.parammaps = {}
@@ -851,14 +851,14 @@ export default {
             this.requestParam.parammaps.id = row.id
             PostDataByName(this.requestParam).then(response => {
               if (response.msg === 'fail') {
-                this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
               } else {
-                this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+                this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
                 this.getList2()
               }
             })
           }).catch(() => {
-            this.$message({ type: 'info', message: '已取消删除' })
+            this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
           })
         } else {
           this.requestParam.name = 'deleteChart'
@@ -867,9 +867,9 @@ export default {
           this.requestParam.parammaps.id = row.id
           PostDataByName(this.requestParam).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList2()
             }
           })
@@ -877,7 +877,7 @@ export default {
       })
 
       // MessageBox.confirm('当前图表已被引用,是否进行删除?', {
-      //   confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      //   confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       // }).then(() => {
       //   this.requestParam.name = 'deleteChart'
       //   this.requestParam.parammaps = {}
@@ -885,14 +885,14 @@ export default {
       //   this.requestParam.parammaps.id = row.id
       //   PostDataByName(this.requestParam).then(response => {
       //     if (response.msg === 'fail') {
-      //       this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+      //       this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
       //     } else {
-      //       this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+      //       this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
       //       this.getList2()
       //     }
       //   })
       // }).catch(() => {
-      //   this.$message({ type: 'info', message: '已取消删除' })
+      //   this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       // })
     }
 

+ 21 - 21
src/views/systemManagement/boardEchartManagement2/index.vue

@@ -546,10 +546,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -731,10 +731,10 @@ export default {
 
       ExecDataByConfig(send_data3).then(response => {
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -777,10 +777,10 @@ export default {
       PostDataByName(send_data3).then(response => {
         console.log('新增保存发送参数', send_data3)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList2()
         } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -808,8 +808,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteDashboard'
         this.requestParam.parammaps = {}
@@ -817,14 +817,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleRowDelete2(row) {
@@ -843,7 +843,7 @@ export default {
         console.log(res)
         if (res.data.list[0].cou > 0) {
           MessageBox.confirm('当前图表已被引用,是否进行删除?', {
-            confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+            confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.requestParam.name = 'deleteChart'
             this.requestParam.parammaps = {}
@@ -851,14 +851,14 @@ export default {
             this.requestParam.parammaps.id = row.id
             PostDataByName(this.requestParam).then(response => {
               if (response.msg === 'fail') {
-                this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
               } else {
-                this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+                this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
                 this.getList2()
               }
             })
           }).catch(() => {
-            this.$message({ type: 'info', message: '已取消删除' })
+            this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
           })
         } else {
           this.requestParam.name = 'deleteChart'
@@ -867,9 +867,9 @@ export default {
           this.requestParam.parammaps.id = row.id
           PostDataByName(this.requestParam).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList2()
             }
           })
@@ -877,7 +877,7 @@ export default {
       })
 
       // MessageBox.confirm('当前图表已被引用,是否进行删除?', {
-      //   confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      //   confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       // }).then(() => {
       //   this.requestParam.name = 'deleteChart'
       //   this.requestParam.parammaps = {}
@@ -885,14 +885,14 @@ export default {
       //   this.requestParam.parammaps.id = row.id
       //   PostDataByName(this.requestParam).then(response => {
       //     if (response.msg === 'fail') {
-      //       this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+      //       this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
       //     } else {
-      //       this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+      //       this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
       //       this.getList2()
       //     }
       //   })
       // }).catch(() => {
-      //   this.$message({ type: 'info', message: '已取消删除' })
+      //   this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       // })
     }
 

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

@@ -271,7 +271,7 @@ export default {
       data.parammaps.times = this.form.type1
       postJson(url, data).then(response => {
         if (response.msg == 'ok') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success',  duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success',  duration: 2000 })
         } else {
           this.$notify({ title: '失败', message: '保存失败', type: 'success',  duration: 2000 })
         }
@@ -301,7 +301,7 @@ export default {
       data.type = type
       postJson(url, data).then(response => {
         if (response.msg == 'ok') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success',  duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success',  duration: 2000 })
         } else {
           this.$notify({ title: '失败', message: '保存失败', type: 'success',  duration: 2000 })
         }
@@ -314,7 +314,7 @@ export default {
       data.date = parseTime(this.form.date, '{y}-{m}-{d}')
       postJson(url, data).then(response => {
         if (response.msg == 'ok') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success',  duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success',  duration: 2000 })
         } else {
           this.$notify({ title: '失败', message: '保存失败', type: 'success',  duration: 2000 })
         }

+ 9 - 9
src/views/systemManagement/labelManagement/index.vue

@@ -339,8 +339,8 @@ export default {
 
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDriver'
@@ -349,14 +349,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -366,10 +366,10 @@ export default {
     form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择驾驶员信息', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('driver.qxzjsyxx'), duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -383,9 +383,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 4 - 4
src/views/systemManagement/notificationManagement/index.vue

@@ -264,8 +264,8 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择角色信息', duration: 2000 })
       } else {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -285,9 +285,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 10 - 10
src/views/systemManagement/operationManagement/group/index.vue

@@ -494,14 +494,14 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const tId = new RegExp("column 'id'")
           if (tId.test(response.data)) {
-            this.$notify({ title: '保存失败', message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         }
       })
@@ -583,14 +583,14 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('编辑保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const tId = new RegExp("column 'id'")
           if (tId.test(response.data)) {
-            this.$notify({ title: '保存失败', message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         }
       })
@@ -694,10 +694,10 @@ export default {
         console.log('页面配置保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
           this.tab1.pageConfiguration.dialogFormVisible = false
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -839,10 +839,10 @@ export default {
         console.log('关联保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
           this.tab1.relation.dialogFormVisible = false
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     }

+ 8 - 8
src/views/systemManagement/operationManagement/pasture/index.vue

@@ -338,10 +338,10 @@ export default {
         console.log('页面配置保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
           this.tab1.pageConfiguration.dialogFormVisible = false
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -430,14 +430,14 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const tId = new RegExp("column 'id'")
           if (tId.test(response.data)) {
-            this.$notify({ title: '保存失败', message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         }
       })
@@ -507,14 +507,14 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('编辑保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const tId = new RegExp("column 'id'")
           if (tId.test(response.data)) {
-            this.$notify({ title: '保存失败', message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: '集团已存在,不可重复生成', type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         }
       })

+ 2 - 2
src/views/systemManagement/ranchInformation/index.vue

@@ -251,10 +251,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },

+ 1 - 1
src/views/systemManagement/reminderSettings/index.vue

@@ -906,7 +906,7 @@
         postJson(url,data).then(response => {
           if(response.code == 200){
             console.log('成功')
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
             this.setUp.dialogFormVisible = false
             this.getList()
           }else{

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

@@ -325,14 +325,14 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.getList()
         } else {
           const isRepeat = new RegExp('Duplicate entry')
           if (isRepeat.test(response.data)) {
             this.$message({ type: 'error', message: '角色名称不可重复', duration: 2000 })
           } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
         }
       })
@@ -387,10 +387,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -407,8 +407,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log(this.selectList)
         this.selectList = []
@@ -426,14 +426,14 @@ export default {
         ExecDataByConfig(this.requestParam).then(response => {
           console.log('删除保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
-            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
           } else {
-            this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
             this.getList()
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -445,8 +445,8 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择角色信息', duration: 2000 })
       } else {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -466,9 +466,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -892,9 +892,9 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('权限菜单保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
           this.role.dialogFormVisible = false
           this.getList()
         }

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

@@ -319,10 +319,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -395,10 +395,10 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', 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: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -415,8 +415,8 @@ export default {
     },
     handleRowDelete(row) {
       console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      MessageBox.confirm( this.$t('common.delMsg'), {
+        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteUser'
@@ -425,14 +425,14 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
         	if (response.msg === 'fail') {
-        		this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+        		this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
         	} else {
-        		this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+        		this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
         		this.getList()
         	}
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
+        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
       })
     },
     handleSelectionChange(val) {
@@ -444,8 +444,8 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择用户信息', duration: 2000 })
       } else {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        MessageBox.confirm( this.$t('common.delMsg'), {
+          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -459,9 +459,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('删除保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -470,8 +470,8 @@ export default {
     },
     handleResetPassword(row) {
       MessageBox.confirm('是否确认将此用户密码重置为默认密码123456?', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.confirm'),
+        confirmButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'initPassword'
@@ -483,7 +483,7 @@ export default {
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({
-            title: '成功',
+            title: this.$t('common.succes'),
             message: '重置密码成功',
             type: 'success',
             duration: 2000