From 0b847d2903b0c124d2d6147074dcd7205d67c302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 12 Jul 2024 08:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/productionSituationMW.vue    |  9 ++----
 .../report/productionSituationTablets.vue     | 28 +++++++++++++------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index 7858e55..3f22870 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -55,16 +55,11 @@
 
       <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
       <el-row v-if="this.listQuery.type === 2">
-        <el-col :span="12">
+        <el-col :span="18">
           <div class="blueTip">
             生产情况对比
           </div>
         </el-col>
-        <el-col :span="6">
-          <bm-line-bar-target style="margin-top: 21px" :type="listQuery.type" :chartHeight="chartHeight"
-            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'"
-            :chartNum="chartNum" />
-        </el-col>
         <el-col :span="6">
           <div class="blueTip">
             {{ title }}
@@ -80,7 +75,7 @@
             :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
-          <bm-line-bar-target style="margin-top: 21px" :type="listQuery.type" :chartHeight="chartHeight"
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
             :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'"
             :chartNum="chartNum" />
         </el-col>
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 352f638..a884a75 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -55,22 +55,34 @@
 
       <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
       <el-row v-if="this.listQuery.type === 2">
-        <el-col :span="12">
+        <el-col :span="18">
           <div class="blueTip">
             生产情况对比
           </div>
-          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
-            :legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
-        </el-col>
-        <el-col :span="6">
-          <bm-line-bar-target style="margin-top:21px" :type="listQuery.type" :chartHeight="chartHeight"
-            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart"
-            :chartId=" 'chartTarget'" :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
           <div class="blueTip">
             {{ title }}
           </div>
+        </el-col>
+      </el-row>
+      <el-row v-if="this.listQuery.type === 2">
+        <el-col :span="12">
+          <!-- <div class="blueTip">
+            生产情况对比
+          </div> -->
+          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
+            :legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
+            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart"
+            :chartId=" 'chartTarget'" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <!-- <div class="blueTip">
+            {{ title }}
+          </div> -->
           <bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
             :chartMsg="chartMsgYearTarget" ref="chartYearTarget" :chartId=" 'chartYearTarget'" :chartNum="chartNum" />
         </el-col>