Browse Source

看板板

master
常熟吴彦祖 2 weeks ago
parent
commit
8c3110554d
  1. 28
      src/views/modules/haianWarehouse/dashboard/autoSortingBoard54.vue
  2. 59
      src/views/modules/haianWarehouse/dashboard/errorAreaBoard54.vue
  3. 59
      src/views/modules/haianWarehouse/dashboard/palletOutboundBoard54.vue

28
src/views/modules/haianWarehouse/dashboard/autoSortingBoard54.vue

@ -383,7 +383,7 @@ export default {
.screen-title {
position: relative;
font-size: 34px;
font-size: 32px;
font-weight: bold;
color: #ffffff;
margin: 0;
@ -466,7 +466,8 @@ export default {
z-index: 1;
padding: 8px 15px;
height: calc(100vh - 60px);
overflow-y: auto;
/* 整页不再滚动,只让表体滚,避免全屏时把表头卷出屏幕 - rqrq */
overflow: hidden;
&::-webkit-scrollbar {
width: 6px;
@ -493,7 +494,6 @@ export default {
box-sizing: border-box;
padding: 10px;
background: rgba(70, 90, 120, 0.9);
backdrop-filter: blur(10px);
border: 1px solid rgba(23, 179, 163, 0.5);
border-radius: 12px;
box-shadow:
@ -509,7 +509,6 @@ export default {
box-shadow:
0 12px 48px rgba(0, 0, 0, 0.5),
0 0 30px rgba(23, 179, 163, 0.2);
transform: translateY(-2px);
}
}
@ -554,6 +553,7 @@ export default {
.panel-table {
padding: 0;
flex: 1;
min-height: 0;
overflow-y: auto;
&::-webkit-scrollbar {
@ -580,19 +580,19 @@ export default {
border-spacing: 0;
thead {
position: sticky;
top: 0;
z-index: 2;
tr {
background: #1b6676;
}
th {
/* 粘在单元格上。写在 thead 上时,电视机全屏滚动会把整行表头卷走 - rqrq */
position: sticky;
top: 0;
z-index: 3;
background: #1b6676;
padding: 5px 6px;
color: #fcfdfd;
font-size: 16px;
font-size: 20px;
font-weight: bold;
text-align: center;
border-bottom: 2px solid rgba(23, 179, 163, 0.4);
@ -637,7 +637,7 @@ export default {
td {
padding: 4px 6px;
color: rgba(255, 255, 255, 0.9);
font-size: 15px;
font-size: 20px;
border-bottom: 1px solid rgba(23, 179, 163, 0.15);
&.text-center {
@ -660,7 +660,7 @@ export default {
display: inline-block;
padding: 4px 12px;
border-radius: 12px;
font-size: 14px;
font-size: 20px;
font-weight: bold;
text-align: center;
min-width: 80px;
@ -693,7 +693,7 @@ export default {
/* ===== 响应式适配 ===== */
@media screen and (max-width: 1600px) {
.screen-title {
font-size: 30px;
font-size: 32px;
letter-spacing: 3px;
}
@ -704,7 +704,7 @@ export default {
@media screen and (min-width: 2560px) {
.screen-title {
font-size: 38px;
font-size: 32px;
}
.panel-title-bar {
@ -728,7 +728,7 @@ export default {
}
.status-badge {
font-size: 18px;
font-size: 20px;
padding: 4px 10px;
min-width: 100px;
}

59
src/views/modules/haianWarehouse/dashboard/errorAreaBoard54.vue

@ -75,7 +75,7 @@
<script>
import { getErrorAreaBoard } from '@/api/haianWarehouse/errorAreaBoard'
// 外观沿用海安看板。每 5 秒无锁查 site=54、区域 A09 的栈板 - rqrq
// 外观沿用海安看板。每 20 秒无锁查 site=54、区域 A09 的栈板 - rqrq
export default {
name: 'HaianErrorAreaBoard54',
@ -92,7 +92,9 @@ export default {
boardList: [],
scrollTimer: null,
scrollPaused: false,
scrollResumeAt: 0
// 打开页面先停 3 秒再滚;到底后先停住,到点再回顶 - rqrq
scrollResumeAt: Date.now() + 3000,
scrollHoldBottom: false
}
},
computed: {
@ -114,12 +116,12 @@ export default {
this.updateTime()
}, 1000)
this.startRefreshCheck()
// 每 5 秒查一次 A09。上一轮没回来就跳过,避免请求叠在一起 - rqrq
// 每 20 秒查一次 A09。上一轮没回来就跳过,避免请求叠在一起 - rqrq
this.getDataList()
this.pollTimer = setInterval(() => {
this.getDataList()
}, 5000)
// 和人工分拣一样每 60 毫秒走 1 像素;内容没超出时方法内直接返回 - rqrq
}, 20000)
// 每 60 毫秒走 1 像素。开头和回到顶部各停 3 秒,内容没超出时方法内直接返回 - rqrq
this.scrollTimer = setInterval(this.scrollTable, 60)
},
@ -182,17 +184,26 @@ export default {
const weekDay = weekDays[now.getDay()]
this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds} ${weekDay}`
},
// 到底停留 2 秒再回顶。没有数据或表格没超出可视高度时不滚 - rqrq
// 先在顶部停 3 秒再下滚。到底后再停 3 秒才回到顶部,然后重新停 3 秒。没数据或没超出高度时不滚 - rqrq
scrollTable () {
const viewport = this.$refs.tableViewport
if (!viewport || this.scrollPaused || !this.boardList.length || Date.now() < this.scrollResumeAt) return
if (viewport.scrollHeight <= viewport.clientHeight) return
if (viewport.scrollTop + viewport.clientHeight >= viewport.scrollHeight - 1) {
const atBottom = viewport.scrollTop + viewport.clientHeight >= viewport.scrollHeight - 1
if (atBottom) {
if (!this.scrollHoldBottom) {
// 先停在底部,避免一到底就跳回顶部 - rqrq
this.scrollHoldBottom = true
this.scrollResumeAt = Date.now() + 3000
return
}
viewport.scrollTop = 0
this.scrollResumeAt = Date.now() + 2000
} else {
viewport.scrollTop += 1
this.scrollHoldBottom = false
this.scrollResumeAt = Date.now() + 3000
return
}
this.scrollHoldBottom = false
viewport.scrollTop += 1
}
}
}
@ -269,7 +280,7 @@ export default {
.screen-title {
position: relative;
font-size: 34px;
font-size: 32px;
font-weight: bold;
color: #ffffff;
margin: 0;
@ -352,7 +363,8 @@ export default {
z-index: 1;
padding: 8px 15px;
height: calc(100vh - 60px);
overflow-y: auto;
/* 整页不再滚动,只让表体滚,避免全屏时把表头卷出屏幕 - rqrq */
overflow: hidden;
&::-webkit-scrollbar {
width: 6px;
@ -379,7 +391,6 @@ export default {
box-sizing: border-box;
padding: 10px;
background: rgba(70, 90, 120, 0.9);
backdrop-filter: blur(10px);
border: 1px solid rgba(23, 179, 163, 0.5);
border-radius: 12px;
box-shadow:
@ -395,7 +406,6 @@ export default {
box-shadow:
0 12px 48px rgba(0, 0, 0, 0.5),
0 0 30px rgba(23, 179, 163, 0.2);
transform: translateY(-2px);
}
}
@ -440,6 +450,7 @@ export default {
.panel-table {
padding: 0;
flex: 1;
min-height: 0;
overflow-y: auto;
&::-webkit-scrollbar {
@ -466,19 +477,19 @@ export default {
border-spacing: 0;
thead {
position: sticky;
top: 0;
z-index: 2;
tr {
background: #1b6676;
}
th {
/* 粘在单元格上。写在 thead 上时,电视机全屏滚动会把整行表头卷走 - rqrq */
position: sticky;
top: 0;
z-index: 3;
background: #1b6676;
padding: 5px 6px;
color: #fcfdfd;
font-size: 16px;
font-size: 20px;
font-weight: bold;
text-align: center;
border-bottom: 2px solid rgba(23, 179, 163, 0.4);
@ -523,7 +534,7 @@ export default {
td {
padding: 4px 6px;
color: rgba(255, 255, 255, 0.9);
font-size: 15px;
font-size: 20px;
border-bottom: 1px solid rgba(23, 179, 163, 0.15);
&.text-center {
@ -556,7 +567,7 @@ export default {
display: inline-block;
padding: 4px 12px;
border-radius: 12px;
font-size: 14px;
font-size: 20px;
font-weight: bold;
text-align: center;
min-width: 80px;
@ -589,7 +600,7 @@ export default {
/* ===== 响应式适配 ===== */
@media screen and (max-width: 1600px) {
.screen-title {
font-size: 30px;
font-size: 32px;
letter-spacing: 3px;
}
@ -600,7 +611,7 @@ export default {
@media screen and (min-width: 2560px) {
.screen-title {
font-size: 38px;
font-size: 32px;
}
.panel-title-bar {
@ -624,7 +635,7 @@ export default {
}
.status-badge {
font-size: 18px;
font-size: 20px;
padding: 4px 10px;
min-width: 100px;
}

59
src/views/modules/haianWarehouse/dashboard/palletOutboundBoard54.vue

@ -78,7 +78,7 @@
<script>
import { getPalletOutboundBoard } from '@/api/haianWarehouse/palletOutboundBoard'
// 外观沿用海安自动分拣看板。数据改为每 5 秒查出库托盘,灯只看立库是不是 200 - rqrq
// 外观沿用海安自动分拣看板。数据改为每 20 秒查出库托盘,灯只看立库是不是 200 - rqrq
export default {
name: 'HaianPalletOutboundBoard54',
@ -95,7 +95,9 @@ export default {
boardList: [],
scrollTimer: null,
scrollPaused: false,
scrollResumeAt: 0
// 打开页面先停 3 秒再滚;到底后先停住,到点再回顶 - rqrq
scrollResumeAt: Date.now() + 3000,
scrollHoldBottom: false
}
},
computed: {
@ -117,12 +119,12 @@ export default {
this.updateTime()
}, 1000)
this.startRefreshCheck()
// 每 5 秒查一次。上一轮没回来就跳过,避免请求叠在一起 - rqrq
// 每 20 秒查一次。上一轮没回来就跳过,避免请求叠在一起 - rqrq
this.getDataList()
this.pollTimer = setInterval(() => {
this.getDataList()
}, 5000)
// 和人工分拣一样每 60 毫秒走 1 像素;内容没超出时方法内直接返回 - rqrq
}, 20000)
// 每 60 毫秒走 1 像素。开头和回到顶部各停 3 秒,内容没超出时方法内直接返回 - rqrq
this.scrollTimer = setInterval(this.scrollTable, 60)
},
@ -195,17 +197,26 @@ export default {
const weekDay = weekDays[now.getDay()]
this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds} ${weekDay}`
},
// 到底停留 2 秒再回顶。没有数据或表格没超出可视高度时不滚 - rqrq
// 先在顶部停 3 秒再下滚。到底后再停 3 秒才回到顶部,然后重新停 3 秒。没数据或没超出高度时不滚 - rqrq
scrollTable () {
const viewport = this.$refs.tableViewport
if (!viewport || this.scrollPaused || !this.boardList.length || Date.now() < this.scrollResumeAt) return
if (viewport.scrollHeight <= viewport.clientHeight) return
if (viewport.scrollTop + viewport.clientHeight >= viewport.scrollHeight - 1) {
const atBottom = viewport.scrollTop + viewport.clientHeight >= viewport.scrollHeight - 1
if (atBottom) {
if (!this.scrollHoldBottom) {
// 先停在底部,避免一到底就跳回顶部 - rqrq
this.scrollHoldBottom = true
this.scrollResumeAt = Date.now() + 3000
return
}
viewport.scrollTop = 0
this.scrollResumeAt = Date.now() + 2000
} else {
viewport.scrollTop += 1
this.scrollHoldBottom = false
this.scrollResumeAt = Date.now() + 3000
return
}
this.scrollHoldBottom = false
viewport.scrollTop += 1
}
}
}
@ -282,7 +293,7 @@ export default {
.screen-title {
position: relative;
font-size: 34px;
font-size: 32px;
font-weight: bold;
color: #ffffff;
margin: 0;
@ -365,7 +376,8 @@ export default {
z-index: 1;
padding: 8px 15px;
height: calc(100vh - 60px);
overflow-y: auto;
/* 整页不再滚动,只让表体滚,避免全屏时把表头卷出屏幕 - rqrq */
overflow: hidden;
&::-webkit-scrollbar {
width: 6px;
@ -392,7 +404,6 @@ export default {
box-sizing: border-box;
padding: 10px;
background: rgba(70, 90, 120, 0.9);
backdrop-filter: blur(10px);
border: 1px solid rgba(23, 179, 163, 0.5);
border-radius: 12px;
box-shadow:
@ -408,7 +419,6 @@ export default {
box-shadow:
0 12px 48px rgba(0, 0, 0, 0.5),
0 0 30px rgba(23, 179, 163, 0.2);
transform: translateY(-2px);
}
}
@ -453,6 +463,7 @@ export default {
.panel-table {
padding: 0;
flex: 1;
min-height: 0;
overflow-y: auto;
&::-webkit-scrollbar {
@ -483,19 +494,19 @@ export default {
}
thead {
position: sticky;
top: 0;
z-index: 2;
tr {
background: #1b6676;
}
th {
/* 粘在单元格上。写在 thead 上时,电视机全屏滚动会把整行表头卷走 - rqrq */
position: sticky;
top: 0;
z-index: 3;
background: #1b6676;
padding: 5px 6px;
color: #fcfdfd;
font-size: 16px;
font-size: 20px;
font-weight: bold;
text-align: center;
border-bottom: 2px solid rgba(23, 179, 163, 0.4);
@ -540,7 +551,7 @@ export default {
td {
padding: 4px 6px;
color: rgba(255, 255, 255, 0.9);
font-size: 15px;
font-size: 20px;
border-bottom: 1px solid rgba(23, 179, 163, 0.15);
&.text-center {
@ -563,7 +574,7 @@ export default {
display: inline-block;
padding: 4px 12px;
border-radius: 12px;
font-size: 14px;
font-size: 20px;
font-weight: bold;
text-align: center;
min-width: 80px;
@ -596,7 +607,7 @@ export default {
/* ===== 响应式适配 ===== */
@media screen and (max-width: 1600px) {
.screen-title {
font-size: 30px;
font-size: 32px;
letter-spacing: 3px;
}
@ -607,7 +618,7 @@ export default {
@media screen and (min-width: 2560px) {
.screen-title {
font-size: 38px;
font-size: 32px;
}
.panel-title-bar {
@ -631,7 +642,7 @@ export default {
}
.status-badge {
font-size: 18px;
font-size: 20px;
padding: 4px 10px;
min-width: 100px;
}

Loading…
Cancel
Save