From d0a2c018b1612fb40d5e38f78d5180f2b90500fd Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 06 九月 2022 17:28:49 +0800
Subject: [PATCH] 1.新增车间公告页面2.新看板修改并部署
---
src/views/kb/ckgl.vue | 130 ++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 62 deletions(-)
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 0d93c85..749ccb1 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -10,11 +10,15 @@
<span>{{ headTime }}</span>
</div>
</div>
-
+ <MarqueeTips
+ :content="MarqueeTipsContent"
+ class="MarqueeTipsContentClass"
+ style="top:90px"
+ :speed="speed"
+ />
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
- <!-- <div class="kb_left_top kb_pd10" style="padding:10px 0px 10px 5px">-->
<div class="kb_left_top kb_pd10">
<div class="kb_left_top_block" style="margin-top: 10px">
<div class="headTitle kb_title_text">浜у搧寰呭叆搴�</div>
@@ -25,12 +29,12 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="440"
+ height="400"
>
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="110"
+ width="120"
>
<template slot-scope="{row}">
<div v-if=" row.voucherdate">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -40,17 +44,17 @@
<el-table-column
prop="wo"
label="鍗曟嵁缂栧彿"
- width="149"
+ width="159"
/>
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
- width="95"
+ width="105"
/>
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="170"
+ width="180"
>
<template slot-scope="{row}">
<div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
@@ -60,17 +64,21 @@
<el-table-column
prop="materiel_code"
label="浜у搧缂栧彿"
- width="86"
+ width="96"
/>
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="140"
- />
+ width="160"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.materiel_name }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="specification"
label="瑙勬牸鍨嬪彿"
- width="113"
+ width="128"
>
<template slot-scope="{row}">
<div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
@@ -90,7 +98,7 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="50"
+ width="55"
/>
<el-table-column
prop="totalStockInQuantity"
@@ -107,20 +115,20 @@
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="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="110"
+ label="棰勮鍏ュ簱"
+ width="120"
>
<template slot-scope="{row}">
<div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
@@ -240,26 +248,15 @@
</div>
</div>
</div>
- <!-- 2-->
- <div v-if="false" class="kb_left_bottom kb_pd10">
- <div class="kb_left_bottom_content">
- <div class="content01">
- <!-- <div id="bar03" style="width: 100%;height:100%" />-->
- </div>
- <div class="content01">
- <!-- <div id="bar04" style="width: 100%;height:100%" />-->
- </div>
- </div>
- </div>
</div>
<div class="kb_right kb_pd10">
<div class="kb_right_top kb_pd10">
<div class="kb_right_top_content">
- <div class="content_head kb_title_text">浜у搧搴撳瓨閲忔帓琛孴op5</div>
- <div class="content_body">
+ <div class="content_head kb_title_text" style="margin-top: 30px;">浜у搧搴撳瓨閲忔帓琛孴op5</div>
+ <div class="content_body" style="height:402px;">
<div id="bar03" style="width: 100%;height:100%" />
</div>
- <div class="content_head kb_title_text" style="margin-top: 12px">鍘熸枡搴撳瓨閲忔帓琛孴op5</div>
+ <div class="content_head kb_title_text" style="margin-top: 12px">鍗婃垚鍝佸簱瀛橀噺鎺掕Top5</div>
<div class="content_body">
<div id="bar04" style="width: 100%;height:100%" />
</div>
@@ -281,14 +278,21 @@
WareHouseTopBottomData,
WareHouseTopLeftData
} from '@/api/dzkb'
+import MarqueeTips from 'vue-marquee-tips'
export default {
name: 'Index2',
+ components: {
+ MarqueeTips
+ },
data() {
return {
headTime: '',
tableDataTop: [],
- tableDataBottom: []
+ tableDataBottom: [],
+
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100// 鍏憡鎾斁鐨勯�熷害
}
},
@@ -299,8 +303,17 @@
this.getWareHouseTopLeftData()
this.getWareHouseTopBottomData()
this.getEcharts()
+
+ this.getMarqueeTipsContent()
},
methods: {
+ // 鑾峰彇鍏憡
+ getMarqueeTipsContent() {
+ this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
+ const spance = ' '.padStart(this.MarqueeTipsContent.length * 2, ' ')
+ this.MarqueeTipsContent = this.MarqueeTipsContent + spance
+ this.speed = this.MarqueeTipsContent.length / 10
+ },
// 鑾峰彇宸︿笂table鏁版嵁
getWareHouseTopLeftData() {
WareHouseTopLeftData().then(res => {
@@ -308,7 +321,7 @@
const divData = this.$refs.tableDataTopRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- setInterval(() => {
+ const task = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -318,9 +331,13 @@
divData.scrollTop = 0
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
+ if (this.tableDataTop.length > 9) {
+ clearInterval(task)
+ this.getWareHouseTopLeftData()
+ }
})
}
- }, this.tableDataTop.length <= 10 ? 1000 * 6 : 100)
+ }, this.tableDataTop.length <= 9 ? 1000 * 3 : 100)
})
},
// 鑾峰彇宸︿笅table鏁版嵁
@@ -330,7 +347,7 @@
const divData = this.$refs.tableDataBottomRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- setInterval(() => {
+ const task = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -340,9 +357,14 @@
divData.scrollTop = 0
WareHouseTopBottomData().then(res => {
this.tableDataBottom = res.data
+
+ if (this.tableDataBottom.length > 10) {
+ clearInterval(task)
+ this.getWareHouseTopBottomData()
+ }
})
}
- }, this.tableDataBottom.length <= 10 ? 1000 * 6 : 100)
+ }, this.tableDataBottom.length <= 10 ? 1000 * 3 : 100)
})
},
@@ -426,7 +448,8 @@
padding-left: 5px;
.kb_left_top {
- height: 920px;
+ height:880px;
+ margin-top: 40px;
display: flex;
flex-direction: column;
justify-content: flex-start;
@@ -457,23 +480,6 @@
}
- .kb_left_bottom {
- height: 395px;
-
- .kb_left_bottom_content {
- height: 360px;
- display: flex;
- justify-content: space-between;
-
- .content01 {
- width: 48%;
- height: 100%;
- border: 1px solid $kbBorderColor;
- background-color: $kbBackgroundColor;
- border-radius: 5px;
- }
- }
- }
}
.kb_right {
@@ -498,7 +504,7 @@
}
.content_body {
- height: 442px;
+ height: 443px;
border: 1px solid $kbBorderColor;
background-color: $kbBackgroundColor;
--
Gitblit v1.9.3