From 829af0ac8a4138ffed196d3d01c4c7d1c2c14020 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 30 十二月 2024 13:10:20 +0800
Subject: [PATCH] 1.递交

---
 src/views/kanbanManager/cj.vue |  159 +++++++++++++++++++++++------------------------------
 1 files changed, 69 insertions(+), 90 deletions(-)

diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 4f74d49..03a26ad 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -29,7 +29,7 @@
             </div>
             <div
               class="lineContent horn"
-              style="height: 870px;display: flex;flex-direction: column;justify-content: space-between"
+              style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
             >
               <el-table
                 ref="tableDataLeftCenterRef"
@@ -38,88 +38,77 @@
                 style="width: 100%;"
                 :header-cell-style="headerCellStyle"
                 :cell-style="cellStyle"
-                height="920"
+                height="500"
               >
 
                 <el-table-column
                   prop="wo_code"
                   label="宸ュ崟鍙�"
-                  width="270"
+                  width="220"
                 />
-                <!--                <el-table-column-->
-                <!--                  prop="saleOrderCode"-->
-                <!--                  label="鐢熶骇鍗曞彿"-->
-                <!--                  width="160"-->
-                <!--                />-->
-                <el-table-column
-                  prop="wkshp_name"
-                  label="鐢熶骇杞﹂棿"
-                  width="210"
-                />
-                <!--                600-->
                 <el-table-column
                   prop="partcode"
                   label="浜у搧缂栫爜"
-                  width="210"
+                  width="160"
                 />
                 <el-table-column
                   prop="partname"
                   label="浜у搧鍚嶇О"
-                  width="210"
+                  width="160"
                 />
-                <!--                <el-table-column-->
-                <!--                  prop="partspec"-->
-                <!--                  label="浜у搧瑙勬牸"-->
-                <!--                  width="160"-->
-                <!--                >-->
-                <!--                  <template slot-scope="{row}">-->
-                <!--                    {{ row.partspec ? row.partspec : '/' }}-->
-                <!--                  </template>-->
-                <!--                </el-table-column>-->
+                <el-table-column
+                  prop="partspec"
+                  label="浜у搧瑙勬牸"
+                  width="160"
+                >
+                  <template slot-scope="{row}">
+                    {{ row.partspec ? row.partspec : '/' }}
+                  </template>
+                </el-table-column>
                 <el-table-column
                   prop="plan_qty"
                   label="浠诲姟鏁伴噺"
-                  width="170"
+                  width="120"
                 />
                 <el-table-column
                   prop="good_qty"
                   label="鍚堟牸鏁伴噺"
-                  width="170"
+                  width="120"
                 />
-                <!--                <el-table-column-->
-                <!--                  prop="ng_qty"-->
-                <!--                  label="涓嶈壇鏁伴噺"-->
-                <!--                  width="120"-->
-                <!--                />-->
-                <!--                <el-table-column-->
-                <!--                  prop="laborbad_qty"-->
-                <!--                  label="宸ュ簾鏁伴噺"-->
-                <!--                  width="120"-->
-                <!--                />-->
-                <!--                <el-table-column-->
-                <!--                  prop="materielbad_qty"-->
-                <!--                  label="鏂欏簾鏁伴噺"-->
-                <!--                  width="120"-->
-                <!--                />-->
-                <!--                <el-table-column-->
-                <!--                  prop="seq"-->
-                <!--                  label="宸ュ簭椤哄簭"-->
-                <!--                  width="120"-->
-                <!--                />-->
-                <!--                <el-table-column-->
-                <!--                  prop="step_code"-->
-                <!--                  label="宸ュ簭缂栫爜"-->
-                <!--                  width="120"-->
-                <!--                />-->
+                <el-table-column
+                  prop="ng_qty"
+                  label="涓嶈壇鏁伴噺"
+                  width="120"
+                />
+                <el-table-column
+                  prop="laborbad_qty"
+                  label="宸ュ簾鏁伴噺"
+                  width="120"
+                />
+                <el-table-column
+                  prop="materielbad_qty"
+                  label="鏂欏簾鏁伴噺"
+                  width="120"
+                />
+                <el-table-column
+                  prop="seq"
+                  label="宸ュ簭椤哄簭"
+                  width="120"
+                />
+                <el-table-column
+                  prop="step_code"
+                  label="宸ュ簭缂栫爜"
+                  width="120"
+                />
                 <el-table-column
                   prop="step_name"
                   label="宸ュ簭鍚嶇О"
-                  width="320"
+                  width="120"
                 />
                 <el-table-column
                   prop="schedule"
                   label="瀹屾垚杩涘害(%)"
-                  width="313"
+                  width="213"
                 />
               </el-table>
             </div>
@@ -127,27 +116,27 @@
 
         </div>
         <!--        涓嬭竟-->
-        <!--        <div style="display: flex;justify-content: space-between;margin-top: 15px;">-->
-        <!--          <div style="width: 1000px;">-->
-        <!--            <div class="smallTitle">-->
-        <!--              <svg-icon icon-class="blcs" class="svg_class" />-->
-        <!--              璐ㄩ噺涓嶈壇(杩戜竴鍛�)-->
-        <!--            </div>-->
-        <!--            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
-        <!--              <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />-->
+        <div style="display: flex;justify-content: space-between;margin-top: 15px;">
+          <div style="width: 1000px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="blcs" class="svg_class" />
+              璐ㄩ噺涓嶈壇(杩戜竴鍛�)
+            </div>
+            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
+              <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />
 
-        <!--            </div>-->
-        <!--          </div>-->
-        <!--          <div style="width: 850px;">-->
-        <!--            <div class="smallTitle">-->
-        <!--              <svg-icon icon-class="ckkc" class="svg_class" />-->
-        <!--              涓嶈壇缁熻(杩戜竴鏈�)-->
-        <!--            </div>-->
-        <!--            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
-        <!--              <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />-->
-        <!--            </div>-->
-        <!--          </div>-->
-        <!--        </div>-->
+            </div>
+          </div>
+          <div style="width: 850px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="ckkc" class="svg_class" />
+              涓嶈壇缁熻(杩戜竴鏈�)
+            </div>
+            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
+              <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -188,10 +177,6 @@
 
     }
   },
-  activated() {
-    window.addEventListener('resize', this.getHeight)
-    this.getHeight()
-  },
   created() {
     setInterval(this.getNowTime, 1000)
 
@@ -201,13 +186,11 @@
     }, 1000 * 60 * 120)
   },
   mounted() {
-    // this.getAllApi()
-    this.getWorkShopProduceTopData()
+    this.getAllApi()
   },
   methods: {
     async getWorkShopProduceTopData() {
-      // WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
-      WorkShopProduceTopData({ wkshopcode: '101,102' }).then(res => {
+      WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
         this.tableDataCenterTop = res.data
 
         const divData = this.$refs.tableDataLeftCenterRef.bodyWrapper
@@ -225,7 +208,7 @@
               }
             })
           }
-        }, this.tableDataCenterTop.length <= 22 ? 1000 * 30 : 200)
+        }, this.tableDataCenterTop.length <= 11 ? 1000 * 15 : 200)
       })
     },
 
@@ -268,14 +251,14 @@
         })
       }, 1000 * 50)
 
-      const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] })
+      const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') })
       this.RightBottom = res5.data
       if (this.RightBottom.length > 0) {
         loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
       }
 
       setInterval(() => {
-        WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] }).then(res5 => {
+        WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') }).then(res5 => {
           this.RightBottom = res5.data
           if (this.RightBottom.length > 0) {
             loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
@@ -283,7 +266,7 @@
         })
       }, 1000 * 60)
 
-      await this.getWorkShopProduceTopData()
+      this.getWorkShopProduceTopData()
     },
 
     // 鑾峰彇褰撳墠鏃堕棿
@@ -363,10 +346,6 @@
 ::v-deep .el-table tr,
 ::v-deep .el-table td {
   background-color: transparent;
-}
-
-::v-deep .gutter {
-  display: none;
 }
 
 .all_block01 {

--
Gitblit v1.9.3