From bff85d777d7eb1e362adce089a287fd9bc85c03c Mon Sep 17 00:00:00 2001
From: shishuaikang <280848880@qq.com>
Date: 星期四, 07 十二月 2023 15:11:00 +0800
Subject: [PATCH] 1.搅合站分辨率修改 2.拌和站屏管理添加材料改成input 3.巡检任务bug修改
---
web/src/views/MixingInfo/messageInfo.vue | 161 +++++++++++++++++++++++++++++++----------------------
1 files changed, 95 insertions(+), 66 deletions(-)
diff --git a/web/src/views/MixingInfo/messageInfo.vue b/web/src/views/MixingInfo/messageInfo.vue
index c2a3a46..26e9899 100644
--- a/web/src/views/MixingInfo/messageInfo.vue
+++ b/web/src/views/MixingInfo/messageInfo.vue
@@ -5,33 +5,38 @@
</div>
<div class="mixing_main">
<div class="mixing_left">
- <div class="mixing_left_num"><span>{{mixingList&&mixingList.tableNum}}</span></div>
- <div class="mixing_left_name">{{mixingList&&mixingList.materialName}}</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">
<div class="mixing_rows">
<div class="mixing_rows_titles">产地名称：</div>
- <div class="mixing_rows_datas">{{mixingList&&mixingList.nameOfOrigin}}</div>
+ <div class="mixing_rows_datas">{{ mixingList && mixingList.nameOfOrigin }}</div>
</div>
<div class="mixing_rows">
<div class="mixing_rows_titles">进场数量：</div>
- <div class="mixing_rows_datas">{{mixingList&&mixingList.incomingQuantity}} t</div>
+ <div class="mixing_rows_datas">{{ mixingList && mixingList.incomingQuantity }} t</div>
</div>
<div class="mixing_rows">
<div class="mixing_rows_titles">进场日期：</div>
- <div class="mixing_rows_datas">{{mixingList&&mixingList.inTime}}</div>
+ <div class="mixing_rows_datas">{{ mixingList && mixingList.inTime }}</div>
</div>
<div class="mixing_rows">
<div class="mixing_rows_titles">检验日期：</div>
- <div class="mixing_rows_datas">{{mixingList&&mixingList.inspectionDate}}</div>
+ <div class="mixing_rows_datas">{{ mixingList && mixingList.inspectionDate }}</div>
</div>
<div class="mixing_rows">
<div class="mixing_rows_titles">检验状态：</div>
- <div class="mixing_rows_datas" :class="{'standardStyle':mixingList.status===1,'notStandardStyle':mixingList.status!==1}">{{mixingList&&mixingList.status===1?'合格':mixingList&&mixingList.status===2?'待检':''}}</div>
+ <div class="mixing_rows_datas"
+ :class="{ 'standardStyle': mixingList.status === 1, 'notStandardStyle': mixingList.status !== 1 }">
+ {{ mixingList && mixingList.status === 1 ? '合格' : mixingList && mixingList.status === 2 ? '待检' : ''
+ }}</div>
</div>
<div class="mixing_rows">
<div class="mixing_rows_titles">报告编号：</div>
- <div class="mixing_rows_datas">{{mixingList&&mixingList.reportNumber}}</div>
+ <div class="mixing_rows_datas">{{ mixingList && mixingList.reportNumber }}</div>
</div>
</div>
</div>
@@ -39,35 +44,45 @@
</template>
<script>
export default {
- data(){
- return{
- timer:null,//定时器
- mixingList:null,//展示数据
+ data() {
+ return {
+ timer: null,//定时器
+ mixingList: [],//展示数据
}
},
- created(){
+ created() {
this.searchMixingInfos()
},
- mounted(){
+ mounted() {
const that = this;
// that.searchMixingInfos()
- that.timer = setInterval(()=>{
+ 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);
this.timer = null;
},
- methods:{
- searchMixingInfos(){
- let params={
- tableNum:window.location.href.split('/')[5].split('=')[1]
+ methods: {
+ searchMixingInfos() {
+ let params = {
+ tableNum: window.location.href.split('/')[5].split('=')[1]
}
- this.$api.Infos.showHmixings(params).then(res=>{
- if(res.statusMsg==='ok'){
- this.mixingList = res.data===null?[]:res.data
- }else{
+ this.$api.Infos.showHmixings(params).then(res => {
+ if (res.statusMsg === 'ok') {
+ this.mixingList = res.data === null ? [] : res.data
+ } else {
this.$message.warning('请检查网络或联系管理员!!!')
}
})
@@ -76,29 +91,30 @@
}
</script>
<style scoped lang="scss">
-.mixing_index{
+.mixing_index {
+ display: flex;
+ flex-direction: column;
width: 100%;
height: 100%;
- padding: 5px;
+ padding: 0.4rem;
background: url("../../assets/mixing/mixing_bg3.png") no-repeat;
background-size: 100% 100%;
background-position: center center;
-
- .mixing_header{
+
+ .mixing_header {
width: 100%;
height: 3.2rem;
position: relative;
- padding: 50px;
+ padding: 4rem;
display: flex;
justify-content: center;
align-items: center;
-
- span{
+
+ 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%);
@@ -107,84 +123,97 @@
}
}
- .mixing_main{
+ .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{
- width: 45%;
- margin-right: 15px;
+
+ .mixing_left {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ margin-right: 3rem;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
- .mixing_left_num{
+ .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;
background-color: rgba(37, 129, 255, 0.29);
}
}
- .mixing_left_name{
+
+ .mixing_left_name {
+ flex: 1;
width: 100%;
- height: 20%;
- margin-top: 15px;
display: flex;
justify-content: center;
align-items: center;
- text-shadow: 5px 7px 0px rgba(0,66,255,0.2), 16px 23px 16px rgba(14,19,48,0.15);
- background: linear-gradient(to bottom,#FFFFFF 0%,rgba(140, 186, 255, 0.88) 100%);
+ text-shadow: 5px 7px 0px rgba(0, 66, 255, 0.2), 16px 23px 16px rgba(14, 19, 48, 0.15);
+ background: linear-gradient(to bottom, #FFFFFF 0%, rgba(140, 186, 255, 0.88) 100%);
background-clip: text;
-webkit-background-clip: text;
- text-fill-color: transparent;
-webkit-text-fill-color: transparent;
color: #FFFFFF;
font-size: 9rem;
font-weight: 500;
}
}
- .mixing_right{
- width:55%;
- background: linear-gradient(to right,#0D3776 0%,#041A40 100%);
+
+ .mixing_right {
+ flex: 1.2;
+ background: linear-gradient(to right, #0D3776 0%, #041A40 100%);
display: flex;
flex-direction: column;
- justify-content: space-around;
- .mixing_rows{
- padding: 10px 20px;
+ justify-content: space-between;
+ padding: 2rem 4rem;
+
+ .mixing_rows {
+ overflow: hidden;
display: flex;
- .mixing_rows_titles{
+
+ .mixing_rows_titles {
flex: none;
color: #FFFFFF;
font-weight: 400;
font-size: 5rem;
}
- .mixing_rows_datas{
+
+ .mixing_rows_datas {
flex: none;
color: #FFFFFF;
font-weight: 400;
font-size: 5rem;
}
- .standardStyle{
- color:#15EF48;
- font-size:8rem;
+
+ .standardStyle {
+ color: #15EF48;
+ font-size: 8rem;
}
- .notStandardStyle{
- color:rgba(255, 102, 0, 1);
- font-size:8rem;
+
+ .notStandardStyle {
+ color: rgba(255, 102, 0, 1);
+ font-size: 8rem;
}
}
}
--
Gitblit v1.9.3