修改

src/views/copilot/factoryData/components/BarChartBase.vue

@@ -1,19 +1,24 @@
 <template>
-  <div class="left-chart-base">
-    <!-- <div class="legend">
+  <chart-container class="bar-chart-base">
+    <div class="left-chart-base">
+      <!-- <div class="legend">
       <span v-for="item in legend" :key="item.label" class="legend-item"
         :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }">{{ item.label }}</span>
     </div> -->
 
-    <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
-  </div>
+      <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
+    </div>
+  </chart-container>
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
 import * as echarts from "echarts";
+import ChartContainer from "../../components/ChartContainer.vue";
+
 // import CopilotButton from "./chartButton"
 export default {
   components: {
+    ChartContainer
     // CopilotButton,
   },
   name: "Energy",
@@ -68,7 +73,7 @@ export default {
             },
           },
           axisLabel: {
-            rotate:45,
+            // rotate:45,
             color: "rgba(255, 255, 255, 0.7)",
             fontSize: 12,
           },

src/views/copilot/factoryData/components/Order.vue

@@ -41,7 +41,7 @@ export default {
         data: [],
         rowNum: 12,
         waitTime: 3000,
-        columnWidth: [100],
+        columnWidth: [150],
         align: ["center"],
         carousel: "page",
       },
@@ -104,8 +104,8 @@ export default {
             }</span>`
           );
           arr.push(
-            `<span title=${this.prodOrder[i].inStatus || ""}>${
-            this.prodOrder[i].inStatus || ""
+            `<span title=${this.prodOrder[i].orderStatus || ""}>${
+            this.prodOrder[i].orderStatus === 0 ? '未开始' : this.prodOrder[i].orderStatus === 1 ? '进行中' : '已完成' || ""
             }</span>`
           );
           arr.push(