From c26deaa0190c0ed42b398f3e5696013127a6c10f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 11 三月 2025 16:17:51 +0800
Subject: [PATCH] 1.看板修改

---
 src/views/kanbanManager/ckgl.vue |   74 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 3d0d5e1..b5d1f31 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -22,7 +22,7 @@
           <div style="height: 470px;">
             <div class="smallTitle">
               <svg-icon icon-class="cpdrk" class="svg_class" />
-              鐢熶骇寰呭叆搴�
+              閲囪喘寰呭叆搴�
             </div>
             <div class="lineContent horn" style="height: 410px">
               <el-table
@@ -53,15 +53,15 @@
                     <div class="ellipsis">{{ row.wo }}</div>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="wkshp_name"
-                  label="鐢熶骇杞﹂棿"
-                  width="105"
-                >
-                  <template slot-scope="{row}">
-                    <div class="ellipsis">{{ row.wkshp_name }}</div>
-                  </template>
-                </el-table-column>
+                <!--                <el-table-column-->
+                <!--                  prop="wkshp_name"-->
+                <!--                  label="鐢熶骇杞﹂棿"-->
+                <!--                  width="105"-->
+                <!--                >-->
+                <!--                  <template slot-scope="{row}">-->
+                <!--                    <div class="ellipsis">{{ row.wkshp_name }}</div>-->
+                <!--                  </template>-->
+                <!--                </el-table-column>-->
                 <el-table-column
                   prop="saleOrderCode"
                   label="閿�鍞鍗曞彿"
@@ -84,7 +84,7 @@
                 <el-table-column
                   prop="materiel_name"
                   label="浜у搧鍚嶇О"
-                  width="170"
+                  width="275"
                 >
                   <template slot-scope="{row}">
                     <div class="ellipsis">{{ row.materiel_name }}</div>
@@ -156,8 +156,8 @@
           </div>
           <div style="height: 470px;margin-top: 30px;">
             <div class="smallTitle">
-              <svg-icon icon-class="drk" class="svg_class" />
-              濮斿寰呭叆搴�
+              <svg-icon icon-class="cpdrk" class="svg_class" />
+              鎴愬搧寰呭彂璐�
             </div>
             <div class="lineContent horn" style="height: 410px">
               <el-table
@@ -258,7 +258,7 @@
           <div style="height: 470px;">
             <div class="smallTitle">
               <svg-icon icon-class="ph" class="svg_class" />
-              鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
+              杩戜竴鏈堥噰璐緟鍏ュ簱鐗╂枡鎺掕Top5
             </div>
             <div class="lineContent horn" style="height: 410px">
               <div id="bar03" style="width: 100%;height:100%; " />
@@ -268,7 +268,7 @@
           <div style="height: 470px;margin-top: 30px;">
             <div class="smallTitle">
               <svg-icon icon-class="ph" class="svg_class" />
-              鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
+              杩戜竴鏈堥攢鍞凡鍙戣揣浜у搧鎺掕Top5
             </div>
             <div class="lineContent horn" style="height: 410px">
               <div id="bar04" style="width: 100%;height:100%;" />
@@ -286,10 +286,10 @@
 import './kbCommon.css'
 import { bar02, kbTop, loadEcharts } from '@/utils/myEcharts'
 import {
-  WareHouseTopLeftData,
-  WareHouseTopBottomData,
-  WareHouseRightTopData,
-  WareHouseRightBottomData
+  ProcureOutsourcLeftTop,
+  ProductConsignmentLeftBottom,
+  ProcureOutsourcRightTop,
+  ProductionStockedInRightBottom
 } from '@/api/kanbanManager'
 
 export default {
@@ -335,8 +335,8 @@
     window.addEventListener('offline', this.updateOnlineStatus)
     this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
 
-    this.getWareHouseTopLeftData()
-    this.getWareHouseTopBottomData()
+    this.getProcureOutsourcLeftTop()
+    this.getProductConsignmentLeftBottom()
     this.getEcharts()
   },
   beforeDestroy() {
@@ -367,8 +367,8 @@
       }
     },
     // 鑾峰彇宸︿笂table鏁版嵁
-    getWareHouseTopLeftData() {
-      WareHouseTopLeftData().then(res => {
+    getProcureOutsourcLeftTop() {
+      ProcureOutsourcLeftTop().then(res => {
         this.tableDataTop = res.data
         // this.number1 = this.tableDataTop.length
         const divData = this.$refs.tableDataTopRef.bodyWrapper
@@ -381,12 +381,12 @@
           if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
             // 閲嶇疆table璺濈椤堕儴璺濈
             divData.scrollTop = 0
-            WareHouseTopLeftData().then(res => {
+            ProcureOutsourcLeftTop().then(res => {
               this.tableDataTop = res.data
               // this.number1 = this.tableDataTop.length
               if (this.tableDataTop.length > 10) {
                 clearInterval(this.tableTopTask)
-                this.getWareHouseTopLeftData()
+                this.getProcureOutsourcLeftTop()
               }
             })
           }
@@ -394,8 +394,8 @@
       })
     },
     // 鑾峰彇宸︿笅table鏁版嵁
-    getWareHouseTopBottomData() {
-      WareHouseTopBottomData().then(res => {
+    getProductConsignmentLeftBottom() {
+      ProductConsignmentLeftBottom().then(res => {
         this.tableDataBottom = res.data
         this.number2 = this.tableDataBottom.length
         const divData = this.$refs.tableDataBottomRef.bodyWrapper
@@ -409,12 +409,12 @@
           if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
             // 閲嶇疆table璺濈椤堕儴璺濈
             divData.scrollTop = 0
-            WareHouseTopBottomData().then(res => {
+            ProductConsignmentLeftBottom().then(res => {
               this.tableDataBottom = res.data
               this.number2 = this.tableDataBottom.length
               if (this.tableDataBottom.length > 10) {
                 clearInterval(this.tableBottomTask)
-                this.getWareHouseTopBottomData()
+                this.getProductConsignmentLeftBottom()
               }
             })
           }
@@ -424,23 +424,23 @@
 
     // 鑾峰彇echarts
     getEcharts() {
-      WareHouseRightTopData().then(res => {
-        loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+      ProcureOutsourcRightTop().then(res => {
+        loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
       })
 
-      WareHouseRightBottomData().then(res => {
-        loadEcharts('bar04', bar02(res.dat.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+      ProductionStockedInRightBottom().then(res => {
+        loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
       })
 
       this.echartsRightTop = setInterval(() => {
-        WareHouseRightTopData().then(res => {
-          loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+        ProcureOutsourcRightTop().then(res => {
+          loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
         })
       }, 1000 * 15)
 
       this.echartsRightBottom = setInterval(() => {
-        WareHouseRightBottomData().then(res => {
-          loadEcharts('bar04', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+        ProductionStockedInRightBottom().then(res => {
+          loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
         })
       }, 1000 * 15)
     },

--
Gitblit v1.9.3