Merge pull request 'projects/mescc/zhp' (#98) from projects/mescc/zhp into projects/mescc/develop

Reviewed-on: #98

src/views/report/components/produceLineBar.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-07-12 09:08:20
+ * @LastEditTime: 2024-07-12 09:12:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@ export default {
         color: [],
         // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
         grid: {
-          left: 40,
+          left: 30,
           right: 0,
           bottom: 30,
           top: 30,

src/views/report/productionSituationMW.vue

@@ -66,6 +66,18 @@
           </div>
         </el-col>
       </el-row>
+      <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
+        <el-col :span="24">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
+      </el-row>
       <el-row v-if="this.listQuery.type === 2">
         <el-col :span="12">
           <!-- <div class="blueTip">
@@ -75,9 +87,8 @@
             :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
-          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'"
+            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
-            :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
           <!-- <div class="blueTip">
@@ -89,13 +100,13 @@
       </el-row>
       <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
         <el-col :span="18">
-          <div class="blueTip">
+          <!-- <div class="blueTip">
             生产情况对比
-          </div>
+          </div> -->
           <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">
+        <el-col :span="6">
           <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
             :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" />
         </el-col>
@@ -108,9 +119,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
-        <div class="blueTip">
+        <!-- <div class="blueTip">
           生产情况对比
-        </div>
+        </div> -->
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />

src/views/report/productionSituationTablets.vue

@@ -66,6 +66,18 @@
           </div>
         </el-col>
       </el-row>
+      <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
+        <el-col :span="24">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
+      </el-row>
       <el-row v-if="this.listQuery.type === 2">
         <el-col :span="12">
           <!-- <div class="blueTip">
@@ -75,9 +87,9 @@
             :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"
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart"
+            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
-            :chartId=" 'chartTarget'" :chartNum="chartNum" />
+            :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
           <!-- <div class="blueTip">
@@ -89,14 +101,14 @@
       </el-row>
       <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
         <el-col :span="18">
-          <div class="blueTip">
+          <!-- <div class="blueTip">
             生产情况对比
-          </div>
+          </div> -->
           <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">
-          <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="'chartDayTarget'"
             :chartNum="chartNum" />
         </el-col>
@@ -109,9 +121,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
-        <div class="blueTip">
+        <!-- <div class="blueTip">
           生产情况对比
-        </div>
+        </div> -->
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />