From 39f8ffd810b6b1c8e3964b21fef4c8c24aaa17e1 Mon Sep 17 00:00:00 2001
From: shishuaikang <280848880@qq.com>
Date: 星期三, 06 十二月 2023 17:02:53 +0800
Subject: [PATCH] 苏州拌合站大屏分辨率修改,定时器改10分钟
---
web/src/views/MixingInfo/workShop.vue | 2
web/src/views/MixingInfo/messageInfo.vue | 48 ++++++++++++++++-------
web/src/views/MixingInfo/mixRatio.vue | 2
web/src/router/index.js | 4 +-
web/src/views/MixingInfo/mixing.vue | 2
web/src/views/GoodManage/MixRatioScreen.vue | 7 +--
6 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/web/src/router/index.js b/web/src/router/index.js
index fe7eda0..d1faa3e 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -18,7 +18,7 @@
path: '/mixing/*',
name: 'mixing',
meta: {
- title: '管片场拌合站'
+ title: '拌和站大屏'
},
component: () => import('../views/MixingInfo/mixing.vue'),
},
@@ -26,7 +26,7 @@
path: '/mixratio/*',
name: 'mixratio',
meta: {
- title: '管片场拌合站表格'
+ title: '配和站大屏'
},
component: () => import('../views/MixingInfo/mixRatio.vue'),
},
diff --git a/web/src/views/GoodManage/MixRatioScreen.vue b/web/src/views/GoodManage/MixRatioScreen.vue
index 74f6fb2..af1f047 100644
--- a/web/src/views/GoodManage/MixRatioScreen.vue
+++ b/web/src/views/GoodManage/MixRatioScreen.vue
@@ -64,8 +64,8 @@
</div>
<div class="row" v-for="sub in item.dataLists" :key="sub.name">
- <div class="name">{{ sub.name }}</div>
<div class="column">
+ <div class="name">{{ sub.name }}</div>
<div class="column-item" v-for="(sub, index) in sub.value" :key="index">{{ sub }}</div>
</div>
</div>
@@ -372,6 +372,7 @@
this.submitMode = 'update'
this.showDialog().then(() => {
const {mixingSignboardId, proName, constructionUnit, saveStamp, construction, dataListFlat} = this.tableData[i]
+ console.log(constructionUnit)
this.ruleForm = Object.assign(this.ruleForm, {
mixingSignboardId,
proName,
@@ -463,7 +464,6 @@
changeSelectForm(val) {
let item = this.selects.screenNames.find(obj => obj.value === val)
this.ruleForm.proName = item.proName
- this.ruleForm.constructionUnit = item.constructionUnit
}
}
}
@@ -507,7 +507,7 @@
.row {
flex: 1;
width: 100%;
- height: 40px;
+ min-height: 40px;
margin: 0 -1px -1px 0;
text-align: center;
line-height: 40px;
@@ -519,7 +519,6 @@
align-items: center;
float: left;
width: 160px;
- height: 100%;
margin: -1px -1px -1px 0;
color: #BEE2F0;
border: 1px solid #01B3EF;
diff --git a/web/src/views/MixingInfo/messageInfo.vue b/web/src/views/MixingInfo/messageInfo.vue
index c2a3a46..38cbd3b 100644
--- a/web/src/views/MixingInfo/messageInfo.vue
+++ b/web/src/views/MixingInfo/messageInfo.vue
@@ -5,7 +5,9 @@
</div>
<div class="mixing_main">
<div class="mixing_left">
- <div class="mixing_left_num"><span>{{mixingList&&mixingList.tableNum}}</span></div>
+ <div class="mixing_left_num">
+ <div class="">{{mixingList&&mixingList.tableNum}}</div>
+ </div>
<div class="mixing_left_name">{{mixingList&&mixingList.materialName}}</div>
</div>
<div class="mixing_right">
@@ -53,7 +55,17 @@
// that.searchMixingInfos()
that.timer = setInterval(()=>{
that.searchMixingInfos()
- },60000)
+ },60000 * 10)
+
+ let width = document.getElementsByClassName('mixing_index')[0].clientWidth
+ let $html = document.getElementsByTagName('html')[0]
+ let fontsize = width / 1920 * 11
+ $html.style.fontSize = `${fontsize}px`
+ window.onresize = () => {
+ let width = document.getElementsByClassName('mixing_index')[0].clientWidth
+ let fontsize = width / 1920 * 11
+ $html.style.fontSize = `${fontsize}px`
+ }
},
beforeDestroy() {
clearInterval(this.timer);
@@ -77,6 +89,8 @@
</script>
<style scoped lang="scss">
.mixing_index{
+ display: flex;
+ flex-direction: column;
width: 100%;
height: 100%;
padding: 5px;
@@ -89,16 +103,15 @@
width: 100%;
height: 3.2rem;
position: relative;
- padding: 50px;
+ padding: 4rem;
display: flex;
justify-content: center;
align-items: center;
span{
position: absolute;
- font-size: 3rem;
+ font-size: 5rem;
font-weight: bold;
- line-height: 3.2rem;
letter-spacing: 2px;
text-shadow: 0px 3px 3px rgba(25, 63, 95, 0.05);
background: -webkit-linear-gradient(90deg, #2AC0FF 0%, #FFFFFF 70%);
@@ -108,12 +121,16 @@
}
.mixing_main{
+ overflow: hidden;
+ flex: 1;
width: 100%;
- height: calc(100% - 3rem);
- position: absolute;
- padding: 20px 15px;
+ height: 100%;
+ padding: 6rem;
display: flex;
+
.mixing_left{
+ display: flex;
+ flex-direction: column;
width: 45%;
margin-right: 15px;
display: flex;
@@ -122,17 +139,19 @@
justify-content: space-between;
.mixing_left_num{
+ position: relative;
+ overflow: hidden;
+ padding: 1rem;
+ flex: 3.2;
width: 100%;
- height: 78%;
- padding: 10px;
background: url("../../assets/mixing/mixing_left_bg.png") no-repeat;
background-size: 100% 100%;
- span{
- height: 100%;
- padding: 10px 0;
+ >div{
display: flex;
justify-content: center;
align-items: center;
+ width: 100%;
+ height: 100%;
color: rgba(254, 252, 94, 1);
font-size: 44rem;
font-weight: bold;
@@ -140,9 +159,8 @@
}
}
.mixing_left_name{
+ flex: 1;
width: 100%;
- height: 20%;
- margin-top: 15px;
display: flex;
justify-content: center;
align-items: center;
diff --git a/web/src/views/MixingInfo/mixRatio.vue b/web/src/views/MixingInfo/mixRatio.vue
index 3393117..c69ce94 100644
--- a/web/src/views/MixingInfo/mixRatio.vue
+++ b/web/src/views/MixingInfo/mixRatio.vue
@@ -45,7 +45,7 @@
fn()
return fn
})(),
- 1000 * 60 * 1
+ 1000 * 60 * 10
)
if (Vue) {
Vue.$once('hook:beforeDestroy', function () {
diff --git a/web/src/views/MixingInfo/mixing.vue b/web/src/views/MixingInfo/mixing.vue
index 5ff8d87..b6801dd 100644
--- a/web/src/views/MixingInfo/mixing.vue
+++ b/web/src/views/MixingInfo/mixing.vue
@@ -46,7 +46,7 @@
fn()
return fn
})(),
- 1000 * 60 * 1
+ 1000 * 60 * 10
)
if (Vue) {
Vue.$once('hook:beforeDestroy', function () {
diff --git a/web/src/views/MixingInfo/workShop.vue b/web/src/views/MixingInfo/workShop.vue
index 99cfbe0..7dabef9 100644
--- a/web/src/views/MixingInfo/workShop.vue
+++ b/web/src/views/MixingInfo/workShop.vue
@@ -66,7 +66,7 @@
const that = this;
that.timer = setInterval(()=>{
that.searchWorkInfos()
- },60000)
+ },60000 * 10)
},
beforeDestroy() {
clearInterval(this.timer);
--
Gitblit v1.9.3