Browse Source

准确性分析翻译

Shan9312 11 months ago
parent
commit
14c4468af6
50 changed files with 495 additions and 410 deletions
  1. 2 2
      .env.development
  2. 1 1
      src/componentChart/ChartTable.vue
  3. 3 3
      src/components/index.vue
  4. 40 1
      src/lang/en/langModule/errorAnalysis.js
  5. 47 1
      src/lang/zn/langModule/errorAnalysis.js
  6. 1 1
      src/views/basicData/groupColumn/index.vue
  7. 10 10
      src/views/basicData/sapLog/index.vue
  8. 8 8
      src/views/dashboard/pasture/index.vue
  9. 1 1
      src/views/formulationPlan/dailyExecutionPlan/historyRecord.vue
  10. 9 9
      src/views/formulationPlan/dailyExecutionPlan/index.vue
  11. 1 1
      src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue
  12. 23 23
      src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue
  13. 6 6
      src/views/formulationPlan/dailyExecutionPlan/typePage/premixedPlan.vue
  14. 13 13
      src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue
  15. 3 3
      src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue
  16. 1 1
      src/views/formulationPlan/dhedFormula/index - 20230829备份.vue
  17. 1 1
      src/views/formulationPlan/dhedFormula/index.vue
  18. 1 1
      src/views/formulationPlan/dhedFormula/index备.vue
  19. 2 2
      src/views/formulationPlan/materialIssuancePlan/historyRecord.vue
  20. 23 23
      src/views/formulationPlan/materialIssuancePlan/index.vue
  21. 12 12
      src/views/formulationPlan/materialIssuancePlan/index1.vue
  22. 10 10
      src/views/formulationPlan/premixedPlan/index.vue
  23. 1 1
      src/views/formulationPlan/pushMaterialPlan/index.vue
  24. 27 27
      src/views/formulationPlan/surplusMaterialPlan/index.vue
  25. 1 1
      src/views/shedProduction/dungScores/index.vue
  26. 4 4
      src/views/shedProduction/dutyRecord/index.vue
  27. 1 1
      src/views/shedProduction/fecalScreen/index.vue
  28. 2 2
      src/views/shedProduction/formulaDryMatter/historyRecord.vue
  29. 1 1
      src/views/shedProduction/formulaDryMatter/index.vue
  30. 1 1
      src/views/shedProduction/materialRemainingRecord/index.vue
  31. 2 2
      src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue
  32. 1 1
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  33. 1 1
      src/views/shedProduction/performance/index.vue
  34. 1 1
      src/views/shedProduction/physicalConditionScore/index.vue
  35. 2 2
      src/views/statisticalAnalysis/equipmentRunningTrack/index - 副本.vue
  36. 2 2
      src/views/statisticalAnalysis/equipmentRunningTrack/index.vue
  37. 2 2
      src/views/statisticalAnalysis/errorAnalysis/group/index.vue
  38. 33 33
      src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue
  39. 25 25
      src/views/statisticalAnalysis/errorAnalysis/group/tab2.vue
  40. 18 18
      src/views/statisticalAnalysis/errorAnalysis/group/tab3.vue
  41. 83 83
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  42. 6 6
      src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue
  43. 12 12
      src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue
  44. 2 2
      src/views/statisticalAnalysis/feedingEfficiency/group/tab2.vue
  45. 21 21
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue
  46. 14 14
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index备.vue
  47. 3 3
      src/views/statisticalAnalysis/inventoryManagement/group/index.vue
  48. 9 9
      src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue
  49. 1 1
      src/views/statisticalAnalysis/processAnalysis/group/index.vue
  50. 1 1
      src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

+ 2 - 2
.env.development

@@ -5,9 +5,9 @@ ENV = 'development'
 # base api
 # 测试线
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
+# VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
 # VUE_APP_BASE_API = 'http://192.168.1.93/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

+ 1 - 1
src/componentChart/ChartTable.vue

@@ -46,7 +46,7 @@
                   <span>{{ scope.row.drivercode }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="误差值" min-width="130px" align="center">
+              <el-table-column :label="$t('errorAnalysis.wcz')" min-width="130px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.drivercode }}</span>
                 </template>

+ 3 - 3
src/components/index.vue

@@ -31,7 +31,7 @@
             class="elTable table-fixed"
           >
             <el-table-column v-if="tab.isFormulaName" label="配方模板" min-width="70px" align="center" prop="配方模板" />
-            <el-table-column v-if="tab.isHouseName" label="栏舍" min-width="70px" align="center" prop="栏舍" />
+            <el-table-column v-if="tab.isHouseName" :label="$t('errorAnalysis.pen')" min-width="70px" align="center" prop="栏舍" />
             <el-table-column v-if="tab.isHouseName" label="配方模板" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isLivestockType" :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
             <el-table-column label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
@@ -331,7 +331,7 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column label="栏舍" min-width="60px" align="center" prop="barname" />
+                <el-table-column :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
                 <el-table-column label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
                 <el-table-column label="单产" min-width="60px" align="center" prop="product" />
                 <el-table-column label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
@@ -363,7 +363,7 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column label="栏舍" min-width="60px" align="center" prop="barname" />
+                <el-table-column :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
                 <el-table-column label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
                 <el-table-column label="单产" min-width="60px" align="center" prop="product" />
                 <el-table-column label="干物质采食量" min-width="60px" align="center" prop="dryweight" />

+ 40 - 1
src/lang/en/langModule/errorAnalysis.js

@@ -77,7 +77,46 @@ jhzl:"Planned weight(kg)",
 skzl:'Actual Weight(kg)',
 zql:"Accuracy rate",
 hlqxcs:"Planned blending cancellation count",
-lsslsjtj:"Feed spreading time statistics in pens"
+lsslsjtj:"Feed spreading time statistics in pens",
+tmrnames:'TMR Name',
+
+zdtzcs:"automatic transition count",
+sdtzcs:'manual transition count',
+zdtzsjzl:'actual weight of automatic transition',
+zdtzzql:"automatic transition accuracy rate",
+sdtzllzl:"theoretical weight of manual transition",
+sdtzsjzl:"actual weight of manual transition",
+sdtzzql:"manual transition accuracy rate",
+zdtzllzl:'theoretical weight of automatic transition',
+time:'Time',
+pen:'pen',
+czNum:"peration Number",
+wcz:"Error Value",
+planTime:"planned time",
+startTime:"start time",
+endTime:'end time',
+jsTime:'mix time',
+stWeight:'Starting Weight',
+edWeight:'Ending Weight',
+isOK:'Is it up to standard?',
+area:'Area',
+tzfs:'transition method',
+ccms:'batch description',
+sfytj:'Whether to Pre-calculate Statistics',
+one: 'First Shift',
+two: "Second Shift",
+three: "Third Shift",
+four: "Fourth Shift",
+five: "Fifth Shift",
+six: "Sixth Shift",
+
+sdtz:'Manual switch',
+    zdtz:"Auto switch",
+    qxtz:"Cancel switch"
+
+
+
+
 
 
 

+ 47 - 1
src/lang/zn/langModule/errorAnalysis.js

@@ -76,7 +76,53 @@ export default{
    skzl:'实际重量(kg)',
    zql:"准确率",
    hlqxcs:"混料计划取消次数",
-   lsslsjtj:"栏舍撒料时间统计"
+   lsslsjtj:"栏舍撒料时间统计",
+   tmrnames:'TMR名称',
+   zdtzcs:"自动跳转次数",
+   sdtzcs:'手动跳转次数',
+   zdtzsjzl:'自动跳转实际重量',
+   zdtzzql:"自动跳转准确率",
+   sdtzllzl:"手动跳转理论重量",
+   sdtzsjzl:"手动跳转实际重量",
+   sdtzzql:"手动跳转准确率",
+   zdtzllzl:'自动跳转理论重量',
+    time:'时间',
+    pen:'栏舍',
+    czNum:"操作编号",
+    wcz:"误差值",
+    planTime:"计划时间",
+    startTime:"开始时间",
+    endTime:'结束时间',
+    jsTime:'搅拌时间',
+    stWeight:'开始重量',
+    edWeight:'结束重量',
+    isOK:'是否达标',
+    area:'区域',
+    tzfs:'跳转方式',
+    ccms:'车次描述',
+    sfytj:'是否预统计',
+    one:'第一班',
+    two:"第二班",
+    three:"第三班",
+    four:"第四班",
+    five:"第五班",
+    six:"第六班",
+
+    sdtz:'手动跳转',
+    zdtz:"自动跳转",
+    qxtz:"取消跳转"
+
+
+
+
+
+    
+
+
+
+
+
+
 
   
 

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

@@ -95,7 +95,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="栏舍" min-width="150px" align="center">
+        <el-table-column :label="$t('errorAnalysis.pen')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.KTEXT }}</span>
             <el-select v-if="scope.row.Edit" v-model="scope.row.AUFNR" filterable class="filter-item" style="width: 95%;padding:10px 0;">

+ 10 - 10
src/views/basicData/sapLog/index.vue

@@ -78,15 +78,15 @@
           >
             <el-table-column label="序号" min-width="90px" align="center" prop="pastureName" />
             <el-table-column :label="$t('errorAnalysis.date')" min-width="90px" align="center" prop="status" />
-            <el-table-column label="班次" min-width="90px" align="center" prop="msgtext" />
-            <el-table-column label="车次" min-width="90px" align="center" prop="url" />
+            <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="90px" align="center" prop="msgtext" />
+            <el-table-column :label="$t('errorAnalysis.projname')" min-width="90px" align="center" prop="url" />
             <el-table-column label="配方" min-width="90px" align="center" prop="createTime" />
             <el-table-column label="原料" min-width="90px" align="center" prop="createTime" />
             <el-table-column label="原料顺序" min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.llzl')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="90px" align="center" prop="createTime" />
-            <el-table-column label="开始时间" min-width="90px" align="center" prop="createTime" />
-            <el-table-column label="结束时间" min-width="90px" align="center" prop="createTime" />
+            <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="90px" align="center" prop="createTime" />
+            <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.Driver')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column label="自拌料-饲料顺序" min-width="90px" align="center" prop="createTime" />
             <el-table-column label="自拌料-饲料名称" min-width="90px" align="center" prop="createTime" />
@@ -135,15 +135,15 @@
           >
             <el-table-column label="序号" min-width="90px" align="center" prop="pastureName" />
             <el-table-column :label="$t('errorAnalysis.date')" min-width="90px" align="center" prop="status" />
-            <el-table-column label="班次" min-width="90px" align="center" prop="msgtext" />
-            <el-table-column label="车次" min-width="90px" align="center" prop="url" />
-            <el-table-column label="栏舍" min-width="90px" align="center" prop="createTime" />
+            <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="90px" align="center" prop="msgtext" />
+            <el-table-column :label="$t('errorAnalysis.projname')" min-width="90px" align="center" prop="url" />
+            <el-table-column :label="$t('errorAnalysis.pen')" min-width="90px" align="center" prop="createTime" />
             <el-table-column label="存栏" min-width="90px" align="center" prop="createTime" />
             <el-table-column label="发料顺序" min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.llzl')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="90px" align="center" prop="createTime" />
-            <el-table-column label="开始时间" min-width="90px" align="center" prop="createTime" />
-            <el-table-column label="结束时间" min-width="90px" align="center" prop="createTime" />
+            <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="90px" align="center" prop="createTime" />
+            <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.Driver')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column label="饲料顺序" min-width="90px" align="center" prop="createTime" />
@@ -172,7 +172,7 @@
           >
             <el-table-column label="序号" min-width="90px" align="center" prop="pastureName" />
             <el-table-column :label="$t('errorAnalysis.date')" min-width="90px" align="center" prop="status" />
-            <el-table-column label="栏舍" min-width="90px" align="center" prop="msgtext" />
+            <el-table-column :label="$t('errorAnalysis.pen')" min-width="90px" align="center" prop="msgtext" />
             <el-table-column label="重量" min-width="90px" align="center" prop="url" />
           </el-table>
         </div>

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

@@ -145,13 +145,13 @@
             <span class="content"> {{$t('dashboard.costSts')}}</span>
           </div>
           <div v-if="row4.chart1.isChart" class="button">
-            <div class="exportTable" @click="handleExport('row4chartLine1')"{{$t('dashboard.Export')}}/div>
+            <div class="exportTable" @click="handleExport('row4chartLine1')">{{$t('dashboard.Export')}}</div>
             <div class="exportTable" @click="handleTable('row4chartLine1')">{{$t('dashboard.sTable')}}</div>
           </div>
           <div v-if="row4.chart1.isChart" id="row4chartLine1" v-loading="row4.chart1.listLoading" style="background: #fff;height:310px;" />
           <div v-if="row4.chart1.isTable" class="table" style="position: absolute;width: 100%;">
             <div class="button">
-              <div class="exportTable" @click="handleExport('row4chartLine1')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('row4chartLine1')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleChart('row4chartLine1')">{{$t('dashboard.sTable')}}</div>
             </div>
             <el-table
@@ -265,13 +265,13 @@
               <span class="content">{{$t('dashboard.planSta')}}</span>
             </div>
             <div v-if="row3.chart1.isChart" class="button">
-              <div class="exportTable" @click="handleExport('row3chartLine1')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('row3chartLine1')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('row3chartLine1')">{{$t('dashboard.sTable')}}</div>
             </div>
             <div v-if="row3.chart1.isChart" id="row3chartLine1" v-loading="row3.chart1.listLoading" style="background: #fff;height:310px;" />
             <div v-if="row3.chart1.isTable" class="table" style="position: absolute;width: 100%;">
               <div class="button">
-                <div class="exportTable" @click="handleExport('row3chartLine1')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('row3chartLine1')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('row3chartLine1')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -307,13 +307,13 @@
               <span class="content">{{$t('dashboard.mixStatic')}}</span>
             </div>
             <div v-if="row4.chart2.isChart" class="button">
-              <div class="exportTable" @click="handleExport('row4chartLine2')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('row4chartLine2')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('row4chartLine2')">{{$t('dashboard.sTable')}}</div>
             </div>
             <div v-if="row4.chart2.isChart" id="row4chartLine2" v-loading="row4.chart2.listLoading" style="background: #fff;height:310px;" />
             <div v-if="row4.chart2.isTable" class="table" style="position: absolute;width:100%;">
               <div class="button">
-                <div class="exportTable" @click="handleExport('row4chartLine2')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('row4chartLine2')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('row4chartLine2')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -348,13 +348,13 @@
               <span class="content">{{$t('dashboard.miruTitle')}}</span>
             </div>
             <div v-if="row3.chart2.isChart" class="button">
-              <div class="exportTable" @click="handleExport('row3chartLine2')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('row3chartLine2')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('row3chartLine2')">{{$t('dashboard.sTable')}}</div>
             </div>
             <div v-if="row3.chart2.isChart" id="row3chartLine2" v-loading="row3.chart2.listLoading" style="background: #fff;height:310px;" />
             <div v-if="row3.chart2.isTable" class="table" style="position: absolute;width: 100%;">
               <div class="button">
-                <div class="exportTable" @click="handleExport('row3chartLine2')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('row3chartLine2')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('row3chartLine2')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table

+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/historyRecord.vue

@@ -45,7 +45,7 @@
               <span>{{ scope.row.havebutton }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="班次" min-width="180px" align="center">
+          <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="180px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.times }}</span>
             </template>

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

@@ -106,7 +106,7 @@
               <div v-else style="background: #FC2323;color:#000 ;line-height:30px;">是</div>
             </template>
           </el-table-column>
-          <el-table-column label="班次" min-width="80px" align="center">
+          <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="80px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.times }}</span>
             </template>
@@ -310,7 +310,7 @@
                     <span>{{ scope.row.sort }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="栏舍" min-width="90px" align="center">
+                <el-table-column :label="$t('errorAnalysis.pen')" min-width="90px" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.fname }}</span>
                   </template>
@@ -852,7 +852,7 @@
                 <span v-else>是</span>
               </template>
             </el-table-column>
-            <el-table-column label="班次" min-width="80px" align="center" prop="times" />
+            <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="80px" align="center" prop="times" />
             <el-table-column label="理论量" min-width="80px" align="center" prop="lweight" />
             <el-table-column label="启用" min-width="70px" align="center">
               <template slot-scope="scope">
@@ -1320,17 +1320,17 @@ export default {
         console.log(response.data.list[0].inforvalue)
         this.myMaxTimes = response.data.list[0].inforvalue
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: '第一班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one') }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two')}]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three')}]
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four')}]
         } else if (response.data.list[0].inforvalue == 5) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three') }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }]
         } else if (response.data.list[0].inforvalue == 6) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }, { id: '6', name: '第六班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three') }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }, { id: '6', name: this.$t('errorAnalysis.six') }]
         }
       })
     },

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

@@ -25,7 +25,7 @@
           </template>
         </el-table-column>
         <el-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-        <el-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
+        <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
         <el-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
         <el-table-column :key="5" label="实际牛头数" min-width="100px" align="center">
           <template slot-scope="scope">

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

@@ -35,7 +35,7 @@
         @selection-change="handleSelect"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column label="车次" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
+        <el-table-column :label="$t('errorAnalysis.projname')" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
           </template>
@@ -62,7 +62,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="班次" width="65px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  width="65px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.timesstr }}</span>
           </template>
@@ -723,41 +723,41 @@ export default {
       postJson(url, data).then(response => {
         console.log(response.data.list[0].inforvalue)
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: 1, name: '第一班' }]
+          this.frequencyList = [{ id: 1, name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), }
           ]
         } else if (response.data.list[0].inforvalue == 3) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), }
           ]
         } else if (response.data.list[0].inforvalue == 4) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' },
-            { id: 4, name: '第四班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), },
+            { id: 4, name: this.$t('errorAnalysis.four'), }
           ]
         }else if (response.data.list[0].inforvalue == 5) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' },
-            { id: 4, name: '第四班' },
-            { id: 5, name: '第五班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), },
+            { id: 4, name: this.$t('errorAnalysis.four'), },
+            { id: 5, name: this.$t('errorAnalysis.five'), }
           ]
         }else if (response.data.list[0].inforvalue == 6) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' },
-            { id: 4, name: '第四班' },
-            { id: 5, name: '第五班' },
-            { id: 6, name: '第六班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), },
+            { id: 4, name: this.$t('errorAnalysis.four'), },
+            { id: 5, name: this.$t('errorAnalysis.five'), },
+            { id: 6, name: this.$t('errorAnalysis.six'), }
           ]
         }
       })

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

@@ -24,7 +24,7 @@
         @selection-change="handleSelect"
       >
         <el-table-column type="selection" min-width="50" />
-        <el-table-column label="车次" min-width="85px" align="center">
+        <el-table-column :label="$t('errorAnalysis.projname')" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.sort }}</span>
             <el-input v-if="scope.row.Edit" v-model.trim="scope.row.sort" type="number" style="width:80%;padding:10px 0;" />
@@ -46,7 +46,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="班次" min-width="120px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="120px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.times }}</span>
             <el-select v-if="scope.row.Edit" v-model="scope.row.times" filterable placeholder="" class="filter-item" style="width:80%;padding:10px 0;" @change="(value)=> {changeTimes(value, scope.row)}">
@@ -207,13 +207,13 @@ export default {
     getIsDisplay() {
       GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: '第一班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
         }
       })
     },

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

@@ -37,12 +37,12 @@
         @selection-change="handleSelect"
       >
         <el-table-column type="selection" min-width="50" />
-        <el-table-column label="车次" min-width="80px" align="center">
+        <el-table-column :label="$t('errorAnalysis.projname')" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="栏舍" min-width="110px" align="center">
+        <el-table-column :label="$t('errorAnalysis.pen')" min-width="110px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.qstr }}</span>
           </template>
@@ -58,7 +58,7 @@
               inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
           </template>
         </el-table-column>
-        <el-table-column label="班次" min-width="120px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="120px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.times }}</span>
           </template>
@@ -439,40 +439,40 @@ export default {
         if (response.data.list[0].inforvalue == 1) {
           this.frequencyList = [{
             id: '1',
-            name: '第一班'
+            name: this.$t('errorAnalysis.one'),
           }]
         } else if (response.data.list[0].inforvalue == 2) {
           this.frequencyList = [{
             id: '1',
-            name: '第一班'
+            name: this.$t('errorAnalysis.one'),
           }, {
             id: '2',
-            name: '第二班'
+            name: this.$t('errorAnalysis.two'),
           }]
         } else if (response.data.list[0].inforvalue == 3) {
           this.frequencyList = [{
             id: '1',
-            name: '第一班'
+            name: this.$t('errorAnalysis.one'),
           }, {
             id: '2',
-            name: '第二班'
+            name: this.$t('errorAnalysis.two'),
           }, {
             id: '3',
-            name: '第三班'
+            name: this.$t('errorAnalysis.three'),
           }]
         } else if (response.data.list[0].inforvalue == 4) {
           this.frequencyList = [{
             id: '1',
-            name: '第一班'
+            name: this.$t('errorAnalysis.one'),
           }, {
             id: '2',
-            name: '第二班'
+            name: this.$t('errorAnalysis.two'),
           }, {
             id: '3',
-            name: '第三班'
+            name: this.$t('errorAnalysis.three'),
           }, {
             id: '4',
-            name: '第四班'
+            name: this.$t('errorAnalysis.four'),
           }]
         }
       })

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

@@ -73,7 +73,7 @@
             <el-table-column type="selection" align="center" width="50" />
             <el-table-column label="序号" align="center" type="index" width="50px" />
             <el-table-column  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="110px" align="center" />
-            <el-table-column label="班次" prop="times" min-width="110px" align="center" />
+            <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="110px" align="center" />
             <el-table-column label="鲜样重量(g)" prop="freshweight" min-width="110px" align="center" />
             <el-table-column label="烘干重量(g)" prop="dryweight" min-width="110px" align="center" />
             <el-table-column label="理论干物质" prop="thoweight" min-width="110px" align="center" />
@@ -120,8 +120,8 @@
             class="elTable table-fixed"
             :span-method="objectSpanMethod"
           >
-            <el-table-column label="栏舍" prop="barname" min-width="70px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <el-table-column label="班次" prop="times" min-width="70px" align="center" class-name="small-padding fixed-width" fixed="left" />
+            <el-table-column :label="$t('errorAnalysis.pen')" prop="barname" min-width="70px" align="center" class-name="small-padding fixed-width" fixed="left" />
+            <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="70px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <el-table-column label="调节前班次重量" prop="weight" min-width="70px" align="center" />
             <el-table-column label="调节后班次重量" prop="weightafter" min-width="100px" align="center" />
             <el-table-column label="调节前理论干物质量" prop="ftweight" min-width="70px" align="center" />

+ 1 - 1
src/views/formulationPlan/dhedFormula/index - 20230829备份.vue

@@ -264,7 +264,7 @@
               </template>
             </u-table-column> -->
             <u-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <u-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
+            <u-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
             <u-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
             <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />

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

@@ -303,7 +303,7 @@
               </template>
             </u-table-column> -->
             <u-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <u-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
+            <u-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
             <u-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
             <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />

+ 1 - 1
src/views/formulationPlan/dhedFormula/index备.vue

@@ -264,7 +264,7 @@
               </template>
             </u-table-column> -->
             <u-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <u-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
+            <u-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
             <u-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
             <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />

+ 2 - 2
src/views/formulationPlan/materialIssuancePlan/historyRecord.vue

@@ -21,7 +21,7 @@
         class="elTable table-fixed"
         row-key="id"
       >
-        <el-table-column label="车次" width="85px" align="center">
+        <el-table-column :label="$t('errorAnalysis.projname')" width="85px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
           </template>
@@ -41,7 +41,7 @@
             <el-switch v-model="scope.row.sel" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleTakeEffectChange(scope.$index, scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column label="班次" width="100px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  width="100px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.timesstr }}</span>
           </template>

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

@@ -44,7 +44,7 @@
         @selection-change="handleSelect"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column label="车次" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
+        <el-table-column :label="$t('errorAnalysis.projname')" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
           </template>
@@ -64,7 +64,7 @@
             <el-switch v-model="scope.row.sel" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
           </template>
         </el-table-column>
-        <el-table-column label="班次" width="65px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  width="65px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.timesstr }}</span>
           </template>
@@ -764,41 +764,41 @@ export default {
       postJson(url, data).then(response => {
         console.log(response.data.list[0].inforvalue)
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: 1, name: '第一班' }]
+          this.frequencyList = [{ id: 1, name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), }
           ]
         } else if (response.data.list[0].inforvalue == 3) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), }
           ]
         } else if (response.data.list[0].inforvalue == 4) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' },
-            { id: 4, name: '第四班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), },
+            { id: 4, name: this.$t('errorAnalysis.four'), }
           ]
         }else if (response.data.list[0].inforvalue == 5) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' },
-            { id: 4, name: '第四班' },
-            { id: 5, name: '第五班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), },
+            { id: 4, name: this.$t('errorAnalysis.four'), },
+            { id: 5, name: this.$t('errorAnalysis.five'), }
           ]
         }else if (response.data.list[0].inforvalue == 6) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' },
-            { id: 4, name: '第四班' },
-            { id: 5, name: '第五班' },
-            { id: 6, name: '第六班' },
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), },
+            { id: 4, name: this.$t('errorAnalysis.four'), },
+            { id: 5, name: this.$t('errorAnalysis.five'), },
+            { id: 6, name: this.$t('errorAnalysis.six'), },
           ]
         }
       })

+ 12 - 12
src/views/formulationPlan/materialIssuancePlan/index1.vue

@@ -43,7 +43,7 @@
         @selection-change="handleSelect"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column label="车次" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
+        <el-table-column :label="$t('errorAnalysis.projname')" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
           </template>
@@ -63,7 +63,7 @@
             <el-switch v-model="scope.row.sel" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
           </template>
         </el-table-column>
-        <el-table-column label="班次" width="65px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  width="65px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.timesstr }}</span>
           </template>
@@ -644,24 +644,24 @@ export default {
       postJson(url, data).then(response => {
         console.log(response.data.list[0].inforvalue)
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: 1, name: '第一班' }]
+          this.frequencyList = [{ id: 1, name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), }
           ]
         } else if (response.data.list[0].inforvalue == 3) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), }
           ]
         } else if (response.data.list[0].inforvalue == 4) {
           this.frequencyList = [
-            { id: 1, name: '第一班' },
-            { id: 2, name: '第二班' },
-            { id: 3, name: '第三班' },
-            { id: 4, name: '第四班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), },
+            { id: 2, name: this.$t('errorAnalysis.two'), },
+            { id: 3, name: this.$t('errorAnalysis.three'), },
+            { id: 4, name: this.$t('errorAnalysis.four'), }
           ]
         }
       })

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

@@ -31,7 +31,7 @@
         @selection-change="handleSelect"
       >
         <el-table-column type="selection" min-width="50" />
-        <el-table-column label="车次" min-width="110px" align="center">
+        <el-table-column :label="$t('errorAnalysis.projname')" min-width="110px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.sort }}</span>
             <el-input v-if="scope.row.Edit" v-model.trim="scope.row.sort" type="number" style="width:80%;padding:10px 0;" />
@@ -53,7 +53,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="班次" min-width="130px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.times }}</span>
             <el-select v-if="scope.row.Edit" v-model="scope.row.times" filterable placeholder="" class="filter-item" style="width:80%;padding:10px 0;" @change="(value)=> {changeTimes(value, scope.row)}">
@@ -140,7 +140,7 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
           >
-            <el-table-column label="车次" min-width="130px" align="center">
+            <el-table-column :label="$t('errorAnalysis.projname')" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sort }}</span>
               </template>
@@ -155,7 +155,7 @@
                 <span>{{ scope.row.tmrcode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="班次" min-width="130px" align="center">
+            <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.times }}</span>
               </template>
@@ -323,17 +323,17 @@ export default {
     getIsDisplay() {
       GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: '第一班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
         } else if (response.data.list[0].inforvalue == 5) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }]
         } else if (response.data.list[0].inforvalue == 6) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }, { id: '6', name: '第六班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }, { id: '6', name: this.$t('errorAnalysis.six'), }]
         }
       })
     },

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

@@ -34,7 +34,7 @@
         <el-table-column label="推料车" min-width="100px" align="center" class-name="small-padding fixed-width" fixed="left" prop="tname" />
         <el-table-column label="时间" min-width="100px" align="center" prop="date" />
         <el-table-column label="备注" min-width="100px" align="center" prop="remark" />
-        <el-table-column label="栏舍" min-width="100px" align="center" prop="bname" />
+        <el-table-column :label="$t('errorAnalysis.pen')" min-width="100px" align="center" prop="bname" />
         <el-table-column label="状态" min-width="90px" align="center">
           <template slot-scope="scope">
             <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />

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

@@ -25,13 +25,13 @@
         :data="table.list" border fit highlight-current-row style="width: 100%;" :row-style="rowStyle"
         :cell-style="cellStyle" class="elTable table-fixed" row-key="id" @selection-change="handleSelect">
         <el-table-column type="selection" min-width="50" />
-        <el-table-column label="车次" min-width="80px" align="center">
+        <el-table-column :label="$t('errorAnalysis.projname')" min-width="80px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
 
           </template>
         </el-table-column>
-        <el-table-column label="栏舍" min-width="110px" align="center">
+        <el-table-column :label="$t('errorAnalysis.pen')" min-width="110px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.qstr }}</span>
 
@@ -49,7 +49,7 @@
               inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
           </template>
         </el-table-column>
-        <el-table-column label="班次" min-width="120px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="120px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.times }}</span>
 
@@ -237,12 +237,12 @@
           <el-table :key="history.tableKey" v-loading="history.listLoading" element-loading-text="给我一点时间"
             :data="history.list" border fit highlight-current-row style="width: 100%;" :row-style="rowStyle"
             :cell-style="cellStyle" class="elTable table-fixed">
-            <el-table-column label="车次" min-width="130px" align="center">
+            <el-table-column :label="$t('errorAnalysis.projname')" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sort }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="栏舍" min-width="130px" align="center">
+            <el-table-column :label="$t('errorAnalysis.pen')" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.qstr }}</span>
               </template>
@@ -258,7 +258,7 @@
                   :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
               </template>
             </el-table-column>
-            <el-table-column label="班次" min-width="130px" align="center">
+            <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.times }}</span>
               </template>
@@ -550,77 +550,77 @@
           if (response.data.list[0].inforvalue == 1) {
             this.frequencyList = [{
               id: '1',
-              name: '第一班'
+              name: this.$t('errorAnalysis.one'),
             }]
           } else if (response.data.list[0].inforvalue == 2) {
             this.frequencyList = [{
               id: '1',
-              name: '第一班'
+              name: this.$t('errorAnalysis.one'),
             }, {
               id: '2',
-              name: '第二班'
+              name: this.$t('errorAnalysis.two'),
             }]
           } else if (response.data.list[0].inforvalue == 3) {
             this.frequencyList = [{
               id: '1',
-              name: '第一班'
+              name: this.$t('errorAnalysis.one'),
             }, {
               id: '2',
-              name: '第二班'
+              name: this.$t('errorAnalysis.two'),
             }, {
               id: '3',
-              name: '第三班'
+              name: this.$t('errorAnalysis.three'),
             }]
           } else if (response.data.list[0].inforvalue == 4) {
             this.frequencyList = [{
               id: '1',
-              name: '第一班'
+              name: this.$t('errorAnalysis.one'),
             }, {
               id: '2',
-              name: '第二班'
+              name: this.$t('errorAnalysis.two'),
             }, {
               id: '3',
-              name: '第三班'
+              name: this.$t('errorAnalysis.three'),
             }, {
               id: '4',
-              name: '第四班'
+              name: this.$t('errorAnalysis.four'),
             }]
           }else if (response.data.list[0].inforvalue == 5) {
             this.frequencyList = [{
               id: '1',
-              name: '第一班'
+              name: this.$t('errorAnalysis.one'),
             }, {
               id: '2',
-              name: '第二班'
+              name: this.$t('errorAnalysis.two'),
             }, {
               id: '3',
-              name: '第三班'
+              name: this.$t('errorAnalysis.three'),
             }, {
               id: '4',
-              name: '第四班'
+              name: this.$t('errorAnalysis.four'),
             }, {
               id: '5',
-              name: '第五班'
+              name: this.$t('errorAnalysis.five'),
             }]
           }else if (response.data.list[0].inforvalue == 6) {
             this.frequencyList = [{
               id: '1',
-              name: '第一班'
+              name: this.$t('errorAnalysis.one'),
             }, {
               id: '2',
-              name: '第二班'
+              name: this.$t('errorAnalysis.two'),
             }, {
               id: '3',
-              name: '第三班'
+              name: this.$t('errorAnalysis.three'),
             }, {
               id: '4',
-              name: '第四班'
+              name: this.$t('errorAnalysis.four'),
             }, {
               id: '5',
-              name: '第五班'
+              name: this.$t('errorAnalysis.five'),
             }, {
               id: '6',
-              name: '第六班'
+              name: this.$t('errorAnalysis.six'),
             }]
           }
         })

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

@@ -20,7 +20,7 @@
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
       <el-dropdown style="float: right;margin-right: 10px;">
-        <el-button class="export" icon="el-icon-upload2"{{$t('dashboard.Export')}}/el-button>
+        <el-button class="export" icon="el-icon-upload2">{{$t('dashboard.Export')}}</el-button>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
           <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>

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

@@ -18,7 +18,7 @@
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus"  @click="handleCreate">分配</el-button>
       <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
-      <el-button class="export" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport"{{$t('dashboard.Export')}}/el-button>
+      <el-button class="export" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport">{{$t('dashboard.Export')}}</el-button>
     </div>
     <div class="table">
       <el-table
@@ -47,7 +47,7 @@
             <span>{{ scope.row.operatetime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="班次" min-width="150px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="150px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.times }}</span>
           </template>
@@ -113,7 +113,7 @@
                   :cell-style="cellStyle"
                   class="elTable table-fixed"
                 >
-                  <el-table-column label="班次" min-width="150px" align="center">
+                  <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="150px" align="center">
                     <template slot-scope="scope">
                       <span>{{ scope.row.timesstr }}</span>
                     </template>
@@ -164,7 +164,7 @@
                   :cell-style="cellStyle"
                   class="elTable table-fixed"
                 >
-                  <el-table-column label="班次" min-width="150px" align="center">
+                  <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="150px" align="center">
                     <template slot-scope="scope">
                       <span>{{ scope.row.timesstr }}</span>
                     </template>

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

@@ -21,7 +21,7 @@
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
       <el-dropdown style="float: right;margin-right: 10px;">
-        <el-button class="export" icon="el-icon-upload2"{{$t('dashboard.Export')}}/el-button>
+        <el-button class="export" icon="el-icon-upload2">{{$t('dashboard.Export')}}</el-button>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
           <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>

+ 2 - 2
src/views/shedProduction/formulaDryMatter/historyRecord.vue

@@ -22,7 +22,7 @@
       >
         <el-table-column :key="1" label="序号" prop="sort" align="center" width="50px" />
         <el-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" />
-        <el-table-column :key="3" label="班次" prop="time1" min-width="90px" align="center" />
+        <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="time1" min-width="90px" align="center" />
         <el-table-column :key="4" label="鲜重重量(g)" prop="freshweight" min-width="90px" align="center" />
         <el-table-column :key="5" label="烘干重量(g)" prop="dryweight" min-width="90px" align="center" />
         <el-table-column :key="6" label="理论干物质" prop="thoweight" min-width="90px" align="center" />
@@ -59,7 +59,7 @@
           >
             <el-table-column :key="1" label="序号" prop="sort" align="center" width="50px" />
             <el-table-column :key="2" label="修改时间" prop="changeTime1" min-width="90px" align="center" />
-            <el-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" />
+            <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" />
             <el-table-column :key="4" label="鲜重重量(g)" prop="times" min-width="90px" align="center" />
             <el-table-column :key="5" label="烘干重量(g)" prop="times" min-width="90px" align="center" />
             <el-table-column :key="6" label="理论干物质" prop="times" min-width="90px" align="center" />

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

@@ -58,7 +58,7 @@
             <span>{{ scope.row.barname }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="班次" min-width="90px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.timesstr }}</span>
           </template>

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

@@ -62,7 +62,7 @@
         <el-table-column  :label="$t('errorAnalysis.isHouseName')"  min-width="150px" align="center" prop="barname" />
         <el-table-column label="剩料量(kg)" min-width="150px" align="center" prop="remain" />
         <el-table-column label="干物质" min-width="150px" align="center" prop="dry" />
-        <el-table-column label="班次" min-width="90px" align="center" prop="timesstr" />
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="90px" align="center" prop="timesstr" />
         <el-table-column label="收集时间" min-width="100px" align="center" prop="operatetime" />
         <el-table-column label="操作人" min-width="90px" align="center" prop="emp" />
         <el-table-column  :label="$t('errorAnalysis.cz')" align="center" width="80" class-name="small-padding fixed-width" fixed="right">

+ 2 - 2
src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue

@@ -22,7 +22,7 @@
       >
         <el-table-column :key="1" label="序号" prop="sort" align="center" width="50px" />
         <el-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" />
-        <el-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" />
+        <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" />
         <el-table-column :key="4" label="第一层" min-width="90px" align="center">
           <el-table-column label="比例 (%)" prop="onerate" min-width="90px" align="center" />
           <el-table-column label="重量 (g)" prop="oneweight" min-width="90px" align="center" />
@@ -71,7 +71,7 @@
           >
             <el-table-column :key="1" label="序号" prop="sort" align="center" width="50px" />
             <el-table-column :key="2" label="修改时间" prop="operatetime1" min-width="90px" align="center" />
-            <el-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" />
+            <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" />
             <el-table-column :key="4" label="第一层" min-width="90px" align="center">
               <el-table-column label="比例 (%)" prop="onerate" min-width="90px" align="center" />
               <el-table-column label="重量 (g)" prop="oneweight" min-width="90px" align="center" />

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

@@ -58,7 +58,7 @@
             <span>{{ scope.row.barname }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="班次" min-width="70px" align="center">
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="70px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.times }}</span>
           </template>

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

@@ -21,7 +21,7 @@
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
       <el-dropdown style="float: right;margin-right: 10px;">
-        <el-button class="export" icon="el-icon-upload2"{{$t('dashboard.Export')}}/el-button>
+        <el-button class="export" icon="el-icon-upload2">{{$t('dashboard.Export')}}</el-button>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
           <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>

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

@@ -20,7 +20,7 @@
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
       <el-dropdown style="float: right;margin-right: 10px;">
-        <el-button class="export" icon="el-icon-upload2"{{$t('dashboard.Export')}}/el-button>
+        <el-button class="export" icon="el-icon-upload2">{{$t('dashboard.Export')}}</el-button>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
           <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>

+ 2 - 2
src/views/statisticalAnalysis/equipmentRunningTrack/index - 副本.vue

@@ -52,8 +52,8 @@
             @row-click="rowClick2"
           >
             <el-table-column label="设备名称" min-width="90px" align="center" prop="field1" />
-            <el-table-column label="开始时间" min-width="80px" align="center" prop="field2" />
-            <el-table-column label="结束时间" min-width="90px" align="center" prop="field3" />
+            <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="80px" align="center" prop="field2" />
+            <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="90px" align="center" prop="field3" />
             <el-table-column label="时长(分钟)" min-width="100px" align="center" prop="field4" />
           </el-table>
         </div>

+ 2 - 2
src/views/statisticalAnalysis/equipmentRunningTrack/index.vue

@@ -52,8 +52,8 @@
             @row-click="rowClick2"
           >
             <el-table-column label="设备名称" min-width="90px" align="center" prop="field1" />
-            <el-table-column label="开始时间" min-width="80px" align="center" prop="field2" />
-            <el-table-column label="结束时间" min-width="90px" align="center" prop="field3" />
+            <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="80px" align="center" prop="field2" />
+            <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="90px" align="center" prop="field3" />
             <el-table-column label="时长(分钟)" min-width="100px" align="center" prop="field4" />
           </el-table>
         </div>

+ 2 - 2
src/views/statisticalAnalysis/errorAnalysis/group/index.vue

@@ -5,12 +5,12 @@
       <el-tab-pane  :label="$t('errorAnalysis.sumName')"     name="first">
         <component :is="myComponent1" ref="detail1" />
       </el-tab-pane>
-      <el-tab-pane label="混料统计" name="second">
+      <el-tab-pane :label="$t('errorAnalysis.hltj')"name="second">
         <keep-alive>
           <component :is="myComponent2" ref="detail2" />
         </keep-alive>
       </el-tab-pane>
-      <el-tab-pane label="撒料统计" name="third">
+      <el-tab-pane :label="$t('errorAnalysis.sltj')" name="third">
         <keep-alive>
           <component :is="myComponent3" ref="detail3" />
         </keep-alive>

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

@@ -16,7 +16,7 @@
       />
       <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
-      <el-button class="export" @click="handleDownload"{{$t('dashboard.Export')}}/el-button>
+      <el-button class="export" @click="handleDownload">{{$t('dashboard.Export')}}</el-button>
       <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
     </div>
     <div id="table" class="table">
@@ -102,13 +102,13 @@
             <h4>计划统计</h4>
             <div v-if="chart1.isChart" class="button">
               <el-date-picker v-model="chart1.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-              <div class="exportTable" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart1')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="chart1.isChart" id="chartLine1" v-loading="chart1.listLoading" style="width:100%;height:400px;background: #fff;" />
             <div v-if="chart1.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart1')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -144,13 +144,13 @@
             <h4>{{$t('errorAnalysis.nqName')}}</h4>
             <div v-if="chart2.isChart" class="button">
               <el-date-picker v-model="chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart2')" />
-              <div class="exportTable" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart2')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="chart2.isChart" id="chartLine2" style="width:100%;height:400px;" />
             <div v-if="chart2.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart2')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -184,13 +184,13 @@
             <h4>混料次数统计</h4>
             <div v-if="chart3.isChart" class="button">
               <el-date-picker v-model="chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart3')" />
-              <div class="exportTable" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart3')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="chart3.isChart" id="chartLine3" style="width:100%;height:400px;" />
             <div v-if="chart3.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart3')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -208,8 +208,8 @@
                 class="elTable table-fixed"
               >
                 <el-table-column label="牧场" sortable min-width="90px" align="center" prop="牧场" />
-                <el-table-column label="自动跳转次数" sortable min-width="90px" align="center" prop="field1" />
-                <el-table-column label="手动跳转次数" sortable min-width="100px" align="center" prop="field2" />
+                <el-table-column :label="$t('errorAnalysis.zdtzcs')" sortable min-width="90px" align="center" prop="field1" />
+                <el-table-column :label="$t('errorAnalysis.sdtzcs')" sortable min-width="100px" align="center" prop="field2" />
                 <el-table-column label="混料取消次数" sortable min-width="100px" align="center" prop="field5" />
               </el-table>
             </div>
@@ -221,13 +221,13 @@
             <h4>混料准确率统计</h4>
             <div v-if="chart4.isChart" class="button">
               <el-date-picker v-model="chart4.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart4')" />
-              <div class="exportTable" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart4')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="chart4.isChart" id="chartLine4" style="width:100%;height:400px;" />
             <div v-if="chart4.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart4')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -245,14 +245,14 @@
                 class="elTable table-fixed"
               >
                 <el-table-column sortable label="牧场" sortable min-width="90px" align="center" prop="牧场" />
-                <el-table-column label="自动跳转次数" sortable min-width="80px" align="center" prop="field3" />
-                <el-table-column label="手动跳转次数" sortable min-width="80px" align="center" prop="field4" />
-                <el-table-column label="自动跳转理论重量" sortable min-width="85px" align="center" prop="理论自动" />
-                <el-table-column label="自动跳转实际重量" sortable min-width="85px" align="center" prop="实际自动" />
-                <el-table-column label="自动跳转准确率" sortable min-width="85px" align="center" prop="field1" />
-                <el-table-column label="手动跳转理论重量" sortable min-width="85px" align="center" prop="理论手动" />
-                <el-table-column label="手动跳转实际重量" sortable min-width="85px" align="center" prop="实际手动" />
-                <el-table-column label="手动跳转准确率" sortable min-width="85px" align="center" prop="field2" />
+                <el-table-column :label="$t('errorAnalysis.zdtzcs')" sortable min-width="80px" align="center" prop="field3" />
+                <el-table-column :label="$t('errorAnalysis.sdtzcs')" sortable min-width="80px" align="center" prop="field4" />
+                <el-table-column :label="$t('errorAnalysis.zdtzllzl')" sortable min-width="85px" align="center" prop="理论自动" />
+                <el-table-column :label="$t('errorAnalysis.zdtzsjzl')" sortable min-width="85px" align="center" prop="实际自动" />
+                <el-table-column :label="$t('errorAnalysis.zdtzzql')" sortable min-width="85px" align="center" prop="field1" />
+                <el-table-column :label="$t('errorAnalysis.sdtzllzl')" sortable min-width="85px" align="center" prop="理论手动" />
+                <el-table-column :label="$t('errorAnalysis.sdtzsjzl')" sortable min-width="85px" align="center" prop="实际手动" />
+                <el-table-column :label="$t('errorAnalysis.sdtzzql')" sortable min-width="85px" align="center" prop="field2" />
               </el-table>
             </div>
           </div>
@@ -266,13 +266,13 @@
             <h4>栏舍平均撒料时间统计</h4>
             <div v-if="chart5.isChart" class="button">
               <el-date-picker v-model="chart5.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart5')" />
-              <div class="exportTable" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart5')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="chart5.isChart" id="chartLine5" style="width:100%;height:400px;" />
             <div v-if="chart5.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart5')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -301,13 +301,13 @@
             <h4>混料计划取消次数</h4>
             <div v-if="chart6.isChart" class="button">
               <el-date-picker v-model="chart6.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart6')" />
-              <div class="exportTable" @click="handleExport('chart6')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart6')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart6')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="chart6.isChart" id="chartLine6" style="width:100%;height:400px;" />
             <div v-if="chart6.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart6')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart6')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart6')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -372,9 +372,9 @@
             <el-table-column v-if="pasture.isFormulaName" :key="2" sortable  :label="$t('errorAnalysis.feedName')"  min-width="110px" align="center" prop="配方名称" />
             <el-table-column v-if="pasture.isHouseName" :key="3" sortable  :label="$t('errorAnalysis.isHouseName')"  min-width="110px" align="center" prop="栏舍名称" />
             <el-table-column v-if="pasture.isLivestockType" :key="4" sortable :label="$t('errorAnalysis.sxlb')" min-width="110px" align="center" prop="牲畜类别" />
-            <el-table-column v-if="pasture.isTrainNumber" :key="5" sortable label="车次" min-width="110px" align="center" prop="车次" />
-            <el-table-column v-if="pasture.isTrainNumber" :key="6" sortable label="班次" min-width="110px" align="center" prop="班次" />
-            <el-table-column v-if="pasture.isTrainNumber" :key="7" sortable label="TMR名称" min-width="110px" align="center" prop="TMR名称" />
+            <el-table-column v-if="pasture.isTrainNumber" :key="5" sortable :label="$t('errorAnalysis.projname')" min-width="110px" align="center" prop="车次" />
+            <el-table-column v-if="pasture.isTrainNumber" :key="6" sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="110px" align="center" prop="班次" />
+            <el-table-column v-if="pasture.isTrainNumber" :key="7" sortable :label="$t('errorAnalysis.tmrnames')" min-width="110px" align="center" prop="TMR名称" />
             <el-table-column v-if="pasture.isTrainNumber" :key="8" sortable  :label="$t('errorAnalysis.Driver')"  min-width="110px" align="center" prop="驾驶员" />
             <el-table-column :key="9" sortable  :label="$t('errorAnalysis.llzl')"  min-width="110px" align="center" prop="理论重量" />
             <el-table-column :key="10" sortable  :label="$t('errorAnalysis.acWeight')"  min-width="110px" align="center" prop="实际重量" />
@@ -409,9 +409,9 @@
             <el-table-column v-if="pasture.isFormulaName" :key="2" sortable  :label="$t('errorAnalysis.feedName')"  min-width="110px" align="center" prop="配方名称" />
             <el-table-column v-if="pasture.isHouseName" :key="3" sortable  :label="$t('errorAnalysis.isHouseName')"  min-width="110px" align="center" prop="栏舍名称" />
             <el-table-column v-if="pasture.isLivestockType" :key="4" sortable :label="$t('errorAnalysis.sxlb')" min-width="110px" align="center" prop="牲畜类别" />
-            <el-table-column v-if="pasture.isTrainNumber" :key="5" sortable label="车次" min-width="110px" align="center" prop="车次" />
-            <el-table-column v-if="pasture.isTrainNumber" :key="6" sortable label="班次" min-width="110px" align="center" prop="班次" />
-            <el-table-column v-if="pasture.isTrainNumber" :key="7" sortable label="TMR名称" min-width="110px" align="center" prop="TMR" />
+            <el-table-column v-if="pasture.isTrainNumber" :key="5" sortable :label="$t('errorAnalysis.projname')" min-width="110px" align="center" prop="车次" />
+            <el-table-column v-if="pasture.isTrainNumber" :key="6" sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="110px" align="center" prop="班次" />
+            <el-table-column v-if="pasture.isTrainNumber" :key="7" sortable :label="$t('errorAnalysis.tmrnames')" min-width="110px" align="center" prop="TMR" />
             <el-table-column v-if="pasture.isTrainNumber" :key="8" sortable  :label="$t('errorAnalysis.Driver')"  min-width="110px" align="center" prop="驾驶员" />
             <el-table-column :key="9" sortable  :label="$t('errorAnalysis.llzl')"  min-width="110px" align="center" prop="理论重量" />
             <el-table-column :key="10" sortable  :label="$t('errorAnalysis.acWeight')"  min-width="110px" align="center" prop="实际重量" />
@@ -1564,7 +1564,7 @@ export default {
           }
         },
         legend: {
-          data: ['自动跳转', '手动跳转', '取消次数']
+          data: [ this.$t('errorAnalysis.zdtz'), this.$t('errorAnalysis.sdtz'), this.$t('errorAnalysis.qxtz') ]
         },
         xAxis: [{ type: 'category', data: chartLine_data.data1, axisPointer: { type: 'shadow' }}],
         yAxis: [{ type: 'value', name: '次数', min: 0, max: 100, interval: 20, axisLabel: { formatter: '{value}' }}],
@@ -1585,7 +1585,7 @@ export default {
           }
         },
         {
-          name: '手动跳转',
+          name:this.$t('errorAnalysis.sdtz'),
           type: 'bar',
           itemStyle: {
             normal: {
@@ -1779,7 +1779,7 @@ export default {
         xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: [{
           type: '',
-          name: '时间',
+          name: this.$t('errorAnalysis.time'),
           mix: 0,
           max: 24,
           interval: 2,
@@ -2029,7 +2029,7 @@ export default {
             tHeader: ['日期', '自动跳转次数', '手动跳转次数', '自动跳转理论重量', '自动跳转实际重量', '自动跳转准确率', '手动跳转理论重量', '手动跳转实际重量', '手动跳转准确率'],
             filterVal: ['日期', 'field1', 'field2', '理论自动', '实际自动', 'field3', '理论手动', '实际手动', 'field4'],
             tableDatas: this.chart5.table.list,
-            sheetName: '混料统计'
+            sheetName: this.$t('errorAnalysis.hltj')
           }
         ]
         json2excel(excelDatasTabChart5, '混料统计', true, 'xlsx')

+ 25 - 25
src/views/statisticalAnalysis/errorAnalysis/group/tab2.vue

@@ -16,7 +16,7 @@
           <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
         <el-input v-model="table.getdataListParm.parammaps.templetname" style="width: 120px;float: left;" placeholder="配方名称" class="filter-item" clearable />
-        <el-select v-model="table.getdataListParm.parammaps.buttontype" style="width: 120px;float: left;" filterable placeholder="跳转方式" class="filter-item" clearable>
+        <el-select v-model="table.getdataListParm.parammaps.buttontype" style="width: 120px;float: left;" filterable :placeholder="$t('errorAnalysis.tzfs')"class="filter-item" clearable>
           <el-option v-for="item in jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
         <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 120px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
@@ -24,7 +24,7 @@
         </el-select>
         <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
-        <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport"{{$t('dashboard.Export')}}/el-button>
+        <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">{{$t('dashboard.Export')}}</el-button>
       </div>
     </div>
 
@@ -45,22 +45,22 @@
       >
         <el-table-column label="牧场" min-width="90px" align="center" prop="牧场" />
         <el-table-column :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
-        <el-table-column label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-        <el-table-column label="车次" min-width="50px" align="center" prop="车次" />
-        <el-table-column label="班次" min-width="50px" align="center" prop="班次" />
+        <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
+        <el-table-column :label="$t('errorAnalysis.projname')" min-width="50px" align="center" prop="车次" />
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="50px" align="center" prop="班次" />
         <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="90px" align="center" prop="配方名称" />
-        <el-table-column label="饲料" min-width="70px" align="center" prop="饲料" />
+        <el-table-column :label="$t('errorAnalysis.isFeed')"  min-width="70px" align="center" prop="饲料" />
         <el-table-column  :label="$t('errorAnalysis.llzl')"  min-width="55px" align="center" prop="理论重量" />
         <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="55px" align="center" prop="实际重量" />
-        <el-table-column label="误差值" min-width="45px" align="center" prop="误差值" />
+        <el-table-column :label="$t('errorAnalysis.wcz')" min-width="45px" align="center" prop="误差值" />
         <el-table-column :label="$t('errorAnalysis.zql')" min-width="45px" align="center" prop="准确率" />
-        <el-table-column label="计划时间" min-width="55px" align="center" prop="计划时间" />
-        <el-table-column label="开始时间" min-width="55px" align="center" prop="开始时间" />
-        <el-table-column label="结束时间" min-width="55px" align="center" prop="结束时间" />
-        <el-table-column label="搅拌时间" min-width="55px" align="center" prop="搅拌时间" />
-        <el-table-column label="跳转方式" min-width="55px" align="center" prop="跳转方式" />
-        <el-table-column label="开始重量" min-width="55px" align="center" prop="开始重量" />
-        <el-table-column label="结束重量" min-width="55px" align="center" prop="结束重量" />
+        <el-table-column :label="$t('errorAnalysis.planTime')"  min-width="55px" align="center" prop="计划时间" />
+        <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="55px" align="center" prop="开始时间" />
+        <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="55px" align="center" prop="结束时间" />
+        <el-table-column :label="$t('errorAnalysis.jsTime')"  min-width="55px" align="center" prop="搅拌时间" />
+        <el-table-column :label="$t('errorAnalysis.tzfs')"  min-width="55px" align="center" prop="跳转方式" />
+        <el-table-column :label="$t('errorAnalysis.stWeight')"  min-width="55px" align="center" prop="开始重量" />
+        <el-table-column :label="$t('errorAnalysis.edWeight')"  min-width="55px" align="center" prop="结束重量" />
       </el-table>
     </div>
   </div>
@@ -124,7 +124,7 @@ export default {
         }
       },
       frequencyList: [],
-      jumpModeList: [{ id: '0', name: '手动跳转' }, { id: '1', name: '自动跳转' }],
+      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
       isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }],
       table: {
         getdataListParm: {
@@ -182,18 +182,18 @@ export default {
     getIsDisplay() {
       GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: '第一班' }]
-          this.frequencyList = [{ id: '1', name: '第一班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
         }
       })
     },
@@ -285,7 +285,7 @@ export default {
           tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', ' 跳转方式', '开始重量', '结束重量', '搅拌时间'],
           filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
           tableDatas: this.table.list,
-          sheetName: '混料统计'
+          sheetName: this.$t('errorAnalysis.hltj')
         }
       ]
       json2excel(excelDatasTab2, '混料统计', true, 'xlsx')

+ 18 - 18
src/views/statisticalAnalysis/errorAnalysis/group/tab3.vue

@@ -17,7 +17,7 @@
         </el-select>
         <el-input v-model="table.getdataListParm.parammaps.templetname" style="width: 110px;float: left;" placeholder="配方名称" class="filter-item" clearable />
         <el-input v-model="table.getdataListParm.parammaps.fname" style="width: 110px;float: left;" :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" clearable />
-        <el-select v-model="table.getdataListParm.parammaps.buttontype" style="width: 110px;float: left;" filterable placeholder="跳转方式" class="filter-item" clearable>
+        <el-select v-model="table.getdataListParm.parammaps.buttontype" style="width: 110px;float: left;" filterable :placeholder="$t('errorAnalysis.tzfs')"class="filter-item" clearable>
           <el-option v-for="item in jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
         <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 110px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
@@ -25,7 +25,7 @@
         </el-select>
         <el-button class="successBorder" style="float:left;" @click="form_search">{{$t('common.query')}}</el-button>
         <el-button class="successBorder" style="float:left;" @click="handleRefresh">{{$t('common.reset')}}</el-button>
-        <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport"{{$t('dashboard.Export')}}/el-button>
+        <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">{{$t('dashboard.Export')}}</el-button>
       </div>
     </div>
     <div class="table">
@@ -45,21 +45,21 @@
       >
         <el-table-column label="牧场" min-width="55px" align="center" prop="牧场" />
         <el-table-column :label="$t('errorAnalysis.date')" min-width="55px" align="center" prop="日期" />
-        <el-table-column label="TMR名称" min-width="55px" align="center" prop="TMR名称" />
-        <el-table-column label="车次" min-width="55px" align="center" prop="车次" />
-        <el-table-column label="班次" min-width="55px" align="center" prop="班次" />
+        <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="55px" align="center" prop="TMR名称" />
+        <el-table-column :label="$t('errorAnalysis.projname')" min-width="55px" align="center" prop="车次" />
+        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="55px" align="center" prop="班次" />
         <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="55px" align="center" prop="配方名称" />
-        <el-table-column label="栏舍" min-width="55px" align="center" prop="栏舍" />
+        <el-table-column :label="$t('errorAnalysis.pen')" min-width="55px" align="center" prop="栏舍" />
         <el-table-column  :label="$t('errorAnalysis.llzl')"  min-width="55px" align="center" prop="理论重量" />
         <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="55px" align="center" prop="实际重量" />
-        <el-table-column label="误差值" min-width="55px" align="center" prop="误差值" />
+        <el-table-column :label="$t('errorAnalysis.wcz')" min-width="55px" align="center" prop="误差值" />
         <el-table-column :label="$t('errorAnalysis.zql')" min-width="55px" align="center" prop="准确率" />
-        <el-table-column label="开始时间" min-width="55px" align="center" prop="开始时间" />
-        <el-table-column label="结束时间" min-width="55px" align="center" prop="结束时间" />
-        <!-- <el-table-column label="搅拌时间" min-width="70px" align="center" prop="搅拌时间" /> -->
-        <el-table-column label="跳转方式" min-width="55px" align="center" prop="跳转方式" />
-        <el-table-column label="开始重量" min-width="55px" align="center" prop="开始重量" />
-        <el-table-column label="结束重量" min-width="55px" align="center" prop="结束重量" />
+        <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="55px" align="center" prop="开始时间" />
+        <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="55px" align="center" prop="结束时间" />
+        <!-- <el-table-column :label="$t('errorAnalysis.jsTime')"  min-width="70px" align="center" prop="搅拌时间" /> -->
+        <el-table-column :label="$t('errorAnalysis.tzfs')"  min-width="55px" align="center" prop="跳转方式" />
+        <el-table-column :label="$t('errorAnalysis.stWeight')"  min-width="55px" align="center" prop="开始重量" />
+        <el-table-column :label="$t('errorAnalysis.edWeight')"  min-width="55px" align="center" prop="结束重量" />
       </el-table>
       <!-- <pagination v-show="tab3.table.total>=0" :total="tab3.table.total" :page.sync="tab3.table.getdataListParm.offset" :limit.sync="tab3.table.getdataListParm.pagecount" @pagination="getTab3List" /> -->
     </div>
@@ -123,7 +123,7 @@ export default {
           }
         }
       },
-      jumpModeList: [{ id: '0', name: '手动跳转' }, { id: '1', name: '自动跳转' }],
+      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
       frequencyList: [],
       isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }],
       table: {
@@ -183,13 +183,13 @@ export default {
     getIsDisplay() {
       GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: '第一班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
         }
       })
     },

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

@@ -94,15 +94,15 @@
             <u-table-column v-if="tab.isFormulaName" :key="2" sortable  :label="$t('errorAnalysis.feedName')"  min-width="70px" align="center" prop="配方名称" />
             <u-table-column v-if="tab.isHouseName" :key="3" sortable  :label="$t('errorAnalysis.isHouseName')"  min-width="70px" align="center" prop="栏舍名称" />
             <u-table-column v-if="tab.isLivestockType" :key="4" sortable :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
-            <u-table-column v-if="tab.isTrainNumber" :key="5" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-            <u-table-column v-if="tab.isTrainNumber" :key="6" sortable label="车次" min-width="70px" align="center" prop="车次" />
-            <u-table-column v-if="tab.isTrainNumber" :key="7" sortable label="班次" min-width="70px" align="center" prop="班次" />
+            <u-table-column v-if="tab.isTrainNumber" :key="5" sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
+            <u-table-column v-if="tab.isTrainNumber" :key="6" sortable :label="$t('errorAnalysis.projname')" min-width="70px" align="center" prop="车次" />
+            <u-table-column v-if="tab.isTrainNumber" :key="7" sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="70px" align="center" prop="班次" />
             <u-table-column v-if="tab.isTrainNumber" :key="8" sortable  :label="$t('errorAnalysis.Driver')"  min-width="70px" align="center" prop="驾驶员" />
-            <u-table-column v-if="tab.isTMRName" :key="9" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-            <u-table-column v-if="tab.isTMRName" :key="10" sortable label="班次" min-width="70px" align="center" prop="班次" />
-            <u-table-column v-if="tab.isTMRName" :key="11" sortable label="车次" min-width="70px" align="center" prop="车次" />
+            <u-table-column v-if="tab.isTMRName" :key="9" sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
+            <u-table-column v-if="tab.isTMRName" :key="10" sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="70px" align="center" prop="班次" />
+            <u-table-column v-if="tab.isTMRName" :key="11" sortable :label="$t('errorAnalysis.projname')" min-width="70px" align="center" prop="车次" />
             <u-table-column v-if="tab.isTMRName" :key="12" sortable  :label="$t('errorAnalysis.Driver')"  min-width="70px" align="center" prop="驾驶员" />
-            <u-table-column v-if="tab.isFeed" :key="13" sortable label="饲料" min-width="70px" align="center" prop="fname" />
+            <u-table-column v-if="tab.isFeed" :key="13" sortable :label="$t('errorAnalysis.isFeed')"  min-width="70px" align="center" prop="fname" />
             <u-table-column :key="14" sortable  :label="$t('errorAnalysis.llzl')"  min-width="60px" align="center" prop="理论重量" />
             <u-table-column :key="15" sortable  :label="$t('errorAnalysis.acWeight')"  min-width="60px" align="center" prop="实际重量" />
             <u-table-column :key="16" sortable :label="$t('errorAnalysis.jshlczs')" min-width="60px" align="center" prop="计划混料操作数" />
@@ -120,7 +120,7 @@
             <u-table-column :key="28" sortable :label="$t('processAnalysis.hlzql')" min-width="70px" align="center" prop="混料正确率" />
             <u-table-column :key="29" sortable :label="$t('errorAnalysis.qcqxzql')" min-width="60px" align="center" prop="去除取消正确率" />
             <u-table-column :key="30" sortable  :label="$t('errorAnalysis.bzc')"  min-width="60px" align="center" prop="方差" />
-            <u-table-column :key="31" v-if="tab.isTrainNumber" sortable label="区域" min-width="60px" align="center" prop="barname" />
+            <u-table-column :key="31" v-if="tab.isTrainNumber" sortable :label="$t('errorAnalysis.area')"  min-width="60px" align="center" prop="barname" />
             <u-table-column v-if="activeName=='first' && tab.table.list !== null" :key="33" align="center" width="70"  :label="$t('errorAnalysis.cz')" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
                 <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('1',row)" />
@@ -160,15 +160,15 @@
               <u-table-column v-if="tab.isFormulaName" :key="2" sortable  :label="$t('errorAnalysis.feedName')"  min-width="70px" align="center" prop="配方名称" />
               <u-table-column v-if="tab.isHouseName" :key="3" sortable  :label="$t('errorAnalysis.isHouseName')"  min-width="70px" align="center" prop="栏舍名称" />
               <u-table-column v-if="tab.isLivestockType" :key="4" sortable :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
-              <u-table-column v-if="tab.isTrainNumber" :key="5" sortable label="车次" min-width="70px" align="center" prop="车次" />
-              <u-table-column v-if="tab.isTrainNumber" :key="6" sortable label="班次" min-width="70px" align="center" prop="班次" />
-              <u-table-column v-if="tab.isTrainNumber" :key="7" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
+              <u-table-column v-if="tab.isTrainNumber" :key="5" sortable :label="$t('errorAnalysis.projname')" min-width="70px" align="center" prop="车次" />
+              <u-table-column v-if="tab.isTrainNumber" :key="6" sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="70px" align="center" prop="班次" />
+              <u-table-column v-if="tab.isTrainNumber" :key="7" sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
               <u-table-column v-if="tab.isTrainNumber" :key="8" sortable  :label="$t('errorAnalysis.Driver')"  min-width="70px" align="center" prop="驾驶员" />
-              <u-table-column v-if="tab.isTMRName" :key="9" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-              <u-table-column v-if="tab.isTMRName" :key="10" sortable label="班次" min-width="70px" align="center" prop="班次" />
-              <u-table-column v-if="tab.isTMRName" :key="11" sortable label="车次" min-width="70px" align="center" prop="车次" />
+              <u-table-column v-if="tab.isTMRName" :key="9" sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
+              <u-table-column v-if="tab.isTMRName" :key="10" sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="70px" align="center" prop="班次" />
+              <u-table-column v-if="tab.isTMRName" :key="11" sortable :label="$t('errorAnalysis.projname')" min-width="70px" align="center" prop="车次" />
               <u-table-column v-if="tab.isTMRName" :key="12" sortable  :label="$t('errorAnalysis.Driver')"  min-width="70px" align="center" prop="驾驶员" />
-              <u-table-column v-if="tab.isFeed" :key="13" sortable label="饲料" min-width="70px" align="center" prop="饲料" />
+              <u-table-column v-if="tab.isFeed" :key="13" sortable :label="$t('errorAnalysis.isFeed')"  min-width="70px" align="center" prop="饲料" />
               <u-table-column :key="14" sortable  :label="$t('errorAnalysis.llzl')"  min-width="60px" align="center" prop="理论重量" />
               <u-table-column :key="15" sortable  :label="$t('errorAnalysis.acWeight')"  min-width="60px" align="center" prop="实际重量" />
               <u-table-column :key="16" sortable  :label="$t('errorAnalysis.sljhczs')"  min-width="60px" align="center" prop="计划撒料操作数" />
@@ -186,7 +186,7 @@
               <u-table-column :key="28" sortable :label="$t('processAnalysis.slzql')" min-width="70px" align="center" prop="撒料正确率" />
               <u-table-column :key="29" sortable :label="$t('errorAnalysis.qcqxzql')" min-width="65px" align="center" prop="去除取消正确率" />
               <u-table-column :key="30" sortable  :label="$t('errorAnalysis.bzc')"  min-width="60px" align="center" prop="方差" />
-              <u-table-column :key="31" v-if="tab.isTrainNumber" sortable label="区域" min-width="60px" align="center" prop="barname" />
+              <u-table-column :key="31" v-if="tab.isTrainNumber" sortable :label="$t('errorAnalysis.area')"  min-width="60px" align="center" prop="barname" />
               <u-table-column v-if="activeName=='first' && tab.table2.list !== null" :key="32" align="center" width="70"  :label="$t('errorAnalysis.cz')" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="{row}">
                   <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('2',row)" />
@@ -465,7 +465,7 @@
                     class="elTable table-fixed"
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="90px" align="center" prop="日期" />
-                    <el-table-column label="车次" sortable min-width="90px" align="center" prop="名称" />
+                    <el-table-column :label="$t('errorAnalysis.projname')" sortable min-width="90px" align="center" prop="名称" />
                     <el-table-column :label="$t('errorAnalysis.jhzl')" sortable min-width="100px" align="center" prop="理论量" />
                     <el-table-column :label="$t('errorAnalysis.skzl')"sortable min-width="100px" align="center" prop="实际量" />
                     <el-table-column :label="$t('errorAnalysis.zql')" sortable min-width="90px" align="center" prop="准确率" />
@@ -527,21 +527,21 @@
                     class="elTable table-fixed"
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="100px" align="center" prop="日期" />
-                    <el-table-column label="自动跳转次数" sortable min-width="130px" align="center" prop="field1" />
-                    <el-table-column label="手动跳转次数" sortable min-width="130px" align="center" prop="field2" />
-                    <el-table-column label="自动跳转理论重量" sortable min-width="110px" align="center" prop="理论自动" />
-                    <el-table-column label="自动跳转实际重量" sortable min-width="110px" align="center" prop="实际自动" />
-                    <el-table-column label="自动跳转准确率" sortable min-width="110px" align="center" prop="field3" />
-                    <el-table-column label="手动跳转理论重量" sortable min-width="110px" align="center" prop="理论手动" />
-                    <el-table-column label="手动跳转实际重量" sortable min-width="110px" align="center" prop="实际手动" />
-                    <el-table-column label="手动跳转准确率" sortable min-width="110px" align="center" prop="field4" />
+                    <el-table-column :label="$t('errorAnalysis.zdtzcs')" sortable min-width="130px" align="center" prop="field1" />
+                    <el-table-column :label="$t('errorAnalysis.sdtzcs')" sortable min-width="130px" align="center" prop="field2" />
+                    <el-table-column :label="$t('errorAnalysis.zdtzllzl')" sortable min-width="110px" align="center" prop="理论自动" />
+                    <el-table-column :label="$t('errorAnalysis.zdtzsjzl')" sortable min-width="110px" align="center" prop="实际自动" />
+                    <el-table-column :label="$t('errorAnalysis.zdtzzql')" sortable min-width="110px" align="center" prop="field3" />
+                    <el-table-column :label="$t('errorAnalysis.sdtzllzl')" sortable min-width="110px" align="center" prop="理论手动" />
+                    <el-table-column :label="$t('errorAnalysis.sdtzsjzl')" sortable min-width="110px" align="center" prop="实际手动" />
+                    <el-table-column :label="$t('errorAnalysis.sdtzzql')" sortable min-width="110px" align="center" prop="field4" />
                   </el-table>
                 </div>
               </div>
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4>{{$t('errorAnalysis.hltj')}}</h4>
+                <h4>{{$t('errorAnalysis.hlqxcs')}}</h4>
                 <div v-if="tab.chart6.isChart" class="button">
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart6.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart6')">
@@ -658,7 +658,7 @@
                     class="elTable table-fixed"
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="110px" align="center" prop="日期" />
-                    <el-table-column label="栏舍" sortable min-width="110px" align="center" prop="fname" />
+                    <el-table-column :label="$t('errorAnalysis.pen')" sortable min-width="110px" align="center" prop="fname" />
                     <el-table-column  :label="$t('errorAnalysis.slsj')"  sortable min-width="110px" align="center" prop="撒料时间" />
                   </el-table>
                 </div>
@@ -668,13 +668,13 @@
         </div>
       </div>
       </el-tab-pane>
-      <el-tab-pane label="混料统计" name="second">
+      <el-tab-pane :label="$t('errorAnalysis.hltj')"name="second">
         <div class="search" ref="myHeightSecond">
           <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions3" />
           <!-- <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="display:inline-block;margin-top: 5px;" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="display:inline-block;margin-top: 5px;" :disabled="Nextdisabled2" @click="handleNext2" />
-          <el-select clearable filterable v-model="tab2.table.getdataListParm.parammaps.tmrtname" placeholder="TMR设备" class="filter-item" style="width: 120px;">
+          <el-select clearable filterable v-model="tab2.table.getdataListParm.parammaps.tmrtname" :placeholder="$t('errorAnalysis.tmrName')" class="filter-item" style="width: 120px;">
             <el-option v-for="(item,index) in tab2.TMRNameList" :key="index" :label="item.tmrloadname" :value="item.tmrloadname" />
           </el-select>
           <el-input v-model="tab2.table.getdataListParm.parammaps.projname" style="margin-top: 5px;width: 110px;" :placeholder="$t('errorAnalysis.projname')"  class="filter-item" clearable />
@@ -682,7 +682,7 @@
             <el-option v-for="item in tab2.frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-input v-model="tab2.table.getdataListParm.parammaps.templetname" style="margin-top: 5px;width: 110px;" :placeholder="$t('errorAnalysis.feedName')"  class="filter-item" clearable />
-          <el-select v-model="tab2.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 130px;" filterable placeholder="跳转方式" class="filter-item" clearable>
+          <el-select v-model="tab2.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 130px;" filterable :placeholder="$t('errorAnalysis.tzfs')" class="filter-item" clearable>
             <el-option v-for="item in tab2.jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <div style="display: inline-block;" class="filter-item1">
@@ -726,46 +726,46 @@
             :height="myHeightSecond"
           >
             <u-table-column sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
-            <u-table-column sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-            <u-table-column sortable label="操作编号" min-width="70px" align="center" prop="sort" />
-            <u-table-column sortable label="车次" min-width="50px" align="center" prop="车次" />
-            <u-table-column sortable label="班次" min-width="50px" align="center" prop="班次" />
+            <u-table-column sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
+            <u-table-column sortable :label="$t('errorAnalysis.czNum')"  min-width="70px" align="center" prop="sort" />
+            <u-table-column sortable :label="$t('errorAnalysis.projname')" min-width="50px" align="center" prop="车次" />
+            <u-table-column sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="50px" align="center" prop="班次" />
             <u-table-column sortable  :label="$t('errorAnalysis.feedName')"  min-width="70px" align="center" prop="配方名称">
               <template slot-scope="{row}">
                 <a @click="clickRecipeName2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
               </template>
             </u-table-column>
             <u-table-column sortable  :label="$t('errorAnalysis.Driver')"  min-width="50px" align="center" prop="驾驶员" />
-            <u-table-column sortable label="饲料" min-width="70px" align="center" prop="饲料">
+            <u-table-column sortable :label="$t('errorAnalysis.isFeed')"  min-width="70px" align="center" prop="饲料">
               <template slot-scope="{row}">
                 <a @click="clickFeed2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.饲料 }}</a>
               </template>
             </u-table-column>
             <u-table-column sortable  :label="$t('errorAnalysis.llzl')"  min-width="55px" align="center" prop="理论重量" />
             <u-table-column sortable  :label="$t('errorAnalysis.acWeight')"  min-width="55px" align="center" prop="实际重量" />
-            <u-table-column sortable label="误差值" min-width="45px" align="center" prop="误差值" />
+            <u-table-column sortable :label="$t('errorAnalysis.wcz')" min-width="45px" align="center" prop="误差值" />
             <u-table-column sortable :label="$t('errorAnalysis.zql')" min-width="45px" align="center" prop="准确率" />
-            <u-table-column sortable label="计划时间" min-width="55px" align="center" prop="计划时间" />
-            <u-table-column sortable label="开始时间" min-width="55px" align="center" prop="开始时间" />
-            <u-table-column sortable label="结束时间" min-width="55px" align="center" prop="结束时间" />
-            <u-table-column sortable label="搅拌时间" min-width="55px" align="center" prop="搅拌时间" />
-            <u-table-column sortable label="跳转方式" min-width="55px" align="center" prop="跳转方式" />
-            <u-table-column sortable label="开始重量" min-width="55px" align="center" prop="开始重量" />
-            <u-table-column sortable label="结束重量" min-width="55px" align="center" prop="结束重量" />
-            <u-table-column sortable label="车次描述" min-width="55px" align="center" prop="remark" />
-            <u-table-column sortable label="是否达标" min-width="70px" align="center" prop="standard" />
-            <u-table-column sortable label="区域" min-width="70px" align="center" prop="barname" />
+            <u-table-column sortable :label="$t('errorAnalysis.planTime')"  min-width="55px" align="center" prop="计划时间" />
+            <u-table-column sortable :label="$t('errorAnalysis.startTime')"  min-width="55px" align="center" prop="开始时间" />
+            <u-table-column sortable :label="$t('errorAnalysis.endTime')"  min-width="55px" align="center" prop="结束时间" />
+            <u-table-column sortable :label="$t('errorAnalysis.jsTime')"  min-width="55px" align="center" prop="搅拌时间" />
+            <u-table-column sortable :label="$t('errorAnalysis.tzfs')"  min-width="55px" align="center" prop="跳转方式" />
+            <u-table-column sortable :label="$t('errorAnalysis.stWeight')"  min-width="55px" align="center" prop="开始重量" />
+            <u-table-column sortable :label="$t('errorAnalysis.edWeight')"  min-width="55px" align="center" prop="结束重量" />
+            <u-table-column sortable :label="$t('errorAnalysis.ccms')" min-width="55px" align="center" prop="remark" />
+            <u-table-column sortable :label="$t('errorAnalysis.isOK')"  min-width="70px" align="center" prop="standard" />
+            <u-table-column sortable :label="$t('errorAnalysis.area')"  min-width="70px" align="center" prop="barname" />
           </u-table>
           <span v-if="tab2.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="撒料统计" name="third">
+      <el-tab-pane :label="$t('errorAnalysis.sltj')" name="third">
         <div class="search" ref="myHeightThird">
           <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions3" />
           <!-- <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="margin-top: 5px;width:140px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="dispaly:inline-block;margin-top: 5px;" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="dispaly:inline-block;margin-top: 5px;" :disabled="Nextdisabled3" @click="handleNext3" />
-          <el-select v-model="tab3.table.getdataListParm.parammaps.tmrtname" placeholder="TMR设备" class="filter-item" style="margin-top: 5px;width: 120px;" clearable filterable>
+          <el-select v-model="tab3.table.getdataListParm.parammaps.tmrtname" :placeholder="$t('errorAnalysis.tmrName')" class="filter-item" style="margin-top: 5px;width: 120px;" clearable filterable>
             <el-option v-for="(item,index) in tab3.TMRNameList" :key="index" :label="item.tmrloadname" :value="item.tmrloadname" />
           </el-select>
           <el-input v-model="tab3.table.getdataListParm.parammaps.projname" style="margin-top: 5px;width: 150px;" :placeholder="$t('errorAnalysis.projname')"  class="filter-item" clearable />
@@ -774,7 +774,7 @@
           </el-select>
           <el-input v-model="tab3.table.getdataListParm.parammaps.templetname" style="margin-top: 5px;width: 110px;" :placeholder="$t('errorAnalysis.feedName')"  class="filter-item" clearable />
           <el-input v-model="tab3.table.getdataListParm.parammaps.fname" style="margin-top: 5px;width: 110px;" :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" clearable />
-          <el-select v-model="tab3.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 110px;" filterable placeholder="跳转方式" class="filter-item" clearable>
+          <el-select v-model="tab3.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 110px;" filterable :placeholder="$t('errorAnalysis.tzfs')"class="filter-item" clearable>
             <el-option v-for="item in tab3.jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <div style="display: inline-block;" class="filter-item1">
@@ -814,31 +814,31 @@
             :height="myHeightThird"
           >
             <u-table-column sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
-            <u-table-column sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-            <u-table-column sortable label="操作编号" min-width="70px" align="center" prop="sort" />
-            <u-table-column sortable label="车次" min-width="45px" align="center" prop="车次" />
-            <u-table-column sortable label="班次" min-width="45px" align="center" prop="班次" />
+            <u-table-column sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
+            <u-table-column sortable :label="$t('errorAnalysis.czNum')"  min-width="70px" align="center" prop="sort" />
+            <u-table-column sortable :label="$t('errorAnalysis.projname')" min-width="45px" align="center" prop="车次" />
+            <u-table-column sortable :label="$t('errorAnalysis.isTrainNumber')"  min-width="45px" align="center" prop="班次" />
             <u-table-column sortable  :label="$t('errorAnalysis.feedName')"  min-width="70px" align="center" prop="配方名称">
               <template slot-scope="{row}">
                 <a @click="clickRecipeName3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
               </template>
             </u-table-column>
             <u-table-column sortable  :label="$t('errorAnalysis.Driver')"  min-width="50px" align="center" prop="驾驶员" />
-            <u-table-column sortable label="栏舍" min-width="70px" align="center" prop="栏舍">
+            <u-table-column sortable :label="$t('errorAnalysis.pen')" min-width="70px" align="center" prop="栏舍">
               <template slot-scope="{row}">
                 <a @click="clickFence3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.栏舍 }}</a>
               </template>
             </u-table-column>
             <u-table-column sortable  :label="$t('errorAnalysis.llzl')"  min-width="55px" align="center" prop="理论重量" />
             <u-table-column sortable  :label="$t('errorAnalysis.acWeight')"  min-width="55px" align="center" prop="实际重量" />
-            <u-table-column sortable label="误差值" min-width="45px" align="center" prop="误差值" />
+            <u-table-column sortable :label="$t('errorAnalysis.wcz')" min-width="45px" align="center" prop="误差值" />
             <u-table-column sortable :label="$t('errorAnalysis.zql')" min-width="45px" align="center" prop="准确率" />
-            <u-table-column sortable label="开始时间" min-width="55px" align="center" prop="开始时间" />
-            <u-table-column sortable label="结束时间" min-width="55px" align="center" prop="结束时间" />
-            <u-table-column sortable label="跳转方式" min-width="55px" align="center" prop="跳转方式" />
-            <u-table-column sortable label="开始重量" min-width="55px" align="center" prop="开始重量" />
-            <u-table-column sortable label="结束重量" min-width="55px" align="center" prop="结束重量" />
-            <u-table-column sortable label="是否达标" min-width="70px" align="center" prop="standard" />
+            <u-table-column sortable :label="$t('errorAnalysis.startTime')"  min-width="55px" align="center" prop="开始时间" />
+            <u-table-column sortable :label="$t('errorAnalysis.endTime')"  min-width="55px" align="center" prop="结束时间" />
+            <u-table-column sortable :label="$t('errorAnalysis.tzfs')"  min-width="55px" align="center" prop="跳转方式" />
+            <u-table-column sortable :label="$t('errorAnalysis.stWeight')"  min-width="55px" align="center" prop="开始重量" />
+            <u-table-column sortable :label="$t('errorAnalysis.edWeight')"  min-width="55px" align="center" prop="结束重量" />
+            <u-table-column sortable :label="$t('errorAnalysis.isOK')"  min-width="70px" align="center" prop="standard" />
           </u-table>
           <span v-if="tab3.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
         </div>
@@ -1066,7 +1066,7 @@
                   <u-table-column label="序号" width="50px" align="center" type="index" />
                   <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
                   <u-table-column label="修改用户" width="130px" align="center" prop="empname" />
-                  <u-table-column label="班次" min-width="100px" align="center" prop="times" />
+                  <u-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="100px" align="center" prop="times" />
                   <u-table-column label="实际牛头数" min-width="100px" align="center" prop="ccount">
                     <template slot-scope="{row}">
                       <span v-if="row.ccountstatus == 1" style="color: red;">{{row.ccount}}</span>
@@ -1127,7 +1127,7 @@
                   <u-table-column label="序号" width="50px" align="center" type="index" />
                   <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
                   <u-table-column label="修改用户" width="130px" align="center" prop="empname" />
-                  <u-table-column label="班次" width="100px" align="center" prop="times" />
+                  <u-table-column :label="$t('errorAnalysis.isTrainNumber')"  width="100px" align="center" prop="times" />
                   <!-- <u-table-column v-for="(item, index) in fenceTemp.tab2.tableLabel" :key="index" align="center" :min-width="item.width" :prop="item.prop" :label="item.label"> -->
                   <u-table-column v-for="(item, index) in fenceTemp.tab2.tableLabel" :key="index" align="center" :min-width="item.width" :prop="item.prop"  :label="item.label">
                     <template slot-scope="scope">
@@ -1761,7 +1761,7 @@ export default {
           temp: {}
         },
         frequencyList: [],
-        jumpModeList: [{ id: '0', name: '手动跳转' }, { id: '1', name: '自动跳转' }],
+        jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
         isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }]
       },
       tab3: {
@@ -1795,7 +1795,7 @@ export default {
           temp: {}
         },
         frequencyList: [],
-        jumpModeList: [{ id: '0', name: '手动跳转' }, { id: '1', name: '自动跳转' }],
+        jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
         isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }]
       },
       titlefname: '',
@@ -2567,24 +2567,24 @@ export default {
     getIsDisplay() {
       GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
         if (response.data.list[0].inforvalue == 1) {
-          this.tab2.frequencyList = [{ id: '1', name: '第一班' }]
-          this.tab3.frequencyList = [{ id: '1', name: '第一班' }]
+          this.tab2.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
+          this.tab3.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
-          this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
+          this.tab2.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
+          this.tab3.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
-          this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
+          this.tab2.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
+          this.tab3.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
         } else if (response.data.list[0].inforvalue == 4) {
-          this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
-          this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+          this.tab2.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
+          this.tab3.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
         } else if (response.data.list[0].inforvalue == 5) {
-          this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }]
-          this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }]
+          this.tab2.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }]
+          this.tab3.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }]
         } else if (response.data.list[0].inforvalue == 6) {
-          this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }, { id: '6', name: '第六班' }]
-          this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }, { id: '6', name: '第六班' }]
+          this.tab2.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }, { id: '6', name: this.$t('errorAnalysis.six'), }]
+          this.tab3.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }, { id: '5', name: this.$t('errorAnalysis.five'), }, { id: '6', name: this.$t('errorAnalysis.six'), }]
         }
       })
     },
@@ -4372,7 +4372,7 @@ export default {
           top:10,right: 10, show: true, type: 'scroll'
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '5%',
           right: '8%',
           containLabel: true
@@ -4385,7 +4385,7 @@ export default {
         xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: [{
           type: '',
-          name: '时间',
+          name: this.$t('errorAnalysis.time'),
           mix: 0,
           max: 24,
           interval: 2,
@@ -4474,7 +4474,7 @@ export default {
             tHeader: ['日期', '自动跳转次数', '手动跳转次数', '自动跳转理论重量', '自动跳转实际重量', '自动跳转准确率', '手动跳转理论重量', '手动跳转实际重量', '手动跳转准确率'],
             filterVal: ['日期', 'field1', 'field2', '理论自动', '实际自动', 'field3', '理论手动', '实际手动', 'field4'],
             tableDatas: this.tab.chart5.table.list,
-            sheetName: '混料统计'
+            sheetName: this.$t('errorAnalysis.hltj')
           }
         ]
         json2excel(excelDatasTabChart5, '混料统计', true, 'xlsx')
@@ -4636,7 +4636,7 @@ export default {
       //     tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', ' 跳转方式', '开始重量', '结束重量', '搅拌时间'],
       //     filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
       //     tableDatas: this.tab2.table.list,
-      //     sheetName: '混料统计'
+      //     sheetName: this.$t('errorAnalysis.hltj')
       //   }
       // ]
       // json2excel(excelDatasTab2, '混料统计', true, 'xlsx')
@@ -4670,7 +4670,7 @@ export default {
             tHeader: ['日期', 'TMR名称', '操作编号','车次', '班次', '配方名称','驾驶员',  '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', ' 跳转方式', '开始重量', '结束重量', '搅拌时间','是否达标','区域'],
             filterVal: ['日期', 'TMR名称','sort', '车次', '班次', '配方名称','驾驶员',  '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间','standard','barname'],
             tableDatas: exportList,
-            sheetName: '混料统计'
+            sheetName: this.$t('errorAnalysis.hltj')
           }
         ]
         json2excel(excelDatasTab2, '混料统计', true, 'xlsx')

+ 6 - 6
src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -35,9 +35,9 @@
                 >
                   <el-table-column label="序号" align="center" type="index" width="50" />
                   <el-table-column label="计划名称" min-width="60px" align="center" prop="projname" />
-                  <el-table-column label="TMR名称" min-width="60px" align="center" prop="tmrtname" />
+                  <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="60px" align="center" prop="tmrtname" />
                   <el-table-column sortable label="制定日期" min-width="70px" align="center" prop="mydate" />
-                  <el-table-column sortable label="开始时间" min-width="70px" align="center" prop="intime" />
+                  <el-table-column sortable :label="$t('errorAnalysis.startTime')"  min-width="70px" align="center" prop="intime" />
                 </el-table>
               </div>
             </div>
@@ -59,11 +59,11 @@
                   :cell-style="cellStyle"
                   class="elTable table-fixed"
                 >
-                  <el-table-column label="操作编号" min-width="50px" align="center" prop="sort" />
+                  <el-table-column :label="$t('errorAnalysis.czNum')"  min-width="50px" align="center" prop="sort" />
                   <el-table-column label="饲料名称" min-width="50px" align="center" prop="fname" />
                   <el-table-column label="计划重量" min-width="50px" align="center" prop="lweight" />
                   <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="50px" align="center" prop="actualweightminus" />
-                  <el-table-column label="误差值" min-width="50px" align="center" prop="diff" />
+                  <el-table-column :label="$t('errorAnalysis.wcz')" min-width="50px" align="center" prop="diff" />
                   <el-table-column :label="$t('errorAnalysis.zql')" min-width="50px" align="center" prop="diffRate" />
                   <el-table-column label="完成时间" min-width="50px" align="center" prop="intime" />
                   <el-table-column label="过程时间" min-width="50px" align="center" prop="proesstime" />
@@ -89,11 +89,11 @@
                   :cell-style="cellStyle"
                   class="elTable table-fixed"
                 >
-                  <el-table-column label="操作编号" min-width="50px" align="center" prop="sort" />
+                  <el-table-column :label="$t('errorAnalysis.czNum')"  min-width="50px" align="center" prop="sort" />
                   <el-table-column  :label="$t('errorAnalysis.isHouseName')"  min-width="50px" align="center" prop="fname" />
                   <el-table-column label="计划重量" min-width="50px" align="center" prop="lweight" />
                   <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="50px" align="center" prop="actualweightminus" />
-                  <el-table-column label="误差值" min-width="50px" align="center" prop="diff" />
+                  <el-table-column :label="$t('errorAnalysis.wcz')" min-width="50px" align="center" prop="diff" />
                   <el-table-column :label="$t('errorAnalysis.zql')" min-width="50px" align="center" prop="diffRate" />
                   <el-table-column label="完成时间" min-width="50px" align="center" prop="intime" />
                   <el-table-column label="过程时间" min-width="50px" align="center" prop="proesstime" />

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

@@ -5,7 +5,7 @@
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-      <el-button class="export" @click="handleDownload"{{$t('dashboard.Export')}}/el-button>
+      <el-button class="export" @click="handleDownload">{{$t('dashboard.Export')}}</el-button>
       <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
     </div>
     <div id="table" class="table">
@@ -63,13 +63,13 @@
             <h4>泌乳牛干物质采食量</h4>
             <div v-if="tab.chart1.isChart" class="button">
               <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-              <div class="exportTable" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart1')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="tab.chart1.isChart" id="chartLine1" style="width:100%;height:400px;" />
             <div v-if="tab.chart1.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart1')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -99,14 +99,14 @@
             <h4>剩料率</h4>
             <div v-if="tab.chart2.isChart" class="button">
               <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
-              <div class="exportTable" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart2')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="tab.chart2.isChart" id="chartLine2" style="width:100%;height:400px;" />
 
             <div v-if="tab.chart2.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart2')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -140,13 +140,13 @@
             <h4>混料时间统计</h4>
             <div v-if="tab.chart3.isChart" class="button">
               <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-              <div class="exportTable" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart3')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="tab.chart3.isChart" id="chartLine3" style="width:100%;height:400px;" />
             <div v-if="tab.chart3.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart3')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -176,13 +176,13 @@
             <h4>转化率</h4>
             <div v-if="tab.chart4.isChart" class="button">
               <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-              <div class="exportTable" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart4')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="tab.chart4.isChart" id="chartLine4" style="width:100%;height:400px;" />
             <div v-if="tab.chart4.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart4')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -215,13 +215,13 @@
             <h4>成本分析</h4>
             <div v-if="tab.chart5.isChart" class="button">
               <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
-              <div class="exportTable" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+              <div class="exportTable" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
               <div class="exportTable" @click="handleTable('chart5')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
             <div v-if="tab.chart5.isChart" id="chartLine5" style="width:100%;height:400px;" />
             <div v-if="tab.chart5.isTable" class="table">
               <div class="button">
-                <div class="exportTable" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+                <div class="exportTable" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
                 <div class="exportTable" @click="handleChart('chart5')">{{$t('dashboard.sTable')}}</div>
               </div>
               <el-table
@@ -276,7 +276,7 @@
             class="elTable table-fixed"
           >
             <el-table-column v-if="pasture.isFormulaName" label="配方模板" min-width="110px" align="center" prop="配方模板" />
-            <el-table-column v-if="pasture.isHouseName" label="栏舍" min-width="110px" align="center" prop="栏舍" />
+            <el-table-column v-if="pasture.isHouseName" :label="$t('errorAnalysis.pen')" min-width="110px" align="center" prop="栏舍" />
             <el-table-column v-if="pasture.isHouseName" label="配方模板" min-width="110px" align="center" prop="配方模板" />
             <el-table-column v-if="pasture.isLivestockType" :label="$t('errorAnalysis.sxlb')" min-width="110px" align="center" prop="牲畜类别" />
             <el-table-column label="实际牛头数" min-width="110px" align="center" prop="实际牛头数" />

+ 2 - 2
src/views/statisticalAnalysis/feedingEfficiency/group/tab2.vue

@@ -85,7 +85,7 @@
             class="elTable table-fixed"
             height="400px"
           >
-            <el-table-column label="栏舍" min-width="58px" align="center" prop="barname" />
+            <el-table-column :label="$t('errorAnalysis.pen')" min-width="58px" align="center" prop="barname" />
             <el-table-column label="抽查样本数" min-width="58px" align="center" prop="sumcowcount" />
             <el-table-column label="单产" min-width="58px" align="center" prop="product" />
             <el-table-column label="干物质采食量" min-width="58px" align="center" prop="dryweight" />
@@ -117,7 +117,7 @@
             class="elTable table-fixed"
             height="400px"
           >
-            <el-table-column label="栏舍" min-width="60px" align="center" prop="barname" />
+            <el-table-column :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
             <el-table-column label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
             <el-table-column label="单产" min-width="50px" align="center" prop="product" />
             <el-table-column label="干物质采食量" min-width="60px" align="center" prop="dryweight" />

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

@@ -20,7 +20,7 @@
             <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-          <el-button class="export" icon="el-icon-upload2" @click="handleDownload"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" icon="el-icon-upload2" @click="handleDownload">{{$t('dashboard.Export')}}</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
         <div id="table" class="table">
@@ -39,7 +39,7 @@
             :max-height="myHeight"
           >
             <el-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
-            <el-table-column v-if="tab.isHouseName" sortable label="栏舍" min-width="70px" align="center" prop="栏舍" />
+            <el-table-column v-if="tab.isHouseName" sortable :label="$t('errorAnalysis.pen')" min-width="70px" align="center" prop="栏舍" />
             <el-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isLivestockType" sortable :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
             <el-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
@@ -123,14 +123,14 @@
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart1')">{{$t('errorAnalysis.confirm')}}</el-button>
                   </div>
                   <div>
-                    <div class="exportTable2" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable2" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable2" @click="handleTable('chart1')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart1.isChart" id="chartLine1" style="width:100%;height:385px;" />
                 <div v-if="tab.chart1.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable2" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable2" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable2" @click="handleChart('chart1')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -182,14 +182,14 @@
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart2')">{{$t('errorAnalysis.confirm')}}</el-button>
                   </div>
                   <div>
-                    <div class="exportTable2" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable2" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable2" @click="handleTable('chart2')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart2.isChart" id="chartLine2" style="width:100%;height:385px;" />
                 <div v-if="tab.chart2.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart2')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -245,14 +245,14 @@
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart3')">{{$t('errorAnalysis.confirm')}}</el-button>
                   </div>
                   <div>
-                    <div class="exportTable2" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable2" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable2" @click="handleTable('chart3')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart3.isChart" id="chartLine3" style="width:100%;height:385px;" />
                 <div v-if="tab.chart3.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart3')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -304,14 +304,14 @@
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart4')">{{$t('errorAnalysis.confirm')}}</el-button>
                   </div>
                   <div>
-                    <div class="exportTable2" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable2" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable2" @click="handleTable('chart4')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart4.isChart" id="chartLine4" style="width:100%;height:385px;" />
                 <div v-if="tab.chart4.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart4')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -365,14 +365,14 @@
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart5')">{{$t('errorAnalysis.confirm')}}</el-button>
                   </div>
                   <div>
-                    <div class="exportTable2" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable2" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable2" @click="handleTable('chart5')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart5.isChart" id="chartLine5" style="width:100%;height:385px;" />
                 <div v-if="tab.chart5.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart5')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -402,7 +402,7 @@
       <el-tab-pane label="牛群评估" name="second">
         <div class="search">
           <el-date-picker v-model="tab2.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeTab2Date" />
-          <el-button class="export" style="float: right;" icon="el-icon-upload2" @click="handleDownload2"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" style="float: right;" icon="el-icon-upload2" @click="handleDownload2">{{$t('dashboard.Export')}}</el-button>
           <!-- <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" /> -->
         </div>
@@ -480,7 +480,7 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column sortable label="栏舍" min-width="60px" align="center" prop="barname" />
+                <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
                 <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
                 <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
                 <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
@@ -512,7 +512,7 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column sortable label="栏舍" min-width="60px" align="center" prop="barname" />
+                <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
                 <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
                 <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
                 <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
@@ -1004,17 +1004,17 @@ export default {
         console.log(response.data.list[0].inforvalue)
         this.myMaxTimes = response.data.list[0].inforvalue
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: '第一班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
         } else if (response.data.list[0].inforvalue == 5) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' },{ id: '5', name: '第五班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), },{ id: '5', name: this.$t('errorAnalysis.five'), }]
         } else if (response.data.list[0].inforvalue == 6) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' },{ id: '5', name: '第五班' },{ id: '6', name: '第六班' }]
+          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), },{ id: '5', name: this.$t('errorAnalysis.five'), },{ id: '6', name: this.$t('errorAnalysis.six'), }]
         }
       })
     },

+ 14 - 14
src/views/statisticalAnalysis/feedingEfficiency/pasture/index备.vue

@@ -16,7 +16,7 @@
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
           <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
           <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-          <el-button class="export" icon="el-icon-upload2" @click="handleDownload"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" icon="el-icon-upload2" @click="handleDownload">{{$t('dashboard.Export')}}</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
         <div id="table" class="table">
@@ -35,7 +35,7 @@
             :max-height="myHeight"
           >
             <u-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
-            <u-table-column v-if="tab.isHouseName" sortable label="栏舍" min-width="70px" align="center" prop="栏舍" />
+            <u-table-column v-if="tab.isHouseName" sortable :label="$t('errorAnalysis.pen')" min-width="70px" align="center" prop="栏舍" />
             <u-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
             <u-table-column v-if="tab.isLivestockType" sortable :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
             <u-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
@@ -74,13 +74,13 @@
                 <h4 style="text-align:center;">泌乳牛干物质采食量</h4>
                 <div v-if="tab.chart1.isChart" class="button">
                   <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-                  <div class="exportTable" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+                  <div class="exportTable" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
                   <div class="exportTable" @click="handleTable('chart1')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
                 <div v-if="tab.chart1.isChart" id="chartLine1" style="width:100%;height:430px;" />
                 <div v-if="tab.chart1.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart1')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart1')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart1')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -110,13 +110,13 @@
                 <div v-if="tab.chart2.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart2.getdataListParm.parammaps.statisticsList" :option="tab.chart2.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart2" />
                   <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
-                  <div class="exportTable" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+                  <div class="exportTable" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
                   <div class="exportTable" @click="handleTable('chart2')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
                 <div v-if="tab.chart2.isChart" id="chartLine2" style="width:100%;height:430px;" />
                 <div v-if="tab.chart2.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart2')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart2')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart2')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -149,13 +149,13 @@
                 <h4 style="text-align:center;">混料时间统计</h4>
                 <div v-if="tab.chart3.isChart" class="button">
                   <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart3')" />
-                  <div class="exportTable" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+                  <div class="exportTable" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
                   <div class="exportTable" @click="handleTable('chart3')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
                 <div v-if="tab.chart3.isChart" id="chartLine3" style="width:100%;height:430px;" />
                 <div v-if="tab.chart3.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart3')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart3')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart3')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -184,13 +184,13 @@
                 <div v-if="tab.chart4.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart4.getdataListParm.parammaps.statisticsList" :option="tab.chart4.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart4" />
                   <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart4')" />
-                  <div class="exportTable" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+                  <div class="exportTable" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
                   <div class="exportTable" @click="handleTable('chart4')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
                 <div v-if="tab.chart4.isChart" id="chartLine4" style="width:100%;height:430px;" />
                 <div v-if="tab.chart4.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart4')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart4')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart4')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -223,13 +223,13 @@
                 <div v-if="tab.chart5.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart5.getdataListParm.parammaps.statisticsList" :option="tab.chart5.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart5" />
                   <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
-                  <div class="exportTable" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+                  <div class="exportTable" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
                   <div class="exportTable" @click="handleTable('chart5')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
                 <div v-if="tab.chart5.isChart" id="chartLine5" style="width:100%;height:430px;" />
                 <div v-if="tab.chart5.isTable" class="table">
                   <div class="button">
-                    <div class="exportTable" @click="handleExport('chart5')"{{$t('dashboard.Export')}}/div>
+                    <div class="exportTable" @click="handleExport('chart5')">{{$t('dashboard.Export')}}</div>
                     <div class="exportTable" @click="handleChart('chart5')">{{$t('dashboard.sTable')}}</div>
                   </div>
                   <el-table
@@ -337,7 +337,7 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column sortable label="栏舍" min-width="60px" align="center" prop="barname" />
+                <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
                 <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
                 <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
                 <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
@@ -369,7 +369,7 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column sortable label="栏舍" min-width="60px" align="center" prop="barname" />
+                <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
                 <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
                 <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
                 <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />

+ 3 - 3
src/views/statisticalAnalysis/inventoryManagement/group/index.vue

@@ -12,7 +12,7 @@
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
           <el-button class="successBorder" style="margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">{{$t('common.query')}}</el-button>
-          <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport(tab1)"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport(tab1)">{{$t('dashboard.Export')}}</el-button>
         </div>
         <div class="table">
           <el-table
@@ -73,7 +73,7 @@
           <el-input v-if="tab2.isRadio5" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('errorAnalysis.isTrainNumber')"  />
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('errorAnalysis.projname')"  />
           <el-button class="successBorder" @click="form_search('second')">{{$t('common.query')}}</el-button>
-          <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab2')"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab2')">{{$t('dashboard.Export')}}</el-button>
         </div>
         <el-table
           :key="tab2.table.tableKey"
@@ -117,7 +117,7 @@
           <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="日期" />
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="TMR设备编号" />
           <el-button class="successBorder" @click="form_search('third')">{{$t('common.query')}}</el-button>
-          <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab3')"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab3')">{{$t('dashboard.Export')}}</el-button>
         </div>
         <el-table
           :key="tab3.table.tableKey"

+ 9 - 9
src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -8,7 +8,7 @@
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" style="float: left;" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
           <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">{{$t('common.query')}}</el-button>
-          <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" icon="el-icon-upload2" @click="handleExport('tab1')"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" icon="el-icon-upload2" @click="handleExport('tab1')">{{$t('dashboard.Export')}}</el-button>
         </div>
         <div class="table">
           <el-table
@@ -73,7 +73,7 @@
             <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-button class="successBorder" @click="form_search('second')">{{$t('common.query')}}</el-button>
-          <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handleExport('tab2')"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handleExport('tab2')">{{$t('dashboard.Export')}}</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handlesWitch()">切换展示</el-button>
         </div>
 
@@ -146,7 +146,7 @@
           <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="日期" />
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="TMR设备编号" />
           <el-button class="successBorder" @click="form_search('third')">{{$t('common.query')}}</el-button>
-          <el-button class="export filter-item1" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab3')"{{$t('dashboard.Export')}}/el-button>
+          <el-button class="export filter-item1" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab3')">{{$t('dashboard.Export')}}</el-button>
         </div>
         <div v-if="tab3.table.tableConfig.length>2">
         <u-table v-if="isDispayTable3" ref="plTable3" v-loading="tab3.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable3">
@@ -367,26 +367,26 @@ export default {
       postJson(url, data).then(response => {
         console.log(response.data.list[0].inforvalue)
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: 1, name: '第一班' }]
+          this.frequencyList = [{ id: 1, name: this.$t('errorAnalysis.one'), }]
         } else if (response.data.list[0].inforvalue == 2) {
           this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), }, { id: 2, name: this.$t('errorAnalysis.two'), }
           ]
         } else if (response.data.list[0].inforvalue == 3) {
           this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), }, { id: 2, name: this.$t('errorAnalysis.two'), }, { id: 3, name: this.$t('errorAnalysis.three'), }
           ]
         } else if (response.data.list[0].inforvalue == 4) {
           this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), }, { id: 2, name: this.$t('errorAnalysis.two'), }, { id: 3, name: this.$t('errorAnalysis.three'), }, { id: 4, name: this.$t('errorAnalysis.four'), }
           ]
         }else if (response.data.list[0].inforvalue == 5) {
           this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }, { id: 5, name: '第五班' }
+            { id: 1, name: this.$t('errorAnalysis.one'), }, { id: 2, name: this.$t('errorAnalysis.two'), }, { id: 3, name: this.$t('errorAnalysis.three'), }, { id: 4, name: this.$t('errorAnalysis.four'), }, { id: 5, name: this.$t('errorAnalysis.five'), }
           ]
         }else if (response.data.list[0].inforvalue == 6) {
           this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }, { id: 5, name: '第五班' }, { id: 6, name: '第六班' },
+            { id: 1, name: this.$t('errorAnalysis.one'), }, { id: 2, name: this.$t('errorAnalysis.two'), }, { id: 3, name: this.$t('errorAnalysis.three'), }, { id: 4, name: this.$t('errorAnalysis.four'), }, { id: 5, name: this.$t('errorAnalysis.five'), }, { id: 6, name: this.$t('errorAnalysis.six'), },
           ]
         }
       })

+ 1 - 1
src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -1242,7 +1242,7 @@ export default {
         calculable: true,
         xAxis: [
           { type: 'category' }
-          // { type: 'category', splitLine: { show: false }, name: '时间', data: chartLine_data.data1, axisLabel: { show: true, textStyle: { color: '#666' }}}
+          // { type: 'category', splitLine: { show: false }, name: this.$t('errorAnalysis.time'), data: chartLine_data.data1, axisLabel: { show: true, textStyle: { color: '#666' }}}
         ],
         yAxis: [{ type: 'value' }],
         toolbox: {

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

@@ -1354,7 +1354,7 @@ export default {
         calculable: true,
         xAxis: [
           { type: 'category' }
-          // { type: 'category', splitLine: { show: false }, name: '时间', data: chartLine_data.data1, axisLabel: { show: true, textStyle: { color: '#666' }}}
+          // { type: 'category', splitLine: { show: false }, name: this.$t('errorAnalysis.time'), data: chartLine_data.data1, axisLabel: { show: true, textStyle: { color: '#666' }}}
         ],
         yAxis: [{ type: 'value' }],
         toolbox: {