Merge branch 'feature/consolelog' of duanxiaoduan/tmr-group-admin into release/v1.0.2

src/views/statisticalAnalysis/processAnalysis/index.vue

@@ -104,7 +104,7 @@
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情1</h4>
+          <h4>混料详情</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -116,7 +116,8 @@
             style="width: 98%;"
             :row-style="rowStyle"
             :cell-style="cellStyle"
-            class="elTable table-fixed"
+            class="elTable table-fixed"
+            max-height="200px"
           >
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="饲料名称" min-width="60px" align="center" prop="fname" />
@@ -181,7 +182,8 @@
             style="width: 98%;"
             :row-style="rowStyle"
             :cell-style="cellStyle"
-            class="elTable table-fixed"
+            class="elTable table-fixed"
+            max-height="200px"
           >
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="饲料名称" min-width="70px" align="center" prop="fname" />
@@ -355,7 +357,8 @@
             style="width: 98%;"
             :row-style="rowStyle"
             :cell-style="cellStyle"
-            class="elTable table-fixed"
+            class="elTable table-fixed"
+            max-height="200px"
           >
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="饲料名称" min-width="60px" align="center" prop="fname" />
@@ -454,7 +457,8 @@
             style="width: 98%;"
             :row-style="rowStyle"
             :cell-style="cellStyle"
-            class="elTable table-fixed"
+            class="elTable table-fixed"
+            max-height="200px"
           >
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
@@ -785,7 +789,8 @@ export default {
         data.hlzq2 = this.table.getdataListParm.parammaps.hlzq2
       }
       console.log(data,'===999')
-      postJson(url, data).then(response => {
+      postJson(url, data).then(response => {
+        console.log(response.data.list[0])
         if (response.data.list !== null && response.data.list.length > 0) {
           this.table.list = response.data.list
           this.table.total = response.data.total
@@ -794,7 +799,9 @@ export default {
             this.isSpreadingPlan = false
             this.isResidualMaterialPlan = false
             this.isSpreadingPlanSH = false
-            this.isSpreadingPlanSS = false
+            this.isSpreadingPlanSS = false
+            this.table2.getdataListParm.name = 'getprocessAnalysisStr'
+            this.table3.getdataListParm.name = 'getprocessAnalysisHL'
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
             this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
@@ -809,8 +816,8 @@ export default {
             this.isSpreadingPlan = false
             this.isSpreadingPlanSH = false
             this.isSpreadingPlanSS = false
-            this.table2.getdataListParm.name = 'getprocessAnalysisStrSH'
-            this.table3.getdataListParm.name = 'getprocessAnalysisHLSH'
+            this.table2.getdataListParm.name = 'getprocessAnalysisStrSH'
+            this.table3.getdataListParm.name = 'getprocessAnalysisHLSH'
             this.table4.getdataListParm.name = 'getprocessAnalysisSLSH'
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
             this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
@@ -829,7 +836,10 @@ export default {
             this.isResidualMaterialPlan = false
             this.isPremixedPlan = false
             this.isSpreadingPlanSH = true
-            this.isSpreadingPlanSS = false
+            this.isSpreadingPlanSS = false
+            this.table2.getdataListParm.name = 'getprocessAnalysisStr'
+            this.table3.getdataListParm.name = 'getprocessAnalysisHL'
+            this.table4.getdataListParm.name = 'getprocessAnalysisSL'
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
             this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
@@ -850,7 +860,10 @@ export default {
             this.isResidualMaterialPlan = false
             this.isPremixedPlan = false
             this.isSpreadingPlanSH = false
-            this.isSpreadingPlanSS = true
+            this.isSpreadingPlanSS = true
+            this.table2.getdataListParm.name = 'getprocessAnalysisStr'
+            this.table3.getdataListParm.name = 'getprocessAnalysisHL'
+            this.table4.getdataListParm.name = 'getprocessAnalysisSL'
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
             this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
@@ -871,7 +884,10 @@ export default {
             this.isResidualMaterialPlan = false
             this.isPremixedPlan = false
             this.isSpreadingPlanSH = true
-            this.isSpreadingPlanSS = false
+            this.isSpreadingPlanSS = false
+            this.table2.getdataListParm.name = 'getprocessAnalysisStr'
+            this.table3.getdataListParm.name = 'getprocessAnalysisHL'
+            this.table4.getdataListParm.name = 'getprocessAnalysisSL'
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
             this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id