xiug bug

.drone.yml

@@ -4,7 +4,7 @@ name: test
 
 steps:
   - name: build
-    image: plugins/docker
+    image: plugins/docker:20.14.2
     volumes:
       - name: hosts
         path: /etc/hosts

src/lang/en/langModule/processAnalysis.js

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

src/lang/zn/langModule/errorAnalysis.js

@@ -130,7 +130,18 @@ export default{
     tzcs:'跳转次数',
 
 
-
+//
+ccxx:"车次信息",
+zdrq:"制定日期",
+hlxx:"混料信息",
+jhzl:"计划重量",
+wcsj:"完成时间",
+gcsj:"过程时间",
+ksdqzl:"开始读取重量",
+zhdqzl:"最后读取重量",
+qlfs:"取料方式",
+slxx:"撒料信息",
+kzt:"监控图",
 
 
 

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

@@ -17,7 +17,7 @@
         <el-row :gutter="10">
           <el-col :span="10">
             <div class="train">
-              <h4>车次信息</h4>
+              <h4>{{ $t('errorAnalysis.ccxx') }}</h4>
               <div class="table">
                 <el-table
                   :key="table1.tableKey"
@@ -36,7 +36,7 @@
                   <el-table-column :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50" />
                   <el-table-column :label="$t('dailyExecutionPlan.jhmc')"  min-width="60px" align="center" prop="projname" />
                   <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="60px" align="center" prop="tmrtname" />
-                  <el-table-column sortable label="制定日期" min-width="70px" align="center" prop="mydate" />
+                  <el-table-column sortable :label="$t('errorAnalysis.zdrq')" min-width="70px" align="center" prop="mydate" />
                   <el-table-column sortable :label="$t('errorAnalysis.startTime')"  min-width="70px" align="center" prop="intime" />
                 </el-table>
               </div>
@@ -61,20 +61,20 @@
                 >
                   <el-table-column :label="$t('errorAnalysis.czNum')"  min-width="50px" align="center" prop="sort" />
                   <el-table-column :label="$t('InventoryManagement.silc')"    min-width="50px" align="center" prop="fname" />
-                  <el-table-column label="计划重量" min-width="50px" align="center" prop="lweight" />
+                  <el-table-column :label="$t('errorAnalysis.jhzl')" min-width="50px" align="center" prop="lweight" />
                   <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="50px" align="center" prop="actualweightminus" />
                   <el-table-column :label="$t('errorAnalysis.wcz')" min-width="50px" align="center" prop="diff" />
                   <el-table-column :label="$t('errorAnalysis.zql')" min-width="50px" align="center" prop="diffRate" />
-                  <el-table-column label="完成时间" min-width="50px" align="center" prop="intime" />
-                  <el-table-column label="过程时间" min-width="50px" align="center" prop="proesstime" />
-                  <el-table-column label="开始读取重量" min-width="50px" align="center" prop="lastactualweight" />
-                  <el-table-column label="最后读取重量" min-width="50px" align="center" prop="actualweight" />
-                  <el-table-column label="取料方式" min-width="50px" align="center" prop="buttontype" />
+                  <el-table-column :label="$t('errorAnalysis.wcsj')" min-width="50px" align="center" prop="intime" />
+                  <el-table-column :label="$t('errorAnalysis.gcsj')" min-width="50px" align="center" prop="proesstime" />
+                  <el-table-column :label="$t('errorAnalysis.ksdqzl')" min-width="50px" align="center" prop="lastactualweight" />
+                  <el-table-column :label="$t('errorAnalysis.zhdqzl')" min-width="50px" align="center" prop="actualweight" />
+                  <el-table-column:label="$t('errorAnalysis.qlfs')" min-width="50px" align="center" prop="buttontype" />
                 </el-table>
               </div>
             </div>
             <div class="spreading">
-              <h4>撒料信息</h4>
+              <h4>{{$t('errorAnalysis.slxx')}}</h4>
               <div class="table">
                 <el-table
                   :key="table3.tableKey"
@@ -91,15 +91,15 @@
                 >
                   <el-table-column :label="$t('errorAnalysis.czNum')"  min-width="50px" align="center" prop="sort" />
                   <el-table-column  :label="$t('errorAnalysis.isHouseName')"  min-width="50px" align="center" prop="fname" />
-                  <el-table-column label="计划重量" min-width="50px" align="center" prop="lweight" />
+                  <el-table-column :label="$t('errorAnalysis.jhzl')" min-width="50px" align="center" prop="lweight" />
                   <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="50px" align="center" prop="actualweightminus" />
                   <el-table-column :label="$t('errorAnalysis.wcz')" min-width="50px" align="center" prop="diff" />
                   <el-table-column :label="$t('errorAnalysis.zql')" min-width="50px" align="center" prop="diffRate" />
-                  <el-table-column label="完成时间" min-width="50px" align="center" prop="intime" />
-                  <el-table-column label="过程时间" min-width="50px" align="center" prop="proesstime" />
-                  <el-table-column label="开始读取重量" min-width="50px" align="center" prop="lastactualweight" />
-                  <el-table-column label="最后读取重量" min-width="50px" align="center" prop="actualweight" />
-                  <el-table-column label="取料方式" min-width="50px" align="center" prop="buttontype" />
+                  <el-table-column :label="$t('errorAnalysis.wcsj')" min-width="50px" align="center" prop="intime" />
+                  <el-table-column :label="$t('errorAnalysis.gcsj')" min-width="50px" align="center" prop="proesstime" />
+                  <el-table-column :label="$t('errorAnalysis.ksdqzl')" min-width="50px" align="center" prop="lastactualweight" />
+                  <el-table-column :label="$t('errorAnalysis.zhdqzl')" min-width="50px" align="center" prop="actualweight" />
+                  <el-table-column:label="$t('errorAnalysis.qlfs')" min-width="50px" align="center" prop="buttontype" />
                 </el-table>
               </div>
             </div>

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

@@ -1332,8 +1332,8 @@ export default {
         }],
         tooltip: {
           trigger: 'axis',
-          formatter: function(params) {
-            // console.log(params, 'params')
+          formatter: (params)=> {
+            console.log(this.$t('processAnalysis.designName'), 'hsssss')
             var tip = params[0].name
             for (let i = 0; i < params.length; i++) {
               if (params[i].seriesName == this.$t('processAnalysis.designName')) {