From a0690eb0e6fc267a79f6016f1b93dce1b2cfd059 Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Mon, 10 Mar 2025 12:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=92=E9=80=9A=E8=BE=BE=EF=BC=8Cq=20=3D3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/baozuo-demo/BottomCharts.vue | 34 ++++++++++++--
 src/components/baozuo-demo/CenterCmp.vue    | 52 +++++++--------------
 src/components/baozuo-demo/index.vue        |  8 ++--
 src/components/baozuo-demo/pieChart.vue     | 50 ++++++++++++++++++--
 4 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/src/components/baozuo-demo/BottomCharts.vue b/src/components/baozuo-demo/BottomCharts.vue
index 4339c89..c524be4 100644
--- a/src/components/baozuo-demo/BottomCharts.vue
+++ b/src/components/baozuo-demo/BottomCharts.vue
@@ -6,7 +6,13 @@
         <dv-scroll-board :config="config3" style="height:90%;margin-left: 2%;width:96%" />
       </div>
     </div>
-    <div style="width: 100%;" v-else>
+    <div style="width: 100%;" v-if="dataType == '3'">
+      <div class="bc-chart-item">
+        <div class="bcci-header">排工单执行进度</div>
+        <dv-scroll-board :config="config4" style="height:90%;margin-left: 2%;width:96%" />
+      </div>
+    </div>
+    <div style="width: 100%;" v-if="dataType!='3' && dataType !='整机'">
       <div class="bc-chart-item" v-if="isChange">
         <div class="bcci-header">机芯派工单执行进度</div>
         <dv-scroll-board :config="config1" style="height:90%;margin-left: 2%;width:96%" />
@@ -15,7 +21,7 @@
 
       <div class="bc-chart-item" v-if="!isChange">
         <div class="bcci-header">盖板派工单执行进度</div>
-        <dv-scroll-board :config="config2" style="height:90%;margin-left: 2%;width:96%" />
+        <dv-scroll-board :config="config" style="height:90%;margin-left: 2%;width:96%" />
       </div>
     </div>
   </div>
@@ -121,7 +127,21 @@ export default {
             createProgressCircle(0),
             completedQuantity  // 完成数量
           ];
-        } else {
+        }else if(title === 'U1机芯2'){
+          newDataItem = [
+            `PS-${formattedDate2}${String(i).padStart(3, '0')}`,  // 编号
+            title,  // 固定值
+            formattedDate,  // 日期
+            orderQuantity,  // 订单量
+            completionRate,  // 完成率
+            createProgressCircle(100),
+            createProgressCircle(completionRate2),
+            createProgressCircle(completionRate2),
+            createProgressCircle(completionRate2),
+            createProgressCircle(0),
+            completedQuantity,  // 完成数量
+        ]
+        }else {
           // eslint-disable-next-line no-const-assign
           newDataItem = [
             `PS-${formattedDate2}${String(i).padStart(3, '0')}`,  // 编号
@@ -176,6 +196,14 @@ export default {
         columnWidth: [80, 300],
         align: ['center']
       },
+      config4: { 
+        header: ['工单号', '产品名称','派工日期', '派工数量', '工序进度', '进水调节', '按钮调节', '桶身调节', '桶身装底座', '包装','剩余数量'] ,
+        data: generateRandomData(30, 'U1机芯2'),
+        headerHeight: 50,
+        index: true,
+        columnWidth: [80, 300],
+        align: ['center']
+        },
     }
   },
   created() {
diff --git a/src/components/baozuo-demo/CenterCmp.vue b/src/components/baozuo-demo/CenterCmp.vue
index 26bbd5f..ede863e 100644
--- a/src/components/baozuo-demo/CenterCmp.vue
+++ b/src/components/baozuo-demo/CenterCmp.vue
@@ -15,7 +15,7 @@
     <div class="cc-main-container">
       <div class="ccmc-left">
         <div class="ccmc-title">
-            订单信息
+            本月工单概况
         </div>
         <div class="ccmc-items">
           <div class="station-info" v-for="(item, index) in leftData" :key="index">
@@ -29,12 +29,12 @@
 
       <!-- <dv-active-ring-chart class="ccmc-middle" :config="config" /> -->
        <div class="ccmc-middle">
-        <PieChart></PieChart>
+        <PieChart :dataType="dataType"></PieChart>
        </div>
 
       <div class="ccmc-right">
         <div class="ccmc-title">
-          保养及备料信息
+          {{dataType=='3'?'未完成订单数量':'保养及备料信息'}}
         </div>
         <!-- <div class="ccmc-items">
           <div class="station-info" v-for="(item, index) in rightData" :key="index">
@@ -106,6 +106,11 @@ export default {
       { icon: require(`@/img/icons/3.png`), name: '本月派工未完成数', value: '60%' },
       { icon: require(`@/img/icons/3.png`), name: '本月派工完成率', value: '100%' }
     ];
+    const originalLeftData2 = [
+      { icon: require(`@/img/icons/1.png`), name: '完成工单数', value: '1120' },
+      { icon: require(`@/img/icons/2.png`), name: '生产中工单数', value: '600' },
+      { icon: require(`@/img/icons/3.png`), name: '本月生产完成率', value: '100%' }
+    ];
 
     const originalRightData = [
       { icon: require(`@/img/icons/12.png`), name: '保养台数', value: '20' },
@@ -113,38 +118,13 @@ export default {
       { icon: require(`@/img/icons/12.png`), name: '机芯备料进度', value: '98%' },
       { icon: require(`@/img/icons/12.png`), name: '盖板备料进度', value: '85%' }
     ];
+    const originalRightData2 = [
+      { icon: require(`@/img/icons/12.png`), name: '水件', value: '12000' },
+      { icon: require(`@/img/icons/12.png`), name: '排水阀', value: '8000' },
+      { icon: require(`@/img/icons/12.png`), name: '进水阀', value: '6200' },
+      { icon: require(`@/img/icons/12.png`), name: '按钮', value: '3300' }
+    ];
 
-    // 将数值加倍（支持多次加倍）
-    const doubleValue = (value) => {
-      if (typeof value === 'string' && !isNaN(value)) {
-        return (parseFloat(value) * 2).toString();
-      } else if (typeof value === 'string' && value.includes('%')) {
-        return `${(parseFloat(value) * 2)}%`;
-      }
-      return value;
-    };
-
-    // 第一次加倍
-    const doubledLeftData = originalLeftData.map(item => ({
-      ...item,
-      value: item.value
-    }));
-
-    const doubledRightData = originalRightData.map(item => ({
-      ...item,
-      value: item.value
-    }));
-
-    // 第二次加倍
-    const quadrupledLeftData = doubledLeftData.map(item => ({
-      ...item,
-      value: item.value
-    }));
-
-    const quadrupledRightData = doubledRightData.map(item => ({
-      ...item,
-      value: item.value
-    }));
 
     return {
       config: {
@@ -177,8 +157,8 @@ export default {
         data: ['机芯产量', '盖板产量']
       },
 
-      leftData: quadrupledLeftData,
-      rightData: quadrupledRightData
+      leftData: this.dataType == '3'?originalLeftData2:originalLeftData,
+      rightData: this.dataType == '3'?originalRightData2:originalRightData
     }
   }
 }
diff --git a/src/components/baozuo-demo/index.vue b/src/components/baozuo-demo/index.vue
index 24fce99..749ec35 100644
--- a/src/components/baozuo-demo/index.vue
+++ b/src/components/baozuo-demo/index.vue
@@ -3,7 +3,7 @@
     <dv-full-screen-container>
 
 
-      <top-header Name="褓座数字化智能工厂制造执行系统(MES)" style="height:5%;" />
+      <top-header :Name="dataType=='3'? '恒通达MES系统生产看板':'褓座数字化智能工厂制造执行系统(MES)'" style="height:5%;" />
       <dv-border-box-1 class="main-container" style="height: 50%;">
 
 
@@ -63,10 +63,12 @@ export default {
      // 获取 URL 查询参数并设置 dataType
      const queryParams = new URLSearchParams(window.location.search);
     const dataTypeParam = queryParams.get('q');
-    
+      console.log(dataTypeParam)
     if (dataTypeParam === '1') {
       this.dataType = '整机';
-    } else {
+    }else if(dataTypeParam === '3'){
+      this.dataType = '3';
+    }else{
       this.dataType = ''; // 如果不是 '1'，则设置为空
     }
 
diff --git a/src/components/baozuo-demo/pieChart.vue b/src/components/baozuo-demo/pieChart.vue
index 7bf9c7d..67a9be6 100644
--- a/src/components/baozuo-demo/pieChart.vue
+++ b/src/components/baozuo-demo/pieChart.vue
@@ -45,8 +45,10 @@
       chartData: {
         type: Object,
       },
+      props: { 
       dataType: {
       }
+  },
     },
     data() {
       return {
@@ -95,6 +97,49 @@
         option: {}
       }
     },
+    created(){
+    // 获取 URL 查询参数并设置 dataType
+    const queryParams = new URLSearchParams(window.location.search);
+    const dataTypeParam = queryParams.get('q');
+    if(dataTypeParam == '3'){
+      this.config.data = [
+            {
+            value: 520,
+            name: "水件",
+            },
+            {
+            value: 280,
+            name: "排水阀",
+            },
+            {
+            value: 100,
+            name: "进水阀",
+            },
+            {
+            value: 100,
+            name: "按钮",
+            },
+        ];
+      this.testchartData = [
+            {
+            value: 520,
+            name: "水件",
+            },
+            {
+            value: 280,
+            name: "排水阀",
+            },
+            {
+            value: 100,
+            name: "进水阀",
+            },
+            {
+            value: 100,
+            name: "按钮",
+            },
+        ];
+    }
+    },
     mounted() {
       const { createData } = this
   
@@ -104,8 +149,7 @@
     },
     methods: {
       createData() {
-       
-        const chartData = [
+        let chartData = [
             {
             value: 520,
             name: "机芯产量",
@@ -123,6 +167,7 @@
             name: "组件产量",
             },
         ];
+      
         const colorList = [
         // new echarts.graphic.LinearGradient(0, 0, 0, 1, [
         // {
@@ -207,7 +252,6 @@
         pieData2.push(gapData);
         }
         var myChart = echarts.init(document.getElementById('pieId-new'));
-        const chartDom = document.getElementById('pieId-new');
         this.option = {
             title: [
                 {