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 | 24 +++---
src/views/workOrder/produceOrderList.vue | 4 +
src/views/kanbanManager/cj.vue | 158 +++++++++++++++++++-------------------
src/views/kanbanManager/zhkb.vue | 2
src/utils/myEcharts.js | 5
src/views/workOrder/workOrderList.vue | 10 +-
6 files changed, 104 insertions(+), 99 deletions(-)
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index 415693e..55bcdcb 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -2104,12 +2104,13 @@
return option
}
-export function all02(data) {
+export function all02(data, title) {
return {
backgroundColor: 'transparent',
// tooltip: {},
title: {
- text: '姣忔湀璁㈠崟鏁伴噺/鍑哄簱鏁伴噺',
+ text: title,
+ // text: '姣忔湀璁㈠崟鏁伴噺/鍑哄簱鏁伴噺',
left: '50%',
top: '0%',
textAlign: 'center',
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 03a26ad..f761b2e 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -29,7 +29,7 @@
</div>
<div
class="lineContent horn"
- style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
+ style="height: 880px;display: flex;flex-direction: column;justify-content: space-between"
>
<el-table
ref="tableDataLeftCenterRef"
@@ -38,7 +38,7 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="500"
+ height="930"
>
<el-table-column
@@ -54,7 +54,7 @@
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="160"
+ width="400"
/>
<el-table-column
prop="partspec"
@@ -80,16 +80,16 @@
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="laborbad_qty"-->
+ <!-- label="宸ュ簾鏁伴噺"-->
+ <!-- width="120"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="materielbad_qty"-->
+ <!-- label="鏂欏簾鏁伴噺"-->
+ <!-- width="120"-->
+ <!-- />-->
<el-table-column
prop="seq"
label="宸ュ簭椤哄簭"
@@ -116,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>
@@ -202,13 +202,13 @@
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()
}
})
}
- }, this.tableDataCenterTop.length <= 11 ? 1000 * 15 : 200)
+ }, this.tableDataCenterTop.length <= 22 ? 1000 * 15 : 200)
})
},
@@ -222,51 +222,51 @@
this.wkshopcode = [code]
}
- this.wkshopcode.forEach(i => {
- const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
- this.legendData.push(aa)
- })
+ // this.wkshopcode.forEach(i => {
+ // const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
+ // this.legendData.push(aa)
+ // })
+ //
+ // const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') })
+ // this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
+ // for (const res4Key in res4.data) {
+ // if (this.wkshopcode.includes(res4Key)) {
+ // const bb = res4.data[res4Key].map(i => i.count)
+ // this.cjzl03_yData.push(bb)
+ // }
+ // }
+ // loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
+ // setInterval(() => {
+ // WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') }).then(res4 => {
+ // this.cjzl03_yData = []
+ //
+ // this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
+ // for (const res4Key in res4.data) {
+ // if (this.wkshopcode.includes(res4Key)) {
+ // const bb = res4.data[res4Key].map(i => i.count)
+ // this.cjzl03_yData.push(bb)
+ // }
+ // }
+ // loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
+ // })
+ // }, 1000 * 50)
+ //
+ // 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.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)))
+ // }
+ // })
+ // }, 1000 * 60)
- const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') })
- this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
- for (const res4Key in res4.data) {
- if (this.wkshopcode.includes(res4Key)) {
- const bb = res4.data[res4Key].map(i => i.count)
- this.cjzl03_yData.push(bb)
- }
- }
- loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
- setInterval(() => {
- WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') }).then(res4 => {
- this.cjzl03_yData = []
-
- this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
- for (const res4Key in res4.data) {
- if (this.wkshopcode.includes(res4Key)) {
- const bb = res4.data[res4Key].map(i => i.count)
- this.cjzl03_yData.push(bb)
- }
- }
- loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
- })
- }, 1000 * 50)
-
- 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.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)))
- }
- })
- }, 1000 * 60)
-
- this.getWorkShopProduceTopData()
+ await this.getWorkShopProduceTopData()
},
// 鑾峰彇褰撳墠鏃堕棿
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 5c687e2..b5d1f31 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -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>
@@ -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%;" />
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index e241026..19c6983 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -193,7 +193,7 @@
async getAllApi() {
// const { data: res } = await ShopSearch()
const res = [
- { org_code: '2', org_name: '鍖呰杞﹂棿' }
+ { org_code: '1', org_name: '鍖呰杞﹂棿' }
// { org_code: '102', org_name: '鎸ゅ嚭杞﹂棿' }
]
this.wkshopArr = res
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index e0a54e9..95b6ed3 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -831,6 +831,10 @@
}
const res = await ErpOrderSearch(data)
+ res.data.forEach(i => {
+ i.planenddate = i.planenddate ? i.planenddate : handleDatetime(new Date())
+ i.planstartdate = i.planstartdate ? i.planstartdate : handleDatetime(new Date())
+ })
this.tableData = res.data
this.total = res.count
},
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 0a82b94..1427b1b 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -8,11 +8,11 @@
<el-button v-waves type="success" icon="el-icon-connection" @click="send">娲惧彂</el-button>
</div>
- <el-button v-waves type="primary" @click="batchUpdate"><i
- class="el-icon-edit-outline"
- style="margin-right: 0;"
- /> 鎵归噺淇敼
- </el-button>
+ <!-- <el-button v-waves type="primary" @click="batchUpdate"><i-->
+ <!-- class="el-icon-edit"-->
+ <!-- style="margin-right: 0;"-->
+ <!-- /> 鎵归噺缁戝畾-->
+ <!-- </el-button>-->
</div>
<div class="bodyTopFormGroup">
--
Gitblit v1.9.3