Shan9312 преди 1 година
родител
ревизия
7f02ae55f8
променени са 46 файла, в които са добавени 353 реда и са изтрити 284 реда
  1. 14 14
      src/components/index.vue
  2. 35 2
      src/lang/en/langModule/errorAnalysis.js
  3. 35 2
      src/lang/zn/langModule/errorAnalysis.js
  4. 4 4
      src/views/basicData/feedTable/index.vue
  5. 1 1
      src/views/basicData/groupColumn/index.vue
  6. 2 2
      src/views/basicData/standardParameters/index.vue
  7. 1 1
      src/views/customboard/ChartPanel/components/filterPanel.vue
  8. 1 1
      src/views/customboard/ChartPanel/components/visualizePanel.vue
  9. 1 2
      src/views/customboard/ChartPanel/index.vue
  10. 16 16
      src/views/dashboard/group/index.vue
  11. 7 7
      src/views/formulationPlan/dailyExecutionPlan/index.vue
  12. 1 1
      src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue
  13. 2 2
      src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue
  14. 1 1
      src/views/formulationPlan/formulaDistribution/index.vue
  15. 3 3
      src/views/formulationPlan/materialIssuancePlan/index.vue
  16. 3 3
      src/views/formulationPlan/materialIssuancePlan/index1.vue
  17. 1 1
      src/views/formulationPlan/pushMaterialPlan/index.vue
  18. 1 1
      src/views/formulationPlan/recipeTemplate/index.vue
  19. 2 2
      src/views/formulationPlan/surplusMaterialPlan/index.vue
  20. 1 1
      src/views/inventoryManagement/feedContract/index.vue
  21. 1 1
      src/views/inventoryManagement/inventoryList/index.vue
  22. 1 1
      src/views/inventoryManagement/laborConsumption/index.vue
  23. 2 2
      src/views/inventoryManagement/warehousing/index.vue
  24. 1 1
      src/views/shedProduction/dungScores/index.vue
  25. 2 2
      src/views/shedProduction/dutyRecord/index.vue
  26. 1 1
      src/views/shedProduction/fecalScreen/index.vue
  27. 1 1
      src/views/shedProduction/formulaDryMatter/index.vue
  28. 1 1
      src/views/shedProduction/materialRemainingRecord/index.vue
  29. 1 1
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  30. 1 1
      src/views/shedProduction/performance/index.vue
  31. 1 1
      src/views/shedProduction/physicalConditionScore/index.vue
  32. 21 21
      src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue
  33. 1 1
      src/views/statisticalAnalysis/errorAnalysis/group/tab2.vue
  34. 1 1
      src/views/statisticalAnalysis/errorAnalysis/group/tab3.vue
  35. 98 96
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  36. 2 2
      src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue
  37. 11 11
      src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue
  38. 50 48
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue
  39. 14 14
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index备.vue
  40. 2 2
      src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue
  41. 1 1
      src/views/systemManagement/labelManagement/index.vue
  42. 2 2
      src/views/systemManagement/operationManagement/group/index.vue
  43. 1 1
      src/views/systemManagement/operationManagement/pasture/index.vue
  44. 2 2
      src/views/systemManagement/reminderSettings/index.vue
  45. 1 1
      src/views/systemManagement/role/index.vue
  46. 1 1
      src/views/systemManagement/user/index.vue

+ 14 - 14
src/components/index.vue

@@ -59,7 +59,7 @@
             <el-col :span="24" style="margin-top: 10px;">
               <span>图表查询时间:</span>
               <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
-              <el-button class="successBorder" @click="handleChartDate">确认</el-button>
+              <el-button class="successBorder" @click="handleChartDate">{{$t('errorAnalysis.confirm')}}</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
           </el-row>
@@ -70,7 +70,7 @@
                 <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')">导出</div>
-                  <div class="exportTable" @click="handleTable('chart1')">切换表格</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">
@@ -103,10 +103,10 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">牛栏剩料率</h4>
                 <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="请选择统计参数" @searchSelect="changeStatisticChart2" />
+                  <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')">导出</div>
-                  <div class="exportTable" @click="handleTable('chart2')">切换表格</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">
@@ -145,7 +145,7 @@
                 <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')">导出</div>
-                  <div class="exportTable" @click="handleTable('chart3')">切换表格</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">
@@ -178,10 +178,10 @@
                 <h4 style="text-align:center;">转化率</h4>
                 <div v-if="tab.chart4.isChart" class="button">
                   <!-- <span>{{ tab.chart4.statisticsList }}</span> -->
-                  <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="请选择统计参数" @searchSelect="changeStatisticChart4" />
+                  <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')">导出</div>
-                  <div class="exportTable" @click="handleTable('chart4')">切换表格</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">
@@ -217,10 +217,10 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">成本分析</h4>
                 <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="请选择统计参数" @searchSelect="changeStatisticChart5" />
+                  <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')">导出</div>
-                  <div class="exportTable" @click="handleTable('chart5')">切换表格</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">
@@ -1129,7 +1129,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '剩料率', axisLabel: { formatter: '{value} %' }
         },
@@ -1198,7 +1198,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data1, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data1, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '分钟',
           axisLabel: {
@@ -1317,9 +1317,9 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
-          type: 'value', name: '百分比', axisLabel: { formatter: '{value} %' }
+          type: 'value', name: this.$t('errorAnalysis.bfb') , axisLabel: { formatter: '{value} %' }
         },
         series: (function() {
           var serie = []
@@ -1432,7 +1432,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '公斤奶饲料成本(元)'
         },

+ 35 - 2
src/lang/en/langModule/errorAnalysis.js

@@ -15,7 +15,7 @@ export default{
   isTrainNumber:"Batch",
   tmrName:"TMR equipment",
 
-  
+
   hlStartTime:'Mixing Start Time',
   hlEndTime:'Mixing End Time',
   hl:'Mixing',
@@ -48,4 +48,37 @@ hlsdzdtzcs:'manual blending transition count',
 hlzqs:'Correct number of mixed materials',
 yclczs:'the count of operations for feed that has been spread',
 
-}
+statisticalTypeList: [{ id: '7', name: 'Unclassified' }, { id: '0', name: 'Driver' }, { id: '1', name: 'Formula Name' }, { id: '2', name: 'Shelter Name' }, { id: '3', name: 'Livestock Category' }, { id: '4', name: 'Batch' }, { id: '5', name: 'TMR Name' }, { id: '6', name: 'Feed' }],
+planName:"Planning Statistics",
+ day:"Day",
+month:"Month",
+confirm:"OK",
+feedName:'Formulation Accuracy Rate',
+changeTable:'Switch Table',
+qxznf:'"Please Select Year',
+qxzz:"Please Select Week",
+nf:'Year',
+xztjcs:"Please Select Statistical Parameters",
+
+qxz:"Please Select",
+nqName:"Herd Accuracy Rate",
+
+jhzql:'Planning Accuracy',
+jhzql1:"Planning Correctness Rate",
+jhzqll:"Planning Accuracy Rate (Excluding Canceled Weight",
+bfb:'Percentage',
+
+jhzxzl:'Planned Execution Weight(kg)',
+pfllzl:'Formula Theoretical Weight(kg)',
+jhqxzl:'Planned Cancellation Weight(kg)',
+jhs:"Planned Number",
+clzql:'accuracy rate per batch(weight)',
+jhzl:"Planned weight(kg)",
+skzl:'Actual Weight(kg)',
+zql:"Accuracy rate",
+hlqxcs:"Planned blending cancellation count",
+lsslsjtj:"Feed spreading time statistics in pens"
+
+
+
+}

+ 35 - 2
src/lang/zn/langModule/errorAnalysis.js

@@ -48,10 +48,43 @@ export default{
    hlsdzdtzcs:'混料手动跳转次数',
    hlzqs:'混料正确数',
    yclczs:'已撒料操作数',
-   
+
+   statisticalTypeList: [{ id: '7', name: '无分类' }, { id: '0', name: '驾驶员' }, { id: '1', name: '配方名称' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '牲畜类别' }, { id: '4', name: '车次' }, { id: '5', name: 'TMR名称' }, { id: '6', name: '饲料' }],
+
+   planName:"计划统计",
+   day:"日",
+   month:"月",
+   confirm:"确认",
+   feedName:'配方准确率',
+   changeTable:'切换表格',
+   qxznf:'请选择年份',
+   qxzz:"请选择周",
+   nf:'年份',
+   xztjcs:"请选择统计参数",
+   qxz:"请选择",
+   nqName:"牛群准确率",
+   jhzql:'计划准确率',
+   jhzql1:"计划正确率",
+   jhzqll:"计划准确率(去除取消重量)",
+   bfb:'百分比',
+   jhzxzl:'计划执行重量(kg)',
+   pfllzl:'配方理论重量(kg)',
+   jhqxzl:'计划取消重量(kg)',
+   jhs:"计划数",
+   clzql:'车辆准确率(重量)',
+   jhzl:"计划重量(kg)",
+   skzl:'实际重量(kg)',
+   zql:"准确率",
+   hlqxcs:"混料计划取消次数",
+   lsslsjtj:"栏舍撒料时间统计"
+
+  
+
+
+
+
 
 
-   
 
 
 

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

@@ -303,7 +303,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -657,7 +657,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="nutritive.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-          <el-button v-if="nutritive.dialogStatus==='nutritive' && isRoleEdit" class="save" :disabled="isokDisable" @click="nutritiveData()">确认</el-button>
+          <el-button v-if="nutritive.dialogStatus==='nutritive' && isRoleEdit" class="save" :disabled="isokDisable" @click="nutritiveData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -711,7 +711,7 @@
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="sapCode.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-          <el-button v-if="sapCode.dialogStatus==='sapCode' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData()">确认</el-button>
+          <el-button v-if="sapCode.dialogStatus==='sapCode' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -751,7 +751,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-          <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">确认</el-button>
+          <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -169,7 +169,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-          <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">确认</el-button>
+          <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -237,7 +237,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="table1.dialogFormVisible = false;getList() ">{{$t('common.closed')}}</el-button>
-          <el-button class="save" :disabled="isokDisable" @click="updateData()">确认</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -357,7 +357,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="table2.dialogFormVisible = false; getList2()">{{$t('common.closed')}}</el-button>
-          <el-button class="save" :disabled="isokDisable" @click="updateData()">确认</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 1 - 1
src/views/customboard/ChartPanel/components/filterPanel.vue

@@ -44,7 +44,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button class="downminCancel" size="mini" style="right: 90px;" @click="visible=false">取消</el-button>
-        <el-button class="miniPrimary" size="mini" type="primary" @click="handleConfirm">确认</el-button>
+        <el-button class="miniPrimary" size="mini" type="primary" @click="handleConfirm">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
   </el-form-item>

+ 1 - 1
src/views/customboard/ChartPanel/components/visualizePanel.vue

@@ -2,7 +2,7 @@
   <div class="pane-container" style="position: relactive">
     <div>{{ messagechart }}</div>
     <!-- 单独画出来的转换表格 -->
-    <el-button v-if="isChart" type="text" style="z-index: 1;position: absolute;top:10px;right: 100px" @click="handleTable()">切换表格</el-button>
+    <el-button v-if="isChart" type="text" style="z-index: 1;position: absolute;top:10px;right: 100px" @click="handleTable()">{{$t('errorAnalysis.changeTable')}}</el-button>
 
     <!-- 切换出来的表格 -->
     <div v-if="isTable" class="table" style="width: 100%;height:100%;background: #fff;z-index: 1;position: absolute;top:0px;right: 0px;">

+ 1 - 2
src/views/customboard/ChartPanel/index.vue

@@ -79,7 +79,7 @@
                 </span>
                 <span v-show="editLimit">
                   <el-input-number v-model="limit" :disabled="loading" size="mini" style="width:100px;" :max="60000" @blur="editLimit=false" />
-                  <el-button class="miniPrimary" @click="editLimit=false">确认</el-button>
+                  <el-button class="miniPrimary" @click="editLimit=false">{{$t('errorAnalysis.confirm')}}</el-button>
                 </span>
               </div>
             </el-form-item>
@@ -220,7 +220,6 @@ export default {
         filterStr: this.filterStr,
         limit: this.limit
       })
-      console.log('sqlSentencethis.filterStr', this.filterStr)
     }
   },
   watch: {

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

@@ -144,7 +144,7 @@
           </div>
           <div v-if="row4.chart1.isChart" class="button">
             <div class="exportTable" @click="handleExport('row4chartLine1')">导出</div>
-            <div class="exportTable" @click="handleTable('row4chartLine1')">切换表格</div>
+            <div class="exportTable" @click="handleTable('row4chartLine1')">{{$t('errorAnalysis.changeTable')}}</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%;">
@@ -250,7 +250,7 @@
             </div>
             <div v-if="row3.chart1.isChart" class="button">
               <div class="exportTable" @click="handleExport('row3chartLine1')">导出</div>
-              <div class="exportTable" @click="handleTable('row3chartLine1')">切换表格</div>
+              <div class="exportTable" @click="handleTable('row3chartLine1')">{{$t('errorAnalysis.changeTable')}}</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%;">
@@ -273,14 +273,14 @@
                 class="elTable table-fixed"
               >
                 <el-table-column label="牧场" sortable min-width="85px" align="center" prop="牧场" />
-                <el-table-column label="计划执行重量(kg)" sortable min-width="90px" align="center" prop="实际量" />
-                <el-table-column label="配方理论重量(kg)" sortable min-width="90px" align="center" prop="理论量" />
-                <el-table-column label="计划准确率" sortable min-width="85px" align="center" prop="field1" />
-                <el-table-column label="计划取消重量(kg)" sortable min-width="90px" align="center" prop="计划取消重量" />
-                <el-table-column label="计划准确率(去除取消重量)" sortable min-width="100px" align="center" prop="field3" />
-                <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="75px" align="center" prop="field2" />
+                <el-table-column :label="$t('errorAnalysis.jhzxzl')" sortable min-width="90px" align="center" prop="实际量" />
+                <el-table-column :label="$t('errorAnalysis.pfllzl')" sortable min-width="90px" align="center" prop="理论量" />
+                <el-table-column :label="$t('errorAnalysis.jhzql')" sortable min-width="85px" align="center" prop="field1" />
+                <el-table-column :label="$t('errorAnalysis.jhqxzl')" sortable min-width="90px" align="center" prop="计划取消重量" />
+                <el-table-column :label="$t('errorAnalysis.jhzqll')" sortable min-width="100px" align="center" prop="field3" />
+                <el-table-column :label="$t('errorAnalysis.jhzql1')" sortable min-width="85px" align="center" prop="正确数" />
+                <el-table-column :label="$t('errorAnalysis.jhs')" sortable min-width="85px" align="center" prop="计划数" />
+                <el-table-column :label="$t('errorAnalysis.jhzql1')"sortable min-width="75px" align="center" prop="field2" />
               </el-table>
             </div>
           </div>
@@ -291,7 +291,7 @@
             </div>
             <div v-if="row3.chart2.isChart" class="button">
               <div class="exportTable" @click="handleExport('row3chartLine2')">导出</div>
-              <div class="exportTable" @click="handleTable('row3chartLine2')">切换表格</div>
+              <div class="exportTable" @click="handleTable('row3chartLine2')">{{$t('errorAnalysis.changeTable')}}</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%;">
@@ -327,7 +327,7 @@
             </div>
             <div v-if="row4.chart2.isChart" class="button">
               <div class="exportTable" @click="handleExport('row4chartLine2')">导出</div>
-              <div class="exportTable" @click="handleTable('row4chartLine2')">切换表格</div>
+              <div class="exportTable" @click="handleTable('row4chartLine2')">{{$t('errorAnalysis.changeTable')}}</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%;">
@@ -944,7 +944,7 @@ export default {
         tooltip: { trigger: 'axis', axisPointer: { type: 'cross', crossStyle: { color: '#999' }}},
         legend: { data: ['计划准确率', '计划正确率', '计划准确率(去除取消重量)'] },
         xAxis: [{ type: 'category', data: chartLine_data.data1, axisPointer: { type: 'shadow' }}],
-        yAxis: [{ type: 'value', name: '百分比', min: 0, max: 100, interval: 20, axisLabel: { formatter: '{value}' }}],
+        yAxis: [{ type: 'value', name: this.$t('errorAnalysis.bfb') , min: 0, max: 100, interval: 20, axisLabel: { formatter: '{value}' }}],
         series: [
           { name: '计划准确率', type: 'bar', itemStyle: { normal: { color: '#7ecf51' }}, data: chartLine_data.data2, markLine: { data: [{ type: 'average' }], symbol: ['none', 'none'], position: 'insideTopCenter', itemStyle: { normal: { lineStyle: { type: 'dotted', width: 3 }, label: { show: true, position: 'middle', formatter: '' }}}, large: true, effect: { show: false, loop: true, period: 0, scaleSize: 2, color: null, shadowColor: null, shadowBlur: null }}},
           { name: '计划正确率', type: 'bar', itemStyle: { normal: { color: '#ff6600' }}, data: chartLine_data.data3, markLine: { data: [{ type: 'average' }], symbol: ['none', 'none'], position: 'insideTopCenter', itemStyle: { normal: { lineStyle: { type: 'dotted', width: 3 }, label: { show: true, position: 'middle', formatter: '' }}}, large: true, effect: { show: false, loop: true, period: 0, scaleSize: 2, color: null, shadowColor: null, shadowBlur: null }}},
@@ -1014,7 +1014,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: 'kg', axisLabel: { formatter: '{value}' }
         },
@@ -1086,7 +1086,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: 'kg', axisLabel: { formatter: '{value}' }
         },
@@ -1156,7 +1156,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: 'kg', axisLabel: { formatter: '{value}' }
         },

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

@@ -777,8 +777,8 @@
         </el-form>
         <div slot="footer" class="dialog-footer" style="bottom:20px">
           <el-button class="cancelClose" @click="newGeneration.dialogFormVisible = false;getList()">取消</el-button>
-          <el-button v-if="newGeneration.dialogStatus== 'newGeneration'" class="save" :disabled="isokDisable" @click="newGenerationData()">确认</el-button>
-          <el-button v-else class="save" :disabled="isokDisable" @click="copyData()">确认</el-button>
+          <el-button v-if="newGeneration.dialogStatus== 'newGeneration'" class="save" :disabled="isokDisable" @click="newGenerationData()">{{$t('errorAnalysis.confirm')}}</el-button>
+          <el-button v-else class="save" :disabled="isokDisable" @click="copyData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -813,7 +813,7 @@
         <i class="el-icon-loading" />
         <span>正在同步</span>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button class="miniPrimary" @click="dataSynchronization.dialogFormVisible = false;">确认</el-button>
+          <el-button class="miniPrimary" @click="dataSynchronization.dialogFormVisible = false;">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -887,10 +887,10 @@
         </el-form>
         <div slot="footer" class="dialog-footer" style="bottom:20px">
           <el-button class="cancelClose" @click="sapUpload.dialogFormVisible = false;getList()">取消</el-button>
-          <el-button class="save" v-if="sapUpload.dialogStatus == 'sapUpload'" :disabled="isokDisable" @click="sapUploadData()">确认</el-button>
-          <el-button class="save" v-else-if="sapUpload.dialogStatus == 'udload1'" :disabled="isokDisable" @click="udData1()">确认</el-button>
-          <el-button class="save" v-else-if="sapUpload.dialogStatus == 'udload2'" :disabled="isokDisable" @click="udData2()">确认</el-button>
-          <el-button class="save" v-else-if="sapUpload.dialogStatus == 'udload3'" :disabled="isokDisable" @click="udData3()">确认</el-button>
+          <el-button class="save" v-if="sapUpload.dialogStatus == 'sapUpload'" :disabled="isokDisable" @click="sapUploadData()">{{$t('errorAnalysis.confirm')}}</el-button>
+          <el-button class="save" v-else-if="sapUpload.dialogStatus == 'udload1'" :disabled="isokDisable" @click="udData1()">{{$t('errorAnalysis.confirm')}}</el-button>
+          <el-button class="save" v-else-if="sapUpload.dialogStatus == 'udload2'" :disabled="isokDisable" @click="udData2()">{{$t('errorAnalysis.confirm')}}</el-button>
+          <el-button class="save" v-else-if="sapUpload.dialogStatus == 'udload3'" :disabled="isokDisable" @click="udData3()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -443,7 +443,7 @@
           </div>
           <div slot="footer" class="dialog-footer" style="height:55px;">
             <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">{{$t('common.closed')}}</el-button>
-            <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">确认</el-button>
+            <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">{{$t('errorAnalysis.confirm')}}</el-button>
           </div>
         </div>
       </div>

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

@@ -194,7 +194,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="close();">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save"
-            :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+            :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -206,7 +206,7 @@
         {{ check.temp.bnames }}
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
+        <el-button class="save" @click="check.dialogFormVisible=false;">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -105,7 +105,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" @click="formulaDistribution.pasture.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="formulaDistributionData()">确认</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="formulaDistributionData()">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
 

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

@@ -411,7 +411,7 @@
           </div>
           <div slot="footer" class="dialog-footer" style="height: 55px;">
             <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">{{$t('common.closed')}}</el-button>
-            <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">确认</el-button>
+            <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">{{$t('errorAnalysis.confirm')}}</el-button>
           </div>
         </div>
       </div>
@@ -431,7 +431,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
+        <el-button class="save" @click="check.dialogFormVisible=false;">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
 
@@ -478,7 +478,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">确认</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -350,7 +350,7 @@
           </div>
           <div slot="footer" class="dialog-footer" style="height: 55px;">
             <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">{{$t('common.closed')}}</el-button>
-            <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">确认</el-button>
+            <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">{{$t('errorAnalysis.confirm')}}</el-button>
           </div>
         </div>
       </div>
@@ -370,7 +370,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
+        <el-button class="save" @click="check.dialogFormVisible=false;">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
 
@@ -417,7 +417,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">确认</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -107,7 +107,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-          <el-button class="save" @click="create.dialogStatus = 'create' ? createData():updateData()" :disabled="isokDisable" >确认</el-button>
+          <el-button class="save" @click="create.dialogStatus = 'create' ? createData():updateData()" :disabled="isokDisable" >{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -773,7 +773,7 @@
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="detail.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
-          <el-button class="save" :disabled="isokDisable" @click="syntheticPremixData()">确认</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="syntheticPremixData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -207,7 +207,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save"
-            :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+            :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -302,7 +302,7 @@
         {{ check.temp.bnames }}
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
+        <el-button class="save" @click="check.dialogFormVisible=false;">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
 

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

@@ -159,7 +159,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button v-if="create.dialogStatus == 'see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus !== 'see'" class="cancelClose" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
-          <el-button v-if="create.dialogStatus !== 'see'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus !== 'see'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -150,7 +150,7 @@
           <el-button v-if="create.dialogStatus==='see'" class="import" icon="el-icon-upload2" :disabled="isokDisable" @click="handleExport(2)">导出</el-button>
           <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -173,7 +173,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList();">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">{{$t('common.closed')}}</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -255,7 +255,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button v-if="create.dialogStatus == 'see' " class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList(); ">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus !== 'see' " class="cancelClose" @click="create.dialogFormVisible = false;getList(); ">{{$t('common.closed')}}</el-button>
-          <el-button v-if="create.dialogStatus !== 'see' " class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus !== 'see' " class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -309,7 +309,7 @@
           </el-table>
           <div slot="footer" class="dialog-footer">
             <el-button class="cancelClose" @click="initial.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
-            <el-button class="save" :disabled="isokDisable" @click="initialData()">确认</el-button>
+            <el-button class="save" :disabled="isokDisable" @click="initialData()">{{$t('errorAnalysis.confirm')}}</el-button>
           </div>
         </div>
       </div>

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

@@ -225,7 +225,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -144,7 +144,7 @@
               </div>
               <div slot="footer" class="dialog-footer" style="bottom: 20px;">
                 <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-                <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
+                <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="createData()">{{$t('errorAnalysis.confirm')}}</el-button>
               </div>
             </div>
           </el-tab-pane>
@@ -195,7 +195,7 @@
               </div>
               <div slot="footer" class="dialog-footer" style="bottom: 20px;">
                 <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
-                <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="createData2()">确认</el-button>
+                <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="createData2()">{{$t('errorAnalysis.confirm')}}</el-button>
               </div>
             </div>
           </el-tab-pane>

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

@@ -199,7 +199,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -196,7 +196,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -180,7 +180,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -228,7 +228,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -275,7 +275,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -247,7 +247,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -91,7 +91,7 @@
         <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
           <span>图表查询时间:</span>
           <el-date-picker v-model="chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
-          <el-button class="successBorder" @click="handleChartDate">确认</el-button>
+          <el-button class="successBorder" @click="handleChartDate">{{$t('errorAnalysis.confirm')}}</el-button>
           <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
         </el-col>
       </el-row>
@@ -103,7 +103,7 @@
             <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="handleTable('chart1')">切换表格</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">
@@ -126,14 +126,14 @@
                 class="elTable table-fixed"
               >
                 <el-table-column label="牧场" sortable min-width="85px" align="center" prop="牧场" />
-                <el-table-column label="计划执行重量(kg)" sortable min-width="85px" align="center" prop="实际量" />
-                <el-table-column label="配方理论重量(kg)" sortable min-width="85px" align="center" prop="理论量" />
-                <el-table-column label="计划准确率" sortable min-width="80px" align="center" prop="field1" />
-                <el-table-column label="计划取消重量(kg)" sortable min-width="85px" align="center" prop="计划取消重量" />
-                <el-table-column label="计划准确率(去除取消重量)" sortable min-width="110px" align="center" prop="field3" />
-                <el-table-column label="计划正确数" sortable min-width="80px" align="center" prop="正确数" />
-                <el-table-column label="计划数" sortable min-width="70px" align="center" prop="计划数" />
-                <el-table-column label="计划正确率" sortable min-width="80px" align="center" prop="field2" />
+                <el-table-column :label="$t('errorAnalysis.jhzxzl')" sortable min-width="85px" align="center" prop="实际量" />
+                <el-table-column :label="$t('errorAnalysis.pfllzl')" sortable min-width="85px" align="center" prop="理论量" />
+                <el-table-column :label="$t('errorAnalysis.jhzql')" sortable min-width="80px" align="center" prop="field1" />
+                <el-table-column :label="$t('errorAnalysis.jhqxzl')" sortable min-width="85px" align="center" prop="计划取消重量" />
+                <el-table-column :label="$t('errorAnalysis.jhzqll')" sortable min-width="110px" align="center" prop="field3" />
+                <el-table-column :label="$t('errorAnalysis.jhzql1')" sortable min-width="80px" align="center" prop="正确数" />
+                <el-table-column :label="$t('errorAnalysis.jhs')" sortable min-width="70px" align="center" prop="计划数" />
+                <el-table-column :label="$t('errorAnalysis.jhzql1')"sortable min-width="80px" align="center" prop="field2" />
               </el-table>
             </div>
           </div>
@@ -141,11 +141,11 @@
         <!-- 牛群准确率 -->
         <el-col :span="12">
           <div class="grid-content">
-            <h4>牛群准确率</h4>
+            <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="handleTable('chart2')">切换表格</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">
@@ -169,9 +169,9 @@
               >
                 <el-table-column label="牧场" sortable min-width="90px" align="center" prop="牧场" />
                 <el-table-column :label="$t('errorAnalysis.sxlb')" sortable min-width="90px" align="center" prop="field5" />
-                <el-table-column label="计划重量(kg)" sortable min-width="100px" align="center" prop="理论量" />
-                <el-table-column label="实际重量(kg)" sortable min-width="100px" align="center" prop="实际量" />
-                <el-table-column label="准确率" sortable min-width="90px" align="center" prop="field1" />
+                <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="field1" />
               </el-table>
             </div>
           </div>
@@ -185,7 +185,7 @@
             <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="handleTable('chart3')">切换表格</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">
@@ -222,7 +222,7 @@
             <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="handleTable('chart4')">切换表格</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">
@@ -267,7 +267,7 @@
             <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="handleTable('chart5')">切换表格</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">
@@ -302,7 +302,7 @@
             <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="handleTable('chart6')">切换表格</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">
@@ -1371,7 +1371,7 @@ export default {
         tooltip: { trigger: 'axis', axisPointer: { type: 'cross', crossStyle: { color: '#999' }}},
         legend: { data: ['计划准确率', '计划正确率', '计划准确率(去除取消重量)'] },
         xAxis: [{ type: 'category', data: chartLine_data.data1, axisPointer: { type: 'shadow' }}],
-        yAxis: [{ type: 'value', name: '百分比', min: 0, max: 100, interval: 20, axisLabel: { formatter: '{value}' }}],
+        yAxis: [{ type: 'value', name: this.$t('errorAnalysis.bfb') , min: 0, max: 100, interval: 20, axisLabel: { formatter: '{value}' }}],
         series: [
           { name: '计划准确率', type: 'bar', itemStyle: { normal: { color: '#7ecf51' }}, data: chartLine_data.data2, markLine: { data: [{ type: 'average' }], symbol: ['none', 'none'], position: 'insideTopCenter', itemStyle: { normal: { lineStyle: { type: 'dotted', width: 3 }, label: { show: true, position: 'middle', formatter: '' }}}, large: true, effect: { show: false, loop: true, period: 0, scaleSize: 2, color: null, shadowColor: null, shadowBlur: null }}},
           { name: '计划正确率', type: 'bar', itemStyle: { normal: { color: '#ff6600' }}, data: chartLine_data.data3, markLine: { data: [{ type: 'average' }], symbol: ['none', 'none'], position: 'insideTopCenter', itemStyle: { normal: { lineStyle: { type: 'dotted', width: 3 }, label: { show: true, position: 'middle', formatter: '' }}}, large: true, effect: { show: false, loop: true, period: 0, scaleSize: 2, color: null, shadowColor: null, shadowBlur: null }}},
@@ -1776,7 +1776,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: [{
           type: '',
           name: '时间',

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

@@ -53,7 +53,7 @@
         <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="准确率" 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="结束时间" />

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

@@ -53,7 +53,7 @@
         <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="准确率" 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="搅拌时间" /> -->

+ 98 - 96
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -206,56 +206,56 @@
             <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
               <span>图表查询时间:</span>
               <el-radio-group v-model="tab.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeAllSpecificDate">
-                <el-radio-button label="1" border></el-radio-button>
-                <el-radio-button label="3" border></el-radio-button>
+                <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
               </el-radio-group>
               <div v-show="tab.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                 <el-date-picker v-model="tab.chartDate" :clearable="false" class="inputDatetime filter-item" style="width:250px;" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
               </div>
               <div v-show="tab.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                <el-select v-model="tab.selectYear" class="filter-item" style="width:130px;margin-right:10px;" placeholder="请选择年份" @change="changeAllYear">
+                <el-select v-model="tab.selectYear" class="filter-item" style="width:130px;margin-right:10px;" :placeholder="$t('errorAnalysis.qxznf')"  @change="changeAllYear">
                   <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                 </el-select>
-                <el-select v-model="tab.selectWeek" class="filter-item" style="width:170px;" multiple :multiple-limit="2" placeholder="请选择周">
+                <el-select v-model="tab.selectWeek" class="filter-item" style="width:170px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                   <el-option v-for="(item,index) in tab.weekList" :key="index" :label="item.name" :value="item.id" />
                 </el-select>
               </div>
               <div v-show="tab.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                 <el-date-picker v-model="tab.chartMonth" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" style="width:250px;" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
               </div>
-              <el-button class="successBorder" style="margin-left:10px;" @click="handleAllDate">确认</el-button>
+              <el-button class="successBorder" style="margin-left:10px;" @click="handleAllDate">{{$t('errorAnalysis.confirm')}}</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
           </el-row>
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4>计划统计</h4>
+                <h4>{{$t('errorAnalysis.planName')}}</h4>
                 <div v-if="tab.chart2.isChart" class="button">
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart2.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart2')">
-                      <el-radio-button label="1" border></el-radio-button>
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart2')">
+                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart2')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart2.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" format="yyyy-MM" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart2')">确认</el-button>
+                    <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="handleTable('chart2')">切换表格</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;background: #fff;" />
@@ -279,47 +279,47 @@
                     class="elTable table-fixed"
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="85px" align="center" prop="日期" />
-                    <el-table-column label="计划执行重量(kg)" sortable min-width="80px" align="center" prop="实际量" />
-                    <el-table-column label="配方理论重量(kg)" sortable min-width="80px" align="center" prop="理论量" />
-                    <el-table-column label="计划准确率" sortable min-width="85px" align="center" prop="field1" />
-                    <el-table-column label="计划取消重量(kg)" sortable min-width="80px" align="center" prop="计划取消重量" />
-                    <el-table-column label="计划准确率(去除取消重量)" sortable min-width="100px" align="center" prop="field3" />
-                    <el-table-column label="计划正确数" sortable min-width="85px" align="center" prop="正确数" />
-                    <el-table-column label="计划数" sortable min-width="60px" align="center" prop="计划数" />
-                    <el-table-column label="计划正确率" sortable min-width="75px" align="center" prop="field2" />
+                    <el-table-column :label="$t('errorAnalysis.jhzxzl')" sortable min-width="80px" align="center" prop="实际量" />
+                    <el-table-column :label="$t('errorAnalysis.pfllzl')" sortable min-width="80px" align="center" prop="理论量" />
+                    <el-table-column :label="$t('errorAnalysis.jhzql')" sortable min-width="85px" align="center" prop="field1" />
+                    <el-table-column :label="$t('errorAnalysis.jhqxzl')" sortable min-width="80px" align="center" prop="计划取消重量" />
+                    <el-table-column :label="$t('errorAnalysis.jhzqll')" sortable min-width="100px" align="center" prop="field3" />
+                    <el-table-column :label="$t('errorAnalysis.jhzql1')" sortable min-width="85px" align="center" prop="正确数" />
+                    <el-table-column :label="$t('errorAnalysis.jhs')" sortable min-width="60px" align="center" prop="计划数" />
+                    <el-table-column :label="$t('errorAnalysis.jhzql1')"sortable min-width="75px" align="center" prop="field2" />
                   </el-table>
                 </div>
               </div>
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4>配方准确率</h4>
+                <h4>{{$t('errorAnalysis.feedName')}}</h4>
                 <div v-if="tab.chart1.isChart" class="button">
                   <div class="chartButton">
-                    <my-select ref="tenantselect" :model="tab.chart1.getdataListParm.parammaps.statisticsList" :option="tab.chart1.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart1" />
+                    <my-select ref="tenantselect" :model="tab.chart1.getdataListParm.parammaps.statisticsList" :option="tab.chart1.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart1" />
                     <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart1')">
-                      <el-radio-button label="1" border></el-radio-button>
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart1')">
+                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart1')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart1.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart1')">确认</el-button>
+                    <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="handleTable('chart1')">切换表格</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;" />
@@ -344,9 +344,9 @@
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="90px" align="center" prop="日期" />
                     <el-table-column  :label="$t('errorAnalysis.feedName')"  sortable min-width="90px" align="center" prop="名称" />
-                    <el-table-column label="计划重量(kg)" sortable min-width="100px" align="center" prop="理论量" />
-                    <el-table-column label="实际重量(kg)" sortable min-width="100px" align="center" prop="实际量" />
-                    <el-table-column label="准确率" 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="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -355,33 +355,33 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4>牛群准确率</h4>
+                <h4>{{$t('errorAnalysis.nqName')}}</h4>
                 <div v-if="tab.chart3.isChart" class="button">
                   <div class="chartButton">
-                    <my-select ref="tenantselect" :model="tab.chart3.getdataListParm.parammaps.statisticsList" :option="tab.chart3.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart3" />
+                    <my-select ref="tenantselect" :model="tab.chart3.getdataListParm.parammaps.statisticsList" :option="tab.chart3.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart3" />
                     <el-radio-group v-model="tab.chart3.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart3')">
-                      <el-radio-button label="1" border></el-radio-button>
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart3')">
+                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart3')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart3.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart3')">确认</el-button>
+                    <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="handleTable('chart3')">切换表格</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;" />
@@ -406,42 +406,42 @@
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="90px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.sxlb')" sortable min-width="90px" align="center" prop="名称" />
-                    <el-table-column label="计划重量(kg)" sortable min-width="100px" align="center" prop="理论量" />
-                    <el-table-column label="实际重量(kg)" sortable min-width="100px" align="center" prop="实际量" />
-                    <el-table-column label="准确率" 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="准确率" />
                   </el-table>
                 </div>
               </div>
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4>车辆准确率(重量)</h4>
+                <h4>{{$t('errorAnalysis.clzql')}}</h4>
                 <div v-if="tab.chart4.isChart" class="button">
                   <div class="chartButton">
-                    <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="请选择统计参数" @searchSelect="changeStatisticChart4" />
+                    <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-radio-group v-model="tab.chart4.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart4')">
-                      <el-radio-button label="1" border></el-radio-button>
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart4')">
+                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart4')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart4.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart4')">确认</el-button>
+                    <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="handleTable('chart4')">切换表格</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;" />
@@ -466,9 +466,9 @@
                   >
                     <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="计划重量(kg)" sortable min-width="100px" align="center" prop="理论量" />
-                    <el-table-column label="实际重量(kg)" sortable min-width="100px" align="center" prop="实际量" />
-                    <el-table-column label="准确率" 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="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -478,32 +478,32 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4>混料统计</h4>
+                <h4> {{$t('errorAnalysis.hltj')}} </h4>
                 <div v-if="tab.chart5.isChart" class="button">
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart5.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart5')">
-                      <el-radio-button label="1" border></el-radio-button>
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart5')">
+                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart5')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart5.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart5')">确认</el-button>
+                    <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="handleTable('chart5')">切换表格</div>
+                    <div class="exportTable2" @click="handleTable('chart5')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart5.isChart" id="chartLine5" class="button" style="width:100%;height:385px;" />
@@ -541,32 +541,32 @@
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4>混料计划取消次数</h4>
+                <h4>{{$t('errorAnalysis.hltj')}}</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')">
-                      <el-radio-button label="1" border></el-radio-button>
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart6.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart6.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart6.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart6.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart6')">
+                      <el-select v-model="tab.chart6.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart6')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart6.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart6.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart6.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart6.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart6.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart6')">确认</el-button>
+                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart6')">{{$t('errorAnalysis.confirm')}}</el-button>
                   </div>
                   <div>
                     <div class="exportTable2" @click="handleExport('chart6')">{{$t('dashboard.Export')}}</div>
-                    <div class="exportTable2" @click="handleTable('chart6')">切换表格</div>
+                    <div class="exportTable2" @click="handleTable('chart6')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart6.isChart" id="chartLine6" style="width:100%;height:385px;" />
@@ -590,7 +590,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="field1" />
+                    <el-table-column :label="$t('errorAnalysis.hlqxcs')" sortable min-width="110px" align="center" prop="field1" />
                   </el-table>
                 </div>
               </div>
@@ -600,7 +600,7 @@
           <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
             <el-col :span="24">
               <div class="grid-content">
-                <h4>栏舍撒料时间统计</h4>
+                <h4>{{$t('errorAnalysis.lsslsjtj')}}</h4>
                 <div v-if="tab.chart7.isChart" class="button">
                   <div class="chartButton">
                     <!-- 君盛-->
@@ -608,33 +608,33 @@
                       <el-option v-for="item in tab.chart7.statisticsList" :key="item.name" :label="item.name" :value="item.name" />
                     </el-select> -->
                     <!-- 其他牧场  -->
-                    <my-select ref="tenantselect" :model="tab.chart7.getdataListParm.parammaps.statisticsList" :option="tab.chart7.statisticsList"  :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart7" />
+                    <my-select ref="tenantselect" :model="tab.chart7.getdataListParm.parammaps.statisticsList" :option="tab.chart7.statisticsList"  :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart7" />
                     <el-select v-model="tab.chart7.getdataListParm.parammaps.ftId" multiple collapse-tags placeholder="请选择"  @change="changeformula()">
                       <el-option v-for="item in tab.chart7.formulaList" :key="item.id" :label="item.tname" :value="item.id" />
                     </el-select>
                     <el-radio-group v-model="tab.chart7.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;margin-left: 10px;" @change="changeChartSpecificDate('chart7')">
-                      <el-radio-button label="1" border></el-radio-button>
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart7.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart7.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart7.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart7.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart7')">
+                      <el-select v-model="tab.chart7.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart7')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart7.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart7.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart7.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart7.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart7.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart7')">确认</el-button>
+                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart7')">{{$t('errorAnalysis.confirm')}}</el-button>
                   </div>
                   <div>
                     <div class="exportTable2" @click="handleExport('chart7')">{{$t('dashboard.Export')}}</div>
-                    <div class="exportTable2" @click="handleTable('chart7')">切换表格</div>
+                    <div class="exportTable2" @click="handleTable('chart7')">{{$t('errorAnalysis.changeTable')}}</div>
                   </div>
                 </div>
                 <div v-if="tab.chart7.isChart" id="chartLine7" style="width:100%;height:385px;" />
@@ -744,7 +744,7 @@
             <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="准确率" 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="结束时间" />
@@ -832,7 +832,7 @@
             <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="准确率" 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="跳转方式" />
@@ -852,8 +852,8 @@
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
       <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">{{$t('common.closed')}}</el-button>
-      <el-button  class="save" v-if="activeName=='second'" :disabled="isokDisable" @click="exportList2()">确认</el-button>
-      <el-button  class="save" v-else-if="activeName=='third'" :disabled="isokDisable" @click="exportList3()">确认</el-button>
+      <el-button  class="save" v-if="activeName=='second'" :disabled="isokDisable" @click="exportList2()">{{$t('errorAnalysis.confirm')}}</el-button>
+      <el-button  class="save" v-else-if="activeName=='third'" :disabled="isokDisable" @click="exportList3()">{{$t('errorAnalysis.confirm')}}</el-button>
     </div>
     </el-dialog>
     <!-- 查看 -->
@@ -1806,7 +1806,7 @@ export default {
       stopTime:'',
       error:'',
       isShowDialog: false,
-      statisticalTypeList: [{ id: '7', name: '无分类' }, { id: '0', name: '驾驶员' }, { id: '1', name: '配方名称' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '牲畜类别' }, { id: '4', name: '车次' }, { id: '5', name: 'TMR名称' }, { id: '6', name: '饲料' }],
+      statisticalTypeList: this.$t('errorAnalysis.statisticalTypeList'),
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
       exportList:{
@@ -3529,7 +3529,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           min:0,  //取0为最小刻度
           max: 100, //取100为最大刻度
@@ -3541,7 +3541,7 @@ export default {
           max: function(value) {//取最大值向上取整为最大刻度
             return  Math.ceil(value.max)
           },
-          type: 'value', name: '百分比', axisLabel: { formatter: '{value} %' }
+          type: 'value', name: this.$t('errorAnalysis.bfb') , axisLabel: { formatter: '{value} %' }
         },
         series: (function() {
           var serie = []
@@ -3636,7 +3636,7 @@ export default {
           trigger: 'axis'
         },
         legend: {
-          data: ['计划准确率', '计划正确率', '计划准确率(去除取消重量)'],
+          data: [this.$t('errorAnalysis.jhzql'),this.$t('errorAnalysis.jhzql1'),this.$t('errorAnalysis.jhzqll')],
           right: 10
         },
         grid: {
@@ -3650,7 +3650,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data1, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data1, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           min:0,  //取0为最小刻度
           max: 100, //取100为最大刻度
@@ -3662,12 +3662,12 @@ export default {
           max: function(value) {//取最大值向上取整为最大刻度
             return  Math.ceil(value.max)
           },
-          type: 'value', name: '百分比', axisLabel: { formatter: '{value} %' }
+          type: 'value', name: this.$t('errorAnalysis.bfb') , axisLabel: { formatter: '{value} %' }
         },
         series: [
-          { name: '计划准确率', type: 'line', data: chartLine_data.data2 },
-          { name: '计划正确率', type: 'line', data: chartLine_data.data3 },
-          { name: '计划准确率(去除取消重量)', type: 'line', data: chartLine_data.data4 }
+          { name: this.$t('errorAnalysis.jhzql'), type: 'line', data: chartLine_data.data2 },
+          { name: this.$t('errorAnalysis.jhzql1'), type: 'line', data: chartLine_data.data3 },
+          { name: this.$t('errorAnalysis.jhzqll'), type: 'line', data: chartLine_data.data4 }
         ]
       }
       this.tab.chart2.chartLine.setOption(option)
@@ -3793,7 +3793,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           min:0,  //取0为最小刻度
           max: 100, //取100为最大刻度
@@ -3805,7 +3805,7 @@ export default {
           max: function(value) {//取最大值向上取整为最大刻度
             return  Math.ceil(value.max)
           },
-          type: 'value', name: '百分比', axisLabel: { formatter: '{value} %' }
+          type: 'value', name: this.$t('errorAnalysis.bfb') , axisLabel: { formatter: '{value} %' }
         },
         series: (function() {
           var serie = []
@@ -3943,7 +3943,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           min:0,  //取0为最小刻度
           max: 100, //取100为最大刻度
@@ -3955,7 +3955,7 @@ export default {
           max: function(value) {//取最大值向上取整为最大刻度
             return  Math.ceil(value.max)
           },
-          type: 'value', name: '百分比', axisLabel: { formatter: '{value} %' }
+          type: 'value', name: this.$t('errorAnalysis.bfb') , axisLabel: { formatter: '{value} %' }
         },
         series: (function() {
           var serie = []
@@ -4184,7 +4184,7 @@ export default {
         },
         xAxis: [
           {
-            name: '日期',
+            name:this.$t('errorAnalysis.date') ,
             type: 'category',
             data: chartLine_data.data1,
             axisTick: {
@@ -4382,7 +4382,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: [{
           type: '',
           name: '时间',
@@ -5399,7 +5399,9 @@ export default {
   }
   .button{
     height: 95px;
-    .exportTable2{float: right;margin-right: 5px;margin-top: 5px;}
+    .exportTable2{float: right;margin-right: 5px;margin-top: 5px;width:auto; padding:0 6px;
+
+    }
   }
   .app-container1{padding-left: 10px;background-color: #F4F4F4;}
   .dashboard-editor-container {

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

@@ -64,7 +64,7 @@
                   <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="准确率" min-width="50px" align="center" prop="diffRate" />
+                  <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" />
                   <el-table-column label="开始读取重量" min-width="50px" align="center" prop="lastactualweight" />
@@ -94,7 +94,7 @@
                   <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="准确率" min-width="50px" align="center" prop="diffRate" />
+                  <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" />
                   <el-table-column label="开始读取重量" min-width="50px" align="center" prop="lastactualweight" />

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

@@ -52,7 +52,7 @@
         <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
           <span>图表查询时间:</span>
           <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
-          <el-button class="successBorder" @click="handleChartDate">确认</el-button>
+          <el-button class="successBorder" @click="handleChartDate">{{$t('errorAnalysis.confirm')}}</el-button>
           <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
         </el-col>
       </el-row>
@@ -64,7 +64,7 @@
             <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="handleTable('chart1')">切换表格</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">
@@ -100,7 +100,7 @@
             <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="handleTable('chart2')">切换表格</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;" />
 
@@ -141,7 +141,7 @@
             <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="handleTable('chart3')">切换表格</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">
@@ -177,7 +177,7 @@
             <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="handleTable('chart4')">切换表格</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">
@@ -216,7 +216,7 @@
             <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="handleTable('chart5')">切换表格</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">
@@ -813,7 +813,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: 'kg', axisLabel: { formatter: '{value}' }
         },
@@ -895,7 +895,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '剩料率', axisLabel: { formatter: '{value} %' }
         },
@@ -975,7 +975,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '分钟', axisLabel: { formatter: '{value}min' }
         },
@@ -1049,7 +1049,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '饲料转化率', axisLabel: { formatter: '{value} %' }
         },
@@ -1123,7 +1123,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '公斤奶饲料成本(元)'
         },

+ 50 - 48
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -68,25 +68,25 @@
             <el-col :span="23">
               <span>图表查询时间:</span>
               <el-radio-group v-model="tab.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeAllSpecificDate">
-                <el-radio-button label="1" border></el-radio-button>
+                <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
                 <!-- <el-radio-button label="2" border>周</el-radio-button> -->
-                <el-radio-button label="3" border></el-radio-button>
+                <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
               </el-radio-group>
               <div v-show="tab.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                 <el-date-picker v-model="tab.chartDate" :clearable="false" class="inputDatetime filter-item" style="width:250px;" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
               </div>
               <div v-show="tab.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                <el-select v-model="tab.selectYear" class="filter-item" style="width:130px;margin-right:10px;" placeholder="请选择年份" @change="changeAllYear">
+                <el-select v-model="tab.selectYear" class="filter-item" style="width:130px;margin-right:10px;" :placeholder="$t('errorAnalysis.qxznf')"  @change="changeAllYear">
                   <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                 </el-select>
-                <el-select v-model="tab.selectWeek" class="filter-item" style="width:170px;" multiple :multiple-limit="2" placeholder="请选择周">
+                <el-select v-model="tab.selectWeek" class="filter-item" style="width:170px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                   <el-option v-for="(item,index) in tab.weekList" :key="index" :label="item.name" :value="item.id" />
                 </el-select>
               </div>
               <div v-show="tab.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                 <el-date-picker v-model="tab.chartMonth" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" style="width:250px;" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
               </div>
-              <el-button class="successBorder" style="margin-left:10px;" @click="handleAllDate">确认</el-button>
+              <el-button class="successBorder" style="margin-left:10px;" @click="handleAllDate">{{$t('errorAnalysis.confirm')}}</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
           </el-row>
@@ -96,35 +96,35 @@
                 <h4 style="text-align:center;">干物质采食量</h4>
                 <div v-if="tab.chart1.isChart" class="button">
                   <div class="chartButton">
-                    <my-select ref="tenantselect" :model="tab.chart1.getdataListParm.parammaps.statisticsList" :option="tab.chart1.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;margin-top: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart1" />
+                    <my-select ref="tenantselect" :model="tab.chart1.getdataListParm.parammaps.statisticsList" :option="tab.chart1.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;margin-top: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart1" />
                     <el-select v-model="tab.chart1.getdataListParm.parammaps.bigcowclass" filterable placeholder="牲畜类别" class="filter-item" clearable style="width: 150px;margin-right: 5px;margin-top: 5px;" @change="changeLivestockType">
                       <el-option v-for="item in tab.chart1.livestockTypeList" :key="item.value" :label="item.label" :value="item.label" />
                     </el-select>
                     <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;margin-right: 10px;" @change="changeChartSpecificDate('chart1')">
-                      <el-radio-button label="1" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
                       <!-- <el-radio-button label="2" border>周</el-radio-button> -->
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <!-- <br/> -->
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-top: 5px;">
                       <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;">
-                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;margin-top: 5px;" placeholder="年份" @change="changeChartYear('chart1')">
+                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;margin-top: 5px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart1')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart1.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart1.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;">
                       <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart1')">确认</el-button>
+                    <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="handleTable('chart1')">切换表格</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;" />
@@ -159,31 +159,31 @@
                 <h4 style="text-align:center;">牛栏剩料率</h4>
                 <div v-if="tab.chart2.isChart" class="button">
                   <div class="chartButton">
-                    <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="请选择统计参数" @searchSelect="changeStatisticChart2" />
+                    <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-radio-group v-model="tab.chart2.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart2')">
-                      <el-radio-button label="1" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
                       <!-- <el-radio-button label="2" border>周</el-radio-button> -->
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart2')">
+                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart2')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart2.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart2.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart2')">确认</el-button>
+                    <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="handleTable('chart2')">切换表格</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;" />
@@ -222,31 +222,31 @@
                 <h4 style="text-align:center;">混料时间统计</h4>
                 <div v-if="tab.chart3.isChart" class="button">
                   <div class="chartButton">
-                    <my-select ref="tenantselect" :model="tab.chart3.getdataListParm.parammaps.statisticsList" :option="tab.chart3.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart3" />
+                    <my-select ref="tenantselect" :model="tab.chart3.getdataListParm.parammaps.statisticsList" :option="tab.chart3.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" :placeholder="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart3" />
                     <el-radio-group v-model="tab.chart3.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart3')">
-                      <el-radio-button label="1" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
                       <!-- <el-radio-button label="2" border>周</el-radio-button> -->
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart3')">
+                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart3')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart3.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart3.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart3')">确认</el-button>
+                    <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="handleTable('chart3')">切换表格</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;" />
@@ -281,31 +281,31 @@
                 <h4 style="text-align:center;">转化率</h4>
                 <div v-if="tab.chart4.isChart" class="button">
                   <div class="chartButton">
-                    <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="请选择统计参数" @searchSelect="changeStatisticChart4" />
+                    <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-radio-group v-model="tab.chart4.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart4')">
-                      <el-radio-button label="1" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
                       <!-- <el-radio-button label="2" border>周</el-radio-button> -->
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart4')">
+                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart4')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart4.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart4.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart4')">确认</el-button>
+                    <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="handleTable('chart4')">切换表格</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;" />
@@ -342,31 +342,31 @@
                 <h4 style="text-align:center;">成本分析</h4>
                 <div v-if="tab.chart5.isChart" class="button">
                   <div class="chartButton">
-                    <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="请选择统计参数" @searchSelect="changeStatisticChart5" />
+                    <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-radio-group v-model="tab.chart5.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart5')">
-                      <el-radio-button label="1" border></el-radio-button>
+                      <el-radio-button label="1" border>{{$t('errorAnalysis.day')}}</el-radio-button>
                       <!-- <el-radio-button label="2" border>周</el-radio-button> -->
-                      <el-radio-button label="3" border></el-radio-button>
+                      <el-radio-button label="3" border>{{$t('errorAnalysis.month')}}</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
-                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart5')">
+                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" :placeholder="$t('errorAnalysis.nf')"  @change="changeChartYear('chart5')">
                         <el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
                       </el-select>
-                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
+                      <el-select v-model="tab.chart5.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" :placeholder="$t('errorAnalysis.qxzz')" >
                         <el-option v-for="(item,index) in tab.chart5.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
                       </el-select>
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
                       <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
-                    <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart5')">确认</el-button>
+                    <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="handleTable('chart5')">切换表格</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;" />
@@ -537,8 +537,8 @@
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
       <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">{{$t('common.closed')}}</el-button>
-      <el-button  class="save" v-if="activeName=='first'" :disabled="isokDisable" @click="exportList1()">确认</el-button>
-      <el-button  class="save" v-else :disabled="isokDisable" @click="exportList2()">确认</el-button>
+      <el-button  class="save" v-if="activeName=='first'" :disabled="isokDisable" @click="exportList1()">{{$t('errorAnalysis.confirm')}}</el-button>
+      <el-button  class="save" v-else :disabled="isokDisable" @click="exportList2()">{{$t('errorAnalysis.confirm')}}</el-button>
     </div>
     </el-dialog>
   </div>
@@ -2210,7 +2210,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '剩料率', axisLabel: { formatter: '{value} %' }
         },
@@ -2346,7 +2346,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '分钟',
           axisLabel: {
@@ -2479,9 +2479,9 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
-          type: 'value', name: '百分比', axisLabel: { formatter: '{value} %' }
+          type: 'value', name: this.$t('errorAnalysis.bfb') , axisLabel: { formatter: '{value} %' }
         },
         series: (function() {
           var serie = []
@@ -2607,7 +2607,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '公斤奶饲料成本(元)'
         },
@@ -2834,7 +2834,9 @@ export default {
 <style lang="scss" scoped>
   .button{
     height: 130px;
-    .exportTable2{float: right;margin-right: 5px;margin-top: 5px;}
+    .exportTable2{float: right;margin-right: 5px;margin-top: 5px;
+      width:auto;padding:0 4px;
+    }
   }
   .app-container1{padding-left: 10px;background-color: #F4F4F4;}
   .dashboard-editor-container {

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

@@ -64,7 +64,7 @@
             <el-col :span="24" style="margin-top: 10px;">
               <span>图表查询时间:</span>
               <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
-              <el-button class="successBorder" @click="handleChartDate">确认</el-button>
+              <el-button class="successBorder" @click="handleChartDate">{{$t('errorAnalysis.confirm')}}</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
           </el-row>
@@ -75,7 +75,7 @@
                 <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="handleTable('chart1')">切换表格</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">
@@ -108,10 +108,10 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">牛栏剩料率</h4>
                 <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="请选择统计参数" @searchSelect="changeStatisticChart2" />
+                  <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="handleTable('chart2')">切换表格</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">
@@ -150,7 +150,7 @@
                 <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="handleTable('chart3')">切换表格</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">
@@ -182,10 +182,10 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">转化率</h4>
                 <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="请选择统计参数" @searchSelect="changeStatisticChart4" />
+                  <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="handleTable('chart4')">切换表格</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">
@@ -221,10 +221,10 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">成本分析</h4>
                 <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="请选择统计参数" @searchSelect="changeStatisticChart5" />
+                  <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="handleTable('chart5')">切换表格</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">
@@ -1200,7 +1200,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '剩料率', axisLabel: { formatter: '{value} %' }
         },
@@ -1272,7 +1272,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data1, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data1, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '分钟',
           axisLabel: {
@@ -1387,9 +1387,9 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
-          type: 'value', name: '百分比', axisLabel: { formatter: '{value} %' }
+          type: 'value', name: this.$t('errorAnalysis.bfb') , axisLabel: { formatter: '{value} %' }
         },
         series: (function() {
           var serie = []
@@ -1504,7 +1504,7 @@ export default {
           right: '2%',
           feature: {}
         },
-        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
+        xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name:this.$t('errorAnalysis.date')  },
         yAxis: {
           type: 'value', name: '公斤奶饲料成本(元)'
         },

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

@@ -335,8 +335,8 @@ export default {
       rowHeight: 30,
       isDispayTable2:false,
       isDispayTable3:false,
-      statisticalTypeList2: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }, { id: '5', name: 'TMR班次' }, { id: '6', name: '车次' }],
-      statisticalTypeList3: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }],
+      statisticalTypeList2: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name:this.$t('errorAnalysis.date')  }, { id: '4', name: 'TMR设备编号' }, { id: '5', name: 'TMR班次' }, { id: '6', name: '车次' }],
+      statisticalTypeList3: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name:this.$t('errorAnalysis.date')  }, { id: '4', name: 'TMR设备编号' }],
       frequencyList: [], // 班次
       isTable1:true,
       spanObj: {},

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

@@ -152,7 +152,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer" style="bottom: 10px;">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
-          <el-button class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="createData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -111,7 +111,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:10px">
         <el-button class="cancelClose" @click="tab1.pageConfiguration.dialogFormVisible = false;getList(); ">取消</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="pageConfigurationData()">确认</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="pageConfigurationData()">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
     <!-- 关联 -->
@@ -240,7 +240,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:10px;">
         <el-button class="cancelClose" @click="tab1.relation.dialogFormVisible = false;getList(); ">取消</el-button>
-        <el-button v-if="tab1.relation.dialogStatus==='relation'" class="save" :disabled="isokDisable" @click="relationData()">确认</el-button>
+        <el-button v-if="tab1.relation.dialogStatus==='relation'" class="save" :disabled="isokDisable" @click="relationData()">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -110,7 +110,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:10px">
         <el-button class="cancelClose" @click="tab1.pageConfiguration.dialogFormVisible = false;getList(); ">取消</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="pageConfigurationData()">确认</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="pageConfigurationData()">{{$t('errorAnalysis.confirm')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -223,7 +223,7 @@
         </div>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
           <el-button class="cancelClose" @click="setUp.dialogFormVisible = false;getList(); ">取消</el-button>
-          <el-button class="save" :disabled="isokDisable" @click="setData()">确认</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="setData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -371,7 +371,7 @@
           <img src="https://img2.baidu.com/it/u=1151188475,1753963046&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=300" alt="">
         </div>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
-          <el-button class="save" :disabled="isokDisable" @click="QRcode.dialogFormVisible = false;">确认</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="QRcode.dialogFormVisible = false;">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -135,7 +135,7 @@
         </div>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
           <el-button class="cancelClose" @click="role.dialogFormVisible = false;getList(); ">取消</el-button>
-          <el-button v-if="role.dialogStatus==='role'" class="save" :disabled="isokDisable" @click="roleData()">确认</el-button>
+          <el-button v-if="role.dialogStatus==='role'" class="save" :disabled="isokDisable" @click="roleData()">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>

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

@@ -130,7 +130,7 @@
           <img :src="imgUrl" alt="">
         </div>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
-          <el-button class="save" :disabled="isokDisable" @click="QRcode.dialogFormVisible = false;">确认</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="QRcode.dialogFormVisible = false;">{{$t('errorAnalysis.confirm')}}</el-button>
         </div>
       </div>
     </el-dialog>