From 5abc5f45a74ca2b5671ef73d6a665b6e6321d194 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 22 九月 2022 11:12:55 +0800
Subject: [PATCH] 大岛看板整体字体变大
---
src/views/kb/bzcj.vue | 141 +++++---
src/views/kb/zpcj.vue | 141 +++++---
src/views/kb/kbCommon.css | 10
src/views/sbgl/djjl.vue | 8
src/views/kb/cgdd.vue | 75 +++-
src/views/kb/ckgl.vue | 185 +++++++----
src/views/kb/dccj.vue | 141 +++++---
src/views/kb/zhkb.vue | 140 +++++---
src/utils/myEcharts.js | 11
9 files changed, 509 insertions(+), 343 deletions(-)
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index ae8e82d..c6330a7 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -418,12 +418,21 @@
color: function(value, index) {
return value === '0' ? 'transparent' : '#fff'
},
- fontSize: 14,
+ fontSize: 18,
// formatter: function(value, index) {
// return [
// '{lg|' + (index + 1) + '銆� }' + '{title|' + value + '} '
// ].join('\n')
// },
+ formatter: function(params) {
+ var val = ''
+ if (params.length > 5) {
+ val = params.substr(0, 5) + '...'
+ return val
+ } else {
+ return params
+ }
+ },
rich: {
lg: {
// backgroundColor: '#339911',
diff --git a/src/views/kb/bzcj.vue b/src/views/kb/bzcj.vue
index ef74dd3..ff32861 100644
--- a/src/views/kb/bzcj.vue
+++ b/src/views/kb/bzcj.vue
@@ -13,8 +13,9 @@
<MarqueeTips
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
- :speed="300"
+ :speed="180"
/>
+ <!-- :speed="speed"-->
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
@@ -26,7 +27,7 @@
<div class="kb_left_top kb_pd10">
<div class="kb_left_top02">
- <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
+ <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>
@@ -113,12 +114,13 @@
<el-table-column
prop="RowNum"
label="搴忓彿"
- width="40"
+ width="50"
/>
+ <!-- label="鍔犲伐鐘舵��"-->
<el-table-column
prop="status"
- label="鍔犲伐鐘舵��"
- width="70"
+ label="鐘舵��"
+ width="65"
>
<template slot-scope="{row}">
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
@@ -129,7 +131,7 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
@@ -138,57 +140,67 @@
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="158"
+ width="178"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="175"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- width="145"
- />
- <el-table-column
- prop="partspec"
- label="瑙勬牸"
- width="125"
+ width="205"
>
<template slot-scope="{row}">
- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-if="row.wo_code" class="ellipsis">{{ row.wo_code }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="name"
- label="鍗曚綅"
- width="50"
- />
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="瑙勬牸"-->
+ <!-- width="125"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- label="鍗曚綅"-->
+ <!-- width="50"-->
+ <!-- />-->
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="wcl"
label="瀹屾垚鐜�"
- width="50"
+ width="60"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
@@ -197,7 +209,7 @@
<el-table-column
prop="planenddate"
label="棰勮寮�濮�"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.planenddate.substring(0, 10) }}</div>
@@ -206,7 +218,7 @@
<el-table-column
prop="planstartdate"
label="棰勮缁撴潫"
- width="105"
+ width="125"
>
<template slot-scope="{row}">
<div>{{ row.planstartdate.substring(0, 10) }}</div>
@@ -250,12 +262,22 @@
prop="linename"
label="浜х嚎"
width="120"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.linename" class="ellipsis">{{ row.linename }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="partname"
width="138"
label="浜у搧"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
@@ -301,14 +323,14 @@
headTime: '',
lineContent: [],
- lineContent4: [],
+ lineContent3: [],
leftTopData: [],
tableData: [],
tableDataRank: [],
lineCodeArr: [],
- ShopArr: ['CJ003'], // 杞﹂棿缂栫爜鏁扮粍 鍖呰杞﹂棿
+ ShopArr: ['CJ003'], // 杞﹂棿缂栫爜鏁扮粍
MarqueeTipsContent: '', // 鍏憡
speed: 100// 鍏憡鎾斁鐨勯�熷害
@@ -331,6 +353,7 @@
await this.getTableDataRoll()
await this.getTableDataRankRoll()
await this.getMarqueeTipsContent()
+ await this.getMarqueeTipsContent()
},
// 鑾峰彇鍏憡
getMarqueeTipsContent() {
@@ -351,11 +374,12 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
})
+ // }, this.speed * 1000)
}, 1000 * 60 * 5)
})
},
// 鑾峰彇杞﹂棿缂栫爜
- async getShopSearch() {
+ async getShopSearch() {
const res1 = await ShopSearch()
if (res1.code === '200') {
this.ShopArr = []
@@ -380,26 +404,26 @@
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
let start = 0
const task = setInterval(() => {
- if (Math.floor(start / 4) === count && count !== 0) {
+ if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
} else if (count === 0) {
clearInterval(task)
this.getShopSearchLine()
}
- this.lineContent4 = this.lineContent.slice(start, start + 4)
- start = start + 4
+ this.lineContent3 = this.lineContent.slice(start, start + 3)
+ start = start + 3
}, 1000 * 3)
},
@@ -526,9 +550,8 @@
.kb_left_top_title01 {
position: absolute;
- top: 40px;
+ top: 37px;
left: 15px;
- font-size: 18px;
display: flex;
color: #00ffff;
@@ -547,6 +570,7 @@
flex-direction: column;
justify-content: flex-start;
padding-top: 70px;
+
.kb_left_top02 {
display: flex;
flex-direction: column;
@@ -558,9 +582,9 @@
.kb_left_top_block {
width: 100%;
- height: 100px;
+ height: 133px;
display: flex;
- font-size: 14px;
+ font-size: 17px;
border-bottom: 1px solid $kbBorderColor;
justify-content: flex-start;
@@ -573,23 +597,23 @@
.kb_block03 {
width: 1020px;
-
+ font-size: 17px;
display: flex;
flex-direction: column;
- font-size: 12px;
+ //font-size: 12px;
border-radius: 5px;
.kb_block03_content {
border: 1px solid $kbBorderColor;
width: 180px;
- height: 50px;
+ height: 80px;
margin-right: 15px;
display: flex;
flex-direction: column;
.content01 {
+ height: 30px;
width: 100%;
- height: 18px;
border-bottom: 1px solid $kbBorderColor;
display: flex;
align-items: center;
@@ -598,6 +622,7 @@
.content02Parent {
display: flex;
+
.content02 {
width: 60px;
border-right: 1px solid $kbBorderColor;
@@ -606,11 +631,12 @@
display: flex;
align-items: center;
justify-content: center;
- height: 50%;
+ //height: 50%;
+ height: 25px;
}
.content02_2 {
- height: 50%;
+ height: 25px;
display: flex;
align-items: center;
justify-content: center;
@@ -648,7 +674,7 @@
}
- .kb_left_top_block:nth-child(4n) {
+ .kb_left_top_block:nth-child(3n) {
border-bottom: none !important;
}
}
@@ -663,7 +689,6 @@
flex-direction: column;
.content_head {
- font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -694,7 +719,7 @@
flex-direction: column;
.content_head {
- font-size: 18px;
+ //font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -713,9 +738,8 @@
.kb_right_bottom_content_title {
color: #00ffff;
- font-size: 18px;
- margin-bottom: 10px;
- margin-top: -10px;
+ margin-bottom: 5px;
+ margin-top: -12px;
}
.kb_right_bottom_content {
@@ -744,6 +768,7 @@
::v-deep .cell {
padding: 0 !important;
+ font-size: 18px;
}
.circleYellow {
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 3d94a3b..d6a476a 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -3,7 +3,7 @@
<div class="kb_dashboard">
<div class="kb_header">
<div class="flex_c_c" style="letter-spacing: 3px;margin-left: 1px;">
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘
+ 閲囪喘璺熻釜鐪嬫澘
</div>
<div class="kb_headerPic" />
<div class="kb_headTime">
@@ -14,7 +14,7 @@
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
style="top:100px"
- :speed="300"
+ :speed="180"
/>
<div class="kb_content">
<div class="kb_left">
@@ -63,12 +63,16 @@
<el-table-column
prop="PurchaseOrder"
label="閲囪喘璁㈠崟"
- width="163"
- />
+ width="203"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.PurchaseOrder }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="suppername"
label="渚涘簲鍟�"
- width="125"
+ width="163"
>
<template slot-scope="{row}">
<div v-if="row.suppername" class="ellipsis">{{ row.suppername }}</div>
@@ -78,37 +82,42 @@
<el-table-column
prop="username"
label="閲囪喘鍛�"
- width="68"
+ width="78"
>
<template slot-scope="{row}">
<div v-if="row.username">{{ row.username }}</div>
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="partcode"
- label="浜у搧缂栫爜"
- width="108"
- />
+ <!-- <el-table-column-->
+ <!-- prop="partcode"-->
+ <!-- label="浜у搧缂栫爜"-->
+ <!-- width="108"-->
+ <!-- />-->
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="155"
- />
- <el-table-column
- prop="partspec"
- label="瑙勬牸鍨嬪彿"
- width="130"
+ width="175"
>
<template slot-scope="{row}">
- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
- <div v-else>/</div>
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else />
</template>
</el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="瑙勬牸鍨嬪彿"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="quantity"
label="璁㈠崟鏁伴噺"
- width="74"
+ width="94"
>
<template slot-scope="{row}">
<div v-if="row.quantity">{{ parseFloat(row.quantity) }}</div>
@@ -118,7 +127,7 @@
<el-table-column
prop="checktype"
label="妫�楠岀姸鎬�"
- width="84"
+ width="94"
>
<template slot-scope="{row}">
<div v-if="row.checktype===null">鏈楠�</div>
@@ -128,12 +137,12 @@
<el-table-column
prop="checkuser"
label="妫�楠屼汉鍛�"
- width="84"
+ width="94"
/>
<el-table-column
prop="quantity1"
label="宸叉敹鏁伴噺"
- width="74"
+ width="94"
>
<template slot-scope="{row}">
<div v-if="row.quantity1">{{ parseFloat(row.quantity1) }}</div>
@@ -142,7 +151,7 @@
</el-table-column>
<el-table-column
label="鏈敹鏁伴噺"
- width="74"
+ width="94"
>
<template slot-scope="{row}">
<div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity- row.quantity1) }}</div>
@@ -152,7 +161,7 @@
<el-table-column
prop="acceptDate"
label="棰勮浜ゆ湡"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div v-if="row.acceptDate">{{ row.acceptDate.substring(0, 10) }}</div>
@@ -162,7 +171,7 @@
<el-table-column
prop="warning"
label="寤舵湡澶╂暟"
- width="84"
+ width="114"
>
<template slot-scope="{row}">
<div v-if="parseFloat(row.warning)<0" style="color: red">{{ Math.abs(parseFloat(row.warning)) }}</div>
@@ -209,7 +218,12 @@
prop="suppercode"
label="渚涘簲鍟嗙紪鐮�"
width="130"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.suppercode" class="ellipsis">{{ row.suppercode }}</div>
+ <div v-else />
+ </template>
+ </el-table-column>
<el-table-column
prop="suppername"
width="283"
@@ -444,10 +458,12 @@
.number {
margin-top: -50px;
font-size: 18px;
+ font-size: 20px;
}
.text{
margin-top: 50px;
+ font-size: 20px;
}
}
}
@@ -465,7 +481,7 @@
.content_head {
color: #00ffff;
line-height: 20px;
- font-size: 18px;
+ //font-size: 18px;
margin-bottom: 10px;
margin-top: -10px;
}
@@ -494,7 +510,7 @@
.content_head {
color: #00ffff;
line-height: 20px;
- font-size: 18px;
+ //font-size: 18px;
margin-bottom: 10px;
margin-top: -10px;
}
@@ -523,6 +539,7 @@
::v-deep .cell {
padding: 0 !important;
+ font-size: 18px;
}
</style>
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 5fe2ad3..5b1fe05 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -14,7 +14,7 @@
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
style="top:90px"
- :speed="300"
+ :speed="180"
/>
<div class="kb_content">
<div class="kb_left">
@@ -34,87 +34,99 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="120"
+ width="140"
>
<template slot-scope="{row}">
- <div v-if=" row.voucherdate">{{ row.voucherdate.substring(0, 10) }}</div>
+ <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="159"
- />
+ 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="180"
+ width="200"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <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="96"
- />
+ 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="160"
+ width="180"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_name }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="128"
- >
- <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="specification"-->
+ <!-- label="瑙勬牸鍨嬪彿"-->
+ <!-- width="128"-->
+ <!-- >-->
+ <!-- <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">{{ row.stck_name }}</div>
+ <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="55"
+ width="63"
/>
<el-table-column
prop="totalStockInQuantity"
label="宸插叆搴撴暟閲�"
- width="80"
+ width="100"
>
<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="uomname"-->
+ <!-- label="鍗曚綅"-->
+ <!-- width="50"-->
+ <!-- />-->
<!-- <el-table-column-->
<!-- prop="preStartDate"-->
<!-- label="棰勮寮�宸�"-->
@@ -128,7 +140,7 @@
<el-table-column
prop="preFinishDate"
label="棰勮鍏ュ簱"
- width="120"
+ width="140"
>
<template slot-scope="{row}">
<div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
@@ -152,18 +164,22 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="110"
+ width="130"
>
<template slot-scope="{row}">
- <div v-if="row.voucherdate">{{ row.voucherdate.substring(0, 10) }}</div>
- <div v-else />
+ <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="145"
- />
+ width="195"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.wo }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="customename"
label="瀹㈡埛"
@@ -171,73 +187,96 @@
>
<template slot-scope="{row}">
<div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>
- <div v-else />
- </template>
- </el-table-column>
- <el-table-column
- prop="username"
- label="涓氬姟鍛�"
- width="65"
- />
- <el-table-column
- prop="SourceVoucherCode"
- label="鏉ユ簮鍗曞彿"
- width="145"
- >
- <template slot-scope="{row}">
- <div v-if="row.SourceVoucherCode">{{ row.SourceVoucherCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="username"-->
+ <!-- label="涓氬姟鍛�"-->
+ <!-- width="65"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.username" class="ellipsis">{{ row.username }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
- prop="materiel_code"
- label="浜у搧缂栧彿"
- width="96"
- />
+ prop="SourceVoucherCode"
+ label="鏉ユ簮鍗曞彿"
+ width="185"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="materiel_code"-->
+ <!-- label="浜у搧缂栧彿"-->
+ <!-- width="96"-->
+ <!-- />-->
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
width="170"
- />
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="100"
>
<template slot-scope="{row}">
- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
- <div v-else>/</div>
+ <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
</template>
</el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="specification"-->
+ <!-- label="瑙勬牸鍨嬪彿"-->
+ <!-- width="100"-->
+ <!-- >-->
+ <!-- <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="47"
- />
+ width="87"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.quantity }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="saleOutQuantity"
label="宸插彂璐ф暟閲�"
- width="80"
+ width="100"
>
<template slot-scope="{row}">
- <div v-if="row.saleOutQuantity">{{ row.saleOutQuantity }}</div>
+ <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
<div v-else>0</div>
</template>
</el-table-column>
<el-table-column
prop="priuserdefnvc1"
label="妫�楠屾柟寮�"
- width="80"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="priuserdefnvc2"
label="妫�楠屼汉鍛�"
- width="80"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="deliveryDate"
label="棰勮浜よ揣鏃ユ湡"
- width="110"
+ width="141"
>
<template slot-scope="{row}">
<div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div>
@@ -466,7 +505,7 @@
//text-align: center;
//font-size: 26px;
line-height: 20px;
- font-size: 18px;
+ //font-size: 18px;
margin-bottom: 10px;
margin-top: -10px;
color: #00ffff;
@@ -497,7 +536,7 @@
.content_head {
line-height: 20px;
- font-size: 18px;
+ //font-size: 18px;
margin-bottom: 10px;
margin-top: -10px;
color: #00ffff;
@@ -530,5 +569,7 @@
::v-deep .cell {
padding: 0 !important;
+ //font-size: 16px;
+ font-size: 18px;
}
</style>
diff --git a/src/views/kb/dccj.vue b/src/views/kb/dccj.vue
index 8a6a4e1..06c2e93 100644
--- a/src/views/kb/dccj.vue
+++ b/src/views/kb/dccj.vue
@@ -13,8 +13,9 @@
<MarqueeTips
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
- :speed="300"
+ :speed="180"
/>
+ <!-- :speed="speed"-->
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
@@ -26,7 +27,7 @@
<div class="kb_left_top kb_pd10">
<div class="kb_left_top02">
- <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
+ <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>
@@ -113,12 +114,13 @@
<el-table-column
prop="RowNum"
label="搴忓彿"
- width="40"
+ width="50"
/>
+ <!-- label="鍔犲伐鐘舵��"-->
<el-table-column
prop="status"
- label="鍔犲伐鐘舵��"
- width="70"
+ label="鐘舵��"
+ width="65"
>
<template slot-scope="{row}">
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
@@ -129,7 +131,7 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
@@ -138,57 +140,67 @@
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="158"
+ width="178"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="175"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- width="145"
- />
- <el-table-column
- prop="partspec"
- label="瑙勬牸"
- width="125"
+ width="205"
>
<template slot-scope="{row}">
- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-if="row.wo_code" class="ellipsis">{{ row.wo_code }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="name"
- label="鍗曚綅"
- width="50"
- />
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="瑙勬牸"-->
+ <!-- width="125"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- label="鍗曚綅"-->
+ <!-- width="50"-->
+ <!-- />-->
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="wcl"
label="瀹屾垚鐜�"
- width="50"
+ width="60"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
@@ -197,7 +209,7 @@
<el-table-column
prop="planenddate"
label="棰勮寮�濮�"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.planenddate.substring(0, 10) }}</div>
@@ -206,7 +218,7 @@
<el-table-column
prop="planstartdate"
label="棰勮缁撴潫"
- width="105"
+ width="125"
>
<template slot-scope="{row}">
<div>{{ row.planstartdate.substring(0, 10) }}</div>
@@ -250,12 +262,22 @@
prop="linename"
label="浜х嚎"
width="120"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.linename" class="ellipsis">{{ row.linename }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="partname"
width="138"
label="浜у搧"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
@@ -301,14 +323,14 @@
headTime: '',
lineContent: [],
- lineContent4: [],
+ lineContent3: [],
leftTopData: [],
tableData: [],
tableDataRank: [],
lineCodeArr: [],
- ShopArr: ['CJ002'], // 杞﹂棿缂栫爜鏁扮粍 鐢垫睜杞﹂棿
+ ShopArr: ['CJ002'], // 杞﹂棿缂栫爜鏁扮粍
MarqueeTipsContent: '', // 鍏憡
speed: 100// 鍏憡鎾斁鐨勯�熷害
@@ -331,6 +353,7 @@
await this.getTableDataRoll()
await this.getTableDataRankRoll()
await this.getMarqueeTipsContent()
+ await this.getMarqueeTipsContent()
},
// 鑾峰彇鍏憡
getMarqueeTipsContent() {
@@ -351,11 +374,12 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
})
+ // }, this.speed * 1000)
}, 1000 * 60 * 5)
})
},
// 鑾峰彇杞﹂棿缂栫爜
- async getShopSearch() {
+ async getShopSearch() {
const res1 = await ShopSearch()
if (res1.code === '200') {
this.ShopArr = []
@@ -380,26 +404,26 @@
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
let start = 0
const task = setInterval(() => {
- if (Math.floor(start / 4) === count && count !== 0) {
+ if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
} else if (count === 0) {
clearInterval(task)
this.getShopSearchLine()
}
- this.lineContent4 = this.lineContent.slice(start, start + 4)
- start = start + 4
+ this.lineContent3 = this.lineContent.slice(start, start + 3)
+ start = start + 3
}, 1000 * 3)
},
@@ -526,9 +550,8 @@
.kb_left_top_title01 {
position: absolute;
- top: 40px;
+ top: 37px;
left: 15px;
- font-size: 18px;
display: flex;
color: #00ffff;
@@ -547,6 +570,7 @@
flex-direction: column;
justify-content: flex-start;
padding-top: 70px;
+
.kb_left_top02 {
display: flex;
flex-direction: column;
@@ -558,9 +582,9 @@
.kb_left_top_block {
width: 100%;
- height: 100px;
+ height: 133px;
display: flex;
- font-size: 14px;
+ font-size: 17px;
border-bottom: 1px solid $kbBorderColor;
justify-content: flex-start;
@@ -573,23 +597,23 @@
.kb_block03 {
width: 1020px;
-
+ font-size: 17px;
display: flex;
flex-direction: column;
- font-size: 12px;
+ //font-size: 12px;
border-radius: 5px;
.kb_block03_content {
border: 1px solid $kbBorderColor;
width: 180px;
- height: 50px;
+ height: 80px;
margin-right: 15px;
display: flex;
flex-direction: column;
.content01 {
+ height: 30px;
width: 100%;
- height: 18px;
border-bottom: 1px solid $kbBorderColor;
display: flex;
align-items: center;
@@ -598,6 +622,7 @@
.content02Parent {
display: flex;
+
.content02 {
width: 60px;
border-right: 1px solid $kbBorderColor;
@@ -606,11 +631,12 @@
display: flex;
align-items: center;
justify-content: center;
- height: 50%;
+ //height: 50%;
+ height: 25px;
}
.content02_2 {
- height: 50%;
+ height: 25px;
display: flex;
align-items: center;
justify-content: center;
@@ -648,7 +674,7 @@
}
- .kb_left_top_block:nth-child(4n) {
+ .kb_left_top_block:nth-child(3n) {
border-bottom: none !important;
}
}
@@ -663,7 +689,6 @@
flex-direction: column;
.content_head {
- font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -694,7 +719,7 @@
flex-direction: column;
.content_head {
- font-size: 18px;
+ //font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -713,9 +738,8 @@
.kb_right_bottom_content_title {
color: #00ffff;
- font-size: 18px;
- margin-bottom: 10px;
- margin-top: -10px;
+ margin-bottom: 5px;
+ margin-top: -12px;
}
.kb_right_bottom_content {
@@ -744,6 +768,7 @@
::v-deep .cell {
padding: 0 !important;
+ font-size: 18px;
}
.circleYellow {
diff --git a/src/views/kb/kbCommon.css b/src/views/kb/kbCommon.css
index a858176..1e65115 100644
--- a/src/views/kb/kbCommon.css
+++ b/src/views/kb/kbCommon.css
@@ -16,7 +16,7 @@
/*background-color: #123;*/
height: 90px;
line-height: 90px;
- font-size: 40px;
+ font-size: 56px;
color: #09d8f2;
}
@@ -27,6 +27,7 @@
.kb_title_text{
font-weight: bolder;
+ font-size: 24px;
}
.kb_headerPic {
@@ -45,11 +46,12 @@
.kb_headTime {
position: absolute;
right: 10px;
- width: 300px;
+ width: 360px;
height: 50px;
z-index: 10;
top: -20px;
- font-size: 22px;
+ font-size: 28px;
+
}
@@ -95,7 +97,7 @@
height: 30px;
width: 100%;
line-height: 30px;
- font-size: 26px;
+ font-size: 32px;
z-index: 2;
position: absolute;
top:80px;
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 9bea1a6..dd99047 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -3,7 +3,7 @@
<div class="kb_dashboard">
<div class="kb_header">
<div class="flex_c_c kb_header_text">
- 澶у矝杞﹂棿缁煎悎鐪嬫澘
+ 杞﹂棿缁煎悎鐪嬫澘
</div>
<div class="kb_headerPic" />
<div class="kb_headTime">
@@ -13,7 +13,7 @@
<MarqueeTips
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
- :speed="300"
+ :speed="180"
/>
<!-- :speed="speed"-->
<div class="kb_content">
@@ -27,7 +27,7 @@
<div class="kb_left_top kb_pd10">
<div class="kb_left_top02">
- <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
+ <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>
@@ -114,12 +114,13 @@
<el-table-column
prop="RowNum"
label="搴忓彿"
- width="40"
+ width="50"
/>
+ <!-- label="鍔犲伐鐘舵��"-->
<el-table-column
prop="status"
- label="鍔犲伐鐘舵��"
- width="70"
+ label="鐘舵��"
+ width="65"
>
<template slot-scope="{row}">
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
@@ -130,7 +131,7 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
@@ -139,57 +140,67 @@
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="158"
+ width="178"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="175"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- width="145"
- />
- <el-table-column
- prop="partspec"
- label="瑙勬牸"
- width="125"
+ width="205"
>
<template slot-scope="{row}">
- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-if="row.wo_code" class="ellipsis">{{ row.wo_code }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="name"
- label="鍗曚綅"
- width="50"
- />
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="瑙勬牸"-->
+ <!-- width="125"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- label="鍗曚綅"-->
+ <!-- width="50"-->
+ <!-- />-->
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="wcl"
label="瀹屾垚鐜�"
- width="50"
+ width="60"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
@@ -198,7 +209,7 @@
<el-table-column
prop="planenddate"
label="棰勮寮�濮�"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.planenddate.substring(0, 10) }}</div>
@@ -207,7 +218,7 @@
<el-table-column
prop="planstartdate"
label="棰勮缁撴潫"
- width="105"
+ width="125"
>
<template slot-scope="{row}">
<div>{{ row.planstartdate.substring(0, 10) }}</div>
@@ -251,12 +262,22 @@
prop="linename"
label="浜х嚎"
width="120"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.linename" class="ellipsis">{{ row.linename }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="partname"
width="138"
label="浜у搧"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
@@ -302,7 +323,7 @@
headTime: '',
lineContent: [],
- lineContent4: [],
+ lineContent3: [],
leftTopData: [],
tableData: [],
@@ -353,12 +374,12 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
})
- // }, this.speed * 1000)
+ // }, this.speed * 1000)
}, 1000 * 60 * 5)
})
},
// 鑾峰彇杞﹂棿缂栫爜
- async getShopSearch() {
+ async getShopSearch() {
const res1 = await ShopSearch()
if (res1.code === '200') {
this.ShopArr = []
@@ -383,26 +404,26 @@
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
let start = 0
const task = setInterval(() => {
- if (Math.floor(start / 4) === count && count !== 0) {
+ if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
} else if (count === 0) {
clearInterval(task)
this.getShopSearchLine()
}
- this.lineContent4 = this.lineContent.slice(start, start + 4)
- start = start + 4
+ this.lineContent3 = this.lineContent.slice(start, start + 3)
+ start = start + 3
}, 1000 * 3)
},
@@ -529,9 +550,8 @@
.kb_left_top_title01 {
position: absolute;
- top: 40px;
+ top: 37px;
left: 15px;
- font-size: 18px;
display: flex;
color: #00ffff;
@@ -550,6 +570,7 @@
flex-direction: column;
justify-content: flex-start;
padding-top: 70px;
+
.kb_left_top02 {
display: flex;
flex-direction: column;
@@ -561,9 +582,9 @@
.kb_left_top_block {
width: 100%;
- height: 100px;
+ height: 133px;
display: flex;
- font-size: 14px;
+ font-size: 17px;
border-bottom: 1px solid $kbBorderColor;
justify-content: flex-start;
@@ -576,23 +597,23 @@
.kb_block03 {
width: 1020px;
-
+ font-size: 17px;
display: flex;
flex-direction: column;
- font-size: 12px;
+ //font-size: 12px;
border-radius: 5px;
.kb_block03_content {
border: 1px solid $kbBorderColor;
width: 180px;
- height: 50px;
+ height: 80px;
margin-right: 15px;
display: flex;
flex-direction: column;
.content01 {
+ height: 30px;
width: 100%;
- height: 18px;
border-bottom: 1px solid $kbBorderColor;
display: flex;
align-items: center;
@@ -601,6 +622,7 @@
.content02Parent {
display: flex;
+
.content02 {
width: 60px;
border-right: 1px solid $kbBorderColor;
@@ -609,11 +631,12 @@
display: flex;
align-items: center;
justify-content: center;
- height: 50%;
+ //height: 50%;
+ height: 25px;
}
.content02_2 {
- height: 50%;
+ height: 25px;
display: flex;
align-items: center;
justify-content: center;
@@ -651,7 +674,7 @@
}
- .kb_left_top_block:nth-child(4n) {
+ .kb_left_top_block:nth-child(3n) {
border-bottom: none !important;
}
}
@@ -666,7 +689,6 @@
flex-direction: column;
.content_head {
- font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -697,7 +719,7 @@
flex-direction: column;
.content_head {
- font-size: 18px;
+ //font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -716,9 +738,8 @@
.kb_right_bottom_content_title {
color: #00ffff;
- font-size: 18px;
- margin-bottom: 10px;
- margin-top: -10px;
+ margin-bottom: 5px;
+ margin-top: -12px;
}
.kb_right_bottom_content {
@@ -747,6 +768,7 @@
::v-deep .cell {
padding: 0 !important;
+ font-size: 18px;
}
.circleYellow {
diff --git a/src/views/kb/zpcj.vue b/src/views/kb/zpcj.vue
index b103957..99b042f 100644
--- a/src/views/kb/zpcj.vue
+++ b/src/views/kb/zpcj.vue
@@ -13,8 +13,9 @@
<MarqueeTips
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
- :speed="300"
+ :speed="180"
/>
+ <!-- :speed="speed"-->
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
@@ -26,7 +27,7 @@
<div class="kb_left_top kb_pd10">
<div class="kb_left_top02">
- <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
+ <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>
@@ -113,12 +114,13 @@
<el-table-column
prop="RowNum"
label="搴忓彿"
- width="40"
+ width="50"
/>
+ <!-- label="鍔犲伐鐘舵��"-->
<el-table-column
prop="status"
- label="鍔犲伐鐘舵��"
- width="70"
+ label="鐘舵��"
+ width="65"
>
<template slot-scope="{row}">
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
@@ -129,7 +131,7 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
@@ -138,57 +140,67 @@
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="158"
+ width="178"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="175"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- width="145"
- />
- <el-table-column
- prop="partspec"
- label="瑙勬牸"
- width="125"
+ width="205"
>
<template slot-scope="{row}">
- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-if="row.wo_code" class="ellipsis">{{ row.wo_code }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="name"
- label="鍗曚綅"
- width="50"
- />
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="瑙勬牸"-->
+ <!-- width="125"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- label="鍗曚綅"-->
+ <!-- width="50"-->
+ <!-- />-->
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
- width="70"
+ width="85"
/>
<el-table-column
prop="wcl"
label="瀹屾垚鐜�"
- width="50"
+ width="60"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
@@ -197,7 +209,7 @@
<el-table-column
prop="planenddate"
label="棰勮寮�濮�"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.planenddate.substring(0, 10) }}</div>
@@ -206,7 +218,7 @@
<el-table-column
prop="planstartdate"
label="棰勮缁撴潫"
- width="105"
+ width="125"
>
<template slot-scope="{row}">
<div>{{ row.planstartdate.substring(0, 10) }}</div>
@@ -250,12 +262,22 @@
prop="linename"
label="浜х嚎"
width="120"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.linename" class="ellipsis">{{ row.linename }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="partname"
width="138"
label="浜у搧"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
@@ -301,14 +323,14 @@
headTime: '',
lineContent: [],
- lineContent4: [],
+ lineContent3: [],
leftTopData: [],
tableData: [],
tableDataRank: [],
lineCodeArr: [],
- ShopArr: ['CJ001'], // 杞﹂棿缂栫爜鏁扮粍 瑁呴厤杞﹂棿
+ ShopArr: ['CJ001'], // 杞﹂棿缂栫爜鏁扮粍
MarqueeTipsContent: '', // 鍏憡
speed: 100// 鍏憡鎾斁鐨勯�熷害
@@ -331,6 +353,7 @@
await this.getTableDataRoll()
await this.getTableDataRankRoll()
await this.getMarqueeTipsContent()
+ await this.getMarqueeTipsContent()
},
// 鑾峰彇鍏憡
getMarqueeTipsContent() {
@@ -351,11 +374,12 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
})
+ // }, this.speed * 1000)
}, 1000 * 60 * 5)
})
},
// 鑾峰彇杞﹂棿缂栫爜
- async getShopSearch() {
+ async getShopSearch() {
const res1 = await ShopSearch()
if (res1.code === '200') {
this.ShopArr = []
@@ -380,26 +404,26 @@
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
let start = 0
const task = setInterval(() => {
- if (Math.floor(start / 4) === count && count !== 0) {
+ if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
- count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
- this.lineContent4 = this.lineContent.slice(0, 4)
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
})
} else if (count === 0) {
clearInterval(task)
this.getShopSearchLine()
}
- this.lineContent4 = this.lineContent.slice(start, start + 4)
- start = start + 4
+ this.lineContent3 = this.lineContent.slice(start, start + 3)
+ start = start + 3
}, 1000 * 3)
},
@@ -526,9 +550,8 @@
.kb_left_top_title01 {
position: absolute;
- top: 40px;
+ top: 37px;
left: 15px;
- font-size: 18px;
display: flex;
color: #00ffff;
@@ -547,6 +570,7 @@
flex-direction: column;
justify-content: flex-start;
padding-top: 70px;
+
.kb_left_top02 {
display: flex;
flex-direction: column;
@@ -558,9 +582,9 @@
.kb_left_top_block {
width: 100%;
- height: 100px;
+ height: 133px;
display: flex;
- font-size: 14px;
+ font-size: 17px;
border-bottom: 1px solid $kbBorderColor;
justify-content: flex-start;
@@ -573,23 +597,23 @@
.kb_block03 {
width: 1020px;
-
+ font-size: 17px;
display: flex;
flex-direction: column;
- font-size: 12px;
+ //font-size: 12px;
border-radius: 5px;
.kb_block03_content {
border: 1px solid $kbBorderColor;
width: 180px;
- height: 50px;
+ height: 80px;
margin-right: 15px;
display: flex;
flex-direction: column;
.content01 {
+ height: 30px;
width: 100%;
- height: 18px;
border-bottom: 1px solid $kbBorderColor;
display: flex;
align-items: center;
@@ -598,6 +622,7 @@
.content02Parent {
display: flex;
+
.content02 {
width: 60px;
border-right: 1px solid $kbBorderColor;
@@ -606,11 +631,12 @@
display: flex;
align-items: center;
justify-content: center;
- height: 50%;
+ //height: 50%;
+ height: 25px;
}
.content02_2 {
- height: 50%;
+ height: 25px;
display: flex;
align-items: center;
justify-content: center;
@@ -648,7 +674,7 @@
}
- .kb_left_top_block:nth-child(4n) {
+ .kb_left_top_block:nth-child(3n) {
border-bottom: none !important;
}
}
@@ -663,7 +689,6 @@
flex-direction: column;
.content_head {
- font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -694,7 +719,7 @@
flex-direction: column;
.content_head {
- font-size: 18px;
+ //font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -713,9 +738,8 @@
.kb_right_bottom_content_title {
color: #00ffff;
- font-size: 18px;
- margin-bottom: 10px;
- margin-top: -10px;
+ margin-bottom: 5px;
+ margin-top: -12px;
}
.kb_right_bottom_content {
@@ -744,6 +768,7 @@
::v-deep .cell {
padding: 0 !important;
+ font-size: 18px;
}
.circleYellow {
diff --git a/src/views/sbgl/djjl.vue b/src/views/sbgl/djjl.vue
index fe0976f..9f1d18b 100644
--- a/src/views/sbgl/djjl.vue
+++ b/src/views/sbgl/djjl.vue
@@ -322,10 +322,10 @@
},
async getDeviceCheckTakeSearch() {
const res = await DeviceCheckTakeSearch(this.form)
- // this.tableData = res.data
- this.tableData = [
- { RowNum: 1, djjg: 'N' }
- ]
+ this.tableData = res.data
+ // this.tableData = [
+ // { RowNum: 1, djjg: 'N' }
+ // ]
this.total = res.count
return { code: res.code }
--
Gitblit v1.9.3