From 7318acb9143a37e7c10369a975a8717c06eaaf87 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 30 十月 2023 10:52:29 +0800
Subject: [PATCH] 1.看板字段调整
---
src/views/kanbanManager/ckgl.vue | 194 +++++++++++++++++-------------------------------
1 files changed, 69 insertions(+), 125 deletions(-)
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 1b94f5f..55e0c0c 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -2,34 +2,29 @@
<div>
<div class="kb_dashboard">
- <!-- 鏄熺┖鑳屾櫙-->
- <div ref="starsRef" class="stars">
- <div v-for="(item, index) in starsCount" :key="index" class="star" />
- </div>
-
+ <div class="kb_backgroundCustom" />
<div class="kb_header">
- <div class="flex_c_c kb_header_text">
- <div id="topBarLeft" style="width:600px;height:100%" />
- 浠撳簱绠＄悊鏁板瓧鍖栫湅鏉�
- <div id="topBarRight" style="width:600px;height:100%;transform:rotate(180deg);" />
+ <div class="kb_headTime" style="top: 35px;left: 20px">
+ <span>娴欐睙姝ｆ竻鍜屾棩鐢ㄥ埗鍝佹湁闄愬叕鍙�</span>
</div>
- <div class="kb_headTime" style="left: 85px">
- <span>娴欐睙鏂板嚡杩暟瀛楃鎶�鑲′唤鏈夐檺鍏徃</span>
+ <div class="kb_headTime kb_header_text" style="top: 35px;left: 800px">
+ <span>浠撳簱绠＄悊鏁板瓧鍖栫湅鏉�</span>
</div>
- <div class="kb_headTime">
+ <div class="kb_headTime" style="top: 35px;right: 25px">
<span>{{ headTime }}</span>
</div>
</div>
- <div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 980px">
- <div style="width: 1350px; " class="flex_c_b">
+
+ <div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 950px">
+ <div style="width: 1350px;z-index: 2;margin-top: 50px;" class="flex_c_b">
<div style="height: 470px;">
<div class="smallTitle">
<svg-icon icon-class="cpdrk" class="svg_class" />
鐢熶骇寰呭叆搴�
</div>
- <div class="lineContent horn" style="height: 435px">
+ <div class="lineContent horn" style="height: 410px">
<el-table
ref="tableDataTopRef"
:data="tableDataTop"
@@ -37,7 +32,7 @@
class="tableData"
:header-cell-style="headerCellStyleCenter"
:cell-style="cellStyleCenter"
- height="430"
+ height="405"
>
<el-table-column
prop="voucherdate"
@@ -77,15 +72,15 @@
<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_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="浜у搧鍚嶇О"
@@ -95,16 +90,16 @@
<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="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="棰勫叆浠撳簱"
@@ -158,12 +153,12 @@
</el-table>
</div>
</div>
- <div style="height: 470px;">
+ <div style="height: 470px;margin-top: 30px;">
<div class="smallTitle">
<svg-icon icon-class="cpdfh" class="svg_class" />
浜у搧寰呭彂璐�
</div>
- <div class="lineContent horn" style="height: 435px">
+ <div class="lineContent horn" style="height: 410px">
<el-table
ref="tableDataBottomRef"
:data="tableDataBottom"
@@ -171,7 +166,7 @@
class="tableData"
:header-cell-style="headerCellStyleCenter"
:cell-style="cellStyleCenter"
- height="430"
+ height="405"
>
<el-table-column
prop="voucherdate"
@@ -192,16 +187,16 @@
<div class="ellipsis">{{ row.wo }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="customename"
- label="瀹㈡埛"
- width="388"
- >
- <template slot-scope="{row}">
- <div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="customename"-->
+ <!-- label="瀹㈡埛"-->
+ <!-- width="288"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="username"-->
<!-- label="涓氬姟鍛�"-->
@@ -230,22 +225,22 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="200"
+ width="288"
>
<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="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="specification"
+ label="瑙勬牸鍨嬪彿"
+ width="300"
+ >
+ <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="鏁伴噺"
@@ -300,23 +295,23 @@
</div>
</div>
- <div style="width: 500px;" class="flex_c_b">
+ <div style="width: 500px;z-index: 2;margin-top: 50px;" class="flex_c_b">
<div style="height: 470px;">
<div class="smallTitle">
<svg-icon icon-class="ph" class="svg_class" />
鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
</div>
- <div class="lineContent horn" style="height: 435px">
+ <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>
</div>
- <div style="height: 470px;">
+ <div style="height: 470px;margin-top: 30px;">
<div class="smallTitle">
<svg-icon icon-class="ph" class="svg_class" />
鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
</div>
- <div class="lineContent horn" style="height: 435px">
+ <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>
@@ -369,7 +364,7 @@
// 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
setInterval(() => {
window.location.reload()
- }, 1000 * 60 * 60 * 10)
+ }, 1000 * 60 * 120)
},
mounted() {
// 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
@@ -377,12 +372,9 @@
window.addEventListener('offline', this.updateOnlineStatus)
this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
- this.getTopBar()
-
this.getWareHouseTopLeftData()
this.getWareHouseTopBottomData()
this.getEcharts()
- this.setStarsRef()
},
beforeDestroy() {
window.removeEventListener('online', this.updateOnlineStatus)
@@ -411,24 +403,7 @@
}
}
},
- setStarsRef() {
- const starNodes = Array.from(this.$refs.starsRef.children)
- starNodes.forEach(item => {
- const speed = 0.2 + Math.random() * 1
- const thisDistance = this.distance + Math.random() * 300
- item.style.transformOrigin = `0 0 ${thisDistance}px`
- item.style.transform = `
- translate3d(0,0,-${thisDistance}px)
- rotateY(${Math.random() * 360}deg)
- rotateX(${Math.random() * -50}deg)
- scale(${speed},${speed})`
- })
- },
- // 鑾峰彇topEcharts
- getTopBar() {
- loadEcharts('topBarLeft', kbTop())
- loadEcharts('topBarRight', kbTop())
- },
+
// 鑾峰彇宸︿笂table鏁版嵁
getWareHouseTopLeftData() {
WareHouseTopLeftData().then(res => {
@@ -525,8 +500,7 @@
},
headerCellStyleCenter() {
return {
- // backgroundColor: 'rgb(30 ,33, 46)',
- backgroundColor: '#000',
+ backgroundColor: 'transparent ',
padding: '10px 0',
textAlign: 'center',
color: '#07acc2',
@@ -538,8 +512,8 @@
return {
padding: '7.5px 0',
textAlign: 'center',
- backgroundColor: '#000',
- color: '#fff',
+ backgroundColor: 'transparent ',
+ color: '#c7e7ff',
border: 'none',
fontSize: '18px'
}
@@ -553,9 +527,13 @@
$main_color:#09d8f2;
$color01: #00FFFF;
.tableData{
- background: #000;
+ background: transparent;
}
-
+::v-deep .el-table th,
+::v-deep .el-table tr,
+::v-deep .el-table td {
+ background-color: transparent;
+}
.el-table__empty-text{
color: $main_color;
}
@@ -576,37 +554,3 @@
}
</style>
-<!--鏄熺┖-->
-<style lang="css" scoped>
-@keyframes rotate {
- 0% {
- transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(0);
- }
- 100% {
- transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(-360deg);
- }
-}
-
-.stars {
- transform: perspective(500px);
- transform-style: preserve-3d;
- position: absolute;
- perspective-origin: 50% 100%;
- left: 45%;
- animation: rotate 90s infinite linear;
- bottom: 0;
- z-index: 102;
-}
-
-.star {
- width: 2px;
- height: 2px;
- /*background: #f7f7b6;*/
- background: #8edffc;
- position: absolute;
- left: 0;
- top: 0;
- backface-visibility: hidden;
- z-index: 102;
-}
-</style>
--
Gitblit v1.9.3