From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/kb/zhkb.vue | 255 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 179 insertions(+), 76 deletions(-)
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 4d3255d..1e27266 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,8 +13,9 @@
<MarqueeTips
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
- :speed="speed"
+ :speed="180"
/>
+ <!-- :speed="speed"-->
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
@@ -22,11 +23,12 @@
<!-- <div class="PG01" />-->
<!-- <svg-icon icon-class="sccx" />-->
浜х嚎鍔犲伐涓换鍔�
+ <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
</div>
<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>
@@ -100,7 +102,9 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟</div>
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟
+ <div style="margin-left: 30px">{{ number2 }} 鍗�</div>
+ </div>
<div class="content_body">
<el-table
ref="tableData"
@@ -113,12 +117,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 +134,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 +143,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 +212,7 @@
<el-table-column
prop="planenddate"
label="棰勮寮�濮�"
- width="95"
+ width="115"
>
<template slot-scope="{row}">
<div>{{ row.planenddate.substring(0, 10) }}</div>
@@ -206,7 +221,7 @@
<el-table-column
prop="planstartdate"
label="棰勮缁撴潫"
- width="105"
+ width="125"
>
<template slot-scope="{row}">
<div>{{ row.planstartdate.substring(0, 10) }}</div>
@@ -250,12 +265,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="鏁伴噺"
@@ -286,8 +311,7 @@
LineSearchBottomLeftData,
LineSearchBottomRightData,
LineSearchTopLeftData,
- LineSearchTopRightData, ShopSearch,
- ShopSearchLine
+ LineSearchTopRightData, ShopSearch, WkspReportNotice
} from '@/api/dzkb'
import MarqueeTips from 'vue-marquee-tips'
@@ -298,10 +322,13 @@
},
data() {
return {
+
+ onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
headTime: '',
lineContent: [],
- lineContent4: [],
+ lineContent3: [],
leftTopData: [],
tableData: [],
@@ -310,19 +337,70 @@
ShopArr: [], // 杞﹂棿缂栫爜鏁扮粍
- MarqueeTipsContent: '', // 鍏憡
- speed: 100// 鍏憡鎾斁鐨勯�熷害
+ number1: '',
+ number2: '',
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100, // 鍏憡鎾斁鐨勯�熷害
+
+ MarqueeTipsTask: null,
+ ShopSearchTask: null,
+ ShopSearchLineTask: null,
+ TableDataRollTask: null,
+ TableDataRankRollTask: null,
+ EchartsTask: null
}
},
created() {
setInterval(this.getNowTime, 1000)
+
+ // 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
+ setInterval(() => {
+ window.location.reload()
+ }, 1000 * 60 * 120)
},
mounted() {
- this.getValue()
+ // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+ window.addEventListener('online', this.updateOnlineStatus)
+ window.addEventListener('offline', this.updateOnlineStatus)
+ this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus)
+ window.removeEventListener('offline', this.updateOnlineStatus)
},
methods: {
+ // 鏇存柊缃戠粶鐘舵��
+ updateOnlineStatus(e) {
+ if (e.isFirst) {
+ this.getValue()// 鑾峰彇鍊�
+ } else {
+ const loading = this.$loading({
+ lock: true,
+ text: '鏂綉浜嗭紝姝ｅ湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const { type } = e
+ this.onLine = type === 'online'
+ if (this.onLine) {
+ this.getValue()
+ loading.close()
+ this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+ } else {
+ clearInterval(this.MarqueeTipsTask)
+ clearInterval(this.ShopSearchTask)
+ clearInterval(this.ShopSearchLineTask)
+ clearInterval(this.TableDataRollTask)
+ clearInterval(this.TableDataRankRollTask)
+ clearInterval(this.EchartsTask)
+ this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+ }
+ }
+ },
+ // 鑾峰彇鍊�
async getValue() {
await this.getShopSearch()
await this.getShopSearchLine()
@@ -331,16 +409,33 @@
await this.getTableDataRoll()
await this.getTableDataRankRoll()
await this.getMarqueeTipsContent()
+ await this.getMarqueeTipsContent()
},
// 鑾峰彇鍏憡
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
+ WkspReportNotice({ shopcode: this.ShopArr.join(',') }).then(res => {
+ let contentAll = ''
+ res.data.forEach(item => {
+ contentAll += item.contents + ' '.padStart(item.contents.toString().length * 2, ' ')
+ })
+ this.MarqueeTipsContent = contentAll
+ this.speed = this.MarqueeTipsContent.length / 10
+
+ this.MarqueeTipsTask = setInterval(() => {
+ WkspReportNotice({ shopcode: this.ShopArr.join(',') }).then(res1 => {
+ let contentAll = ''
+ res1.data.forEach(item => {
+ contentAll += item.contents + ' '.padStart(item.contents.toString().length * 2, ' ')
+ })
+ 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 = []
@@ -349,7 +444,7 @@
})
}
setInterval(() => {
- ShopSearch().then(res1 => {
+ this.ShopSearchTask = ShopSearch().then(res1 => {
if (res1.code === '200') {
this.ShopArr = []
res1.data.forEach(item => {
@@ -365,26 +460,30 @@
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)
+
+ this.number1 = this.lineContent.length
})
let start = 0
- const task = setInterval(() => {
- if (Math.floor(start / 4) === count && count !== 0) {
+ this.ShopSearchLineTask = setInterval(() => {
+ 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)
+
+ this.number1 = this.lineContent.length
})
} else if (count === 0) {
- clearInterval(task)
+ clearInterval(this.ShopSearchLineTask)
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)
},
@@ -392,10 +491,11 @@
getTableDataRoll() {
LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableData = res.data
+ this.number2 = this.tableData.length
const divData = this.$refs.tableData.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -405,8 +505,9 @@
divData.scrollTop = 0
LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableData = res.data
+ this.number2 = this.tableData.length
if (this.tableData.length > 10) {
- clearInterval(task)
+ clearInterval(this.TableDataRollTask)
this.getTableDataRoll()
}
})
@@ -421,7 +522,7 @@
const divData = this.$refs.tableDataRank.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRankRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
// divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
divData.scrollTop += 1
@@ -433,7 +534,7 @@
this.tableDataRank = res.data
if (this.tableDataRank.length > 9) {
- clearInterval(task)
+ clearInterval(this.TableDataRankRollTask)
this.getTableDataRankRoll()
}
})
@@ -447,7 +548,7 @@
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
- setInterval(() => {
+ this.EchartsTask = setInterval(() => {
LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
@@ -511,9 +612,8 @@
.kb_left_top_title01 {
position: absolute;
- top: 40px;
+ top: 37px;
left: 15px;
- font-size: 18px;
display: flex;
color: #00ffff;
@@ -532,6 +632,7 @@
flex-direction: column;
justify-content: flex-start;
padding-top: 70px;
+
.kb_left_top02 {
display: flex;
flex-direction: column;
@@ -543,9 +644,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;
@@ -558,23 +659,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;
@@ -583,6 +684,7 @@
.content02Parent {
display: flex;
+
.content02 {
width: 60px;
border-right: 1px solid $kbBorderColor;
@@ -591,11 +693,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;
@@ -633,7 +736,7 @@
}
- .kb_left_top_block:nth-child(4n) {
+ .kb_left_top_block:nth-child(3n) {
border-bottom: none !important;
}
}
@@ -648,7 +751,7 @@
flex-direction: column;
.content_head {
- font-size: 18px;
+ display: flex;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -679,7 +782,7 @@
flex-direction: column;
.content_head {
- font-size: 18px;
+ //font-size: 18px;
line-height: 20px;
margin-bottom: 10px;
margin-top: -10px;
@@ -698,9 +801,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 {
@@ -729,6 +831,7 @@
::v-deep .cell {
padding: 0 !important;
+ font-size: 18px;
}
.circleYellow {
--
Gitblit v1.9.3