Shan9312 1 gadu atpakaļ
vecāks
revīzija
aa15c074f8
62 mainītis faili ar 826 papildinājumiem un 576 dzēšanām
  1. 80 80
      src/components/index.vue
  2. 48 0
      src/lang/en/langModule/InventoryManagement.js
  3. 76 0
      src/lang/en/langModule/feedingEfficiency.js
  4. 49 0
      src/lang/zn/langModule/InventoryManagement.js
  5. 76 0
      src/lang/zn/langModule/feedingEfficiency.js
  6. 1 1
      src/views/basicData/feedTable/index.vue
  7. 1 1
      src/views/basicData/groupColumn/index.vue
  8. 1 1
      src/views/basicData/livestockCategory/index.vue
  9. 2 2
      src/views/basicData/sapLog/index.vue
  10. 3 3
      src/views/basicData/standardParameters/index.vue
  11. 1 1
      src/views/customboard/ChartPanel/components/dataPanel.vue
  12. 7 7
      src/views/dashboard/group/index.vue
  13. 2 2
      src/views/formulationPlan/dailyExecutionPlan/index.vue
  14. 3 3
      src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue
  15. 25 25
      src/views/formulationPlan/dhedFormula/index - 20230829备份.vue
  16. 25 25
      src/views/formulationPlan/dhedFormula/index.vue
  17. 25 25
      src/views/formulationPlan/dhedFormula/index备.vue
  18. 2 2
      src/views/formulationPlan/formulaDistribution/index.vue
  19. 1 1
      src/views/formulationPlan/pushMaterialPlan/index.vue
  20. 4 4
      src/views/formulationPlan/recipeTemplate/index.vue
  21. 1 1
      src/views/inventoryManagement/feedContract/index.vue
  22. 1 1
      src/views/inventoryManagement/inventoryList/index.vue
  23. 1 1
      src/views/inventoryManagement/laborConsumption/index.vue
  24. 2 2
      src/views/inventoryManagement/statistics/index.vue
  25. 2 2
      src/views/inventoryManagement/systemConsumption/index.vue
  26. 1 1
      src/views/inventoryManagement/warehousing/index.vue
  27. 1 1
      src/views/shedProduction/dungScores/historyRecord.vue
  28. 1 1
      src/views/shedProduction/dungScores/index.vue
  29. 1 1
      src/views/shedProduction/dutyRecord/index.vue
  30. 1 1
      src/views/shedProduction/fecalScreen/historyRecord.vue
  31. 1 1
      src/views/shedProduction/fecalScreen/index.vue
  32. 1 1
      src/views/shedProduction/formulaDryMatter/historyRecord.vue
  33. 1 1
      src/views/shedProduction/formulaDryMatter/index.vue
  34. 1 1
      src/views/shedProduction/materialRemainingRecord/index.vue
  35. 1 1
      src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue
  36. 1 1
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  37. 5 5
      src/views/shedProduction/performance/index.vue
  38. 1 1
      src/views/shedProduction/physicalConditionScore/historyRecord.vue
  39. 1 1
      src/views/shedProduction/physicalConditionScore/index.vue
  40. 17 17
      src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue
  41. 2 2
      src/views/statisticalAnalysis/errorAnalysis/group/tab2.vue
  42. 2 2
      src/views/statisticalAnalysis/errorAnalysis/group/tab3.vue
  43. 20 20
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  44. 20 20
      src/views/statisticalAnalysis/feedingEfficiency/group/index.vue
  45. 75 75
      src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue
  46. 29 29
      src/views/statisticalAnalysis/feedingEfficiency/group/tab2.vue
  47. 93 92
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue
  48. 84 84
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index备.vue
  49. 1 1
      src/views/statisticalAnalysis/formulaStatistics/index.vue
  50. 1 1
      src/views/statisticalAnalysis/formulationEvaluation/index.vue
  51. 1 1
      src/views/statisticalAnalysis/formulationEvaluation/index备.vue
  52. 7 7
      src/views/statisticalAnalysis/inventoryManagement/group/index.vue
  53. 6 6
      src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue
  54. 1 1
      src/views/statisticalAnalysis/processAnalysis/group/index.vue
  55. 1 1
      src/views/statisticalAnalysis/processAnalysis/pasture/index.vue
  56. 1 1
      src/views/systemManagement/customboard2/ChartPanel2/index.vue
  57. 3 3
      src/views/systemManagement/notificationManagement/index.vue
  58. 1 1
      src/views/systemManagement/operation/index.vue
  59. 1 1
      src/views/systemManagement/operationManagement/group/index.vue
  60. 1 1
      src/views/systemManagement/operationManagement/index.vue
  61. 1 1
      src/views/systemManagement/role/index.vue
  62. 1 1
      src/views/systemManagement/user/index.vue

+ 80 - 80
src/components/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container1">
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="效率统计" name="first">
+      <el-tab-pane :label="$t('feedingEfficiency.xltj')" name="first">
         <div class="search">
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-radio v-model="tab.radio" label="1" @change="changeRadio">配方</el-radio>
-          <el-radio v-model="tab.radio" label="2" @change="changeRadio">栏舍</el-radio>
-          <el-radio v-model="tab.radio" label="3" @change="changeRadio">牲畜类别</el-radio>
-          <el-input v-if="tab.isFormulaName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" placeholder="配方模板" />
-          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
-          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
-          <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
+          <el-radio v-model="tab.radio" label="1" @change="changeRadio">{{$t('feedingEfficiency.pf')}}</el-radio>
+          <el-radio v-model="tab.radio" label="2" @change="changeRadio">{{$t('errorAnalysis.pen')}}</el-radio>
+          <el-radio v-model="tab.radio" label="3" @change="changeRadio">{{$t('feedingEfficiency.cxlb')}}</el-radio>
+          <el-input v-if="tab.isFormulaName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" :placeholder="$t('errorAnalysis.pen')"/>
+          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
@@ -30,35 +30,35 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
           >
-            <el-table-column v-if="tab.isFormulaName" label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <el-table-column v-if="tab.isFormulaName" :label="$t('feedingEfficiency.pfmb')" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isHouseName" :label="$t('errorAnalysis.pen')" min-width="70px" align="center" prop="栏舍" />
-            <el-table-column v-if="tab.isHouseName" label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <el-table-column v-if="tab.isHouseName" :label="$t('feedingEfficiency.pfmb')" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isLivestockType" :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
-            <el-table-column label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
-            <el-table-column label="应混料量(kg)" min-width="60px" align="center" prop="应混料量" />
-            <el-table-column label="实际混料量(kg)" min-width="70px" align="center" prop="实际混料量" />
-            <el-table-column label="撒料量(kg)" min-width="60px" align="center" prop="撒料量" />
+            <el-table-column :label="$t('feedingEfficiency.sjnts')" min-width="60px" align="center" prop="实际牛头数" />
+            <el-table-column :label="$t('feedingEfficiency.yhll')" min-width="60px" align="center" prop="应混料量" />
+            <el-table-column :label="$t('feedingEfficiency.sjhll')" min-width="70px" align="center" prop="实际混料量" />
+            <el-table-column :label="$t('feedingEfficiency.sll')"min-width="60px" align="center" prop="撒料量" />
             <el-table-column label="混料时间" min-width="70px" align="center" prop="混料时间" />
-            <el-table-column label="转投剩料量(kg)" min-width="70px" align="center" prop="转投剩料量" />
-            <el-table-column label="今日剩料量(kg)" min-width="70px" align="center" prop="今日剩料量" />
-            <el-table-column label="剩料率(%)" min-width="60px" align="center" prop="剩料率" />
-            <el-table-column label="TMR干物质(%)" min-width="65px" align="center" prop="TMR干物质" />
-            <el-table-column label="配方干物质采食量(kg/头)" min-width="80px" align="center" prop="配方干物质采食量" />
-            <el-table-column label="实际干物质采食量(kg/头)" min-width="80px" align="center" prop="实际干物质采食量" />
-            <el-table-column label="采食率(%)" min-width="60px" align="center" prop="采食率" />
-            <el-table-column label="配方成本(元/头)" min-width="65px" align="center" prop="配方成本" />
-            <el-table-column label="实际成本(元/头)" min-width="65px" align="center" prop="实际成本" />
-            <el-table-column label="产奶量(kg/头)" min-width="65px" align="center" prop="产奶量" />
-            <el-table-column label="饲料转化率(%)" min-width="60px" align="center" prop="饲料转化率" />
-            <el-table-column label="公斤奶饲料成本" min-width="60px" align="center" prop="公斤奶饲料成本" />
+            <el-table-column :label="$t('feedingEfficiency.ztsll')" min-width="70px" align="center" prop="转投剩料量" />
+            <el-table-column :label="$t('feedingEfficiency.jrsll')" min-width="70px" align="center" prop="今日剩料量" />
+            <el-table-column :label="$t('feedingEfficiency.csl')" min-width="60px" align="center" prop="剩料率" />
+            <el-table-column :label="$t('feedingEfficiency.tmrgwz')"min-width="65px" align="center" prop="TMR干物质" />
+            <el-table-column :label="$t('feedingEfficiency.pfgwzcsl')"min-width="80px" align="center" prop="配方干物质采食量" />
+            <el-table-column :label="$t('feedingEfficiency.sjgwzcsl')"min-width="80px" align="center" prop="实际干物质采食量" />
+            <el-table-column:label="$t('feedingEfficiency.csl')" min-width="60px" align="center" prop="采食率" />
+            <el-table-column :label="$t('feedingEfficiency.pfcb')" min-width="65px" align="center" prop="配方成本" />
+            <el-table-column :label="$t('feedingEfficiency.sjcb')"min-width="65px" align="center" prop="实际成本" />
+            <el-table-column :label="$t('feedingEfficiency.cnl')"min-width="65px" align="center" prop="产奶量" />
+            <el-table-column :label="$t('feedingEfficiency.slzhl')"min-width="60px" align="center" prop="饲料转化率" />
+            <el-table-column :label="$t('feedingEfficiency.gjnclcb')"min-width="60px" align="center" prop="公斤奶饲料成本" />
           </el-table>
           <!-- <pagination v-show="tab.table.total>=0" :total="tab.table.total" :page.sync="tab.table.getdataListParm.offset" :limit.sync="tab.table.getdataListParm.pagecount" @pagination="getTabList" /> -->
         </div>
         <div class="AnalysisChart">
           <el-row :gutter="10">
             <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" />
+              <span>{{$t('feedingEfficiency.tbcxsj')}} :</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">{{$t('errorAnalysis.confirm')}}</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
@@ -66,9 +66,9 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">泌乳牛干物质采食量</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.mrngwzcl')}} </h4>
                 <div v-if="tab.chart1.isChart" class="button">
-                  <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -104,7 +104,7 @@
                 <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="$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')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -141,9 +141,9 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">混料时间统计</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.hlsjtj')}}</h4>
                 <div v-if="tab.chart3.isChart" class="button">
-                  <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart3')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -175,11 +175,11 @@
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">转化率</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.zhl')}}</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="$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')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -205,7 +205,7 @@
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
                     <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="110px" align="center" prop="名称" />
-                    <el-table-column label="饲料转化率" min-width="110px" align="center" prop="准确率" />
+                    <el-table-column :label="$t('feedingEfficiency.slzhl')"min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -215,10 +215,10 @@
           <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
             <el-col :span="24">
               <div class="grid-content">
-                <h4 style="text-align:center;">成本分析</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.cbfx')}}</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="$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')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -244,7 +244,7 @@
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.sxlb')" min-width="110px" align="center" prop="名称" />
-                    <el-table-column label="公斤奶饲料成本(元)" min-width="110px" align="center" prop="准确率" />
+                    <el-table-column :label="$t('feedingEfficiency.gjnclcb1')"min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -253,7 +253,7 @@
           </el-row>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="牛群评估" name="second">
+      <el-tab-pane :label="$t('feedingEfficiency.nxpg')" name="second">
         <div class="search">
           <el-date-picker v-model="tab2.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeTab2Date" />
         </div>
@@ -275,20 +275,20 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column label="宾州筛" min-width="60px" align="center" prop="barname" />
-                <el-table-column label="第一层重量" min-width="60px" align="center" prop="oneweight" />
-                <el-table-column label="第一层百分比" min-width="60px" align="center" prop="onerate" />
-                <el-table-column label="第二层重量" min-width="60px" align="center" prop="twoweight" />
-                <el-table-column label="第二层百分比" min-width="60px" align="center" prop="tworate" />
-                <el-table-column label="第三层重量" min-width="60px" align="center" prop="threeweight" />
-                <el-table-column label="第三层百分比" min-width="60px" align="center" prop="threerate" />
-                <el-table-column label="第四层重量" min-width="60px" align="center" prop="fourweight" />
-                <el-table-column label="第四层百分比" min-width="60px" align="center" prop="fourrate" />
-                <el-table-column label="参考标准" min-width="50px" align="center" prop="standard" />
+                <el-table-column :label="$t('feedingEfficiency.bzs')" min-width="60px" align="center" prop="barname" />
+                <el-table-column :label="$t('feedingEfficiency.dczl1')"min-width="60px" align="center" prop="oneweight" />
+                <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="60px" align="center" prop="onerate" />
+                <el-table-column :label="$t('feedingEfficiency.dczl2')" min-width="60px" align="center" prop="twoweight" />
+                <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="60px" align="center" prop="tworate" />
+                <el-table-column :label="$t('feedingEfficiency.dczl3')"   min-width="60px" align="center" prop="threeweight" />
+                <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="60px" align="center" prop="threerate" />
+                <el-table-column :label="$t('feedingEfficiency.dczl4')"   min-width="60px" align="center" prop="fourweight" />
+                <el-table-column :label="$t('feedingEfficiency.dcbfb4')"    min-width="60px" align="center" prop="fourrate" />
+                <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="50px" align="center" prop="standard" />
               </el-table>
             </el-col>
             <el-col :span="12">
-              <h4 style="text-align:center;">粪便筛分析</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.fbsfx')}}</h4>
               <el-table
                 :key="tab2.table2.tableKey"
                 v-loading="tab2.table2.listLoading"
@@ -304,13 +304,13 @@
                 height="400px"
               >
                 <el-table-column label="粪便筛" min-width="60px" align="center" prop="barname" />
-                <el-table-column label="第一层重量" min-width="60px" align="center" prop="oneweight" />
-                <el-table-column label="第一层百分比" min-width="60px" align="center" prop="onerate" />
-                <el-table-column label="第二层重量" min-width="60px" align="center" prop="twoweight" />
-                <el-table-column label="第二层百分比" min-width="60px" align="center" prop="tworate" />
-                <el-table-column label="第三层重量" min-width="60px" align="center" prop="threeweight" />
-                <el-table-column label="第三层百分比" min-width="60px" align="center" prop="threerate" />
-                <el-table-column label="参考标准" min-width="50px" align="center" prop="standard" />
+                <el-table-column :label="$t('feedingEfficiency.dczl1')"min-width="60px" align="center" prop="oneweight" />
+                <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="60px" align="center" prop="onerate" />
+                <el-table-column :label="$t('feedingEfficiency.dczl2')" min-width="60px" align="center" prop="twoweight" />
+                <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="60px" align="center" prop="tworate" />
+                <el-table-column :label="$t('feedingEfficiency.dczl3')"   min-width="60px" align="center" prop="threeweight" />
+                <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="60px" align="center" prop="threerate" />
+                <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="50px" align="center" prop="standard" />
               </el-table>
             </el-col>
           </el-row>
@@ -332,23 +332,23 @@
                 height="400px"
               >
                 <el-table-column :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
-                <el-table-column label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
-                <el-table-column label="单产" min-width="60px" align="center" prop="product" />
-                <el-table-column label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
-                <el-table-column label="泌乳天数" min-width="50px" align="center" prop="avgdim" />
-                <el-table-column label="标准分数" min-width="50px" align="center" prop="standardscore" />
+                <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="60px" align="center" prop="sumcowcount" />
+                <el-table-column :label="$t('feedingEfficiency.dc')"  min-width="60px" align="center" prop="product" />
+                <el-table-column :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
+                <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="50px" align="center" prop="avgdim" />
+                <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="50px" align="center" prop="standardscore" />
                 <el-table-column label="2.75-分(数量、百分比)" min-width="100px" align="center" prop="score25" />
-                <el-table-column label="2.75分(数量、百分比)" min-width="100px" align="center" prop="score275" />
-                <el-table-column label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />
-                <el-table-column label="3.25分(数量、百分比)" min-width="100px" align="center" prop="score325" />
-                <el-table-column label="3.5分(数量、百分比)" min-width="100px" align="center" prop="score35" />
-                <el-table-column label="3.75分(数量、百分比)" min-width="100px" align="center" prop="score375" />
-                <el-table-column label="4+分(数量、百分比)" min-width="100px" align="center" prop="score4" />
+                <el-table-column :label="$t('feedingEfficiency.bfb275')"    min-width="100px" align="center" prop="score275" />
+                <el-table-column :label="$t('feedingEfficiency.bfb3')"    min-width="90px" align="center" prop="score3" />
+                <el-table-column :label="$t('feedingEfficiency.bfb325')"   min-width="100px" align="center" prop="score325" />
+                <el-table-column :label="$t('feedingEfficiency.bfb35')"   min-width="100px" align="center" prop="score35" />
+                <el-table-column :label="$t('feedingEfficiency.bfb375')"   min-width="100px" align="center" prop="score375" />
+                <el-table-column :label="$t('feedingEfficiency.bfb4')"   min-width="100px" align="center" prop="score4" />
               </el-table>
             </el-col>
             <!-- 粪便评分 -->
             <el-col :span="12">
-              <h4 style="text-align:center;">粪便评分</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.fbpf')}}</h4>
               <el-table
                 :key="tab2.table4.tableKey"
                 v-loading="tab2.table4.listLoading"
@@ -364,16 +364,16 @@
                 height="400px"
               >
                 <el-table-column :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
-                <el-table-column label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
-                <el-table-column label="单产" min-width="60px" align="center" prop="product" />
-                <el-table-column label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
-                <el-table-column label="泌乳天数" min-width="60px" align="center" prop="avgdim" />
-                <el-table-column label="标准分数" min-width="60px" align="center" prop="standardscore" />
-                <el-table-column label="1分(数量、百分比)" min-width="90px" align="center" prop="score1" />
-                <el-table-column label="2分(数量、百分比)" min-width="90px" align="center" prop="score2" />
-                <el-table-column label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />
-                <el-table-column label="4分(数量、百分比)" min-width="90px" align="center" prop="score4" />
-                <el-table-column label="5分(数量、百分比)" min-width="90px" align="center" prop="score5" />
+                <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="60px" align="center" prop="sumcowcount" />
+                <el-table-column :label="$t('feedingEfficiency.dc')"  min-width="60px" align="center" prop="product" />
+                <el-table-column :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
+                <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="60px" align="center" prop="avgdim" />
+                <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="60px" align="center" prop="standardscore" />
+                <el-table-column :label="$t('feedingEfficiency.bfb1')"    min-width="90px" align="center" prop="score1" />
+                <el-table-column :label="$t('feedingEfficiency.bfb2')"    min-width="90px" align="center" prop="score2" />
+                <el-table-column :label="$t('feedingEfficiency.bfb3')"    min-width="90px" align="center" prop="score3" />
+                <el-table-column :label="$t('feedingEfficiency.bfb4')"    min-width="90px" align="center" prop="score4" />
+                <el-table-column :label="$t('feedingEfficiency.bfb5')"   min-width="90px" align="center" prop="score5" />
               </el-table>
             </el-col>
           </el-row>

+ 48 - 0
src/lang/en/langModule/InventoryManagement.js

@@ -0,0 +1,48 @@
+export default{
+  kctj:'Inventory Statistics',
+  yltj:"Feed Analysis",
+  jgfx:"Price Analysis",
+ silc:'feed name',
+   qc:'Beginning of Period',
+   qckc:"Beginning Inventory(kg)",
+   qcje:"Beginning Balance",
+   yl:"Usage",
+   xtckyl:"System Outward Weight(kg)",
+   rgylzl:"Manual Feed Weight(kg)",
+   chzl:"Loss Weight(kg)",
+   qm:'End of Period',
+   qmkc:"End of Period Inventory(kg)",
+   qmje:"End of Period Amount(yuan)",
+   ylfx:"Feed Analysis",
+   tjlx:"Type of Statistics",
+   wc:"Error",
+   sfcfxl:"Whether to Split the Small Materials",
+   rq:"Date",
+   tmrsbbh:"TMR Equipment Number",
+   lbxs:"List Display",
+   
+   
+   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

+ 76 - 0
src/lang/en/langModule/feedingEfficiency.js

@@ -0,0 +1,76 @@
+export default{
+  xltj:"Efficiency statistics",
+  nxpg:'Cattle Herd Assessment',
+  pf:"formulation",
+  pfmb:"Formula Template",
+  sjnts:"actual head count of cattle",
+  yhll:"Required mixing quantity(kg)",
+  sjhll:"Actual mixing quantity(kg)",
+  sll:"Spread quantity(kg)",
+  pjhlsj:"average mixing tim",
+  ztsll:"Leftover Feed Transfer (kg)",
+  zrsll:"Yesterday's leftover feed quantity(kg)",
+  sll:"Residual Feed Rate(%)",
+  tmrgwz:"TMR DM(%)",
+  pfgwzcsl:"Formulated dry matter intake(kg/head)",
+  sjgwzcsl:"actual DMI(kg/head)",
+  csl:"Intake rate(%)",
+  pfllcb:"formulation cost (per head/yuan)",
+  pfcb:"formulation cost (per head/yuan)",
+  sjcb:"actual cost”(per head/yuan)",
+  cnl:"Milk yield(kg/head)",
+  slzhl:"FCR(%)",
+  gjnclcb:"cost of feed per kilogram of milk",
+  tbcxsj:"Icon Inquiry Time",
+  gwzcsl:"DMI",
+  nlsll:"Cow Barn Leftover Rate",
+  hlsjtj:"Feed Mixing Time Statistics",
+  zhl:"Conversion Rate",
+  cbfx:"Cost Analysis",
+  zhdmb:"Best Template",
+  gjnclcb1:"cost of feed per kilogram of milk(元)",
+  cxlb:"Livestock Categories",
+  bzsfx:"PSPS",
+
+
+bzs:"Penn State Sieve",
+dczl1:"First Layer Weight",
+dcbfb1:"First Layer Percentage",
+dczl2:"Second Layer Weight",
+dcbfb2:"Second Layer Percentage",
+dczl3:"hird Layer Weight",
+dcbfb3:"Third Layer Percentage",
+dczl4:"Fourth Layer Weight",
+dcbfb4:"Fourth Layer Percentage”",
+ckbz:"Reference Standard",
+fbsfx:"Fecal Screenin",
+
+tkpl:"Body Condition Scoring",
+czybs:"Sample Size for Spot Checks",
+mrts:"DIM",
+bzfs:"Standard Score",
+bfb1:'1 points',
+bfb2:'2 points',
+bfb3:'3 points',
+bfb4:'4 points)',
+bfb5:'5 points',
+bfb25:'2.5 points)',
+bfb275:"2.75 points",
+bfb325:"3.25points",
+bfb35:"3.5 points)",
+bfb375:"3.75 points",
+bfb44:"4+ points)",
+
+fbpf:"Fecal Scoring",
+dcskff:"Export Time Range",
+dc:"Yield per Unit",
+jrsll:"Today's Leftover Material(kg)",
+mrngwzcl:"Dry Matter Intake (DMI) of Lactating Cows",
+mc:"Ranch",
+mrngwzcl1:"Dry Matter Intake (DMI) of Lactating Cows (kg)",
+sll1:"Leftover feed rate",
+csl1:"Feed Intake(kg)",
+cnl1:"Milk yield",
+  
+  
+  }

+ 49 - 0
src/lang/zn/langModule/InventoryManagement.js

@@ -0,0 +1,49 @@
+export default{
+  kctj:'库存统计',
+  yltj:"用料分析",
+  jgfx:"价格分析",
+ silc:'饲料名称',
+   qc:'期初',
+   qckc:"期初库存(kg)",
+   qcje:"期初金额(元)",
+   yl:"用量",
+   xtckyl:"系统出库重量(kg)",
+   xtckyl:"系统出库重量(kg)",
+   rgylzl:"人工用料重量(kg)",
+   chzl:"损耗重量(kg)",
+   qm:'期末',
+   qmkc:"期末库存(kg)",
+   qmje:"期末金额(元)",
+   ylfx:"用料分析",
+   tjlx:"统计类型",
+   wc:"误差",
+   sfcfxl:"是否拆分小料",
+   rq:"日期",
+   tmrsbbh:"TMR设备编号",
+   lbxs:"列表显示",
+   tjlx:"统计类型",
+   
+   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

+ 76 - 0
src/lang/zn/langModule/feedingEfficiency.js

@@ -0,0 +1,76 @@
+export default{
+xltj:"效率统计",
+nxpg:'牛群评估',
+pf:"配方",
+pfmb:"配方模版",
+sjnts:"实际牛头数",
+yhll:"应混料量(kg)",
+sjhll:"实际混料量(kg)",
+sll:"撒料量(kg)",
+pjhlsj:"平均混料时间",
+ztsll:"转投剩料量(kg)",
+zrsll:"昨日剩料量(kg)",
+sll:"剩料率(%)",
+tmrgwz:"TMR干物质(%)",
+pfgwzcsl:"配方干物质采食量(kg/头)",
+sjgwzcsl:"实际干物质采食量(kg/头)",
+csl:"采食率(%)",
+pfllcb:"配方理论成本",
+pfcb:"配方成本(元/头)",
+sjcb:"实际成本(元/头)",
+cnl:"产奶量(kg/头)",
+slzhl:"饲料转化率(%)",
+gjnclcb:"公斤奶饲料成本",
+tbcxsj:"图表查询时间",
+gwzcsl:"干物质采食量",
+nlsll:"牛栏剩料率",
+hlsjtj:"混料时间统计",
+zhl:"转化率",
+cbfx:"成本分析",
+zhdmb:"最好的模版",
+gjnclcb1:"公斤奶饲料成本(元)",
+cxlb:"牲畜类别",
+bzsfx:"宾州筛分析",
+
+bzs:"宾州筛",
+dczl1:"第一层重量",
+dcbfb1:"第一层百分比",
+dczl2:"第二层重量",
+dcbfb2:"第二层百分比",
+dczl3:"第三层重量",
+dcbfb3:"第三层百分比",
+dczl4:"第四层重量",
+dcbfb4:"第四层百分比",
+ckbz:"参考标准",
+fbsfx:"粪便筛分析",
+
+tkpl:"体况评分",
+czybs:"抽查样本数",
+mrts:"泌乳天数",
+bzfs:"标准分数",
+bfb1:'1分(数量、百分比)',
+bfb2:'2分(数量、百分比)',
+bfb3:'3分(数量、百分比)',
+bfb4:'4分(数量、百分比)',
+bfb5:'5分(数量、百分比)',
+bfb25:'2.5-分(数量、百分比)',
+bfb275:"2.75分(数量、百分比)",
+bfb3:"3分(数量、百分比)",
+bfb325:"3.25分(数量、百分比)",
+bfb35:"3.5分(数量、百分比)",
+bfb375:"3.75分(数量、百分比)",
+bfb44:"4+分(数量、百分比)",
+
+fbpf:"粪便评分",
+dcskff:"导出时间范围",
+dc:"单产",
+jrsll:"今日剩料量(kg)",
+mrngwzcl:"泌乳牛干物质采食量",
+mc:"牧场",
+mrngwzcl1:"泌乳牛干物质采食量 (kg)",
+sll1:"剩料率",
+csl1:"采食量(kg)",
+cnl1:"产奶量",
+
+
+}

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

@@ -735,7 +735,7 @@
           <el-row>
             <el-col :span="18">
               <el-form-item label="时间范围:" prop="inputDatetime">
-                <el-date-picker v-model="sapCode2.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
+                <el-date-picker v-model="sapCode2.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
               </el-form-item>
             </el-col>
           </el-row>

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

@@ -162,7 +162,7 @@
           <el-row>
             <el-col :span="18">
               <el-form-item label="时间范围:" prop="inputDatetime">
-                <el-date-picker v-model="sapCode2.temp.inputDatetime"  class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
+                <el-date-picker v-model="sapCode2.temp.inputDatetime"  class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
               </el-form-item>
             </el-col>
           </el-row>

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

@@ -4,7 +4,7 @@
       <el-select v-model="table.getdataListParm.parammaps.parentname" filterable placeholder="牲畜父类" class="filter-item" style="width: 160px;" clearable>
         <el-option v-for="item in parentList" :key="item.value" :label="item.label" :value="item.label" />
       </el-select>
-      <el-input v-model="table.getdataListParm.parammaps.classname" placeholder="牲畜类别" style="width: 180px;" class="filter-item" clearable />
+      <el-input v-model="table.getdataListParm.parammaps.classname" :placeholder="$t('feedingEfficiency.cxlb')" style="width: 180px;" class="filter-item" clearable />
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>

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

@@ -7,7 +7,7 @@
       <el-select v-model="table.getdataListParm.parammaps.msgtype" placeholder="数据类型" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in dataTypeList" :key="item.Id" :label="item.value" :value="item.Id" />
       </el-select>
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="successBorder" @click="handleSearch">{{$t('common.query')}}</el-button>
       <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
@@ -25,7 +25,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
       >
-        <el-table-column label="牧场" min-width="90px" align="center" prop="pastureName" />
+        <el-table-column :label="$t('feedingEfficiency.mc')"min-width="90px" align="center" prop="pastureName" />
         <el-table-column label="数据类型" min-width="90px" align="center"  prop="msgtypeName">
           <template slot-scope="scope">
             <span >{{scope.row.msgtypeName}}</span>

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

@@ -108,7 +108,7 @@
                 </template>
               </el-table-column>
             </el-table-column>
-            <el-table-column label="宾州筛" align="center" min-width="200px">
+            <el-table-column :label="$t('feedingEfficiency.bzs')" align="center" min-width="200px">
               <el-table-column label="宾州筛一层(%)" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bzonemin }} - {{ scope.row.bzonemax }}</span>
@@ -186,7 +186,7 @@
         <el-form ref="temp" :rules="table1.rules" :model="table1.temp" label-position="right" label-width="160px" style="width: 90%;margin:0 auto 50px">
           <el-row>
             <el-col :span="12">
-              <h3 style="width: 160px;float: left;">配方</h3>
+              <h3 style="width: 160px;float: left;">{{$t('feedingEfficiency.pf')}}</h3>
             </el-col>
           </el-row>
           <el-row>
@@ -260,7 +260,7 @@
         <el-form ref="temp" :rules="table2.rules" :model="table2.temp" label-position="right" label-width="160px" style="width: 90%;margin:0 auto 50px">
           <el-row>
             <el-col :span="10">
-              <h3 style="width: 160px;float: left;">牲畜类别</h3>
+              <h3 style="width: 160px;float: left;">{{$t('feedingEfficiency.cxlb')}}</h3>
             </el-col>
           </el-row>
           <el-row>

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

@@ -14,7 +14,7 @@
       <el-form-item label="数据类型:">
         <el-radio-group v-model="selectedTable" @change="handleDataSrcChange">
           <el-radio-button label="trainnumber">车次</el-radio-button>
-          <el-radio-button label="barroport">栏舍</el-radio-button>
+          <el-radio-button label="barroport">{{$t('errorAnalysis.pen')}}</el-radio-button>
         </el-radio-group>
       </el-form-item>
 

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

@@ -6,7 +6,7 @@
           <div class="row1-t">
             <div class="row1-t-l">
               <div class="img-l">统计范围:</div>
-              <el-date-picker v-model="inputDatetime" :clearable="false" class="inputDatetime filter-item content" type="daterange" :picker-options="pickerOptions" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" align="right" @change="changeDate" />
+              <el-date-picker v-model="inputDatetime" :clearable="false" class="inputDatetime filter-item content" type="daterange" :picker-options="pickerOptions" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" align="right" @change="changeDate" />
             </div>
           </div>
           <div class="row1-c">
@@ -167,8 +167,8 @@
               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="名称" />
-              <el-table-column label="公斤奶饲料成本(元)" sortable min-width="120px" align="center" prop="准确率" />
+              <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="110px" align="center" prop="名称" />
+              <el-table-column :label="$t('feedingEfficiency.gjnclcb1')"sortable min-width="120px" align="center" prop="准确率" />
             </el-table>
           </div>
         </div>
@@ -272,7 +272,7 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column label="牧场" sortable min-width="85px" align="center" prop="牧场" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="85px" align="center" prop="牧场" />
                 <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" />
@@ -287,7 +287,7 @@
           <div class="row2-r" style="position: relative;">
             <div class="title">
               <div class="img-title" />
-              <span class="content">泌乳牛干物质采食量</span>
+              <span class="content">{{$t('feedingEfficiency.mrngwzcl')}} </span>
             </div>
             <div v-if="row3.chart2.isChart" class="button">
               <div class="exportTable" @click="handleExport('row3chartLine2')">导出</div>
@@ -313,7 +313,7 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column label="牧场" sortable min-width="110px" align="center" prop="名称" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="110px" align="center" prop="名称" />
                 <el-table-column label="泌乳牛干物质采食量(kg)" sortable min-width="110px" align="center" prop="准确率" />
               </el-table>
             </div>
@@ -350,7 +350,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="名称" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="110px" align="center" prop="名称" />
                 <el-table-column label="混料重量" sortable min-width="110px" align="center" prop="准确率" />
               </el-table>
             </div>

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

@@ -662,14 +662,14 @@
           <el-row v-if="newGeneration.dialogStatus== 'newGeneration'">
             <el-col :span="24">
               <el-form-item label="时间范围:" prop="inputDatetime">
-                <el-date-picker v-model="newGeneration.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" :picker-options="pickerOptions2" />
+                <el-date-picker v-model="newGeneration.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" :picker-options="pickerOptions2" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row v-else>
             <el-col :span="24">
               <el-form-item label="时间范围:" prop="copyInputDatetime">
-                <el-date-picker v-model="newGeneration.temp.copyInputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
+                <el-date-picker v-model="newGeneration.temp.copyInputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
               </el-form-item>
             </el-col>
           </el-row>

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

@@ -27,7 +27,7 @@
         <el-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
         <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
         <el-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
-        <el-table-column :key="5" label="实际牛头数" min-width="100px" align="center">
+        <el-table-column :key="5" :label="$t('feedingEfficiency.sjnts')" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ccount }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccount" step="0.01" type="number" style="width:95%;padding:10px 0;" @blur="blurCcount(scope.row)" />
@@ -45,10 +45,10 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccountratio" step="0.01" type="number" style="width:95%;padding:10px 0;" @blur="blurCcountratio(scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column :key="8" label="配方模板" min-width="100px" align="center">
+        <el-table-column :key="8" :label="$t('feedingEfficiency.pfmb')" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ptname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.ptid" filterable placeholder="配方模板" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
+            <el-select v-if="scope.row.Edit" v-model="scope.row.ptid" filterable :placeholder="$t('feedingEfficiency.pfmb')" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
               <el-option v-for="item in recipeTemplateList" :key="item.id" :label="item.tname" :value="item.id" />
             </el-select>
           </template>

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

@@ -60,7 +60,7 @@
             <span>{{ scope.row.softccount }}</span>
           </template>
         </el-table-column>
-        <el-table-column :key="3" label="实际牛头数" min-width="80px" align="center">
+        <el-table-column :key="3" :label="$t('feedingEfficiency.sjnts')" min-width="80px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ccount }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccount" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurCcount(scope.row)" />
@@ -78,10 +78,10 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccountratio" type="number" style="width:100%;padding:10px 0;" @blur="blurCcountratio(scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column :key="6" label="配方模板" min-width="100px" align="center">
+        <el-table-column :key="6" :label="$t('feedingEfficiency.pfmb')" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ftname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.ftid" filterable placeholder="配方模板" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
+            <el-select v-if="scope.row.Edit" v-model="scope.row.ftid" filterable :placeholder="$t('feedingEfficiency.pfmb')" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
               <el-option v-for="item in recipeTemplateList" :key="item.id" :label="item.tname" :value="item.id" />
             </el-select>
           </template>
@@ -266,10 +266,10 @@
             <u-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
-            <u-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
+            <u-table-column :key="5" :label="$t('feedingEfficiency.sjnts')" prop="ccount" min-width="70px" align="center" />
             <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />
             <u-table-column :key="7" label="系数头数" prop="ccountratio" min-width="70px" align="center" />
-            <u-table-column :key="8" label="配方模板" prop="ptname" min-width="70px" align="center" />
+            <u-table-column :key="8" :label="$t('feedingEfficiency.pfmb')" prop="ptname" min-width="70px" align="center" />
             <u-table-column v-if="table.isPtsfname" :key="9" label="补料配方" prop="ptsname" min-width="70px" align="center" />
             <u-table-column :key="10" label="班次比例" prop="tratio" min-width="70px" align="center" />
             <u-table-column :key="11" label="班次重量" prop="weight" min-width="70px" align="center" />
@@ -375,7 +375,7 @@
               </el-row>
             </el-form>
             <div style="height: 50px;">
-              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
+              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
               <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
               <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
               <el-button class="successBorder" :disabled="isokDisable" @click="assessmentData()">评估</el-button>
@@ -424,8 +424,8 @@
               </el-table>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="牛群评估" name="second">
-            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
+          <el-tab-pane :label="$t('feedingEfficiency.nxpg')" name="second">
+            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
             <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
             <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
             <el-row>
@@ -455,7 +455,7 @@
                         <span>{{ scope.row.oneweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.onerate }}</span>
                       </template>
@@ -465,7 +465,7 @@
                         <span>{{ scope.row.twoweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.tworate }}</span>
                       </template>
@@ -475,7 +475,7 @@
                         <span>{{ scope.row.threeweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.threerate }}</span>
                       </template>
@@ -485,12 +485,12 @@
                         <span>{{ scope.row.fourweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第四层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb4')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.fourrate }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standard }}</span>
                       </template>
@@ -501,7 +501,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <h3 style="text-align: center;">粪便筛分析</h3>
+                <h3 style="text-align: center;">{{$t('feedingEfficiency.fbsfx')}}</h3>
                 <div class="table">
                   <el-table
                     :key="nutritional.tab2.tableKey2"
@@ -526,7 +526,7 @@
                         <span>{{ scope.row.oneweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.onerate }}</span>
                       </template>
@@ -536,7 +536,7 @@
                         <span>{{ scope.row.twoweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.tworate }}</span>
                       </template>
@@ -546,12 +546,12 @@
                         <span>{{ scope.row.threeweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.threerate }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standard }}</span>
                       </template>
@@ -582,7 +582,7 @@
                         <span>{{ scope.row.operatetime }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
@@ -597,12 +597,12 @@
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.avgdim }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standardscore }}</span>
                       </template>
@@ -648,7 +648,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <h3 style="text-align: center;">粪便评分</h3>
+                <h3 style="text-align: center;">{{$t('feedingEfficiency.fbpf')}}</h3>
                 <div class="table">
                   <el-table
                     :key="nutritional.tab2.tableKey4"
@@ -668,7 +668,7 @@
                         <span>{{ scope.row.operatetime }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
@@ -683,12 +683,12 @@
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.avgdim }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.cowneed }}</span>
                       </template>

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

@@ -63,7 +63,7 @@
             <span>{{ scope.row.softccount }}</span>
           </template>
         </el-table-column>
-        <el-table-column :key="3" label="实际牛头数" min-width="80px" align="center">
+        <el-table-column :key="3" :label="$t('feedingEfficiency.sjnts')" min-width="80px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.ccount }}</span>
             <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.ccount" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurCcount(scope.row)" :placeholder="scope.row.placeholder_ccount" @focus="focusData(scope.row)" />
@@ -81,10 +81,10 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccountratio" type="number" style="width:100%;padding:10px 0;" @blur="blurCcountratio(scope.row)" :placeholder="scope.row.placeholder_ccountratio" />
           </template>
         </el-table-column>
-        <el-table-column :key="6" label="配方模板" min-width="100px" align="center">
+        <el-table-column :key="6" :label="$t('feedingEfficiency.pfmb')" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ftname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.ftid" filterable placeholder="配方模板" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
+            <el-select v-if="scope.row.Edit" v-model="scope.row.ftid" filterable :placeholder="$t('feedingEfficiency.pfmb')" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
               <el-option v-for="item in recipeTemplateList" :key="item.id" :label="item.tname" :value="item.id" />
             </el-select>
           </template>
@@ -305,10 +305,10 @@
             <u-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
-            <u-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
+            <u-table-column :key="5" :label="$t('feedingEfficiency.sjnts')" prop="ccount" min-width="70px" align="center" />
             <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />
             <u-table-column :key="7" label="系数头数" prop="ccountratio" min-width="70px" align="center" />
-            <u-table-column :key="8" label="配方模板" prop="ptname" min-width="70px" align="center" />
+            <u-table-column :key="8" :label="$t('feedingEfficiency.pfmb')" prop="ptname" min-width="70px" align="center" />
             <u-table-column v-if="table.isPtsfname" :key="9" label="补料配方" prop="ptsname" min-width="70px" align="center" />
             <u-table-column :key="10" label="班次比例" prop="tratio" min-width="70px" align="center" />
             <u-table-column :key="11" label="班次重量" prop="weight" min-width="70px" align="center" />
@@ -419,7 +419,7 @@
               </el-row>
             </el-form>
             <div style="height: 50px;">
-              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
+              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
               <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
               <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
               <el-button class="successBorder" :disabled="isokDisable" @click="assessmentData()">评估</el-button>
@@ -468,8 +468,8 @@
               </el-table>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="牛群评估" name="second">
-            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
+          <el-tab-pane :label="$t('feedingEfficiency.nxpg')" name="second">
+            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
             <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
             <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
             <el-row>
@@ -499,7 +499,7 @@
                         <span>{{ scope.row.oneweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.onerate }}</span>
                       </template>
@@ -509,7 +509,7 @@
                         <span>{{ scope.row.twoweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.tworate }}</span>
                       </template>
@@ -519,7 +519,7 @@
                         <span>{{ scope.row.threeweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.threerate }}</span>
                       </template>
@@ -529,12 +529,12 @@
                         <span>{{ scope.row.fourweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第四层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb4')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.fourrate }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standard }}</span>
                       </template>
@@ -545,7 +545,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <h3 style="text-align: center;">粪便筛分析</h3>
+                <h3 style="text-align: center;">{{$t('feedingEfficiency.fbsfx')}}</h3>
                 <div class="table">
                   <el-table
                     :key="nutritional.tab2.tableKey2"
@@ -570,7 +570,7 @@
                         <span>{{ scope.row.oneweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.onerate }}</span>
                       </template>
@@ -580,7 +580,7 @@
                         <span>{{ scope.row.twoweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.tworate }}</span>
                       </template>
@@ -590,12 +590,12 @@
                         <span>{{ scope.row.threeweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.threerate }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standard }}</span>
                       </template>
@@ -626,7 +626,7 @@
                         <span>{{ scope.row.operatetime }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
@@ -641,12 +641,12 @@
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.avgdim }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standardscore }}</span>
                       </template>
@@ -692,7 +692,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <h3 style="text-align: center;">粪便评分</h3>
+                <h3 style="text-align: center;">{{$t('feedingEfficiency.fbpf')}}</h3>
                 <div class="table">
                   <el-table
                     :key="nutritional.tab2.tableKey4"
@@ -712,7 +712,7 @@
                         <span>{{ scope.row.operatetime }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
@@ -727,12 +727,12 @@
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.avgdim }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.cowneed }}</span>
                       </template>

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

@@ -60,7 +60,7 @@
             <span>{{ scope.row.softccount }}</span>
           </template>
         </el-table-column>
-        <el-table-column :key="3" label="实际牛头数" min-width="90px" align="center">
+        <el-table-column :key="3" :label="$t('feedingEfficiency.sjnts')" min-width="90px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ccount }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccount" step="0.01" type="number" style="width:95%;padding:10px 0;" @blur="blurCcount(scope.row)" />
@@ -78,10 +78,10 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccountratio" type="number" style="width:95%;padding:10px 0;" @blur="blurCcountratio(scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column :key="6" label="配方模板" min-width="130px" align="center">
+        <el-table-column :key="6" :label="$t('feedingEfficiency.pfmb')" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ftname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.ftid" filterable placeholder="配方模板" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
+            <el-select v-if="scope.row.Edit" v-model="scope.row.ftid" filterable :placeholder="$t('feedingEfficiency.pfmb')" class="filter-item" style="width:99%;" @change="(value)=> {changeRecipeTemplate(value, scope.row)}">
               <el-option v-for="item in recipeTemplateList" :key="item.id" :label="item.tname" :value="item.id" />
             </el-select>
           </template>
@@ -266,10 +266,10 @@
             <u-table-column :key="2"  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
-            <u-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
+            <u-table-column :key="5" :label="$t('feedingEfficiency.sjnts')" prop="ccount" min-width="70px" align="center" />
             <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />
             <u-table-column :key="7" label="系数头数" prop="ccountratio" min-width="70px" align="center" />
-            <u-table-column :key="8" label="配方模板" prop="ptname" min-width="70px" align="center" />
+            <u-table-column :key="8" :label="$t('feedingEfficiency.pfmb')" prop="ptname" min-width="70px" align="center" />
             <u-table-column v-if="table.isPtsfname" :key="9" label="补料配方" prop="ptsname" min-width="70px" align="center" />
             <u-table-column :key="10" label="班次比例" prop="tratio" min-width="70px" align="center" />
             <u-table-column :key="11" label="班次重量" prop="weight" min-width="70px" align="center" />
@@ -375,7 +375,7 @@
               </el-row>
             </el-form>
             <div style="height: 50px;">
-              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
+              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
               <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
               <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
               <el-button class="successBorder" :disabled="isokDisable" @click="assessmentData()">评估</el-button>
@@ -424,8 +424,8 @@
               </el-table>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="牛群评估" name="second">
-            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
+          <el-tab-pane :label="$t('feedingEfficiency.nxpg')" name="second">
+            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
             <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
             <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
             <el-row>
@@ -455,7 +455,7 @@
                         <span>{{ scope.row.oneweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.onerate }}</span>
                       </template>
@@ -465,7 +465,7 @@
                         <span>{{ scope.row.twoweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.tworate }}</span>
                       </template>
@@ -475,7 +475,7 @@
                         <span>{{ scope.row.threeweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.threerate }}</span>
                       </template>
@@ -485,12 +485,12 @@
                         <span>{{ scope.row.fourweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第四层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb4')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.fourrate }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standard }}</span>
                       </template>
@@ -501,7 +501,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <h3 style="text-align: center;">粪便筛分析</h3>
+                <h3 style="text-align: center;">{{$t('feedingEfficiency.fbsfx')}}</h3>
                 <div class="table">
                   <el-table
                     :key="nutritional.tab2.tableKey2"
@@ -526,7 +526,7 @@
                         <span>{{ scope.row.oneweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.onerate }}</span>
                       </template>
@@ -536,7 +536,7 @@
                         <span>{{ scope.row.twoweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.tworate }}</span>
                       </template>
@@ -546,12 +546,12 @@
                         <span>{{ scope.row.threeweight }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.threerate }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standard }}</span>
                       </template>
@@ -582,7 +582,7 @@
                         <span>{{ scope.row.operatetime }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
@@ -597,12 +597,12 @@
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.avgdim }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.standardscore }}</span>
                       </template>
@@ -648,7 +648,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <h3 style="text-align: center;">粪便评分</h3>
+                <h3 style="text-align: center;">{{$t('feedingEfficiency.fbpf')}}</h3>
                 <div class="table">
                   <el-table
                     :key="nutritional.tab2.tableKey4"
@@ -668,7 +668,7 @@
                         <span>{{ scope.row.operatetime }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
@@ -683,12 +683,12 @@
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.avgdim }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
+                    <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.cowneed }}</span>
                       </template>

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

@@ -5,7 +5,7 @@
     </div>
     <div class="search">
       <el-input v-model="table.getdataListParm.parammaps.fname" placeholder="配方名称" style="width: 180px;" class="filter-item" clearable />
-      <el-select v-model="table.getdataListParm.parammaps.ccname" placeholder="牲畜类别" class="filter-item" style="width: 120px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.ccname" :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.parentname" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.fttype" placeholder="配方类型" class="filter-item" style="width: 120px;" clearable>
@@ -140,7 +140,7 @@
                     <span>{{ scope.$index + (see.tab1.table.pageNum-1) * see.tab1.table.pageSize + 1 }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="牧场" min-width="130px" align="center" prop="pasturename" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"min-width="130px" align="center" prop="pasturename" />
                 <el-table-column label="下发时间" min-width="130px" align="center" prop="date" />
               </el-table>
             </div>

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

@@ -91,7 +91,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="栏舍:" prop="barId">
-                <el-select v-model="create.temp.barId" multiple  filterable placeholder="栏舍" class="filter-item" style="width: 100%;">
+                <el-select v-model="create.temp.barId" multiple  filterable :placeholder="$t('errorAnalysis.pen')"class="filter-item" style="width: 100%;">
                   <el-option v-for="item in barList" :key="item.id" :label="item.bname" :value="item.id" />
                 </el-select>
               </el-form-item>

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

@@ -7,7 +7,7 @@
           <p>配方模板表</p>
         </div>
         <div class="search">
-          <el-select v-model="table.getdataListParm.parammaps.ccname" filterable placeholder="牲畜类别" class="filter-item" clearable>
+          <el-select v-model="table.getdataListParm.parammaps.ccname" filterable :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" clearable>
             <el-option v-for="item in livestockTypeList" :key="item.value" :label="item.label" :value="item.label" />
           </el-select>
           <el-select v-model="table.getdataListParm.parammaps.fttype" filterable placeholder="配方类型" class="filter-item" style="width: 120px;" clearable>
@@ -100,7 +100,7 @@
             <el-table-column :label="$t('errorAnalysis.sxlb')" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.NoEdit">{{ scope.row.ccname }}</span>
-                <el-select v-if="scope.row.Edit" v-model="scope.row.ccid" filterable placeholder="牲畜类别" class="filter-item" style="width:95%;padding:10px 0;" @change="changeLivestockType">
+                <el-select v-if="scope.row.Edit" v-model="scope.row.ccid" filterable :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width:95%;padding:10px 0;" @change="changeLivestockType">
                   <el-option v-for="item in livestockTypeList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </template>
@@ -450,7 +450,7 @@
           </div>
 
           <div class="search">
-            <el-select v-model="template.table.getdataListParm.parammaps.ccname" placeholder="牲畜类别" class="filter-item" clearable>
+            <el-select v-model="template.table.getdataListParm.parammaps.ccname" :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" clearable>
               <el-option v-for="item in livestockTypeList" :key="item.value" :label="item.label" :value="item.label" />
             </el-select>
             <el-select v-model="template.table.getdataListParm.parammaps.fttype" placeholder="配方类型" class="filter-item" style="width: 120px;" clearable>
@@ -793,7 +793,7 @@
     <el-dialog :title="textMap[rowRecipeRecord.dialogStatus]" :destroy-on-close="true" :visible.sync="rowRecipeRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="rowRecipeRecord">
         <div class="search">
-          <el-date-picker ref="inputDatetime" v-model="rowRecipeRecord.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-date-picker ref="inputDatetime" v-model="rowRecipeRecord.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" />
           <el-button class="successBorder" @click="handleRowRecipeRecordSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.providerid" filterable placeholder="请选择供应商" class="filter-item" style="width: 150px;" clearable>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.usetype" placeholder="操作类型" class="filter-item" style="width: 120px;" clearable>

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

@@ -75,7 +75,7 @@
         <el-tabs v-model="see.activeName" @tab-click="handleTabClick">
           <el-tab-pane label="入库记录" name="first">
             <div class="search">
-              <el-date-picker v-model="see.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+              <el-date-picker v-model="see.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
               <el-button class="successBorder" @click="form_search1">{{$t('common.query')}}</el-button>
             </div>
             <div class="table">
@@ -126,7 +126,7 @@
               <el-select v-model="see.getdataListParm2.parammaps.usetype" placeholder="出库类型" class="filter-item" style="width: 150px;" clearable>
                 <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.label" :value="item.value" />
               </el-select>
-              <el-date-picker v-model="see.getdataListParm2.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+              <el-date-picker v-model="see.getdataListParm2.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
               <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
             </div>
             <div class="table">

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

@@ -2,10 +2,10 @@
   <div class="app-container">
 
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-      <el-select v-model="table.getdataListParm.parammaps.cowclassid" placeholder="牲畜类别" class="filter-item" style="width: 150px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.cowclassid" :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in livestockTypeList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.feedid" placeholder="饲料名称" class="filter-item" style="width: 150px;" filterable clearable>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.feedid" filterable placeholder="饲料名称" class="filter-item" style="width: 150px;" clearable>

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

@@ -41,7 +41,7 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
           <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
           <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.times" filterable :placeholder="$t('errorAnalysis.isTrainNumber')"  class="filter-item" style="width: 120px;" clearable>

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

@@ -44,7 +44,7 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
           <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
           <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>

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

@@ -38,7 +38,7 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
           <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
           <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>

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

@@ -50,7 +50,7 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
           <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
           <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>

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

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.cowclass" filterable placeholder="牲畜类别" class="filter-item" style="width: 120px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.cowclass" filterable :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.classname" />
       </el-select>
       <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
@@ -190,13 +190,13 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="牲畜类别:" prop="cowclassid">
-                <!-- <el-select v-if="create.dialogStatus=='create'" v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width: 100%;" @change="changeCowclass">
+                <!-- <el-select v-if="create.dialogStatus=='create'" v-model="create.temp.cowclassid" filterable :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width: 100%;" @change="changeCowclass">
                   <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.id" />
                 </el-select> -->
-              <el-select v-if="create.dialogStatus=='create'"  v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width: 100%;" @change="changeParent">
+              <el-select v-if="create.dialogStatus=='create'"  v-model="create.temp.cowclassid" filterable :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width: 100%;" @change="changeParent">
                 <el-option v-for="item in parentList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-                <!-- <el-input v-else ref="cowclass" v-model="create.temp.cowclass" disabled class="filter-item" placeholder="牲畜类别" /> -->
+                <!-- <el-input v-else ref="cowclass" v-model="create.temp.cowclass" disabled class="filter-item" :placeholder="$t('feedingEfficiency.cxlb')" /> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">

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

@@ -41,7 +41,7 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
           <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
           <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>

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

@@ -8,7 +8,7 @@
         class="inputDatetime filter-item"
         type="daterange"
         :range-separator="$t('common.to')"
-         :start-placeholder="$t('common.startTime')""
+         :start-placeholder="$t('common.startTime')"
         :end-placeholder="$t('common.endTime')"
         style="width: 250px;"
         :picker-options="pickerOptions"
@@ -34,7 +34,7 @@
         :cell-style="tableCellStyle"
         class="elTable table-fixed"
       >
-        <el-table-column sortable label="牧场" min-width="90px" align="center">
+        <el-table-column sortable :label="$t('feedingEfficiency.mc')"min-width="90px" align="center">
           <template slot-scope="{row}">
             <a @click="clickPasture(row)">{{ row.pasturename }}</a>
           </template>
@@ -66,7 +66,7 @@
         :cell-style="tableCellStyle"
         class="elTable table-fixed"
       >
-        <el-table-column sortable label="牧场" min-width="90px" align="center">
+        <el-table-column sortable :label="$t('feedingEfficiency.mc')"min-width="90px" align="center">
           <template slot-scope="{row}">
             <a @click="clickPasture(row)">{{ row.pasturename }}</a>
           </template>
@@ -89,8 +89,8 @@
     <div class="AnalysisChart">
       <el-row :gutter="10">
         <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" />
+          <span>{{$t('feedingEfficiency.tbcxsj')}} :</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">{{$t('errorAnalysis.confirm')}}</el-button>
           <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
         </el-col>
@@ -101,7 +101,7 @@
           <div class="grid-content">
             <h4>计划统计</h4>
             <div v-if="chart1.isChart" class="button">
-              <el-date-picker v-model="chart1.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -125,7 +125,7 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column label="牧场" sortable min-width="85px" align="center" prop="牧场" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="85px" align="center" prop="牧场" />
                 <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" />
@@ -143,7 +143,7 @@
           <div class="grid-content">
             <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')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -167,7 +167,7 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column label="牧场" sortable min-width="90px" align="center" prop="牧场" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"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="$t('errorAnalysis.jhzl')" sortable min-width="100px" align="center" prop="理论量" />
                 <el-table-column :label="$t('errorAnalysis.skzl')"sortable min-width="100px" align="center" prop="实际量" />
@@ -183,7 +183,7 @@
           <div class="grid-content">
             <h4>混料次数统计</h4>
             <div v-if="chart3.isChart" class="button">
-              <el-date-picker v-model="chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart3')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -207,7 +207,7 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column label="牧场" sortable min-width="90px" align="center" prop="牧场" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="90px" align="center" prop="牧场" />
                 <el-table-column :label="$t('errorAnalysis.zdtzcs')" sortable min-width="90px" align="center" prop="field1" />
                 <el-table-column :label="$t('errorAnalysis.sdtzcs')" sortable min-width="100px" align="center" prop="field2" />
                 <el-table-column label="混料取消次数" sortable min-width="100px" align="center" prop="field5" />
@@ -220,7 +220,7 @@
           <div class="grid-content">
             <h4>混料准确率统计</h4>
             <div v-if="chart4.isChart" class="button">
-              <el-date-picker v-model="chart4.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart4')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -244,7 +244,7 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column sortable label="牧场" sortable min-width="90px" align="center" prop="牧场" />
+                <el-table-column sortable :label="$t('feedingEfficiency.mc')"sortable min-width="90px" align="center" prop="牧场" />
                 <el-table-column :label="$t('errorAnalysis.zdtzcs')" sortable min-width="80px" align="center" prop="field3" />
                 <el-table-column :label="$t('errorAnalysis.sdtzcs')" sortable min-width="80px" align="center" prop="field4" />
                 <el-table-column :label="$t('errorAnalysis.zdtzllzl')" sortable min-width="85px" align="center" prop="理论自动" />
@@ -265,7 +265,7 @@
           <div class="grid-content">
             <h4>栏舍平均撒料时间统计</h4>
             <div v-if="chart5.isChart" class="button">
-              <el-date-picker v-model="chart5.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart5')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -290,7 +290,7 @@
                 class="elTable table-fixed"
               >
                 <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="85px" align="center" prop="日期" />
-                <el-table-column label="牧场" sortable min-width="80px" align="center" prop="名称" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="80px" align="center" prop="名称" />
                 <el-table-column label="平均撒料时间" sortable min-width="80px" align="center" prop="准确率" />
               </el-table>
             </div>
@@ -300,7 +300,7 @@
           <div class="grid-content">
             <h4>混料计划取消次数</h4>
             <div v-if="chart6.isChart" class="button">
-              <el-date-picker v-model="chart6.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart6')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -324,7 +324,7 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column label="牧场" sortable min-width="85px" align="center" prop="牧场" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"sortable min-width="85px" align="center" prop="牧场" />
                 <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="80px" align="center" prop="日期" />
                 <el-table-column  :label="$t('errorAnalysis.qxcs')"  sortable min-width="80px" align="center" prop="field1" />
               </el-table>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="search">
       <div>
-        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 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-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 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 style="float: left;margin-bottom: 10px;" class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
         <el-button style="float: left;margin-bottom: 10px;" class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
       </div>
@@ -43,7 +43,7 @@
         class="elTable table-fixed"
         :height="myHeight2"
       >
-        <el-table-column label="牧场" min-width="90px" align="center" prop="牧场" />
+        <el-table-column :label="$t('feedingEfficiency.mc')"min-width="90px" align="center" prop="牧场" />
         <el-table-column :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
         <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
         <el-table-column :label="$t('errorAnalysis.projname')" min-width="50px" align="center" prop="车次" />

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

@@ -2,7 +2,7 @@
   <div class="app-content">
     <div class="search">
       <div>
-        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 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-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 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 style="float: left;margin-bottom: 10px;" :disabled="Beforedisabled" class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
         <el-button style="float: left;margin-bottom: 10px;" :disabled="Nextdisabled" class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       </div>
@@ -43,7 +43,7 @@
         class="elTable table-fixed"
         :height="myHeight2"
       >
-        <el-table-column label="牧场" min-width="55px" align="center" prop="牧场" />
+        <el-table-column :label="$t('feedingEfficiency.mc')"min-width="55px" align="center" prop="牧场" />
         <el-table-column :label="$t('errorAnalysis.date')" min-width="55px" align="center" prop="日期" />
         <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="55px" align="center" prop="TMR名称" />
         <el-table-column :label="$t('errorAnalysis.projname')" min-width="55px" align="center" prop="车次" />

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

@@ -204,13 +204,13 @@
         <div id="AnalysisChart" class="AnalysisChart">
           <el-row :gutter="10">
             <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
-              <span>图表查询时间:</span>
+              <span>{{$t('feedingEfficiency.tbcxsj')}}</span>
               <el-radio-group v-model="tab.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeAllSpecificDate">
                 <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" />
+                <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="$t('errorAnalysis.qxznf')"  @change="changeAllYear">
@@ -238,7 +238,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart2')">
@@ -302,7 +302,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart1')">
@@ -364,7 +364,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart3')">
@@ -424,7 +424,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart4')">
@@ -486,7 +486,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart5')">
@@ -549,7 +549,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart6')">
@@ -617,7 +617,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart7')">
@@ -670,7 +670,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t('errorAnalysis.hltj')"name="second">
         <div class="search" ref="myHeightSecond">
-          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions3" />
+          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions3" />
           <!-- <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="display:inline-block;margin-top: 5px;" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="display:inline-block;margin-top: 5px;" :disabled="Nextdisabled2" @click="handleNext2" />
@@ -761,7 +761,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t('errorAnalysis.sltj')" name="third">
         <div class="search" ref="myHeightThird">
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions3" />
+          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions3" />
           <!-- <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="margin-top: 5px;width:140px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="dispaly:inline-block;margin-top: 5px;" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="dispaly:inline-block;margin-top: 5px;" :disabled="Nextdisabled3" @click="handleNext3" />
@@ -847,8 +847,8 @@
     <!-- 导出 -->
     <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="20%">
     <div>
-      <span>导出时间范围:</span>
-      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions2" />
+      <span>{{$t('feedingEfficiency.dcskff')}}</span>
+      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions2" />
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
       <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">{{$t('common.closed')}}</el-button>
@@ -863,7 +863,7 @@
     <el-dialog :title="textMap[recipeNameTemp2.dialogStatus]" :visible.sync="recipeNameTemp2.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="recipeNameTemp2">
         <div class="search">
-          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" />
           <el-button class="successBorder" @click="handleRecipeNameSearch2">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
@@ -954,7 +954,7 @@
     <el-dialog :title="textMap[recipeNameTemp3.dialogStatus]" :visible.sync="recipeNameTemp3.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="recipeNameTemp3">
         <!-- <div class="search">
-          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp3.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp3.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" />
           <el-button class="successBorder" @click="handleRecipeNameSearch3">{{$t('common.query')}}</el-button>
         </div> -->
         <div class="table">
@@ -1000,7 +1000,7 @@
     <el-dialog :title="textMap[feedTemp.dialogStatus]" :visible.sync="feedTemp.dialogFormVisible" :close-on-click-modal="false" width="98%">
       <div class="feedTemp">
         <div class="search">
-          <el-date-picker ref="inputDatetime" v-model="feedTemp.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-date-picker ref="inputDatetime" v-model="feedTemp.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" />
           <el-button class="successBorder" @click="handleFeedSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
@@ -1046,7 +1046,7 @@
         <el-tabs v-model="fenceTemp.activeName" @tab-click="handleFenceTabClick">
           <el-tab-pane label="班次重量" name="first">
               <div class="search">
-                <el-date-picker ref="inputDatetime" v-model="fenceTemp.tab1.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+                <el-date-picker ref="inputDatetime" v-model="fenceTemp.tab1.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" />
                 <el-button class="successBorder" @click="handleFenceSearch">{{$t('common.query')}}</el-button>
               </div>
               <div class="table">
@@ -1067,7 +1067,7 @@
                   <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
                   <u-table-column label="修改用户" width="130px" align="center" prop="empname" />
                   <u-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="100px" align="center" prop="times" />
-                  <u-table-column label="实际牛头数" min-width="100px" align="center" prop="ccount">
+                  <u-table-column :label="$t('feedingEfficiency.sjnts')" min-width="100px" align="center" prop="ccount">
                     <template slot-scope="{row}">
                       <span v-if="row.ccountstatus == 1" style="color: red;">{{row.ccount}}</span>
                       <span v-else >{{row.ccount}}</span>
@@ -1085,7 +1085,7 @@
                       <span v-else >{{row.ccountratio}}</span>
                     </template>
                   </u-table-column>
-                  <u-table-column label="配方模板" min-width="70px" align="center" prop="ftname">
+                  <u-table-column :label="$t('feedingEfficiency.pfmb')" min-width="70px" align="center" prop="ftname">
                     <template slot-scope="{row}">
                       <a v-if="row.ftnamestatus == 1" @click="clickRecipeTemplate3(row)" style="text-decoration: underline;color: red;">{{ row.ftname }}</a>
                       <a v-else @click="clickRecipeTemplate3(row)" style="text-decoration: underline;">{{ row.ftname }}</a>
@@ -1108,7 +1108,7 @@
           </el-tab-pane>
           <el-tab-pane label="车次重量" name="second">
               <div class="search">
-                <el-date-picker ref="inputDatetime" :clearable="false" v-model="fenceTemp.tab2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+                <el-date-picker ref="inputDatetime" :clearable="false" v-model="fenceTemp.tab2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" />
                 <el-button class="successBorder" @click="handleFenceSearch">{{$t('common.query')}}</el-button>
               </div>
               <div class="table">

+ 20 - 20
src/views/statisticalAnalysis/feedingEfficiency/group/index.vue

@@ -1,43 +1,43 @@
-<template>
+<template>
   <div class="app-container">
     <!-- <h1>集团</h1> -->
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="效率统计" name="first">
+      <el-tab-pane :label="$t('feedingEfficiency.xltj')" name="first">
         <component :is="myComponent1" ref="detail1" />
       </el-tab-pane>
-      <el-tab-pane label="牛群评估" name="second">
+      <el-tab-pane :label="$t('feedingEfficiency.nxpg')" name="second">
         <keep-alive>
           <component :is="myComponent2" ref="detail2" />
         </keep-alive>
       </el-tab-pane>
-    </el-tabs>
-  </div>
-
-</template>
-
+    </el-tabs>
+  </div>
+
+</template>
+
 <script>
 import echarts from 'echarts'
-require('echarts/theme/macarons')
-import { GetDataByName, GetReportform } from '@/api/common'
+require('echarts/theme/macarons')
+import { GetDataByName, GetReportform } from '@/api/common'
 import Cookies from 'js-cookie'
 import { parseTime } from '@/utils/index.js'
 import Pagination from '@/components/Pagination'
 import { json2excel } from '@/utils/index.js'
 import { MessageBox } from 'element-ui'
 import Tab1 from './tab1'
-import Tab2 from './tab2'
-export default {
+import Tab2 from './tab2'
+export default {
   name: 'GroupFeedingEfficiency',
-  components: { Pagination, Tab1, Tab2 },
-  data() {
+  components: { Pagination, Tab1, Tab2 },
+  data() {
     return {
       activeName: 'first',
       myComponent1: null,
       myComponent2: null
-    }
-  },
-
-  created() {},
+    }
+  },
+
+  created() {},
   mounted() {
     this.detailComponent1()
   },
@@ -62,8 +62,8 @@ export default {
     }
 
   }
-}
+}
 </script>
 <style lang="scss" scoped>
   .search{margin-bottom:10px;}
-</style>
+</style>

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

@@ -22,36 +22,36 @@
         :cell-style="tableCellStyle"
         class="elTable table-fixed"
       >
-        <el-table-column label="牧场" min-width="110px" align="center">
+        <el-table-column :label="$t('feedingEfficiency.mc')"  min-width="110px" align="center">
           <template slot-scope="{row}">
             <a @click="clickPasture(row)">{{ row.pasturename }}</a>
           </template>
         </el-table-column>
-        <el-table-column label="实际牛头数" min-width="90px" align="center" prop="实际牛头数" />
-        <el-table-column label="应混料量(kg)" min-width="90px" align="center" prop="应混料量" />
-        <el-table-column label="实际混料量(kg)" min-width="90px" align="center" prop="实际混料量" />
-        <el-table-column label="撒料量(kg)" min-width="90px" align="center" prop="撒料量" />
-        <el-table-column label="平均混料时间" min-width="90px" align="center" prop="混料时间" />
-        <el-table-column label="转投剩料量(kg)" min-width="90px" align="center" prop="转投剩料量" />
-        <el-table-column label="今日剩料量(kg)" min-width="90px" align="center" prop="今日剩料量" />
-        <el-table-column label="剩料率(%)" min-width="90px" align="center" prop="剩料率" />
-        <el-table-column label="TMR干物质(%)" min-width="90px" align="center" prop="TMR干物质" />
-        <el-table-column label="配方干物质采食量(kg/头)" min-width="90px" align="center" prop="配方干物质采食量" />
-        <el-table-column label="实际干物质采食量(kg/头)" min-width="90px" align="center" prop="实际干物质采食量" />
-        <el-table-column label="采食率(%)" min-width="90px" align="center" prop="采食率" />
-        <el-table-column label="配方成本(元/头)" min-width="90px" align="center" prop="配方成本" />
-        <el-table-column label="实际成本(元/头)" min-width="90px" align="center" prop="实际成本" />
-        <el-table-column label="产奶量(kg/头)" min-width="90px" align="center" prop="产奶量" />
-        <el-table-column label="饲料转化率" min-width="90px" align="center" prop="饲料转化率" />
-        <el-table-column label="公斤奶饲料成本" min-width="90px" align="center" prop="公斤奶饲料成本" />
+        <el-table-column :label="$t('feedingEfficiency.sjnts')"   min-width="90px" align="center" prop="实际牛头数" />
+        <el-table-column :label="$t('feedingEfficiency.yhll')"   min-width="90px" align="center" prop="应混料量" />
+        <el-table-column :label="$t('feedingEfficiency.sjhll')"   min-width="90px" align="center" prop="实际混料量" />
+        <el-table-column :label="$t('feedingEfficiency.sll')"   min-width="90px" align="center" prop="撒料量" />
+        <el-table-column :label="$t('feedingEfficiency.pjhlsj')"   min-width="90px" align="center" prop="混料时间" />
+        <el-table-column :label="$t('feedingEfficiency.ztsll')"   min-width="90px" align="center" prop="转投剩料量" />
+        <el-table-column :label="$t('feedingEfficiency.jrsll')"   min-width="90px" align="center" prop="今日剩料量" />
+        <el-table-column :label="$t('feedingEfficiency.csl')"   min-width="90px" align="center" prop="剩料率" />
+        <el-table-column :label="$t('feedingEfficiency.tmrgwz')"  min-width="90px" align="center" prop="TMR干物质" />
+        <el-table-column :label="$t('feedingEfficiency.pfgwzcsl')"   min-width="90px" align="center" prop="配方干物质采食量" />
+        <el-table-column :label="$t('feedingEfficiency.sjgwzcsl')"   min-width="90px" align="center" prop="实际干物质采食量" />
+        <el-table-column:label="$t('feedingEfficiency.csl')"   min-width="90px" align="center" prop="采食率" />
+        <el-table-column :label="$t('feedingEfficiency.pfcb')"   min-width="90px" align="center" prop="配方成本" />
+        <el-table-column :label="$t('feedingEfficiency.sjcb')"   min-width="90px" align="center" prop="实际成本" />
+        <el-table-column :label="$t('feedingEfficiency.cnl')"   min-width="90px" align="center" prop="产奶量" />
+        <el-table-column :label="$t('feedingEfficiency.slzhl')"   min-width="90px" align="center" prop="饲料转化率" />
+        <el-table-column :label="$t('feedingEfficiency.gjnclcb')"   min-width="90px" align="center" prop="公斤奶饲料成本" />
       </el-table>
       <!-- <pagination v-show="tab.table.total>=0" :total="tab.table.total" :page.sync="tab.table.getdataListParm.offset" :limit.sync="tab.table.getdataListParm.pagecount" @pagination="getList" /> -->
     </div>
     <div class="AnalysisChart">
       <el-row :gutter="10">
         <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" />
+          <span>{{$t('feedingEfficiency.tbcxsj')}} :</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">{{$t('errorAnalysis.confirm')}}</el-button>
           <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
         </el-col>
@@ -60,9 +60,9 @@
         <!-- 泌乳牛干物质采食量 -->
         <el-col :span="12">
           <div class="grid-content">
-            <h4>泌乳牛干物质采食量</h4>
+            <h4>{{$t('feedingEfficiency.mrngwzcl')}} </h4>
             <div v-if="tab.chart1.isChart" class="button">
-              <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -86,9 +86,9 @@
                 :cell-style="cellStyle"
                 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="名称" />
-                <el-table-column label="泌乳牛干物质采食量(kg)" sortable min-width="110px" align="center" prop="准确率" />
+                <el-table-column :label="$t('errorAnalysis.date')" sortable   min-width="110px" align="center" prop="日期" />
+                <el-table-column :label="$t('feedingEfficiency.mc')" sortable   min-width="110px" align="center" prop="名称" />
+                <el-table-column :label="$t('feedingEfficiency.mrngwzcl1')" sortable   min-width="110px" align="center" prop="准确率" />
               </el-table>
             </div>
           </div>
@@ -96,9 +96,9 @@
         <!-- 剩料率 -->
         <el-col :span="12">
           <div class="grid-content">
-            <h4>剩料率</h4>
+            <h4>{{$t('feedingEfficiency.sll1')}}</h4>
             <div v-if="tab.chart2.isChart" class="button">
-              <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -123,11 +123,11 @@
                 :cell-style="cellStyle"
                 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="名称" />
-                <el-table-column label="剩料量" sortable min-width="110px" align="center" prop="剩料量" />
-                <el-table-column label="撒料量" sortable min-width="110px" align="center" prop="撒料量" />
-                <el-table-column label="剩料率" sortable min-width="110px" align="center" prop="准确率" />
+                <el-table-column :label="$t('errorAnalysis.date')" sortable   min-width="110px" align="center" prop="日期" />
+                <el-table-column :label="$t('feedingEfficiency.mc')" sortable   min-width="110px" align="center" prop="名称" />
+                <el-table-column label="剩料量" sortable   min-width="110px" align="center" prop="剩料量" />
+                <el-table-column label="撒料量" sortable   min-width="110px" align="center" prop="撒料量" />
+                <el-table-column label="剩料率" sortable   min-width="110px" align="center" prop="准确率" />
               </el-table>
             </div>
           </div>
@@ -137,9 +137,9 @@
         <!-- 混料时间统计 -->
         <el-col :span="12">
           <div class="grid-content">
-            <h4>混料时间统计</h4>
+            <h4>{{$t('feedingEfficiency.hlsjtj')}}</h4>
             <div v-if="tab.chart3.isChart" class="button">
-              <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -163,9 +163,9 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
-                <el-table-column label="牧场" min-width="110px" align="center" prop="名称" />
-                <el-table-column label="混料时间(分钟)" min-width="110px" align="center" prop="准确率" />
+                <el-table-column :label="$t('errorAnalysis.date')"   min-width="110px" align="center" prop="日期" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"   min-width="110px" align="center" prop="名称" />
+                <el-table-column label="混料时间(分钟)"   min-width="110px" align="center" prop="准确率" />
               </el-table>
             </div>
           </div>
@@ -173,9 +173,9 @@
         <!-- 转化率 -->
         <el-col :span="12" style="position: relative;">
           <div class="grid-content">
-            <h4>转化率</h4>
+            <h4>{{$t('feedingEfficiency.zhl')}}</h4>
             <div v-if="tab.chart4.isChart" class="button">
-              <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -199,9 +199,9 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
-                <el-table-column label="牧场" min-width="110px" align="center" prop="名称" />
-                <el-table-column label="饲料转化率" min-width="110px" align="center" prop="准确率" />
+                <el-table-column :label="$t('errorAnalysis.date')"   min-width="110px" align="center" prop="日期" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"   min-width="110px" align="center" prop="名称" />
+                <el-table-column :label="$t('feedingEfficiency.slzhl')"   min-width="110px" align="center" prop="准确率" />
               </el-table>
             </div>
           </div>
@@ -212,9 +212,9 @@
         <!-- 成本分析 -->
         <el-col :span="24">
           <div class="grid-content">
-            <h4>成本分析</h4>
+            <h4>{{$t('feedingEfficiency.cbfx')}}</h4>
             <div v-if="tab.chart5.isChart" class="button">
-              <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
+              <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')">{{$t('errorAnalysis.changeTable')}}</div>
             </div>
@@ -238,9 +238,9 @@
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
               >
-                <el-table-column :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
-                <el-table-column label="牧场" min-width="110px" align="center" prop="名称" />
-                <el-table-column label="公斤奶饲料成本(元)" min-width="110px" align="center" prop="准确率" />
+                <el-table-column :label="$t('errorAnalysis.date')"   min-width="110px" align="center" prop="日期" />
+                <el-table-column :label="$t('feedingEfficiency.mc')"   min-width="110px" align="center" prop="名称" />
+                <el-table-column :label="$t('feedingEfficiency.gjnclcb1')"   min-width="110px" align="center" prop="准确率" />
               </el-table>
             </div>
           </div>
@@ -252,13 +252,13 @@
       <div class="app-pasture">
         <div class="search">
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-radio v-model="pasture.radio" label="1" @change="changeRadio">配方</el-radio>
-          <el-radio v-model="pasture.radio" label="2" @change="changeRadio">栏舍</el-radio>
-          <el-radio v-model="pasture.radio" label="3" @change="changeRadio">牲畜类别</el-radio>
-          <el-input v-if="pasture.isFormulaName" v-model="pasture.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" placeholder="配方模板" />
-          <el-input v-if="pasture.isHouseName" v-model="pasture.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
-          <el-input v-if="pasture.isHouseName" v-model="pasture.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
-          <el-input v-if="pasture.isLivestockType" v-model="pasture.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
+          <el-radio v-model="pasture.radio" label="1" @change="changeRadio">{{$t('feedingEfficiency.pf')}}</el-radio>
+          <el-radio v-model="pasture.radio" label="2" @change="changeRadio">{{$t('errorAnalysis.pen')}}</el-radio>
+          <el-radio v-model="pasture.radio" label="3" @change="changeRadio">{{$t('feedingEfficiency.cxlb')}}</el-radio>
+          <el-input v-if="pasture.isFormulaName" v-model="pasture.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="pasture.isHouseName" v-model="pasture.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" :placeholder="$t('errorAnalysis.pen')"/>
+          <el-input v-if="pasture.isHouseName" v-model="pasture.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="pasture.isLivestockType" v-model="pasture.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-button class="successBorder" @click="handlePastureSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
@@ -275,27 +275,27 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
           >
-            <el-table-column v-if="pasture.isFormulaName" label="配方模板" min-width="110px" align="center" prop="配方模板" />
-            <el-table-column v-if="pasture.isHouseName" :label="$t('errorAnalysis.pen')" min-width="110px" align="center" prop="栏舍" />
-            <el-table-column v-if="pasture.isHouseName" label="配方模板" min-width="110px" align="center" prop="配方模板" />
-            <el-table-column v-if="pasture.isLivestockType" :label="$t('errorAnalysis.sxlb')" min-width="110px" align="center" prop="牲畜类别" />
-            <el-table-column label="实际牛头数" min-width="110px" align="center" prop="实际牛头数" />
-            <el-table-column label="应混料量(kg)" min-width="110px" align="center" prop="应混料量" />
-            <el-table-column label="实际混料量(kg)" min-width="110px" align="center" prop="实际混料量" />
-            <el-table-column label="撒料量(kg)" min-width="110px" align="center" prop="撒料量" />
-            <el-table-column label="混料时间" min-width="110px" align="center" prop="混料时间" />
-            <el-table-column label="转投剩料量(kg)" min-width="110px" align="center" prop="转投剩料量" />
-            <el-table-column label="今日剩料量(kg)" min-width="110px" align="center" prop="今日剩料量" />
-            <el-table-column label="剩料率(%)" min-width="110px" align="center" prop="剩料率" />
-            <el-table-column label="TMR干物质(%)" min-width="110px" align="center" prop="TMR干物质" />
-            <el-table-column label="配方干物质采食量(kg/头)" min-width="110px" align="center" prop="配方干物质采食量" />
-            <el-table-column label="实际干物质采食量(kg/头)" min-width="110px" align="center" prop="实际干物质采食量" />
-            <el-table-column label="采食率(%)" min-width="110px" align="center" prop="采食率" />
-            <el-table-column label="配方成本(元/头)" min-width="110px" align="center" prop="配方成本" />
-            <el-table-column label="实际成本(元/头)" min-width="110px" align="center" prop="实际成本" />
-            <el-table-column label="产奶量(kg/头)" min-width="110px" align="center" prop="产奶量" />
-            <el-table-column label="饲料转化率" min-width="110px" align="center" prop="饲料转化率" />
-            <el-table-column label="公斤奶饲料成本" min-width="110px" align="center" prop="公斤奶饲料成本" />
+            <el-table-column v-if="pasture.isFormulaName" :label="$t('feedingEfficiency.pfmb')"   min-width="110px" align="center" prop="配方模板" />
+            <el-table-column v-if="pasture.isHouseName" :label="$t('errorAnalysis.pen')"   min-width="110px" align="center" prop="栏舍" />
+            <el-table-column v-if="pasture.isHouseName" :label="$t('feedingEfficiency.pfmb')"   min-width="110px" align="center" prop="配方模板" />
+            <el-table-column v-if="pasture.isLivestockType" :label="$t('errorAnalysis.sxlb')"   min-width="110px" align="center" prop="牲畜类别" />
+            <el-table-column :label="$t('feedingEfficiency.sjnts')"   min-width="110px" align="center" prop="实际牛头数" />
+            <el-table-column :label="$t('feedingEfficiency.yhll')"   min-width="110px" align="center" prop="应混料量" />
+            <el-table-column :label="$t('feedingEfficiency.sjhll')"   min-width="110px" align="center" prop="实际混料量" />
+            <el-table-column :label="$t('feedingEfficiency.sll')"   min-width="110px" align="center" prop="撒料量" />
+            <el-table-column label="混料时间"   min-width="110px" align="center" prop="混料时间" />
+            <el-table-column :label="$t('feedingEfficiency.ztsll')"   min-width="110px" align="center" prop="转投剩料量" />
+            <el-table-column :label="$t('feedingEfficiency.jrsll')"   min-width="110px" align="center" prop="今日剩料量" />
+            <el-table-column :label="$t('feedingEfficiency.csl')"   min-width="110px" align="center" prop="剩料率" />
+            <el-table-column :label="$t('feedingEfficiency.tmrgwz')"   min-width="110px" align="center" prop="TMR干物质" />
+            <el-table-column :label="$t('feedingEfficiency.pfgwzcsl')"   min-width="110px" align="center" prop="配方干物质采食量" />
+            <el-table-column :label="$t('feedingEfficiency.sjgwzcsl')"   min-width="110px" align="center" prop="实际干物质采食量" />
+            <el-table-column:label="$t('feedingEfficiency.csl')"   min-width="110px" align="center" prop="采食率" />
+            <el-table-column :label="$t('feedingEfficiency.pfcb')"   min-width="110px" align="center" prop="配方成本" />
+            <el-table-column :label="$t('feedingEfficiency.sjcb')"  min-width="110px" align="center" prop="实际成本" />
+            <el-table-column :label="$t('feedingEfficiency.cnl')"  min-width="110px" align="center" prop="产奶量" />
+            <el-table-column :label="$t('feedingEfficiency.slzhl')"  min-width="110px" align="center" prop="饲料转化率" />
+            <el-table-column :label="$t('feedingEfficiency.gjnclcb')"  min-width="110px" align="center" prop="公斤奶饲料成本" />
           </el-table>
         </div>
       </div>

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

@@ -27,21 +27,21 @@
             class="elTable table-fixed"
             height="400px"
           >
-            <el-table-column label="宾州筛" min-width="70px" align="center" prop="barname" />
-            <el-table-column label="第一层重量" min-width="58px" align="center" prop="oneweight" />
-            <el-table-column label="第一层百分比" min-width="58px" align="center" prop="onerate" />
-            <el-table-column label="第二层重量" min-width="58px" align="center" prop="twoweight" />
-            <el-table-column label="第二层百分比" min-width="58px" align="center" prop="tworate" />
-            <el-table-column label="第三层重量" min-width="58px" align="center" prop="threeweight" />
-            <el-table-column label="第三层百分比" min-width="58px" align="center" prop="threerate" />
-            <el-table-column label="第四层重量" min-width="58px" align="center" prop="fourweight" />
-            <el-table-column label="第四层百分比" min-width="58px" align="center" prop="fourrate" />
-            <el-table-column label="参考标准" min-width="45px" align="center" prop="standard" />
+            <el-table-column :label="$t('feedingEfficiency.bzs')" min-width="70px" align="center" prop="barname" />
+            <el-table-column :label="$t('feedingEfficiency.dczl1')"min-width="58px" align="center" prop="oneweight" />
+            <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="58px" align="center" prop="onerate" />
+            <el-table-column :label="$t('feedingEfficiency.dczl2')" min-width="58px" align="center" prop="twoweight" />
+            <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="58px" align="center" prop="tworate" />
+            <el-table-column :label="$t('feedingEfficiency.dczl3')"   min-width="58px" align="center" prop="threeweight" />
+            <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="58px" align="center" prop="threerate" />
+            <el-table-column :label="$t('feedingEfficiency.dczl4')"   min-width="58px" align="center" prop="fourweight" />
+            <el-table-column :label="$t('feedingEfficiency.dcbfb4')"    min-width="58px" align="center" prop="fourrate" />
+            <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="45px" align="center" prop="standard" />
           </el-table>
         </el-col>
         <!-- 粪便筛分析 -->
         <el-col :span="12">
-          <h4 style="text-align:center;">粪便筛分析</h4>
+          <h4 style="text-align:center;">{{$t('feedingEfficiency.fbsfx')}}</h4>
           <el-table
             :key="table2.tableKey"
             v-loading="table2.listLoading"
@@ -57,13 +57,13 @@
             height="400px"
           >
             <el-table-column label="粪便筛" min-width="70px" align="center" prop="barname" />
-            <el-table-column label="第一层重量" min-width="58px" align="center" prop="oneweight" />
-            <el-table-column label="第一层百分比" min-width="58px" align="center" prop="onerate" />
-            <el-table-column label="第二层重量" min-width="58px" align="center" prop="twoweight" />
-            <el-table-column label="第二层百分比" min-width="58px" align="center" prop="tworate" />
-            <el-table-column label="第三层重量" min-width="58px" align="center" prop="threeweight" />
-            <el-table-column label="第三层百分比" min-width="58px" align="center" prop="threerate" />
-            <el-table-column label="参考标准" min-width="70px" align="center" prop="standard" />
+            <el-table-column :label="$t('feedingEfficiency.dczl1')"min-width="58px" align="center" prop="oneweight" />
+            <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="58px" align="center" prop="onerate" />
+            <el-table-column :label="$t('feedingEfficiency.dczl2')" min-width="58px" align="center" prop="twoweight" />
+            <el-table-column :label="$t('feedingEfficiency.dcbfb2')"  min-width="58px" align="center" prop="tworate" />
+            <el-table-column :label="$t('feedingEfficiency.dczl3')"   min-width="58px" align="center" prop="threeweight" />
+            <el-table-column :label="$t('feedingEfficiency.dcbfb3')"   min-width="58px" align="center" prop="threerate" />
+            <el-table-column :label="$t('feedingEfficiency.ckbz')"   min-width="70px" align="center" prop="standard" />
           </el-table>
         </el-col>
       </el-row>
@@ -86,11 +86,11 @@
             height="400px"
           >
             <el-table-column :label="$t('errorAnalysis.pen')" min-width="58px" align="center" prop="barname" />
-            <el-table-column label="抽查样本数" min-width="58px" align="center" prop="sumcowcount" />
-            <el-table-column label="单产" min-width="58px" align="center" prop="product" />
-            <el-table-column label="干物质采食量" min-width="58px" align="center" prop="dryweight" />
-            <el-table-column label="泌乳天数" min-width="58px" align="center" prop="avgdim" />
-            <el-table-column label="标准分数" min-width="58px" align="center" prop="standardscore" />
+            <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="58px" align="center" prop="sumcowcount" />
+            <el-table-column :label="$t('feedingEfficiency.dc')"  min-width="58px" align="center" prop="product" />
+            <el-table-column :label="$t('feedingEfficiency.gwzcsl')"   min-width="58px" align="center" prop="dryweight" />
+            <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="58px" align="center" prop="avgdim" />
+            <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="58px" align="center" prop="standardscore" />
             <el-table-column label="2.75-分(数量、百分比)" min-width="100px" align="center" prop="score25" />
             <el-table-column label="2.75分(数量、百分比)" min-width="100px" align="center" prop="score275" />
             <el-table-column label="3分(数量、百分比)" min-width="100px" align="center" prop="score3" />
@@ -102,7 +102,7 @@
         </el-col>
         <!-- 粪便评分 -->
         <el-col :span="12">
-          <h4 style="text-align:center;">粪便评分</h4>
+          <h4 style="text-align:center;">{{$t('feedingEfficiency.fbpf')}}</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -118,11 +118,11 @@
             height="400px"
           >
             <el-table-column :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
-            <el-table-column label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
-            <el-table-column label="单产" min-width="50px" align="center" prop="product" />
-            <el-table-column label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
-            <el-table-column label="泌乳天数" min-width="50px" align="center" prop="avgdim" />
-            <el-table-column label="标准分数" min-width="50px" align="center" prop="standardscore" />
+            <el-table-column :label="$t('feedingEfficiency.czybs')"  min-width="60px" align="center" prop="sumcowcount" />
+            <el-table-column :label="$t('feedingEfficiency.dc')"  min-width="50px" align="center" prop="product" />
+            <el-table-column :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
+            <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="50px" align="center" prop="avgdim" />
+            <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="50px" align="center" prop="standardscore" />
             <el-table-column label="1分(数量、百分比)" min-width="90px" align="center" prop="score1" />
             <el-table-column label="2分(数量、百分比)" min-width="90px" align="center" prop="score2" />
             <el-table-column label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />

+ 93 - 92
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -1,21 +1,22 @@
 <template>
   <div class="app-container1">
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="效率统计" name="first">
+      <el-tab-pane :label="$t('feedingEfficiency.xltj')" name="first">
         <div class="search">
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" @change="changeTab1Date" />
+          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" 
+          :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" @change="changeTab1Date" />
           <!-- <el-date-picker v-model="tab2.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeTab2Date" /> -->
           <!-- <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期" @change="changeTab1Date"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="dispaly:inline-block;margin-top: 5px;" :disabled="Beforedisabled1" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="dispaly:inline-block;margin-top: 5px;" :disabled="Nextdisabled1" @click="handleNext" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-radio v-model="tab.radio" label="1" @change="changeRadio">配方</el-radio>
-          <el-radio v-model="tab.radio" label="2" @change="changeRadio">栏舍</el-radio>
-          <el-radio v-model="tab.radio" label="3" @change="changeRadio">牲畜类别</el-radio>
-          <el-input v-if="tab.isFormulaName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" placeholder="配方模板" />
-          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
-          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
-          <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
+          <el-radio v-model="tab.radio" label="1" @change="changeRadio">{{$t('feedingEfficiency.pf')}}</el-radio>
+          <el-radio v-model="tab.radio" label="2" @change="changeRadio">{{$t('errorAnalysis.pen')}}</el-radio>
+          <el-radio v-model="tab.radio" label="3" @change="changeRadio">{{$t('feedingEfficiency.cxlb')}}</el-radio>
+          <el-input v-if="tab.isFormulaName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" :placeholder="$t('errorAnalysis.pen')"/>
+          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-select v-model="tab.table.getdataListParm.parammaps.times" filterable :placeholder="$t('errorAnalysis.isTrainNumber')"  class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
@@ -38,42 +39,42 @@
             class="elTable table-fixed"
             :max-height="myHeight"
           >
-            <el-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <el-table-column v-if="tab.isFormulaName" sortable :label="$t('feedingEfficiency.pfmb')" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isHouseName" sortable :label="$t('errorAnalysis.pen')" min-width="70px" align="center" prop="栏舍" />
-            <el-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <el-table-column v-if="tab.isHouseName" sortable :label="$t('feedingEfficiency.pfmb')" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isLivestockType" sortable :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
-            <el-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
-            <el-table-column sortable label="应混料量(kg)" min-width="60px" align="center" prop="应混料量" />
-            <el-table-column sortable label="实际混料量(kg)" min-width="70px" align="center" prop="实际混料量" />
-            <el-table-column sortable label="撒料量(kg)" min-width="60px" align="center" prop="撒料量" />
-            <el-table-column sortable label="平均混料时间" min-width="70px" align="center" prop="混料时间" />
-            <el-table-column sortable label="转投剩料量(kg)" min-width="70px" align="center" prop="转投剩料量" />
-            <el-table-column sortable label="昨日剩料量(kg)" min-width="70px" align="center" prop="今日剩料量" />
-            <el-table-column sortable label="剩料率(%)" min-width="60px" align="center" prop="剩料率" />
-            <el-table-column sortable label="TMR干物质(%)" min-width="65px" align="center" prop="TMR干物质" />
-            <el-table-column sortable label="配方干物质采食量(kg/头)" min-width="80px" align="center" prop="配方干物质采食量" />
-            <el-table-column sortable label="实际干物质采食量(kg/头)" min-width="80px" align="center" prop="实际干物质采食量" />
-            <el-table-column sortable label="采食率(%)" min-width="60px" align="center" prop="采食率" />
-            <el-table-column sortable label="配方理论成本" min-width="60px" align="center" prop="feedtempletPrice" />
-            <el-table-column sortable label="配方成本(元/头)" min-width="65px" align="center" prop="配方成本" />
-            <el-table-column sortable label="实际成本(元/头)" min-width="65px" align="center" prop="实际成本" />
-            <el-table-column sortable label="产奶量(kg/头)" min-width="65px" align="center" prop="产奶量" />
-            <el-table-column sortable label="饲料转化率(%)" min-width="60px" align="center" prop="饲料转化率" />
-            <el-table-column sortable label="公斤奶饲料成本" min-width="60px" align="center" prop="公斤奶饲料成本" />
+            <el-table-column sortable :label="$t('feedingEfficiency.sjnts')" min-width="60px" align="center" prop="实际牛头数" />
+            <el-table-column sortable :label="$t('feedingEfficiency.yhll')" min-width="60px" align="center" prop="应混料量" />
+            <el-table-column sortable :label="$t('feedingEfficiency.sjhll')" min-width="70px" align="center" prop="实际混料量" />
+            <el-table-column sortable :label="$t('feedingEfficiency.sll')"min-width="60px" align="center" prop="撒料量" />
+            <el-table-column sortable :label="$t('feedingEfficiency.pjhlsj')"min-width="70px" align="center" prop="混料时间" />
+            <el-table-column sortable :label="$t('feedingEfficiency.ztsll')" min-width="70px" align="center" prop="转投剩料量" />
+            <el-table-column sortable :label="$t('feedingEfficiency.zrsll')" min-width="70px" align="center" prop="今日剩料量" />
+            <el-table-column sortable :label="$t('feedingEfficiency.csl')" min-width="60px" align="center" prop="剩料率" />
+            <el-table-column sortable :label="$t('feedingEfficiency.tmrgwz')"min-width="65px" align="center" prop="TMR干物质" />
+            <el-table-column sortable :label="$t('feedingEfficiency.pfgwzcsl')"min-width="80px" align="center" prop="配方干物质采食量" />
+            <el-table-column sortable :label="$t('feedingEfficiency.sjgwzcsl')"min-width="80px" align="center" prop="实际干物质采食量" />
+            <el-table-column sortable:label="$t('feedingEfficiency.csl')" min-width="60px" align="center" prop="采食率" />
+            <el-table-column sortable :label="$t('feedingEfficiency.pfllcb')"min-width="60px" align="center" prop="feedtempletPrice" />
+            <el-table-column sortable :label="$t('feedingEfficiency.pfcb')" min-width="65px" align="center" prop="配方成本" />
+            <el-table-column sortable :label="$t('feedingEfficiency.sjcb')"min-width="65px" align="center" prop="实际成本" />
+            <el-table-column sortable :label="$t('feedingEfficiency.cnl')"min-width="65px" align="center" prop="产奶量" />
+            <el-table-column sortable :label="$t('feedingEfficiency.slzhl')"min-width="60px" align="center" prop="饲料转化率" />
+            <el-table-column sortable :label="$t('feedingEfficiency.gjnclcb')"min-width="60px" align="center" prop="公斤奶饲料成本" />
           </el-table>
           <span v-if="tab.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab.table.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
         <div class="AnalysisChart">
           <el-row :gutter="10">
             <el-col :span="23">
-              <span>图表查询时间:</span>
+              <span>{{$t('feedingEfficiency.tbcxsj')}}</span>
               <el-radio-group v-model="tab.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeAllSpecificDate">
                 <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>{{$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" />
+                <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="$t('errorAnalysis.qxznf')"  @change="changeAllYear">
@@ -93,11 +94,11 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">干物质采食量</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.gwzcsl')}} </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="$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-select v-model="tab.chart1.getdataListParm.parammaps.bigcowclass" filterable :placeholder="$t('feedingEfficiency.cxlb')" 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')">
@@ -107,7 +108,7 @@
                     </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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart1')">
@@ -148,15 +149,15 @@
                     class="elTable table-fixed"
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="110px" align="center" prop="日期" />
-                    <el-table-column label="采食量(kg)" sortable min-width="110px" align="center" prop="field1" />
-                    <el-table-column label="产奶量(kg)" sortable min-width="110px" align="center" prop="field2" />
+                    <el-table-column :label="$t('feedingEfficiency.csl1')"   sortable min-width="110px" align="center" prop="field1" />
+                    <el-table-column :label="$t('feedingEfficiency.cnl1')"   sortable min-width="110px" align="center" prop="field2" />
                   </el-table>
                 </div>
               </div>
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">牛栏剩料率</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.nlsll')}}</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="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart2" />
@@ -166,7 +167,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart2')">
@@ -219,7 +220,7 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">混料时间统计</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.hlsjtj')}}</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="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart3" />
@@ -229,7 +230,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart3')">
@@ -278,7 +279,7 @@
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">转化率</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.zhl')}}</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="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart4" />
@@ -288,7 +289,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart4')">
@@ -330,7 +331,7 @@
                   >
                     <el-table-column sortable :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
                     <el-table-column sortable  :label="$t('errorAnalysis.feedName')"  min-width="110px" align="center" prop="名称" />
-                    <el-table-column sortable label="饲料转化率" min-width="110px" align="center" prop="准确率" />
+                    <el-table-column sortable :label="$t('feedingEfficiency.slzhl')"min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -339,7 +340,7 @@
           <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
             <el-col :span="24">
               <div class="grid-content">
-                <h4 style="text-align:center;">成本分析</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.cbfx')}}</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="$t('errorAnalysis.xztjcs')" @searchSelect="changeStatisticChart5" />
@@ -349,7 +350,7 @@
                       <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" />
+                      <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="$t('errorAnalysis.nf')"  @change="changeChartYear('chart5')">
@@ -391,7 +392,7 @@
                   >
                     <el-table-column sortable :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
                     <el-table-column sortable :label="$t('errorAnalysis.sxlb')" min-width="110px" align="center" prop="名称" />
-                    <el-table-column sortable label="公斤奶饲料成本(元)" min-width="110px" align="center" prop="准确率" />
+                    <el-table-column sortable :label="$t('feedingEfficiency.gjnclcb1')"min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -399,7 +400,7 @@
           </el-row>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="牛群评估" name="second">
+      <el-tab-pane :label="$t('feedingEfficiency.nxpg')" name="second">
         <div class="search">
           <el-date-picker v-model="tab2.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeTab2Date" />
           <el-button class="export" style="float: right;" icon="el-icon-upload2" @click="handleDownload2">{{$t('dashboard.Export')}}</el-button>
@@ -409,7 +410,7 @@
         <div class="table">
           <el-row :gutter="10">
             <el-col :span="12">
-              <h4 style="text-align:center;">宾州筛分析</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.bzsfx')}}</h4>
               <el-table
                 :key="tab2.table.tableKey"
                 v-loading="tab2.table.listLoading"
@@ -424,20 +425,20 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column sortable label="宾州筛" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="第一层重量" min-width="60px" align="center" prop="oneweight" />
-                <el-table-column sortable label="第一层百分比" min-width="60px" align="center" prop="onerate" />
-                <el-table-column sortable label="第二层重量" min-width="60px" align="center" prop="twoweight" />
-                <el-table-column sortable label="第二层百分比" min-width="60px" align="center" prop="tworate" />
-                <el-table-column sortable label="第三层重量" min-width="60px" align="center" prop="threeweight" />
-                <el-table-column sortable label="第三层百分比" min-width="60px" align="center" prop="threerate" />
-                <el-table-column sortable label="第四层重量" min-width="60px" align="center" prop="fourweight" />
-                <el-table-column sortable label="第四层百分比" min-width="60px" align="center" prop="fourrate" />
-                <el-table-column sortable label="参考标准" min-width="50px" align="center" prop="standard" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bzs')" min-width="60px" align="center" prop="barname" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl1')" min-width="60px" align="center" prop="oneweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb1')" min-width="60px" align="center" prop="onerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl2')" min-width="60px" align="center" prop="twoweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb2')"  min-width="60px" align="center" prop="tworate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl3')"   min-width="60px" align="center" prop="threeweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb3')"   min-width="60px" align="center" prop="threerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl4')"   min-width="60px" align="center" prop="fourweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb4')"    min-width="60px" align="center" prop="fourrate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.ckbz')"   min-width="50px" align="center" prop="standard" />
               </el-table>
             </el-col>
             <el-col :span="12">
-              <h4 style="text-align:center;">粪便筛分析</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.fbsfx')}}</h4>
               <el-table
                 :key="tab2.table2.tableKey"
                 v-loading="tab2.table2.listLoading"
@@ -453,19 +454,19 @@
                 height="400px"
               >
                 <el-table-column sortable label="粪便筛" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="第一层重量" min-width="60px" align="center" prop="oneweight" />
-                <el-table-column sortable label="第一层百分比" min-width="60px" align="center" prop="onerate" />
-                <el-table-column sortable label="第二层重量" min-width="60px" align="center" prop="twoweight" />
-                <el-table-column sortable label="第二层百分比" min-width="60px" align="center" prop="tworate" />
-                <el-table-column sortable label="第三层重量" min-width="60px" align="center" prop="threeweight" />
-                <el-table-column sortable label="第三层百分比" min-width="60px" align="center" prop="threerate" />
-                <el-table-column sortable label="参考标准" min-width="50px" align="center" prop="standard" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl1')" min-width="60px" align="center" prop="oneweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb1')" min-width="60px" align="center" prop="onerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl2')" min-width="60px" align="center" prop="twoweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb2')"  min-width="60px" align="center" prop="tworate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl3')"   min-width="60px" align="center" prop="threeweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb3')"   min-width="60px" align="center" prop="threerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.ckbz')"   min-width="50px" align="center" prop="standard" />
               </el-table>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="12">
-              <h4 style="text-align:center;">体况评分</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.tkpl')}}</h4>
               <el-table
                 :key="tab2.table3.tableKey"
                 v-loading="tab2.table3.listLoading"
@@ -481,23 +482,23 @@
                 height="400px"
               >
                 <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
-                <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
-                <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
-                <el-table-column sortable label="泌乳天数" min-width="50px" align="center" prop="avgdim" />
-                <el-table-column sortable label="标准分数" min-width="50px" align="center" prop="standardscore" />
-                <el-table-column sortable label="2.5-分(数量、百分比)" min-width="100px" align="center" prop="score25" />
-                <el-table-column sortable label="2.75分(数量、百分比)" min-width="100px" align="center" prop="score275" />
-                <el-table-column sortable label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />
-                <el-table-column sortable label="3.25分(数量、百分比)" min-width="100px" align="center" prop="score325" />
-                <el-table-column sortable label="3.5分(数量、百分比)" min-width="100px" align="center" prop="score35" />
-                <el-table-column sortable label="3.75分(数量、百分比)" min-width="100px" align="center" prop="score375" />
-                <el-table-column sortable label="4+分(数量、百分比)" min-width="100px" align="center" prop="score4" />
+                <el-table-column sortable :label="$t('feedingEfficiency.czybs')"  min-width="60px" align="center" prop="sumcowcount" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dc')"  min-width="60px" align="center" prop="product" />
+                <el-table-column sortable :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.mrts')"    min-width="50px" align="center" prop="avgdim" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bzfs')"   min-width="50px" align="center" prop="standardscore" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb25')"    min-width="100px" align="center" prop="score25" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb275')"    min-width="100px" align="center" prop="score275" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb3')"    min-width="90px" align="center" prop="score3" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb325')"   min-width="100px" align="center" prop="score325" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb35')"   min-width="100px" align="center" prop="score35" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb375')"   min-width="100px" align="center" prop="score375" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb44')"   min-width="100px" align="center" prop="score4" />
               </el-table>
             </el-col>
             <!-- 粪便评分 -->
             <el-col :span="12">
-              <h4 style="text-align:center;">粪便评分</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.fbpf')}}</h4>
               <el-table
                 :key="tab2.table4.tableKey"
                 v-loading="tab2.table4.listLoading"
@@ -513,16 +514,16 @@
                 height="400px"
               >
                 <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
-                <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
-                <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
-                <el-table-column sortable label="泌乳天数" min-width="60px" align="center" prop="avgdim" />
-                <el-table-column sortable label="标准分数" min-width="60px" align="center" prop="standardscore" />
-                <el-table-column sortable label="1分(数量、百分比)" min-width="90px" align="center" prop="score1" />
-                <el-table-column sortable label="2分(数量、百分比)" min-width="90px" align="center" prop="score2" />
-                <el-table-column sortable label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />
-                <el-table-column sortable label="4分(数量、百分比)" min-width="90px" align="center" prop="score4" />
-                <el-table-column sortable label="5分(数量、百分比)" min-width="90px" align="center" prop="score5" />
+                <el-table-column sortable :label="$t('feedingEfficiency.czybs')"  min-width="60px" align="center" prop="sumcowcount" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dc')"  min-width="60px" align="center" prop="product" />
+                <el-table-column sortable :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.mrts')"    min-width="60px" align="center" prop="avgdim" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bzfs')"   min-width="60px" align="center" prop="standardscore" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb1')"    min-width="90px" align="center" prop="score1" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb2')"    min-width="90px" align="center" prop="score2" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb3')"    min-width="90px" align="center" prop="score3" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb4')"    min-width="90px" align="center" prop="score4" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb5')"   min-width="90px" align="center" prop="score5" />
               </el-table>
             </el-col>
           </el-row>
@@ -532,8 +533,8 @@
     <!-- 导出 -->
     <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="20%">
     <div>
-      <span>导出时间范围:</span>
-      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
+      <span>{{$t('feedingEfficiency.dcskff')}}</span>
+      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
       <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">{{$t('common.closed')}}</el-button>

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

@@ -1,20 +1,20 @@
 <template>
   <div class="app-container1">
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="效率统计" name="first">
+      <el-tab-pane :label="$t('feedingEfficiency.xltj')" name="first">
         <div class="search">
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-if="false"/>
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
+          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
           <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-radio v-model="tab.radio" label="1" @change="changeRadio">配方</el-radio>
-          <el-radio v-model="tab.radio" label="2" @change="changeRadio">栏舍</el-radio>
-          <el-radio v-model="tab.radio" label="3" @change="changeRadio">牲畜类别</el-radio>
-          <el-input v-if="tab.isFormulaName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" placeholder="配方模板" />
-          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
-          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
-          <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
+          <el-radio v-model="tab.radio" label="1" @change="changeRadio">{{$t('feedingEfficiency.pf')}}</el-radio>
+          <el-radio v-model="tab.radio" label="2" @change="changeRadio">{{$t('errorAnalysis.pen')}}</el-radio>
+          <el-radio v-model="tab.radio" label="3" @change="changeRadio">{{$t('feedingEfficiency.cxlb')}}</el-radio>
+          <el-input v-if="tab.isFormulaName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 245px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" :placeholder="$t('errorAnalysis.pen')"/>
+          <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.pfmb')" />
+          <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">{{$t('dashboard.Export')}}</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
@@ -34,27 +34,27 @@
             class="elTable table-fixed"
             :max-height="myHeight"
           >
-            <u-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <u-table-column v-if="tab.isFormulaName" sortable :label="$t('feedingEfficiency.pfmb')" min-width="70px" align="center" prop="配方模板" />
             <u-table-column v-if="tab.isHouseName" sortable :label="$t('errorAnalysis.pen')" min-width="70px" align="center" prop="栏舍" />
-            <u-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <u-table-column v-if="tab.isHouseName" sortable :label="$t('feedingEfficiency.pfmb')" min-width="70px" align="center" prop="配方模板" />
             <u-table-column v-if="tab.isLivestockType" sortable :label="$t('errorAnalysis.sxlb')" min-width="70px" align="center" prop="牲畜类别" />
-            <u-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
-            <u-table-column sortable label="应混料量(kg)" min-width="60px" align="center" prop="应混料量" />
-            <u-table-column sortable label="实际混料量(kg)" min-width="70px" align="center" prop="实际混料量" />
-            <u-table-column sortable label="撒料量(kg)" min-width="60px" align="center" prop="撒料量" />
-            <u-table-column sortable label="平均混料时间" min-width="70px" align="center" prop="混料时间" />
-            <u-table-column sortable label="转投剩料量(kg)" min-width="70px" align="center" prop="转投剩料量" />
-            <u-table-column sortable label="今日剩料量(kg)" min-width="70px" align="center" prop="今日剩料量" />
-            <u-table-column sortable label="剩料率(%)" min-width="60px" align="center" prop="剩料率" />
-            <u-table-column sortable label="TMR干物质(%)" min-width="65px" align="center" prop="TMR干物质" />
-            <u-table-column sortable label="配方干物质采食量(kg/头)" min-width="80px" align="center" prop="配方干物质采食量" />
-            <u-table-column sortable label="实际干物质采食量(kg/头)" min-width="80px" align="center" prop="实际干物质采食量" />
-            <u-table-column sortable label="采食率(%)" min-width="60px" align="center" prop="采食率" />
-            <u-table-column sortable label="配方成本(元/头)" min-width="65px" align="center" prop="配方成本" />
-            <u-table-column sortable label="实际成本(元/头)" min-width="65px" align="center" prop="实际成本" />
-            <u-table-column sortable label="产奶量(kg/头)" min-width="65px" align="center" prop="产奶量" />
-            <u-table-column sortable label="饲料转化率(%)" min-width="60px" align="center" prop="饲料转化率" />
-            <u-table-column sortable label="公斤奶饲料成本" min-width="60px" align="center" prop="公斤奶饲料成本" />
+            <u-table-column sortable :label="$t('feedingEfficiency.sjnts')" min-width="60px" align="center" prop="实际牛头数" />
+            <u-table-column sortable :label="$t('feedingEfficiency.yhll')" min-width="60px" align="center" prop="应混料量" />
+            <u-table-column sortable :label="$t('feedingEfficiency.sjhll')" min-width="70px" align="center" prop="实际混料量" />
+            <u-table-column sortable :label="$t('feedingEfficiency.sll')"min-width="60px" align="center" prop="撒料量" />
+            <u-table-column sortable :label="$t('feedingEfficiency.pjhlsj')"min-width="70px" align="center" prop="混料时间" />
+            <u-table-column sortable :label="$t('feedingEfficiency.ztsll')" min-width="70px" align="center" prop="转投剩料量" />
+            <u-table-column sortable :label="$t('feedingEfficiency.jrsll')" min-width="70px" align="center" prop="今日剩料量" />
+            <u-table-column sortable :label="$t('feedingEfficiency.csl')" min-width="60px" align="center" prop="剩料率" />
+            <u-table-column sortable :label="$t('feedingEfficiency.tmrgwz')"min-width="65px" align="center" prop="TMR干物质" />
+            <u-table-column sortable :label="$t('feedingEfficiency.pfgwzcsl')"min-width="80px" align="center" prop="配方干物质采食量" />
+            <u-table-column sortable :label="$t('feedingEfficiency.sjgwzcsl')"min-width="80px" align="center" prop="实际干物质采食量" />
+            <u-table-column sortable:label="$t('feedingEfficiency.csl')" min-width="60px" align="center" prop="采食率" />
+            <u-table-column sortable :label="$t('feedingEfficiency.pfcb')" min-width="65px" align="center" prop="配方成本" />
+            <u-table-column sortable :label="$t('feedingEfficiency.sjcb')"min-width="65px" align="center" prop="实际成本" />
+            <u-table-column sortable :label="$t('feedingEfficiency.cnl')"min-width="65px" align="center" prop="产奶量" />
+            <u-table-column sortable :label="$t('feedingEfficiency.slzhl')"min-width="60px" align="center" prop="饲料转化率" />
+            <u-table-column sortable :label="$t('feedingEfficiency.gjnclcb')"min-width="60px" align="center" prop="公斤奶饲料成本" />
           </u-table>
           <span v-if="tab.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab.table.total }}{{$t('processAnalysis.tiao')}}</span>
           <!-- <pagination v-show="tab.table.total>=0" :total="tab.table.total" :page.sync="tab.table.getdataListParm.offset" :limit.sync="tab.table.getdataListParm.pagecount" @pagination="getTabList" /> -->
@@ -62,8 +62,8 @@
         <div class="AnalysisChart">
           <el-row :gutter="10">
             <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" />
+              <span>{{$t('feedingEfficiency.tbcxsj')}} :</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">{{$t('errorAnalysis.confirm')}}</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
@@ -71,9 +71,9 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">泌乳牛干物质采食量</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.mrngwzcl')}} </h4>
                 <div v-if="tab.chart1.isChart" class="button">
-                  <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -109,7 +109,7 @@
                 <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="$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')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -146,9 +146,9 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">混料时间统计</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.hlsjtj')}}</h4>
                 <div v-if="tab.chart3.isChart" class="button">
-                  <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart3')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -180,10 +180,10 @@
             </el-col>
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">转化率</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.zhl')}}</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="$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')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -209,7 +209,7 @@
                   >
                     <el-table-column sortable :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
                     <el-table-column sortable  :label="$t('errorAnalysis.feedName')"  min-width="110px" align="center" prop="名称" />
-                    <el-table-column sortable label="饲料转化率" min-width="110px" align="center" prop="准确率" />
+                    <el-table-column sortable :label="$t('feedingEfficiency.slzhl')"min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -219,10 +219,10 @@
           <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
             <el-col :span="24">
               <div class="grid-content">
-                <h4 style="text-align:center;">成本分析</h4>
+                <h4 style="text-align:center;">{{$t('feedingEfficiency.cbfx')}}</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="$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')" />
+                  <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')">{{$t('errorAnalysis.changeTable')}}</div>
                 </div>
@@ -248,7 +248,7 @@
                   >
                     <el-table-column sortable :label="$t('errorAnalysis.date')" min-width="110px" align="center" prop="日期" />
                     <el-table-column sortable :label="$t('errorAnalysis.sxlb')" min-width="110px" align="center" prop="名称" />
-                    <el-table-column sortable label="公斤奶饲料成本(元)" min-width="110px" align="center" prop="准确率" />
+                    <el-table-column sortable :label="$t('feedingEfficiency.gjnclcb1')"min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -257,7 +257,7 @@
           </el-row>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="牛群评估" name="second">
+      <el-tab-pane :label="$t('feedingEfficiency.nxpg')" name="second">
         <div class="search">
           <el-date-picker v-model="tab2.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeTab2Date" />
           <!-- <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore2" />
@@ -281,20 +281,20 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column sortable label="宾州筛" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="第一层重量" min-width="60px" align="center" prop="oneweight" />
-                <el-table-column sortable label="第一层百分比" min-width="60px" align="center" prop="onerate" />
-                <el-table-column sortable label="第二层重量" min-width="60px" align="center" prop="twoweight" />
-                <el-table-column sortable label="第二层百分比" min-width="60px" align="center" prop="tworate" />
-                <el-table-column sortable label="第三层重量" min-width="60px" align="center" prop="threeweight" />
-                <el-table-column sortable label="第三层百分比" min-width="60px" align="center" prop="threerate" />
-                <el-table-column sortable label="第四层重量" min-width="60px" align="center" prop="fourweight" />
-                <el-table-column sortable label="第四层百分比" min-width="60px" align="center" prop="fourrate" />
-                <el-table-column sortable label="参考标准" min-width="50px" align="center" prop="standard" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bzs')" min-width="60px" align="center" prop="barname" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl1')"min-width="60px" align="center" prop="oneweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb1')"min-width="60px" align="center" prop="onerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl2')" min-width="60px" align="center" prop="twoweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb2')"  min-width="60px" align="center" prop="tworate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl3')"   min-width="60px" align="center" prop="threeweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb3')"   min-width="60px" align="center" prop="threerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl4')"   min-width="60px" align="center" prop="fourweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb4')"    min-width="60px" align="center" prop="fourrate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.ckbz')"   min-width="50px" align="center" prop="standard" />
               </el-table>
             </el-col>
             <el-col :span="12">
-              <h4 style="text-align:center;">粪便筛分析</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.fbsfx')}}</h4>
               <el-table
                 :key="tab2.table2.tableKey"
                 v-loading="tab2.table2.listLoading"
@@ -310,19 +310,19 @@
                 height="400px"
               >
                 <el-table-column sortable label="粪便筛" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="第一层重量" min-width="60px" align="center" prop="oneweight" />
-                <el-table-column sortable label="第一层百分比" min-width="60px" align="center" prop="onerate" />
-                <el-table-column sortable label="第二层重量" min-width="60px" align="center" prop="twoweight" />
-                <el-table-column sortable label="第二层百分比" min-width="60px" align="center" prop="tworate" />
-                <el-table-column sortable label="第三层重量" min-width="60px" align="center" prop="threeweight" />
-                <el-table-column sortable label="第三层百分比" min-width="60px" align="center" prop="threerate" />
-                <el-table-column sortable label="参考标准" min-width="50px" align="center" prop="standard" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl1')"min-width="60px" align="center" prop="oneweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb1')"min-width="60px" align="center" prop="onerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl2')" min-width="60px" align="center" prop="twoweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb2')"  min-width="60px" align="center" prop="tworate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dczl3')"   min-width="60px" align="center" prop="threeweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dcbfb3')"   min-width="60px" align="center" prop="threerate" />
+                <el-table-column sortable :label="$t('feedingEfficiency.ckbz')"   min-width="50px" align="center" prop="standard" />
               </el-table>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="12">
-              <h4 style="text-align:center;">体况评分</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.tkpl')}}</h4>
               <el-table
                 :key="tab2.table3.tableKey"
                 v-loading="tab2.table3.listLoading"
@@ -338,23 +338,23 @@
                 height="400px"
               >
                 <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
-                <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
-                <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
-                <el-table-column sortable label="泌乳天数" min-width="50px" align="center" prop="avgdim" />
-                <el-table-column sortable label="标准分数" min-width="50px" align="center" prop="standardscore" />
-                <el-table-column sortable label="2.5-分(数量、百分比)" min-width="100px" align="center" prop="score25" />
-                <el-table-column sortable label="2.75分(数量、百分比)" min-width="100px" align="center" prop="score275" />
-                <el-table-column sortable label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />
-                <el-table-column sortable label="3.25分(数量、百分比)" min-width="100px" align="center" prop="score325" />
-                <el-table-column sortable label="3.5分(数量、百分比)" min-width="100px" align="center" prop="score35" />
-                <el-table-column sortable label="3.75分(数量、百分比)" min-width="100px" align="center" prop="score375" />
-                <el-table-column sortable label="4+分(数量、百分比)" min-width="100px" align="center" prop="score4" />
+                <el-table-column sortable :label="$t('feedingEfficiency.czybs')"  min-width="60px" align="center" prop="sumcowcount" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dc')"  min-width="60px" align="center" prop="product" />
+                <el-table-column sortable :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.mrts')"    min-width="50px" align="center" prop="avgdim" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bzfs')"   min-width="50px" align="center" prop="standardscore" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb25')"    min-width="100px" align="center" prop="score25" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb275')"    min-width="100px" align="center" prop="score275" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb3')"    min-width="90px" align="center" prop="score3" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb325')"   min-width="100px" align="center" prop="score325" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb35')"   min-width="100px" align="center" prop="score35" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb375')"   min-width="100px" align="center" prop="score375" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb4')"   min-width="100px" align="center" prop="score4" />
               </el-table>
             </el-col>
             <!-- 粪便评分 -->
             <el-col :span="12">
-              <h4 style="text-align:center;">粪便评分</h4>
+              <h4 style="text-align:center;">{{$t('feedingEfficiency.fbpf')}}</h4>
               <el-table
                 :key="tab2.table4.tableKey"
                 v-loading="tab2.table4.listLoading"
@@ -370,16 +370,16 @@
                 height="400px"
               >
                 <el-table-column sortable :label="$t('errorAnalysis.pen')" min-width="60px" align="center" prop="barname" />
-                <el-table-column sortable label="抽查样本数" min-width="60px" align="center" prop="sumcowcount" />
-                <el-table-column sortable label="单产" min-width="60px" align="center" prop="product" />
-                <el-table-column sortable label="干物质采食量" min-width="60px" align="center" prop="dryweight" />
-                <el-table-column sortable label="泌乳天数" min-width="60px" align="center" prop="avgdim" />
-                <el-table-column sortable label="标准分数" min-width="60px" align="center" prop="standardscore" />
-                <el-table-column sortable label="1分(数量、百分比)" min-width="90px" align="center" prop="score1" />
-                <el-table-column sortable label="2分(数量、百分比)" min-width="90px" align="center" prop="score2" />
-                <el-table-column sortable label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />
-                <el-table-column sortable label="4分(数量、百分比)" min-width="90px" align="center" prop="score4" />
-                <el-table-column sortable label="5分(数量、百分比)" min-width="90px" align="center" prop="score5" />
+                <el-table-column sortable :label="$t('feedingEfficiency.czybs')"  min-width="60px" align="center" prop="sumcowcount" />
+                <el-table-column sortable :label="$t('feedingEfficiency.dc')"  min-width="60px" align="center" prop="product" />
+                <el-table-column sortable :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
+                <el-table-column sortable :label="$t('feedingEfficiency.mrts')"    min-width="60px" align="center" prop="avgdim" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bzfs')"   min-width="60px" align="center" prop="standardscore" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb1')"    min-width="90px" align="center" prop="score1" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb2')"    min-width="90px" align="center" prop="score2" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb3')"    min-width="90px" align="center" prop="score3" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb4')"    min-width="90px" align="center" prop="score4" />
+                <el-table-column sortable :label="$t('feedingEfficiency.bfb5')"   min-width="90px" align="center" prop="score5" />
               </el-table>
             </el-col>
           </el-row>

+ 1 - 1
src/views/statisticalAnalysis/formulaStatistics/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" ref="searchBar">
     <el-date-picker v-model="inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange"
-      :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;"
+      :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;"
       :picker-options="pickerOptions" />
     <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
     <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />

+ 1 - 1
src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="operation">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;float: left;" @change="changeDate" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;float: left;" @change="changeDate" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.search" placeholder="查询" class="filter-item" style="width: 120px;margin-right: 10px;">

+ 1 - 1
src/views/statisticalAnalysis/formulationEvaluation/index备.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="operation">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeDate" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" @change="changeDate" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
     </div>

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

@@ -7,7 +7,7 @@
           <el-select v-model="tab.table.getdataListParm.parammaps.pastureid" style="margin-right: 10px;margin-bottom:10px;width: 150px;" filterable placeholder="牧场" class="filter-item" clearable>
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
+          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
@@ -56,17 +56,17 @@
           <el-select v-model="tab2.table.getdataListParm.parammaps.pastureid" style="margin-right: 10px;margin-bottom:10px;width: 130px;" filterable placeholder="牧场" class="filter-item" clearable>
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
-          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" />
+          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-radio v-model="tab2.radio" label="1" @change="changeRadio2">牲畜类别</el-radio>
+          <el-radio v-model="tab2.radio" label="1" @change="changeRadio2">{{$t('feedingEfficiency.cxlb')}}</el-radio>
           <el-radio v-model="tab2.radio" label="2" @change="changeRadio2">栏舍名称</el-radio>
           <el-radio v-model="tab2.radio" label="3" @change="changeRadio2">日期</el-radio>
           <el-radio v-model="tab2.radio" label="4" @change="changeRadio2">TMR设备编号</el-radio>
           <el-radio v-model="tab2.radio" label="5" @change="changeRadio2">班次</el-radio>
           <el-radio v-model="tab2.radio" label="6" @change="changeRadio2">车次</el-radio>
-          <el-input v-if="tab2.isRadio1" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="牲畜类别" />
+          <el-input v-if="tab2.isRadio1" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab2.isRadio2" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
           <el-input v-if="tab2.isRadio3" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="日期" />
           <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="TMR设备编号" />
@@ -104,15 +104,15 @@
           <el-select v-model="tab3.table.getdataListParm.parammaps.pastureid" style="margin-right: 10px;margin-bottom:10px;width: 150px;" filterable placeholder="牧场" class="filter-item" clearable>
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" />
+          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">牲畜类别</el-radio>
+          <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">{{$t('feedingEfficiency.cxlb')}}</el-radio>
           <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">栏舍名称</el-radio>
           <el-radio v-model="tab3.radio" label="3" @change="changeRadio3">日期</el-radio>
           <el-radio v-model="tab3.radio" label="4" @change="changeRadio3">TMR设备编号</el-radio>
-          <el-input v-if="tab3.isRadio1" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="牲畜类别" />
+          <el-input v-if="tab3.isRadio1" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
           <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="日期" />
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="TMR设备编号" />

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

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="库存统计" name="first">
         <div class="search">
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
+          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" style="float: left;" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" style="float: left;" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
@@ -49,7 +49,7 @@
       </el-tab-pane>
       <el-tab-pane label="用料分析" name="second">
         <div class="search">
-          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 245px;" :picker-options="pickerOptions2" />
+          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 245px;" :picker-options="pickerOptions2" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
@@ -60,7 +60,7 @@
           <el-select v-model="tab2.table.getdataListParm.parammaps.ftType" placeholder="是否拆分小料" class="filter-item" style="width: 130px;">
             <el-option v-for="item in isSplitsmallmaterialsList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-input v-if="tab2.isRadio1" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="牲畜类别" />
+          <el-input v-if="tab2.isRadio1" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab2.isRadio2" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
           <el-input v-if="tab2.isRadio3" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="日期" />
           <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="TMR设备编号" />
@@ -130,18 +130,18 @@
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
         <div class="search">
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" style="width: 250px;" :picker-options="pickerOptions" />
+          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" :clearable="false" style="width: 250px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
           <el-select v-model="tab3.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio3">
             <el-option v-for="item in statisticalTypeList3" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <!-- <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">牲畜类别</el-radio>
+          <!-- <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">{{$t('feedingEfficiency.cxlb')}}</el-radio>
           <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">栏舍名称</el-radio>
           <el-radio v-model="tab3.radio" label="3" @change="changeRadio3">日期</el-radio>
           <el-radio v-model="tab3.radio" label="4" @change="changeRadio3">TMR设备编号</el-radio> -->
-          <el-input v-if="tab3.isRadio1" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="牲畜类别" />
+          <el-input v-if="tab3.isRadio1" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
           <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="日期" />
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="TMR设备编号" />

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

@@ -6,7 +6,7 @@
       <el-select v-model="table.getdataListParm.parammaps.pastureid" :placeholder="$t('processAnalysis.pastureName')" class="filter-item" style="width: 120px;">
         <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
       </el-select>
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.lpplantype"

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
       <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.lpplantype" :placeholder="$t('processAnalysis.planType')" class="filter-item" style="width: 120px;" clearable>

+ 1 - 1
src/views/systemManagement/customboard2/ChartPanel2/index.vue

@@ -83,7 +83,7 @@
             </el-select>
 
 
-            <el-date-picker v-model="screeningObj.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+            <el-date-picker v-model="screeningObj.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
         
 
 

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

@@ -3,7 +3,7 @@
     <div class="search">
       <el-input v-model="table.getdataListParm.parammaps.rolename" placeholder="标题" style="width: 180px;" class="filter-item" clearable />
       <el-input v-model="table.getdataListParm.parammaps.rolename" placeholder="创建人" style="width: 180px;" class="filter-item" clearable />
-      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="successBorder" @click="form_search('table')">{{$t('common.query')}}</el-button>
       <el-button class="successBorder" @click="handleRefresh('table')">{{$t('common.reset')}}</el-button>
     </div>
@@ -57,7 +57,7 @@
           <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
         <el-input v-model="statisticsRead.getdataListParm.parammaps.rolename" placeholder="用户" style="width: 180px;" class="filter-item" clearable />
-        <el-date-picker ref="inputDatetime" v-model="statisticsRead.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+        <el-date-picker ref="inputDatetime" v-model="statisticsRead.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
         <el-button class="successBorder" @click="form_search('statisticsRead')">{{$t('common.query')}}</el-button>
         <el-button class="successBorder" @click="handleRefresh('statisticsRead')">{{$t('common.reset')}}</el-button>
       </div>
@@ -80,7 +80,7 @@
               <span>{{ scope.$index + (statisticsRead.pageNum-1) * statisticsRead.pageSize + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="牧场" min-width="100px" align="center" prop="rolename" />
+          <el-table-column :label="$t('feedingEfficiency.mc')"min-width="100px" align="center" prop="rolename" />
           <el-table-column label="用户" min-width="100px" align="center" prop="rolename" />
           <el-table-column label="已读时间" min-width="100px" align="center" prop="createdtime" />
         </el-table>

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

@@ -11,7 +11,7 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="操作人" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in operatorList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
       <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>

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

@@ -142,7 +142,7 @@
               <el-form-item label="关联:" prop="radio">
                 <el-radio-group v-model="tab1.relation.radio">
                   <el-radio-button label="集团" />
-                  <el-radio-button label="牧场" />
+                  <el-radio-button :label="$t('feedingEfficiency.mc')"/>
                 </el-radio-group>
               </el-form-item>
             </el-col>

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

@@ -4,7 +4,7 @@
       <el-tab-pane label="集团信息" name="first">
         <component :is="myComponent1" ref="detail" />
       </el-tab-pane>
-      <el-tab-pane label="牧场" name="second">
+      <el-tab-pane :label="$t('feedingEfficiency.mc')"name="second">
         <component :is="myComponent2" ref="detail" />
       </el-tab-pane>
     </el-tabs>

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

@@ -6,7 +6,7 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
       <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>

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

@@ -6,7 +6,7 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <!-- 临时注释 -->
       <!-- <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="公众号关注状态" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in attentionStatusList" :key="item.id" :label="item.name" :value="item.id" />