Merge pull request '修改bug' (#94) from projects/mescc/zhp into projects/mescc/develop

Reviewed-on: #94

src/views/report/components/produceLineBarYearTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-07-11 13:52:44
+ * @LastEditTime: 2024-07-11 16:45:08
  * @LastEditors: zhp
  * @Description:
 -->
@@ -38,7 +38,7 @@ export default {
         grid: {
           left: 60,
           right: 0,
-          bottom: 30,
+          bottom: 31,
           top: 30,
           containLabel:true,
         },

src/views/report/productionSituationTablets.vue

@@ -62,10 +62,10 @@
           <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" style="margin-top:21px">
-          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
-            :chartNum="chartNum" />
+        <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">
@@ -83,9 +83,10 @@
           <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
             :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
         </el-col>
-        <el-col :span="6" style="margin-top: 21px">
-          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId=" 'chartDayTarget'" :chartNum="chartNum" />
+        <el-col :span="6">
+          <bm-line-bar-target style="margin-top: 21px" :type="listQuery.type" :chartHeight="chartHeight"
+            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'"
+            :chartNum="chartNum" />
         </el-col>
         <!-- <el-col :span="6">
           <div class="blueTip">