修改饲料表

src/lang/en/langModule/feedingEfficiency.js

@@ -28,7 +28,7 @@ export default{
   zhl:"Conversion Rate",
   cbfx:"Cost Analysis",
   zhdmb:"Best Template",
-  gjnclcb1:"cost of feed per kilogram of milk(元)",
+  gjnclcb1:"cost of feed per kilogram of milk(yuan)",
   cxlb:"Livestock Categories",
   bzsfx:"PSPS",
 
@@ -38,9 +38,9 @@ dczl1:"First Layer Weight",
 dcbfb1:"First Layer Percentage",
 dczl2:"Second Layer Weight",
 dcbfb2:"Second Layer Percentage",
-dczl3:"hird Layer Weight",
+dczl3:"Third Layer Weight",
 dcbfb3:"Third Layer Percentage",
-dczl4:"Fourth Layer Weight",
+dczl4:"fourh layer percentagth Layer Weight",
 dcbfb4:"Fourth Layer Percentage”",
 ckbz:"Reference Standard",
 fbsfx:"Fecal Screenin",
@@ -49,17 +49,17 @@ 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）",
+bfb1:'1 points(Quantity, Percentage)',
+bfb2:'2 points(Quantity, Percentage)',
+bfb3:'3 points(Quantity, Percentage)',
+bfb4:'4 points(Quantity, Percentage）',
+bfb5:'5 points(Quantity, Percentage)',
+bfb25:'2.5 point(Quantity, Percentage）',
+bfb275:"2.75 points(Quantity, Percentage)",
+bfb325:"3.25points(Quantity, Percentage)",
+bfb35:"3.5 points(Quantity, Percentage)",
+bfb375:"3.75 points(Quantity, Percentage)",
+bfb44:"4+ points(Quantity, Percentage)",
 
 fbpf:"Fecal Scoring",
 dcskff:"Export Time Range",
@@ -74,8 +74,8 @@ cnl1:"Milk yield",
 
 
 //
-fenz:"minute",
-sjfz:'Time (Minutes)',
+fenz:"min",
+sjfz:'Time (min)',
 mrncsl:"Lactating Cow Feed Intake",
 xltj1:"Efficiency Statistics - Formula",
 xltj2:'Efficiency Statistics - Formula',
@@ -84,4 +84,9 @@ xltj4:'Efficiency Statistics - Shift',
 xltj5:'Feeding Efficiency - Herd Assessment',
 fbs:"Fecal Sieve",
 
+slls:"Leftover Feed",
+slls1:"Feed Distribution Quantity”",
+zql:"Accuracy Rate"
+
+
   }

src/lang/zn/langModule/feedingEfficiency.js

@@ -82,5 +82,10 @@ xltj4:'效率统计-班次',
 xltj5:'饲喂效率—牛群评估',
 fbs:"粪便筛",
 
+slls:"剩料量",
+slls1:"撒料量", // “Leftover Feed” 剩料量
+//“Feed Distribution Quantity” 撒料量
 
-}
+zql:"准确率"
+
+}

src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -212,9 +212,9 @@
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="110px" align="center" prop="日期" />
                     <el-table-column  :label="$t('errorAnalysis.isHouseName')"  sortable min-width="110px" align="center" prop="名称" />
-                    <el-table-column :label="$t('performance.sll')"   sortable min-width="110px" align="center" prop="剩料量" />
-                    <el-table-column :label="$t('feedingEfficiency.sll')" sortable min-width="110px" align="center" prop="撒料量" />
-                    <el-table-column :label="$t('feedingEfficiency.sll1')" sortable min-width="110px" align="center" prop="准确率" />
+                    <el-table-column :label="$t('performance.slls')"   sortable min-width="110px" align="center" prop="剩料量" />
+                    <el-table-column :label="$t('feedingEfficiency.slls1')" sortable min-width="110px" align="center" prop="撒料量" />
+                    <el-table-column :label="$t('feedingEfficiency.zql')" sortable min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -2670,10 +2670,10 @@ export default {
             tHeader: labels,
             filterVal: ['日期', 'field1', 'field2'],
             tableDatas: this.tab.chart1.table.list,
-            sheetName: '泌乳牛采食量'
+            sheetName: '干物质采食量'
           }
         ]
-        json2excel(excelDatasTabChart1, this.$t('feedingEfficiency.mrncsl'), true, 'xlsx')
+        json2excel(excelDatasTabChart1, this.$t('feedingEfficiency.gwzcsl'), true, 'xlsx')
       } else if (item == 'chart2') {
         const columns = this.$refs.chart2.columns;
         const labels = columns.map(column => column.label);

src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -930,8 +930,8 @@ export default {
             this.downLoad.list = []
           }
           const table = this.$refs.table1;
-        const columns = table.columns;
-        const labels = columns.map(column => column.label);
+          const columns = table.columns;
+          const labels = columns.map(column => column.label);
 
           import('@/vendor/Export5Excel').then(excel => {
             const multiHeader = [[this.$t('InventoryManagement.silc'), , this.$t('InventoryManagement.qc'), '', this.$t('InventoryManagement.yl'), '', '', '', this.$t('InventoryManagement.qm'), '']]