From 9a4c8548e3bb761cec5fc508650b727a345f9009 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 18 二月 2025 16:55:43 +0800
Subject: [PATCH] 1.大岛2.0看板重构
---
src/views/kanbanManager/ckgl.vue | 440 ++++++++++++++++++++----------------------------------
1 files changed, 164 insertions(+), 276 deletions(-)
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index ad20e9d..b723f7e 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -24,134 +24,14 @@
<svg-icon icon-class="cpdrk" class="svg_class" />
鐢熶骇寰呭叆搴�
</div>
- <div class="lineContent horn" style="height: 410px">
- <el-table
- ref="tableDataTopRef"
- :data="tableDataTop"
- style="width: 100%;"
- class="tableData"
- :header-cell-style="headerCellStyleCenter"
- :cell-style="cellStyleCenter"
- height="405"
- >
- <el-table-column
- prop="voucherdate"
- label="鍗曟嵁鏃ユ湡"
- width="131"
- >
- <template slot-scope="{row}">
- <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
- <div v-else />
- </template>
- </el-table-column>
- <el-table-column
- prop="wo"
- label="鍗曟嵁缂栧彿"
- width="189"
- >
- <template slot-scope="{row}">
- <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="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="浜у搧缂栧彿"-->
- <!-- width="136"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="ellipsis">{{ row.materiel_code }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="materiel_name"
- label="浜у搧鍚嶇О"
- width="170"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.materiel_name }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="136"
- >
- <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="stck_name"
- label="棰勫叆浠撳簱"
- width="100"
- >
- <template slot-scope="{row}">
- <div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="quantity"
- label="鏁伴噺"
- width="63"
+ <div style="height: 410px">
+ <dv-border-box-12>
+ <dv-scroll-board
+ ref="scrollBoardTop"
+ :config="configTableTop"
+ style="width: 1326px;height: 390px;margin:0 auto;padding-top: 13px;"
/>
- <el-table-column
- prop="totalStockInQuantity"
- label="宸插叆搴撴暟閲�"
- width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
- <div v-else>0</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="uomname"-->
- <!-- label="鍗曚綅"-->
- <!-- width="50"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="preStartDate"-->
- <!-- label="棰勮寮�宸�"-->
- <!-- width="100"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.preStartDate">{{ row.preStartDate.substring(0, 10) }}</div>-->
- <!-- <div v-else />-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="preFinishDate"
- label="棰勮鍏ュ簱"
- width="140"
- >
- <template slot-scope="{row}">
- <div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
- <div v-else />
- </template>
- </el-table-column>
-
- </el-table>
+ </dv-border-box-12>
</div>
</div>
<div style="height: 470px;margin-top: 30px;">
@@ -159,97 +39,14 @@
<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="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 style="height: 410px">
+ <dv-border-box-12>
+ <dv-scroll-board
+ ref="scrollBoardBottom"
+ :config="configTableBottom"
+ style="width: 1326px;height: 390px;margin:0 auto;padding-top: 13px;"
+ />
+ </dv-border-box-12>
</div>
</div>
@@ -260,9 +57,10 @@
<svg-icon icon-class="ph" class="svg_class" />
鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
</div>
- <div class="lineContent horn" style="height: 410px">
- <div id="bar03" style="width: 100%;height:100%; " />
- <!--/* <div id="bar03" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />*/-->
+ <div style="height: 410px">
+ <dv-border-box-12>
+ <div id="bar03" key="bar03" style="width: 100%;height:100%; " />
+ </dv-border-box-12>
</div>
</div>
<div style="height: 470px;margin-top: 30px;">
@@ -270,9 +68,10 @@
<svg-icon icon-class="ph" class="svg_class" />
鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
</div>
- <div class="lineContent horn" style="height: 410px">
- <div id="bar04" style="width: 100%;height:100%;" />
- <!-- <div id="bar04" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />-->
+ <div style="height: 410px">
+ <dv-border-box-12>
+ <div id="bar04" key="bar04" style="width: 100%;height:100%;" />
+ </dv-border-box-12>
</div>
</div>
</div>
@@ -300,8 +99,84 @@
onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
headTime: '',
- tableDataTop: [],
- tableDataBottom: [],
+ configTableTop: {
+ headerBGC: 'rgba(38, 68 ,139, 0.2)', // 琛ㄥご鑳屾櫙鑹�
+ oddRowBGC: 'transparent', // 濂囨暟琛岃儗鏅壊
+ evenRowBGC: 'transparent', // 鍋舵暟琛岃儗鏅壊
+ headerHeight: 45,
+ waitTime: 3000,
+ rowNum: 8,
+
+ header: [
+ '<span style="color:#09d8f2;">鍗曟嵁鏃ユ湡</span>',
+ '<span style="color:#09d8f2;">鍗曟嵁缂栧彿</span>',
+ '<span style="color:#09d8f2;">閿�鍞鍗曞彿</span>',
+ '<span style="color:#09d8f2;">浜у搧鍚嶇О</span>',
+ '<span style="color:#09d8f2;">瑙勬牸鍨嬪彿</span>',
+ '<span style="color:#09d8f2;">鏁伴噺</span>',
+ '<span style="color:#09d8f2;">宸插叆搴撴暟閲�</span>',
+ '<span style="color:#09d8f2;">鏈叆搴撴暟閲�</span>'
+ ],
+ data: [
+ // ['<span style="color:#37a2da;">琛�1鍒�1</span>', '琛�1鍒�2', '琛�1鍒�3'],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9]
+
+ ],
+ index: true,
+ columnWidth: [50, 130, 150, 300, 200, 120, 120, 120, 120],
+ align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
+ // carousel: 'page'
+ },
+ configTableBottom: {
+ headerBGC: 'rgba(38, 68 ,139, 0.2)', // 琛ㄥご鑳屾櫙鑹�
+ oddRowBGC: 'transparent', // 濂囨暟琛岃儗鏅壊
+ evenRowBGC: 'transparent', // 鍋舵暟琛岃儗鏅壊
+ headerHeight: 45,
+ waitTime: 3000,
+ rowNum: 8,
+
+ header: [
+ '<span style="color:#09d8f2;">鍗曟嵁鏃ユ湡</span>',
+ '<span style="color:#09d8f2;">鍗曟嵁缂栧彿</span>',
+ '<span style="color:#09d8f2;">閿�鍞鍗曞彿</span>',
+ '<span style="color:#09d8f2;">浜у搧鍚嶇О</span>',
+ '<span style="color:#09d8f2;">瑙勬牸鍨嬪彿</span>',
+ '<span style="color:#09d8f2;">鏁伴噺</span>',
+ '<span style="color:#09d8f2;">宸插叆搴撴暟閲�</span>',
+ '<span style="color:#09d8f2;">鏈叆搴撴暟閲�</span>'
+ ],
+ data: [
+ // ['<span style="color:#37a2da;">琛�1鍒�1</span>', '琛�1鍒�2', '琛�1鍒�3'],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9]
+
+ ],
+ index: true,
+ columnWidth: [50, 130, 150, 300, 200, 120, 120, 120, 120],
+ align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
+ // carousel: 'page'
+ },
MarqueeTipsContent: '', // 鍏憡
speed: 100, // 鍏憡鎾斁鐨勯�熷害
@@ -336,7 +211,15 @@
this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
this.getWareHouseTopLeftData()
+ setInterval(() => {
+ this.getWareHouseTopLeftData()
+ }, 15 * 1000)
+
this.getWareHouseTopBottomData()
+ setInterval(() => {
+ this.getWareHouseTopBottomData()
+ }, 20 * 1000)
+
this.getEcharts()
},
beforeDestroy() {
@@ -369,78 +252,83 @@
// 鑾峰彇宸︿笂table鏁版嵁
getWareHouseTopLeftData() {
WareHouseTopLeftData().then(res => {
- this.tableDataTop = res.data
- // this.number1 = this.tableDataTop.length
- const divData = this.$refs.tableDataTopRef.bodyWrapper
- // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- this.tableTopTask = setInterval(() => {
- // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
- divData.scrollTop += 1
- // divData.scrollTop += divData.scrollHeight / this.tableData.length
- // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
- if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
- // 閲嶇疆table璺濈椤堕儴璺濈
- divData.scrollTop = 0
- WareHouseTopLeftData().then(res => {
- this.tableDataTop = res.data
- // this.number1 = this.tableDataTop.length
- if (this.tableDataTop.length > 10) {
- clearInterval(this.tableTopTask)
- this.getWareHouseTopLeftData()
- }
- })
- }
- }, this.tableDataTop.length <= 10 ? 1000 * 30 : 200)
+ const flag = this.compareArrays(this.configTableTop.data, res.data)
+ if (!flag) {
+ this.configTableTop.data = res.data.map(i =>
+ [
+ i.voucherdate.substring(0, 10),
+ i.wo,
+ i.saleOrderCode ? i.saleOrderCode : '/',
+ i.materiel_name,
+ i.specification ? i.specification : '/',
+ i.quantity,
+ i.totalStockInQuantity ? i.totalStockInQuantity : 0,
+ `<span style="color: red;">${i.quantity - i.totalStockInQuantity}</span>`
+ ]
+ )
+ this.$refs['scrollBoardTop'].updateRows(this.configTableTop.data)
+ }
})
},
// 鑾峰彇宸︿笅table鏁版嵁
getWareHouseTopBottomData() {
WareHouseTopBottomData().then(res => {
- this.tableDataBottom = res.data
- this.number2 = this.tableDataBottom.length
- const divData = this.$refs.tableDataBottomRef.bodyWrapper
- // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- // const task = setInterval(() => {
- this.tableBottomTask = setInterval(() => {
- // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
- divData.scrollTop += 1
- // divData.scrollTop += divData.scrollHeight / this.tableData.length
- // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
- if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
- // 閲嶇疆table璺濈椤堕儴璺濈
- divData.scrollTop = 0
- WareHouseTopBottomData().then(res => {
- this.tableDataBottom = res.data
- this.number2 = this.tableDataBottom.length
- if (this.tableDataBottom.length > 10) {
- clearInterval(this.tableBottomTask)
- this.getWareHouseTopBottomData()
- }
- })
- }
- }, this.tableDataBottom.length <= 10 ? 1000 * 20 : 100)
+ const flag = this.compareArrays(this.configTableBottom.data, res.data)
+ if (!flag) {
+ this.configTableBottom.data = res.data.map(i =>
+ [
+ i.voucherdate.substring(0, 10),
+ i.wo,
+ i.saleOrderCode ? i.saleOrderCode : '/',
+ i.materiel_name,
+ i.specification ? i.specification : '/',
+ i.quantity,
+ i.totalStockInQuantity ? i.totalStockInQuantity : 0,
+ `<span style="color: red;">${i.quantity - i.totalStockInQuantity}</span>`
+ ]
+ )
+ this.$refs['scrollBoardBottom'].updateRows(this.configTableBottom.data)
+ }
})
+ },
+
+ // 涓や釜鏁扮粍鍋氬姣�
+ compareArrays(arr1, arr2) {
+ const set1 = new Set(arr1)
+ const set2 = new Set(arr2)
+
+ if (set1.size !== set2.size) {
+ return false
+ }
+
+ for (const value of set1) {
+ if (!set2.has(value)) {
+ return false
+ }
+ }
+
+ return true
},
// 鑾峰彇echarts
getEcharts() {
WareHouseRightTopData().then(res => {
- loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+ loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 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)))
+ loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 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)))
+ loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
})
- }, 1000 * 15)
+ }, 1000 * 20)
this.echartsRightBottom = setInterval(() => {
WareHouseRightBottomData().then(res => {
- loadEcharts('bar04', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+ loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
})
}, 1000 * 15)
},
--
Gitblit v1.9.3