From 6c2e00278c1194b46eb9153ca4166af868bb15ef Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 08:00:02 +0800
Subject: [PATCH] 1.看板调整2.上云路由整合
---
src/views/kb/zhkb.vue | 153 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 106 insertions(+), 47 deletions(-)
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index d122bc9..ef76dc1 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -2,9 +2,9 @@
<div>
<div class="kb_dashboard">
<!-- 鏄熺┖鑳屾櫙-->
- <div ref="starsRef" class="stars">
- <div v-for="(item, index) in starsCount" :key="index" class="star" />
- </div>
+<!-- <div ref="starsRef" class="stars">-->
+<!-- <div v-for="(item, index) in starsCount" :key="index" class="star" />-->
+<!-- </div>-->
<div class="kb_header">
<div class="flex_c_c kb_header_text">
@@ -19,23 +19,41 @@
<div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px">
<!-- 宸﹁竟-->
<div style="width: 1400px ;height: 969px;" class="flex_c_b">
- <div>
+ <div >
<div class="smallTitle">
<svg-icon icon-class="cxjg" class="svg_class" />
浜х嚎鍔犲伐涓换鍔�
+
+ <div style="display: flex;margin-left: 85px;">
+
+
+
+ <div class="circle" style="background-color: rgb(255 255 255)"></div>
+ <div style="margin-left: 10px" >鏈紑濮�</div>
+
+ <div class="circle" style="margin-left: 10px;background-color: blue;"></div>
+ <div style="margin-left: 10px" >寮�宸�</div>
+
+ <div class="circleYellow" style="margin-left: 10px"></div>
+ <div style="margin-left: 10px" >鎵ц涓�</div>
+
+ <div class="circle" style="margin-left: 10px"></div>
+ <div style="margin-left: 10px" >瀹屽伐</div>
+
+ </div>
</div>
- <div class="lineContent horn">
+ <div class="lineContent horn" style="height: 434px;">
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>
- <div class="kb_mt10">
+<!-- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>-->
+ <div >
鍔犲伐鍗曞彿:{{ item.workcode }}
</div>
- <div class="kb_mt10">
+ <div class="kb_mt20">
浜у搧鍚嶇О:{{ item.partname }}
</div>
- <div class="kb_mt10">
+ <div class="kb_mt20">
浠诲姟鏁伴噺:{{ parseFloat(item.qty) }}
</div>
</div>
@@ -78,6 +96,7 @@
class="circle"
style="background-color: blue;"
/>
+
<div
v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
class="circle"
@@ -120,7 +139,7 @@
<el-table-column
prop="status"
- width="80"
+ width="125"
label="鐘舵��"
>
<template slot-scope="{row}">
@@ -132,31 +151,33 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="120"
+ width="165"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="170"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+
+<!-- <el-table-column-->
+<!-- prop="saleOrderCode"-->
+<!-- label="閿�鍞鍗曞彿"-->
+<!-- width="170"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="190"
+ width="220"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="350"
+ width="370"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -166,21 +187,21 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="105"
+ width="150"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="105"
+ width="150"
/>
- <el-table-column
- prop="ng_qty"
- label="涓嶈壇鏁伴噺"
- width="105"
- />
+<!-- <el-table-column-->
+<!-- prop="ng_qty"-->
+<!-- label="涓嶈壇鏁伴噺"-->
+<!-- width="125"-->
+<!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="105"
+ width="154"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
@@ -316,7 +337,7 @@
this.getTopBar()
this.getShopSearch()
- this.setStarsRef()
+ // this.setStarsRef()
},
methods: {
setStarsRef() {
@@ -420,27 +441,54 @@
},
// 浜х嚎鍔犲伐浠诲姟 宸︿笅鏁版嵁
getLeftBottomData() {
- let startValue = 0 // 鍒濆鍊�
- const scale = 10// 鍒诲害
+ // let startValue = 0 // 鍒濆鍊�
+ // const scale = 10// 鍒诲害
+ //
+ // LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ // this.tableDataLeftBottomTemp = res.data
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ //
+ // const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+ // let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+ //
+ // const timer = setInterval(() => {
+ // startValue = startValue + scale
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ // if (nowLoop === loop) {
+ // clearInterval(timer)
+ // this.getLeftBottomData()
+ // }
+ //
+ // nowLoop++
+ // }, 1000 * 10)
+ // })
LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.tableDataLeftBottomTemp = res.data
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ this.tableDataLeftBottom = res.data
- const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
- let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+ const divData = this.$refs.tableDataLeftBottomRef.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const aaa = setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ divData.scrollTop += 1
+ // divData.scrollTop += divData.scrollHeight / this.tableData.length
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataLeftBottom = res.data
- const timer = setInterval(() => {
- startValue = startValue + scale
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
- if (nowLoop === loop) {
- clearInterval(timer)
- this.getLeftBottomData()
+ if (this.tableDataLeftBottom.length > 10) {
+ clearInterval(aaa)
+ this.getLeftBottomData()
+ }
+ })
}
-
- nowLoop++
- }, 1000 * 10)
+ }, this.tableDataLeftBottom.length <= 10 ? 1000 * 15 : 100)
})
+
+
},
getEcharts() {
@@ -622,6 +670,17 @@
border-radius: 50%;
}
+::v-deep .el-table__body-wrapper{
+ overflow: hidden !important;
+}
+
+.circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+}
+
</style>
<!--鏄熺┖-->
--
Gitblit v1.9.3