From c31433fa0b3059631d8d7abc093d6d563935fd7a Mon Sep 17 00:00:00 2001
From: suixy <2277317060@qq.com>
Date: Thu, 26 Feb 2026 11:26:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/board/board4.js          |   5 +-
 src/views/board/board1/index.vue | 280 +++++++++++++++----------------
 src/views/board/board4/index.vue |  28 +++-
 3 files changed, 168 insertions(+), 145 deletions(-)

diff --git a/src/api/board/board4.js b/src/api/board/board4.js
index 79f2d54..bf49bcb 100644
--- a/src/api/board/board4.js
+++ b/src/api/board/board4.js
@@ -27,10 +27,11 @@ export function getOrderStatistics() {
 /**
  * 获取今日工单进度列表
  */
-export function getOrderProgressList() {
+export function getOrderProgressList(query) {
   return request({
     url: '/board4/orderProgressList',
-    method: 'get'
+    method: 'get',
+    params: query
   })
 }
 
diff --git a/src/views/board/board1/index.vue b/src/views/board/board1/index.vue
index 3d27d5a..ad01888 100644
--- a/src/views/board/board1/index.vue
+++ b/src/views/board/board1/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <div class="headTitle">注塑车间设备运行监控平台</div>
-    <div class="subTitle" style="top: 20%;left: 88%;">设备OEE</div>
-    <div class="subTitle" style="top: 60%;left: 88%;">设备能耗</div>
+<!--    <div class="subTitle" style="top: 20%;left: 88%;">设备OEE</div>-->
+<!--    <div class="subTitle" style="top: 60%;left: 88%;">设备能耗</div>-->
     <div class="top" style="top: 8%;left: 4%"></div>
     <div class="top" style="top: 8%;left: 20%"></div>
     <div class="top" style="top: 8%;left: 36%"></div>
@@ -243,140 +243,140 @@ export default {
   },
   async mounted() {
     await this.getData()
-    this.$refs.chart1.setData({
-      title: [
-        {
-          text: "75%",
-          x: "center",
-          y: "center",
-          textStyle: {
-            fontSize: 2 * vw,
-            color: "#FFFFFF",
-            fontFamily: "DINAlternate-Bold, DINAlternate",
-            foontWeight: "600",
-          },
-        },
-      ],
-      polar: {
-        radius: ["58%", "68%"],
-        center: ["50%", "50%"],
-      },
-      angleAxis: {
-        max: 133,
-        // startAngle: 225,
-        // endAngle: -180,
-        clockwise: true,
-        show: false
-      },
-      radiusAxis: {
-        type: "category",
-        show: true,
-        axisLabel: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-        axisTick: {
-          show: false,
-        },
-      },
-      series: [
-        {
-          name: "",
-          type: "bar",
-          roundCap: false,
-          barWidth: 30,
-          showBackground: true,
-          backgroundStyle: {
-            color: "rgba(66, 66, 66, .3)",
-          },
-          data: [100],
-          coordinateSystem: "polar",
-          itemStyle: {
-            normal: {
-              color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                {
-                  offset: 0,
-                  color: "#16CEB9",
-                },
-                {
-                  offset: 1,
-                  color: "#6648FF",
-                },
-              ]),
-            },
-          },
-        },
-      ],
-    })
-    this.$refs.chart2.setData({
-      title: [
-        {
-          text: "75%",
-          x: "center",
-          y: "center",
-          textStyle: {
-            fontSize: 2 * vw,
-            color: "#FFFFFF",
-            fontFamily: "DINAlternate-Bold, DINAlternate",
-            fontWeight: "600",
-          },
-        },
-      ],
-      polar: {
-        radius: ["58%", "68%"],
-        center: ["50%", "50%"],
-      },
-      angleAxis: {
-        max: 133,
-        // startAngle: 225,
-        // endAngle: -180,
-        clockwise: true,
-        show: false
-      },
-      radiusAxis: {
-        type: "category",
-        show: true,
-        axisLabel: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-        axisTick: {
-          show: false,
-        },
-      },
-      series: [
-        {
-          name: "",
-          type: "bar",
-          roundCap: false,
-          barWidth: 30,
-          showBackground: true,
-          backgroundStyle: {
-            color: "rgba(66, 66, 66, .3)",
-          },
-          data: [100],
-          coordinateSystem: "polar",
-          itemStyle: {
-            normal: {
-              color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                {
-                  offset: 0,
-                  color: "#16CEB9",
-                },
-                {
-                  offset: 1,
-                  color: "#6648FF",
-                },
-              ]),
-            },
-          },
-        },
-      ],
-    })
+    // this.$refs.chart1.setData({
+    //   title: [
+    //     {
+    //       text: "75%",
+    //       x: "center",
+    //       y: "center",
+    //       textStyle: {
+    //         fontSize: 2 * vw,
+    //         color: "#FFFFFF",
+    //         fontFamily: "DINAlternate-Bold, DINAlternate",
+    //         foontWeight: "600",
+    //       },
+    //     },
+    //   ],
+    //   polar: {
+    //     radius: ["58%", "68%"],
+    //     center: ["50%", "50%"],
+    //   },
+    //   angleAxis: {
+    //     max: 133,
+    //     // startAngle: 225,
+    //     // endAngle: -180,
+    //     clockwise: true,
+    //     show: false
+    //   },
+    //   radiusAxis: {
+    //     type: "category",
+    //     show: true,
+    //     axisLabel: {
+    //       show: false,
+    //     },
+    //     axisLine: {
+    //       show: false,
+    //     },
+    //     axisTick: {
+    //       show: false,
+    //     },
+    //   },
+    //   series: [
+    //     {
+    //       name: "",
+    //       type: "bar",
+    //       roundCap: false,
+    //       barWidth: 30,
+    //       showBackground: true,
+    //       backgroundStyle: {
+    //         color: "rgba(66, 66, 66, .3)",
+    //       },
+    //       data: [100],
+    //       coordinateSystem: "polar",
+    //       itemStyle: {
+    //         normal: {
+    //           color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+    //             {
+    //               offset: 0,
+    //               color: "#16CEB9",
+    //             },
+    //             {
+    //               offset: 1,
+    //               color: "#6648FF",
+    //             },
+    //           ]),
+    //         },
+    //       },
+    //     },
+    //   ],
+    // })
+    // this.$refs.chart2.setData({
+    //   title: [
+    //     {
+    //       text: "75%",
+    //       x: "center",
+    //       y: "center",
+    //       textStyle: {
+    //         fontSize: 2 * vw,
+    //         color: "#FFFFFF",
+    //         fontFamily: "DINAlternate-Bold, DINAlternate",
+    //         fontWeight: "600",
+    //       },
+    //     },
+    //   ],
+    //   polar: {
+    //     radius: ["58%", "68%"],
+    //     center: ["50%", "50%"],
+    //   },
+    //   angleAxis: {
+    //     max: 133,
+    //     // startAngle: 225,
+    //     // endAngle: -180,
+    //     clockwise: true,
+    //     show: false
+    //   },
+    //   radiusAxis: {
+    //     type: "category",
+    //     show: true,
+    //     axisLabel: {
+    //       show: false,
+    //     },
+    //     axisLine: {
+    //       show: false,
+    //     },
+    //     axisTick: {
+    //       show: false,
+    //     },
+    //   },
+    //   series: [
+    //     {
+    //       name: "",
+    //       type: "bar",
+    //       roundCap: false,
+    //       barWidth: 30,
+    //       showBackground: true,
+    //       backgroundStyle: {
+    //         color: "rgba(66, 66, 66, .3)",
+    //       },
+    //       data: [100],
+    //       coordinateSystem: "polar",
+    //       itemStyle: {
+    //         normal: {
+    //           color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+    //             {
+    //               offset: 0,
+    //               color: "#16CEB9",
+    //             },
+    //             {
+    //               offset: 1,
+    //               color: "#6648FF",
+    //             },
+    //           ]),
+    //         },
+    //       },
+    //     },
+    //   ],
+    // })
     timer = setInterval(() => {
       this.getData()
     }, 1000 * 60 * 2)
@@ -386,14 +386,14 @@ export default {
       await getDeviceStatusStatistics().then(e => {
         this.runningData = e.data
       })
-      await getDeviceStatusList().then(res => {
-        this.deviceData = res.data.filter(e => !(e.DEVICENAME === "5#" || e.DEVICENAME === "10#" || e.DEVICENAME === "12#" || e.DEVICENAME === "17#" || e.DEVICENAME === "18#"))
-      })
-      getDeviceStartTimeList().then(res => {
+      await getDeviceStartTimeList().then(res => {
         res.data.forEach(e => {
           this.timeData[e.DEVICECODE] = ((e.STARTTIME / 60 / 60) || 0).toFixed(1)
         })
       })
+      await getDeviceStatusList().then(res => {
+        this.deviceData = res.data.filter(e => !(e.DEVICENAME === "5#" || e.DEVICENAME === "10#" || e.DEVICENAME === "12#" || e.DEVICENAME === "17#" || e.DEVICENAME === "18#"))
+      })
       getSimulateData({customCode: 'board-3' || '', customType: 1}).then(val => {
         this.row = val.rows[0]
         this.form = JSON.parse(val.rows[0].customData);
diff --git a/src/views/board/board4/index.vue b/src/views/board/board4/index.vue
index ccdf95c..13ad986 100644
--- a/src/views/board/board4/index.vue
+++ b/src/views/board/board4/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="headTitle">数字化注塑车间管控中心</div>
     <div class="centerDevice"></div>
-    <div class="text1" style="top: 14.7%;left: 5.5%;">计划数: <span
+    <div class="text1" style="top: 14.7%;left: 5.5%;">周计划数: <span
         style="color: #6ACBFD">{{ form.isSimulate ? form.text1 : orderStatisticsData.planCount }}</span>
     </div>
     <div class="text1" style="top: 14.7%;left: 16.8%;">今日完成数: <span style="color: #68FD82">{{
@@ -577,6 +577,28 @@ import {listShutDown} from "@/api/dms/shutDown";
 import {parseTime} from "@/utils/ruoyi";
 
 const now = new Date()
+const getWeekRange = () => {
+  const now = new Date();
+  const day = now.getDay(); // 0-6 (0=周日)
+
+  // 计算到周一的偏移
+  const diffToMonday = day === 0 ? -6 : 1 - day;
+
+  // 本周周一
+  const monday = new Date(now);
+  monday.setDate(now.getDate() + diffToMonday);
+  monday.setHours(0, 0, 0, 0);
+
+  // 本周周日
+  const sunday = new Date(monday);
+  sunday.setDate(monday.getDate() + 6);
+  sunday.setHours(23, 59, 59, 999);
+
+  return {
+    beginTime: parseTime(monday),
+    endTime: parseTime(sunday)
+  };
+}
 const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
   components: {
@@ -708,7 +730,7 @@ export default {
       }).then(res => {
         this.shutDownList = res.rows
       })
-      listQualityInspection({pageSize: 99999999}).then(res => {
+      listQualityInspection({...getWeekRange(),pageSize: 99999999}).then(res => {
         this.qualityInspectionList = res.rows
       })
       getDeviceStatusStatistics().then(e => {
@@ -720,7 +742,7 @@ export default {
       getOrderStatistics().then(val => {
         this.orderStatisticsData = val.data
       })
-      getOrderProgressList().then(val => {
+      getOrderProgressList({...getWeekRange(),pageSize: 99999999}).then(val => {
         this.orderProgressList = val.data
       })
       getDeviceStatus().then(val => {