From b4237012a714fb7952adc41b61e4548f5df1fa35 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 21 Sep 2023 15:15:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/getData1.js      | 357 +++++++++++++++++----------------
 src/pages/shunhe/ProdCount.vue |  39 ++--
 2 files changed, 210 insertions(+), 186 deletions(-)

diff --git a/src/assets/js/getData1.js b/src/assets/js/getData1.js
index 79a6a66..48b693e 100644
--- a/src/assets/js/getData1.js
+++ b/src/assets/js/getData1.js
@@ -28,223 +28,238 @@ export const storageMonitor = (id) => post('api/dashboard/warehouseMonitor', {})
 export const productionStatistics = () => {
   let res = {
     'pressProduction': {
-      'dailyProductionQty': 32.25,
+      'dailyProductionQty': '0.11',
       'equipmentProduction': [
         {
-          'qty': 11000,
+          'qty': 633.0,
           'name': '压机1',
-          'weight': 13000
+          'weight': 0.0
         },
         {
-          'qty': 4000,
+          'qty': 0.0,
           'name': '压机2',
-          'weight': 19000
+          'weight': 0.0
         },
         {
-          'qty': 5000,
-          'name': '压机3',
-          'weight': 6000
+          'qty': 497.0,
+          'name': '液压机',
+          'weight': 0.0
         },
         {
-          'qty': 9120,
-          'name': '压机4',
-          'weight': 8010
-        },
-        {
-          'qty': 9000,
-          'name': '压机5',
-          'weight': 16200
-        },
-        {
-          'qty': 5900,
-          'name': '压机6',
-          'weight': 2000
-        },
-        {
-          'qty': 2220,
-          'name': '压机7',
-          'weight': 9010
-        },
-        {
-          'qty': 3000,
+          'qty': 0.0,
           'name': '压机8',
-          'weight': 8200
-        },
-        {
-          'qty': 5000,
-          'name': '压机9',
-          'weight': 12000
-        },
-        {
-          'qty': 6220,
-          'name': '压机10',
-          'weight': 16010
-        },
-        {
-          'qty': 3900,
-          'name': '压机11',
-          'weight': 10200
-        },
-        {
-          'qty': 6300,
-          'name': '压机12',
-          'weight': 9200
-        },
-        {
-          'qty': 3020,
-          'name': '压机13',
-          'weight': 17010
-        },
-        {
-          'qty': 5500,
-          'name': '压机14',
-          'weight': 9500
-        },
-        {
-          'qty': 7200,
-          'name': '压机15',
-          'weight': 18000
+          'weight': 0.0
         }
       ],
-      'dailyProductionWeight': 64.25
+      'dailyProductionWeight': '0.00'
     },
     'workOrder': [
       {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD001',
-        'equipment': '压机1',
-        'materialCode': 'WL01',
-        'startTime': '2023-08-18 14:02:48',
-        'planned': '1000kg',
-        'completed': '827kg',
-        'endTime': '2023-08-18 14:02:48',
-        'customer': '厂家1',
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230915001',
+        'equipment': '分拣拆垛机械手1',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '2023-09-15 15:16:21',
+        'planned': '1000块',
+        'completed': '0块',
+        'endTime': '2023-09-15 15:27:35',
+        'customer': '客户',
         'status': '完成'
       },
       {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD002',
-        'equipment': '混料机2',
-        'materialCode': 'WL02',
-        'startTime': '2023-08-18 14:02:48',
-        'planned': '1000kg',
-        'completed': '894kg',
-        'customer': '厂家2',
-        'status': '已下发'
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230915004',
+        'equipment': '分拣拆垛机械手1',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '',
+        'planned': '1000块',
+        'completed': '0块',
+        'endTime': '2023-09-15 15:27:20',
+        'customer': '客户',
+        'status': '完成'
       },
       {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD003',
-        'equipment': '压机3',
-        'materialCode': 'WL03',
-        'planned': '3000kg',
-        'completed': '627kg',
-        'customer': '厂家3',
-        'status': '未生产'
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230915007',
+        'equipment': '分拣拆垛机械手1',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '2023-09-19 14:36:40',
+        'planned': '1000块',
+        'completed': '211块',
+        'endTime': '2023-09-19 14:30:53',
+        'customer': '客户',
+        'status': '生产中'
       },
       {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD004',
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230915010',
         'equipment': '混料机4',
-        'materialCode': 'WL04',
-        'startTime': '2023-08-18 14:02:48',
-        'planned': '8000kg',
-        'completed': '6137kg',
-        'customer': '厂家4',
-        'status': '暂停'
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '2023-09-15 15:59:54',
+        'planned': '10000千克',
+        'completed': '485.000千克',
+        'endTime': '',
+        'customer': '客户',
+        'status': '完成'
       },
       {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD005',
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230915013',
         'equipment': '混料机5',
-        'materialCode': 'WL05',
-        'startTime': '2023-08-18 14:02:48',
-        'planned': '1000kg',
-        'completed': '894kg',
-        'customer': '厂家5',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '2023-09-15 16:04:15',
+        'planned': '10000千克',
+        'completed': '千克',
+        'endTime': '',
+        'customer': '',
+        'status': '完成'
+      },
+      {
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230915016',
+        'equipment': '混料机6',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '2023-09-15 16:04:17',
+        'planned': '10000千克',
+        'completed': '0.000千克',
+        'endTime': '',
+        'customer': '',
+        'status': '完成'
+      },
+      {
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230917004',
+        'equipment': '液压机',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '2023-09-17 10:08:43',
+        'planned': '1000块',
+        'completed': '914块',
+        'endTime': '',
+        'customer': '22',
+        'status': '生产中'
+      },
+      {
+        'materialName': '镁碳砖-包壁',
+        'workOrderCode': '230918031',
+        'equipment': '压机5',
+        'materialCode': '90205',
+        'startTime': '2023-09-18 16:17:47',
+        'planned': '628块',
+        'completed': '0块',
+        'endTime': '2023-09-19 13:27:22',
+        'customer': '唐钢长材',
+        'status': '完成'
+      },
+      {
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230918034',
+        'equipment': '压机8',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '2023-09-18 14:06:28',
+        'planned': '1000块',
+        'completed': '0块',
+        'endTime': '',
+        'customer': '22',
+        'status': '生产中'
+      },
+      {
+        'materialName': '镁碳砖MGL8343P10-K23Z006',
+        'workOrderCode': '230918037',
+        'equipment': '混料机4',
+        'materialCode': 'WGBMMC00002MGL8343P10-K23Z006',
+        'startTime': '2023-09-19 08:55:47',
+        'planned': '4999千克',
+        'completed': '11158.000千克',
+        'endTime': '',
+        'customer': 'GW5',
+        'status': '生产中'
+      },
+      {
+        'materialName': '镁碳砖MGL8343P20-K23Z006',
+        'workOrderCode': '230918040',
+        'equipment': '混料机5',
+        'materialCode': 'WGBMMC00002MGL8343P20-K23Z006',
+        'startTime': '2023-09-19 09:10:22',
+        'planned': '4999千克',
+        'completed': '6319.000千克',
+        'endTime': '',
+        'customer': 'GW5',
+        'status': '生产中'
+      },
+      {
+        'materialName': '镁碳砖MGL8343P10-K23Z006',
+        'workOrderCode': '230918043',
+        'equipment': '压机1',
+        'materialCode': 'WGBMMC00002MGL8343P10-K23Z006',
+        'startTime': '2023-09-19 09:42:32',
+        'planned': '428块',
+        'completed': '633块',
+        'endTime': '',
+        'customer': 'GW5',
+        'status': '生产中'
+      },
+      {
+        'materialName': '镁碳砖MGL8343P20-K23Z006',
+        'workOrderCode': '230918046',
+        'equipment': '压机2',
+        'materialCode': 'WGBMMC00002MGL8343P20-K23Z006',
+        'startTime': '2023-09-19 09:42:24',
+        'planned': '428块',
+        'completed': '0块',
+        'endTime': '',
+        'customer': 'GW5',
+        'status': '生产中'
+      },
+      {
+        'materialName': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'workOrderCode': '230919001',
+        'equipment': '分拣拆垛机械手1',
+        'materialCode': 'ZLMMC00001MASC-6532K23Z001',
+        'startTime': '',
+        'planned': '10000块',
+        'completed': '块',
+        'endTime': '',
+        'customer': '客户',
         'status': '已下发'
-      },
-      {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD006',
-        'equipment': '压机6',
-        'materialCode': 'WL06',
-        'planned': '3000kg',
-        'completed': '627kg',
-        'customer': '厂家6',
-        'status': '未生产'
-      },
-      {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD007',
-        'equipment': '混料机7',
-        'materialCode': 'WL07',
-        'startTime': '2023-08-18 14:02:48',
-        'planned': '8000kg',
-        'completed': '6137kg',
-        'customer': '厂家7',
-        'status': '暂停'
-      },
-      {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD008',
-        'equipment': '混料机8',
-        'materialCode': 'WL08',
-        'startTime': '2023-08-18 14:02:48',
-        'planned': '1000kg',
-        'completed': '894kg',
-        'customer': '厂家8',
-        'status': '已下发'
-      },
-      {
-        'planStartTime': '2023-08-18 14:02:48',
-        'workOrderCode': 'DD009',
-        'equipment': '压机9',
-        'materialCode': 'WL09',
-        'planned': '3000kg',
-        'completed': '627kg',
-        'customer': '厂家9',
-        'status': '未生产'
       }
     ],
     'total': {
-      'pressWeight': 30.25,
-      'dryWeight': 20.25,
-      'sortWeight': 16.25
+      'pressWeight': '0.00',
+      'dryWeight': '0.00',
+      'sortWeight': '0.00'
     },
     'finishedProductCompletionRate': [
       {
-        'uncompleted': 5000,
-        'name': '物料1',
-        'completed': 4000
+        'uncompleted': 12789,
+        'name': '转炉镁碳砖MASC-65鞍钢23Z001',
+        'completed': 211
       },
       {
-        'uncompleted': 3000,
-        'name': '物料2',
-        'completed': 4000
-      },
-      {
-        'uncompleted': 4000,
-        'name': '物料3',
-        'completed': 3000
+        'uncompleted': 11222,
+        'name': '转炉镁碳砖MASC-65鞍钢23Z888',
+        'completed': 2988
       }
     ],
     'mixProduction': [
       {
-        'name': '物料1',
-        'value': 800.25
+        'name': '镁碳砖MGL8343P10-K23Z006',
+        'value': 3654.0
       },
       {
-        'name': '物料2',
-        'value': 800.25
+        'name': '镁碳砖MGL8343P99-K23Z099',
+        'value': 2400.0
       },
       {
-        'name': '物料3',
-        'value': 900.25
+        'name': '镁碳砖MGL8343P99-K23Z666',
+        'value': 1100.0
       },
       {
-        'name': '物料4',
-        'value': 600.25
+        'name': '镁碳砖MGL8343P99-K23Z888',
+        'value': 3200.0
+      },
+      {
+        'name': '镁碳砖MGL8343P99-K23Z222',
+        'value': 1800.0
       }
     ]
   }
diff --git a/src/pages/shunhe/ProdCount.vue b/src/pages/shunhe/ProdCount.vue
index 86b86bc..126c1ac 100644
--- a/src/pages/shunhe/ProdCount.vue
+++ b/src/pages/shunhe/ProdCount.vue
@@ -2,7 +2,7 @@
     <section class="bg">
       <!-- <t-header title="顺安大屏监控-生产统计">
       </t-header> -->
-      <t-header title="顺安大屏监控——物流工艺">
+      <t-header title="顺安大屏监控——生产统计">
         <div class="pages">
           <router-link to="/LogisticsProcess">物流工艺</router-link>
           <router-link to="/StorageMonitor">仓储监控</router-link>
@@ -74,12 +74,12 @@
             <div class="title"><span class="dotIncon"></span><span class="tltxt">生产任务</span></div>
           </div>
           <div class="list_scroll_title">
-            <span>订单</span><span>工序</span><span>设备</span><span>物料号</span><span>生产物料</span><span>厂家</span><span>计划量</span><span>生产量</span><span>生产状态</span><span>计划开始时间</span><span>开始时间</span><span>结束时间</span>
+            <span>工单号</span><span>设备</span><span>物料号</span><span>生产物料</span><span>厂家</span><span>计划量</span><span>生产量</span><span>生产状态</span><span>开始时间</span><span>结束时间</span>
           </div>
           <vue-seamless-scroll :data="workOrder" :class-option="classOption" class="content-block-scroll">
             <ul class="content-block-scroll-ul">
               <li v-for="(e, i) in workOrder" :key="i">
-                <span>{{e.workOrderCode}}</span><span>{{e.workOrderCode}}</span><span>{{e.equipment}}</span><span>{{e.materialCode}}</span><span>{{e.materialCode}}</span><span>{{e.customer}}</span><span>{{e.planned}}</span><span>{{e.completed}}</span><span>{{e.status}}</span><span>{{e.planStartTime}}</span><span>{{e.startTime}}</span><span>{{e.endTime}}</span>
+                <span>{{e.workOrderCode}}</span><span>{{e.equipment}}</span><span>{{e.materialCode}}</span><span>{{e.materialName}}</span><span>{{e.customer}}</span><span>{{e.planned}}</span><span>{{e.completed}}</span><span>{{e.status}}</span><span>{{e.startTime}}</span><span>{{e.endTime}}</span>
                 <!-- <span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.device_name}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.material_code}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.plan_qty}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.real_qty}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.qualified_qty}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.unqualified_qty}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.order_status_name}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.realproducestart_date}}</span><span :class="{blue:e.order_status ==='1',yellow:e.order_status ==='2',green:e.order_status ==='3',red:e.order_status ==='4',orange:e.order_status ==='5'}">{{e.realproduceend_date}}</span> -->
               </li>
             </ul>
@@ -201,13 +201,14 @@ export default {
         legend: {
           // orient: 'vertical',
           orient: 'horizontal',
-          top: '0%',
+          top: '-1%',
+          // right: 0,
           textStyle: {
             color: '#fff',
             fontWeight: 'bold',
-            fontSize: 14
+            fontSize: 12
           },
-          itemGap: 30.86,
+          itemGap: 10.86,
           itemWidth: 14.16,
           itemHeight: 7.38,
           data: dataName
@@ -220,12 +221,13 @@ export default {
             radius: ['43%', '70%'],
             label: {
               normal: {
+                show: false,
                 // position: 'inner',
                 formatter: '{d}%',
                 textStyle: {
                   color: '#fff',
                   fontWeight: 'bold',
-                  fontSize: 14
+                  fontSize: 12
                 }
               }
             },
@@ -283,6 +285,9 @@ export default {
         xAxis: {
           // data: ['1号砖', '2号砖', '3号砖', '4号砖'],
           data: materArr,
+          axisLabel: {
+            fontSize: 10
+          },
           axisLine: {
             lineStyle: {
               color: '#fff'
@@ -729,10 +734,12 @@ export default {
       line-height 32px
       // float left
       font-size 14px
-      &:nth-child(1)
-        width 8%
-      &:nth-child(2)
-        width 12%
+      &:nth-child(3)
+        width 16%
+      &:nth-child(4)
+        width 16%
+      &:nth-child(9)
+        width 10%
   .content-block-scroll
     _wh(calc(100% - 0px), calc(100% - 113px))
     margin 0 auto 25px auto
@@ -754,8 +761,10 @@ export default {
         line-height 38px
         box-sizing border-box
         // float left
-        &:nth-child(1)
-          width 8%
-        &:nth-child(2)
-          width 12%
+        &:nth-child(3)
+          width 16%
+        &:nth-child(4)
+          width 16%
+        &:nth-child(9)
+          width 10%
 </style>