From f4841dcec0bfe790e2770dcd06f577902e0bad2b Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 25 十月 2024 14:39:04 +0800
Subject: [PATCH] 1.看板根据实际情况修改
---
src/views/kanbanManager/ckgl.vue | 232 +++++++++++++++++++++++-----------------------
src/views/kanbanManager/cj.vue | 2
src/views/kanbanManager/zhkb.vue | 52 +++++++---
3 files changed, 152 insertions(+), 134 deletions(-)
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index afb3678..3776128 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -220,7 +220,7 @@
WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
this.tableDataCenterTop = res.data
- if (this.tableDataCenterTop.length > 11) {
+ if (this.tableDataCenterTop.length > 22) {
clearInterval(timer)
this.getWorkShopProduceTopData()
}
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index de0ee98..830582a 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -19,12 +19,12 @@
<div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 950px">
<div style="width: 1350px;z-index: 2;margin-top: 50px;" class="flex_c_b">
- <div style="height: 470px;">
+ <div>
<div class="smallTitle">
<svg-icon icon-class="cpdrk" class="svg_class" />
- 鐢熶骇寰呭叆搴�
+ 鐢熶骇鍏ュ簱
</div>
- <div class="lineContent horn" style="height: 410px">
+ <div class="lineContent horn" style="height: 886px">
<el-table
ref="tableDataTopRef"
:data="tableDataTop"
@@ -32,7 +32,7 @@
class="tableData"
:header-cell-style="headerCellStyleCenter"
:cell-style="cellStyleCenter"
- height="405"
+ height="870"
>
<el-table-column
prop="voucherdate"
@@ -62,16 +62,16 @@
<div class="ellipsis">{{ row.wkshp_name }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="saleOrderCode"-->
+ <!-- label="閿�鍞鍗曞彿"-->
+ <!-- width="200"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="materiel_code"-->
<!-- label="浜у搧缂栧彿"-->
@@ -84,7 +84,7 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="170"
+ width="270"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_name }}</div>
@@ -93,7 +93,7 @@
<el-table-column
prop="specification"
label="瑙勬牸鍨嬪彿"
- width="136"
+ width="186"
>
<template slot-scope="{row}">
<div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
@@ -113,7 +113,7 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="63"
+ width="113"
/>
<el-table-column
prop="totalStockInQuantity"
@@ -154,104 +154,104 @@
</el-table>
</div>
</div>
- <div style="height: 470px;margin-top: 30px;">
- <div class="smallTitle">
- <svg-icon icon-class="drk" class="svg_class" />
- 濮斿寰呭叆搴�
- </div>
- <div class="lineContent horn" style="height: 410px">
- <el-table
- ref="tableDataBottomRef"
- :data="tableDataBottom"
- style="width: 100%;"
- class="tableData"
- :header-cell-style="headerCellStyleCenter"
- :cell-style="cellStyleCenter"
- height="405"
- >
- <el-table-column
- prop="voucherdate"
- label="鍗曟嵁鏃ユ湡"
- width="151"
- >
- <template slot-scope="{row}">
- <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wo"
- label="鍗曟嵁缂栧彿"
- width="225"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.wo }}</div>
- </template>
- </el-table-column>
+ <!-- <div style="height: 470px;margin-top: 30px;">-->
+ <!-- <div class="smallTitle">-->
+ <!-- <svg-icon icon-class="drk" class="svg_class" />-->
+ <!-- 濮斿寰呭叆搴�-->
+ <!-- </div>-->
+ <!-- <div class="lineContent horn" style="height: 410px">-->
+ <!-- <el-table-->
+ <!-- ref="tableDataBottomRef"-->
+ <!-- :data="tableDataBottom"-->
+ <!-- style="width: 100%;"-->
+ <!-- class="tableData"-->
+ <!-- :header-cell-style="headerCellStyleCenter"-->
+ <!-- :cell-style="cellStyleCenter"-->
+ <!-- height="405"-->
+ <!-- >-->
+ <!-- <el-table-column-->
+ <!-- prop="voucherdate"-->
+ <!-- label="鍗曟嵁鏃ユ湡"-->
+ <!-- width="151"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="wo"-->
+ <!-- label="鍗曟嵁缂栧彿"-->
+ <!-- width="225"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="ellipsis">{{ row.wo }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
- <el-table-column
- prop="materiel_name"
- label="浜у搧鍚嶇О"
- width="278"
- >
- <template slot-scope="{row}">
- <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="220"
- >
- <template slot-scope="{row}">
- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="quantity"
- label="鏁伴噺"
- width="120"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.quantity }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="saleOutQuantity"
- label="宸插彂璐ф暟閲�"
- width="140"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
- <div v-else>0</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="materiel_name"-->
+ <!-- label="浜у搧鍚嶇О"-->
+ <!-- width="278"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="specification"-->
+ <!-- label="瑙勬牸鍨嬪彿"-->
+ <!-- width="220"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="quantity"-->
+ <!-- label="鏁伴噺"-->
+ <!-- width="120"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="ellipsis">{{ row.quantity }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="saleOutQuantity"-->
+ <!-- label="宸插彂璐ф暟閲�"-->
+ <!-- width="140"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>-->
+ <!-- <div v-else>0</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
- <el-table-column
- prop="deliveryDate"
- label="棰勮浜や粯鏃ユ湡"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0, 10) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="deliveryDate"-->
+ <!-- label="棰勮浜や粯鏃ユ湡"-->
+ <!-- width="200"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0, 10) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="warning"-->
- <!-- label="寤舵湡澶╂暟"-->
- <!-- width="130"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.warning">{{ row.warning }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- </el-table>
- </div>
- </div>
+ <!-- <!– <el-table-column–>-->
+ <!-- <!– prop="warning"–>-->
+ <!-- <!– label="寤舵湡澶╂暟"–>-->
+ <!-- <!– width="130"–>-->
+ <!-- <!– >–>-->
+ <!-- <!– <template slot-scope="{row}">–>-->
+ <!-- <!– <div v-if="row.warning">{{ row.warning }}</div>–>-->
+ <!-- <!– <div v-else>/</div>–>-->
+ <!-- <!– </template>–>-->
+ <!-- <!– </el-table-column>–>-->
+ <!-- </el-table>-->
+ <!-- </div>-->
+ <!-- </div>-->
</div>
<div style="width: 500px;z-index: 2;margin-top: 50px;" class="flex_c_b">
@@ -301,7 +301,7 @@
headTime: '',
tableDataTop: [],
- tableDataBottom: [],
+ // tableDataBottom: [],
MarqueeTipsContent: '', // 鍏憡
speed: 100, // 鍏憡鎾斁鐨勯�熷害
@@ -336,7 +336,7 @@
this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
this.getWareHouseTopLeftData()
- this.getWareHouseTopBottomData()
+ // this.getWareHouseTopBottomData()
this.getEcharts()
},
beforeDestroy() {
@@ -384,13 +384,13 @@
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
// this.number1 = this.tableDataTop.length
- if (this.tableDataTop.length > 10) {
+ if (this.tableDataTop.length > 22) {
clearInterval(this.tableTopTask)
this.getWareHouseTopLeftData()
}
})
}
- }, this.tableDataTop.length <= 10 ? 1000 * 30 : 200)
+ }, this.tableDataTop.length <= 22 ? 1000 * 30 : 200)
})
},
// 鑾峰彇宸︿笅table鏁版嵁
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index c1e6ff4..cf34a0f 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -10,7 +10,7 @@
</div>
<div class="kb_headTime kb_header_text" style="top: 35px;left: 800px">
- <span>瀛ｉ摥缁煎悎鏁板瓧鍖栫湅鏉�</span>
+ <span>妗ヤ笅缁煎悎鏁板瓧鍖栫湅鏉�</span>
</div>
<div class="kb_headTime" style="top: 35px;right: 25px">
@@ -112,9 +112,27 @@
</div>
</div>
- <div style="height: 260px;">
- <div id="all01" class="flex_c_c" style="width: 100%;height:100%;" />
+
+ <div style="height: 180px;padding: 10px;display: flex;justify-content: space-evenly">
+ <div v-for="i in LeftBottomData02" :key="i.wkshp_code" class="flex_c_s">
+ <div class="all_block01 flex_c_s" style="width: 275px;">
+ <div class="flex_c_c all_block02" style=" background: rgba(9, 216, 242, 0.2);">{{ i.wkshp_name }}</div>
+ <div class="" style="display: flex;justify-content:space-between">
+ <div class="all_block02 flex_c_c" style="width: 49% ;background: rgba(9, 216, 242, 0.2)">浠诲姟鏁�</div>
+ <div class="all_block02 flex_c_c" style="width: 49% ;background: rgba(9, 216, 242, 0.2)">{{ i.plan_qty }}</div>
+ </div>
+ <div class="" style="display: flex;justify-content:space-between">
+ <div class="all_block02 flex_c_c" style="width: 49% ;background: rgba(9, 216, 242, 0.2)">鍏ュ簱鏁�</div>
+ <div class="all_block02 flex_c_c" style="width: 49% ;background: rgba(9, 216, 242, 0.2)">{{ i.quantity }}</div>
+ </div>
+ </div>
+ </div>
+
</div>
+
+ <!-- <div style="height: 260px;">-->
+ <!-- <div id="all01" class="flex_c_c" style="width: 100%;height:100%;" />-->
+ <!-- </div>-->
</div>
</div>
<div style="width: 925px;">
@@ -129,11 +147,11 @@
<div class="box02" />
<div>鍘熸潗鏂�</div>
</div>
- <div class="kb_center_block_children all_block06">
- <div style="font-size: 24px;">{{ parseFloat(RightBottom.B) }}</div>
- <div class="box02" />
- <div>鍗婃垚鍝�</div>
- </div>
+ <!-- <div class="kb_center_block_children all_block06">-->
+ <!-- <div style="font-size: 24px;">{{ parseFloat(RightBottom.B) }}</div>-->
+ <!-- <div class="box02" />-->
+ <!-- <div>鍗婃垚鍝�</div>-->
+ <!-- </div>-->
<div class="kb_center_block_children all_block07">
<div style="font-size: 24px;">{{ parseFloat(RightBottom.C) }}</div>
<div class="box02" />
@@ -315,7 +333,7 @@
this.LeftBottomData02.push(data)
}
}
- loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
+ // loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
setInterval(() => {
WorkShopCompreLeftTop({ wkshopcode: temp.join(',') }).then(res2 => {
@@ -350,7 +368,7 @@
this.LeftBottomData02.push(data)
}
}
- loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
+ // loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
})
}, 1000 * 30)
@@ -500,19 +518,19 @@
.all_block05 {
position: absolute;
animation: upDown 3s ease-in-out infinite;
- left: 70px;
+ left: 140px;
}
-.all_block06 {
- position: absolute;
- animation: upDown2 3s ease-in-out infinite;
- left: 320px;
-}
+//.all_block06 {
+// position: absolute;
+// animation: upDown2 3s ease-in-out infinite;
+// left: 320px;
+//}
.all_block07 {
position: absolute;
animation: upDown 3s ease-in-out infinite;
- left: 570px;
+ left: 500px;
}
@keyframes upDown {
--
Gitblit v1.9.3