debugger

src/lang/en/langModule/errorAnalysis.js

@@ -12,7 +12,7 @@ export default{
   animelName:"Livestock Category",
   projname:'Number of Times the Vehicle Was Used ',
   isFeed:"Feed",
-  isTrainNumber:"Batch",
+  isTrainNumber:"Shift",
   tmrName:"TMR equipment",
 
 

src/lang/en/langModule/feedingEfficiency.js

@@ -1,26 +1,26 @@
 export default{
   xltj:"Efficiency statistics",
   nxpg:'Cattle Herd Assessment',
-  pf:"formulation",
+  pf:"Formulation",
   pfmb:"Formula Template",
-  sjnts:"actual head count of cattle",
+  sjnts:"Actual head count of cattle",
   yhll:"Required mixing quantity（kg）",
   sjhll:"Actual mixing quantity（kg）",
-  sll:"Spread quantity（kg）",
-  pjhlsj:"average mixing tim",
+  sll:"Feed Spreading 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)",
+  sjgwzcsl:"Actual DMI（kg/head）",
+  csl:"Leftover feed rate（%）",
+  pfllcb:"Formula Theoretical 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",
+  gjnclcb:"Cost of feed per kilogram of milk",
   tbcxsj:"Icon Inquiry Time",
   gwzcsl:"DMI",
   nlsll:"Cow Barn Leftover Rate",
@@ -83,5 +83,5 @@ xltj3:'Efficiency Statistics - Livestock Category',
 xltj4:'Efficiency Statistics - Shift',
 xltj5:'Feeding Efficiency - Herd Assessment',
 fbs:"Fecal Sieve",
-  
-  }
+
+  }

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

@@ -52,16 +52,16 @@
             <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.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-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>
@@ -152,7 +152,7 @@
                   >
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="110px" align="center" prop="日期" />
                     <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-column :label="$t('feedingEfficiency.cnl')"   sortable min-width="110px" align="center" prop="field2" />
                   </el-table>
                 </div>
               </div>
@@ -1650,7 +1650,7 @@ export default {
         } else {
           this.tab2Download2List4 = []
         }
-       
+
         const columns1 = this.$refs.myTable1.columns;
         const labels1 = columns1.map(column => column.label);