共-条

src/i18n.js

@@ -11,7 +11,6 @@ import locale from 'element-ui/lib/locale'
 Vue.use(VueI18n)
 
 const i18n = new VueI18n({
-  // fallbackLocale: 'CN', // 默认语言设置，当其他语言没有的情况下，使用en作为默认语言
   messages: {
     EN: {
       ...enLocale,
@@ -23,7 +22,8 @@ const i18n = new VueI18n({
     }
   },
 
-  locale: 'CN', // set locale
+  locale: 'EN', // set locale
+  fallbackLocale: 'EN', // 默认语言设置，当其他语言没有的情况下，使用en作为默认语言
 
 
 

src/lang/en/langModule/processAnalysis.js

@@ -55,7 +55,9 @@ slzql:"Feed Spreading Correctness Rate",
 
     pastureName:'Ranch',
     total:'Total of',
-    tiao:'Items'
+    tiao:'Items',
+    slcl:'Spreader Vehicle Capacity'
+
 
 
 

src/lang/zn/langModule/processAnalysis.js

@@ -55,6 +55,7 @@ errorList:[{ value: '有误差', label: '有误差' }, { value: '无误差', lab
 
   pastureName:'牧场',
   total:'共',
-  tiao:'条'
+  tiao:'条',
+  slcl:'撒料车量'
 
 }

src/styles/element-ui.scss

@@ -78,3 +78,8 @@
 .el-range-editor.el-input__inner {
   display: inline-flex !important;
 }
+
+
+.el-date-editor .el-range__close-icon {
+  width:10px !important;
+}

src/views/basicData/feedTable/index.vue

@@ -128,7 +128,7 @@
 
       <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
 
-         <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+         <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     </div>
 
     <!-- 新增/编辑 -->

src/views/basicData/groupColumn/index.vue

@@ -140,7 +140,7 @@
           </template>
         </el-table-column>
       </u-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
       <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
     </div>
     <!-- 获取SAP编码 -->

src/views/basicData/sapLog/index.vue

@@ -176,7 +176,7 @@
             <el-table-column label="重量" min-width="90px" align="center" prop="url" />
           </el-table>
         </div>
-        <span v-if="type.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ type.table.total }}条</span>
+        <span v-if="type.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ type.table.total }}{{$t('processAnalysis.tiao')}}</span>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose1" @click="type.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
         </div>

src/views/basicData/standardParameters/index.vue

@@ -76,7 +76,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <span v-if="table1.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table1.total }}条</span>
+          <span v-if="table1.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table1.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
       </el-tab-pane>
       <el-tab-pane label="宾州筛、粪便筛标准范围" name="second">
@@ -163,7 +163,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <span v-if="table2.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table2.total }}条</span>
+          <span v-if="table2.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table2.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
       </el-tab-pane>
     </el-tabs>

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -154,7 +154,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+        <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
       </div>
     </div>
 <!-- maxHeight="enlargeHeight -->
@@ -510,7 +510,7 @@
                     <span>{{ scope.row.sort }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="撒料车辆" min-width="90px" align="center">
+                <el-table-column :label="$t('processAnalysis.slcl')" min-width="90px" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.fname }}</span>
                   </template>
@@ -568,7 +568,7 @@
                     <span>{{ scope.row.sort }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="撒料车辆" min-width="90px" align="center">
+                <el-table-column :label="$t('processAnalysis.slcl')" min-width="90px" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.fname }}</span>
                   </template>
@@ -866,7 +866,7 @@
             <el-table-column label="描述" min-width="80px" align="center" prop="display" />
             <el-table-column label="发料位" min-width="80px" align="left" prop="barnames" />
           </el-table>
-          <span v-if="deleteRecord.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ deleteRecord.total }}条</span>
+          <span v-if="deleteRecord.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ deleteRecord.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
         <div slot="footer" class="dialog-footer" style="bottom:20px">
           <el-button class="cancelClose1" @click="deleteRecord.dialogFormVisible = false;getList()">取消</el-button>

src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -147,7 +147,7 @@
       <span
         v-if="table.listLoading == false"
         style="margin-right: 30px;margin-top: 10px;font-size: 14px;"
-      >共{{ table.total }}条</span>
+      >{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     </div>
 
     <!-- 新增、编辑 -->

src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue

@@ -87,7 +87,7 @@
           </template>
         </el-table-column>
         </el-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     </div>
 
 

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -139,7 +139,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     </div>
 
     <!-- 自动生成 -->

src/views/formulationPlan/materialIssuancePlan/index1.vue

@@ -115,7 +115,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     </div>
 
     <!-- 自动生成 -->

src/views/formulationPlan/premixedPlan/index.vue

@@ -106,7 +106,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+    <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     <!-- 历史记录 -->
     <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="history.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <template slot="title">

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -48,7 +48,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     </div>
      <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="50%">
       <template slot="title">

src/views/formulationPlan/recipeTemplate/index.vue

@@ -170,7 +170,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;margin-bottom: 10px;font-size: 14px;">共{{ table.total }}条</span>
+        <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;margin-bottom: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
       </div>
       <!-- 配方详情表 -->
       <div v-if="isDetail" ref="detail" class="detail">

src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -99,7 +99,7 @@
 
       </el-table>
       <span v-if="table.listLoading == false"
-        style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+        style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
     </div>
 
 

src/views/inventoryManagement/warning/index.vue

@@ -41,7 +41,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <span v-if="tab1.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab1.total }}条</span>
+          <span v-if="tab1.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab1.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
       </el-tab-pane>
       <el-tab-pane label="库存预警" name="second">
@@ -91,7 +91,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+          <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
       </el-tab-pane>
     </el-tabs>

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

@@ -132,7 +132,7 @@
               </template>
             </u-table-column>
           </u-table>
-          <span v-if="tab.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab.table.total }}条</span>
+          <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 v-if="tab.radio !== '6'">
             <h4>{{$t('errorAnalysis.sl')}}</h4>
             <u-table
@@ -198,7 +198,7 @@
                   </template>
                 </u-table-column>
             </u-table>
-            <span v-if="tab.table2.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab.table2.total }}条</span>
+            <span v-if="tab.table2.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab.table2.total }}{{$t('processAnalysis.tiao')}}</span>
           </div>
         </div>
         <div id="AnalysisChart" class="AnalysisChart">
@@ -756,7 +756,7 @@
             <u-table-column sortable :label="$t('errorAnalysis.isOK')"  min-width="70px" align="center" prop="standard" />
             <u-table-column sortable :label="$t('errorAnalysis.area')"  min-width="70px" align="center" prop="barname" />
           </u-table>
-          <span v-if="tab2.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
+          <span v-if="tab2.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab2.table.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
       </el-tab-pane>
       <el-tab-pane :label="$t('errorAnalysis.sltj')" name="third">
@@ -840,7 +840,7 @@
             <u-table-column sortable :label="$t('errorAnalysis.edWeight')"  min-width="55px" align="center" prop="结束重量" />
             <u-table-column sortable :label="$t('errorAnalysis.isOK')"  min-width="70px" align="center" prop="standard" />
           </u-table>
-          <span v-if="tab3.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
+          <span v-if="tab3.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab3.table.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
       </el-tab-pane>
     </el-tabs>

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

@@ -61,7 +61,7 @@
             <el-table-column sortable label="饲料转化率(%)" min-width="60px" align="center" prop="饲料转化率" />
             <el-table-column sortable label="公斤奶饲料成本" 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;">共{{ tab.table.total }}条</span>
+          <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">

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

@@ -56,7 +56,7 @@
             <u-table-column sortable label="饲料转化率(%)" min-width="60px" align="center" prop="饲料转化率" />
             <u-table-column sortable label="公斤奶饲料成本" 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;">共{{ tab.table.total }}条</span>
+          <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" /> -->
         </div>
         <div class="AnalysisChart">

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

@@ -96,7 +96,7 @@
             </el-table-column>
           </el-table-column>
         </el-table>
-        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
+        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab2.table.total }}{{$t('processAnalysis.tiao')}}</span>
         <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div> -->
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
@@ -140,7 +140,7 @@
             </el-table-column>
           </el-table-column>
         </el-table>
-        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
+        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab3.table.total }}{{$t('processAnalysis.tiao')}}</span>
         <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">暂无数据</div> -->
       </el-tab-pane>
     </el-tabs>

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

@@ -119,7 +119,7 @@
           </u-table> -->
         </div>
 
-        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
+        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab2.table.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
         <div v-else>
           <!-- 新展示 -->
@@ -166,7 +166,7 @@
               </u-table-column>
             </u-table>
         </div>
-        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
+        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab3.table.total }}{{$t('processAnalysis.tiao')}}</span>
       </el-tab-pane>
     </el-tabs>
   </div>

src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -384,7 +384,7 @@
             max-height="260px"
           >
             <el-table-column label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.slcl')" min-width="60px" align="center" prop="fname" />
             <el-table-column label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
             <el-table-column label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
@@ -459,7 +459,7 @@
             max-height="270px"
           >
             <el-table-column label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.slcl')" min-width="60px" align="center" prop="fname" />
             <el-table-column label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
             <el-table-column label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
@@ -494,7 +494,7 @@
             max-height="260px"
           >
             <el-table-column :label="$t('processAnalysis.sort')" min-width="70px" align="center" prop="sort" />
-            <el-table-column label="撒料车辆" min-width="70px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.slcl')" min-width="70px" align="center" prop="fname" />
             <el-table-column :label="$t('processAnalysis.lweight')" min-width="70px" align="center" prop="lweight" />
             <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">

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

@@ -76,7 +76,7 @@
             <el-table-column sortable :label="$t('processAnalysis.minproesstime')" min-width="80px" align="center" prop="proesstime" />
           </el-table>
         </div>
-        <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{"$t('processAnalysis.total')"}}{{ table.total }}{{"$t('processAnalysis.tiao')"}}</span>
+        <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
       </el-col>
       <!-- 预混计划 -->
       <el-col v-if="isPremixedPlan" :span="16">
@@ -414,22 +414,22 @@
             class="elTable table-fixed"
             max-height="260px"
           >
-            <el-table-column label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
-            <el-table-column label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
-            <el-table-column label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column :label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
+            <el-table-column :label="$t('processAnalysis.slcl')" min-width="60px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="$t('processAnalysis.diff')"  min-width="60px" align="center" prop="diff" />
-            <el-table-column label="$t('processAnalysis.diffRate')"  min-width="60px" align="center" prop="diffRate" />
-            <el-table-column label="$t('processAnalysis.intime')"  min-width="60px" align="center" prop="intime" />
-            <el-table-column label="$t('processAnalysis.proesstime')"  min-width="60px" align="center" prop="proesstime" />
-            <el-table-column label="$t('processAnalysis.buttontype')"  min-width="60px" align="center" prop="buttontype" />
-            <el-table-column label="$t('processAnalysis.lastactualweight')"  min-width="60px" align="center" prop="lastactualweight" />
-            <el-table-column label="$t('processAnalysis.actualweight')"  min-width="60px" align="center" prop="actualweight" />
+            <el-table-column :label="$t('processAnalysis.diff')"  min-width="60px" align="center" prop="diff" />
+            <el-table-column :label="$t('processAnalysis.diffRate')"  min-width="60px" align="center" prop="diffRate" />
+            <el-table-column :label="$t('processAnalysis.intime')"  min-width="60px" align="center" prop="intime" />
+            <el-table-column :label="$t('processAnalysis.proesstime')"  min-width="60px" align="center" prop="proesstime" />
+            <el-table-column :label="$t('processAnalysis.buttontype')"  min-width="60px" align="center" prop="buttontype" />
+            <el-table-column :label="$t('processAnalysis.lastactualweight')"  min-width="60px" align="center" prop="lastactualweight" />
+            <el-table-column :label="$t('processAnalysis.actualweight')"  min-width="60px" align="center" prop="actualweight" />
           </el-table>
         </div>
         <div class="ControlChart">
@@ -489,22 +489,22 @@
             class="elTable table-fixed"
             max-height="270px"
           >
-            <el-table-column label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
-            <el-table-column label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
-            <el-table-column label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column :label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
+            <el-table-column ::label="$t('processAnalysis.slcl')" min-width="60px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="$t('processAnalysis.diff')"  min-width="60px" align="center" prop="diff" />
-            <el-table-column label="$t('processAnalysis.diffRate')"  min-width="60px" align="center" prop="diffRate" />
-            <el-table-column label="$t('processAnalysis.intime')"  min-width="60px" align="center" prop="intime" />
-            <el-table-column label="$t('processAnalysis.proesstime')"  min-width="60px" align="center" prop="proesstime" />
-            <el-table-column label="$t('processAnalysis.buttontype')"  min-width="60px" align="center" prop="buttontype" />
-            <el-table-column label="$t('processAnalysis.lastactualweight')"  min-width="60px" align="center" prop="lastactualweight" />
-            <el-table-column label="$t('processAnalysis.actualweight')"  min-width="60px" align="center" prop="actualweight" />
+            <el-table-column :label="$t('processAnalysis.diff')"  min-width="60px" align="center" prop="diff" />
+            <el-table-column :label="$t('processAnalysis.diffRate')"  min-width="60px" align="center" prop="diffRate" />
+            <el-table-column :label="$t('processAnalysis.intime')"  min-width="60px" align="center" prop="intime" />
+            <el-table-column :label="$t('processAnalysis.proesstime')"  min-width="60px" align="center" prop="proesstime" />
+            <el-table-column :label="$t('processAnalysis.buttontype')"  min-width="60px" align="center" prop="buttontype" />
+            <el-table-column :label="$t('processAnalysis.lastactualweight')"  min-width="60px" align="center" prop="lastactualweight" />
+            <el-table-column :label="$t('processAnalysis.actualweight')"  min-width="60px" align="center" prop="actualweight" />
           </el-table>
         </div>
 
@@ -525,7 +525,7 @@
             max-height="260px"
           >
             <el-table-column :label="$t('processAnalysis.sort')" min-width="70px" align="center" prop="sort" />
-            <el-table-column label="撒料车辆" min-width="70px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.slcl')" min-width="70px" align="center" prop="fname" />
             <el-table-column :label="$t('processAnalysis.lweight')" min-width="70px" align="center" prop="lweight" />
             <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">

src/views/statisticalAnalysis/pushingplan/index.vue

@@ -105,7 +105,7 @@
       <!-- <span
         v-if="listLoading == false"
         style="margin-right: 30px; margin-top: 10px; font-size: 14px"
-        >共{{ total }}条</span
+        >{{$t('processAnalysis.total')}}{{ total }}{{$t('processAnalysis.tiao')}}</span
       > -->
     </div>
     <!-- 分页 start-->