From 172fbd8ed8a64952de9c2c806f1ba4b4c2409558 Mon Sep 17 00:00:00 2001
From: shishuaikang <280848880@qq.com>
Date: 星期五, 08 十二月 2023 16:27:56 +0800
Subject: [PATCH] 拌和站大屏图片更换,搅和站样式修改
---
web/src/assets/mixing/container_20.png | 0
web/src/assets/mixing/container_80.png | 0
web/src/views/MixingInfo/messageInfo.vue | 44 +++++++++++++++++++++++++++-----------------
web/src/assets/mixing/container_90.png | 0
web/src/views/MixingInfo/mixing.vue | 2 +-
web/src/assets/mixing/container_100.png | 0
web/src/assets/mixing/container_40.png | 0
web/src/assets/mixing/container_60.png | 0
web/src/assets/mixing/container_10.png | 0
9 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/web/src/assets/mixing/container_10.png b/web/src/assets/mixing/container_10.png
index 15291b0..025f1e4 100644
--- a/web/src/assets/mixing/container_10.png
+++ b/web/src/assets/mixing/container_10.png
Binary files differ
diff --git a/web/src/assets/mixing/container_100.png b/web/src/assets/mixing/container_100.png
index 5b73dda..b861079 100644
--- a/web/src/assets/mixing/container_100.png
+++ b/web/src/assets/mixing/container_100.png
Binary files differ
diff --git a/web/src/assets/mixing/container_20.png b/web/src/assets/mixing/container_20.png
index 2bbe0dc..a0101dd 100644
--- a/web/src/assets/mixing/container_20.png
+++ b/web/src/assets/mixing/container_20.png
Binary files differ
diff --git a/web/src/assets/mixing/container_40.png b/web/src/assets/mixing/container_40.png
index d2f52d3..0f410f2 100644
--- a/web/src/assets/mixing/container_40.png
+++ b/web/src/assets/mixing/container_40.png
Binary files differ
diff --git a/web/src/assets/mixing/container_60.png b/web/src/assets/mixing/container_60.png
index 5ced4a7..70422d7 100644
--- a/web/src/assets/mixing/container_60.png
+++ b/web/src/assets/mixing/container_60.png
Binary files differ
diff --git a/web/src/assets/mixing/container_80.png b/web/src/assets/mixing/container_80.png
index 38348d1..5c06d53 100644
--- a/web/src/assets/mixing/container_80.png
+++ b/web/src/assets/mixing/container_80.png
Binary files differ
diff --git a/web/src/assets/mixing/container_90.png b/web/src/assets/mixing/container_90.png
index 47ee2ac..5c06d53 100644
--- a/web/src/assets/mixing/container_90.png
+++ b/web/src/assets/mixing/container_90.png
Binary files differ
diff --git a/web/src/views/MixingInfo/messageInfo.vue b/web/src/views/MixingInfo/messageInfo.vue
index 61ed868..f2c8db8 100644
--- a/web/src/views/MixingInfo/messageInfo.vue
+++ b/web/src/views/MixingInfo/messageInfo.vue
@@ -6,37 +6,42 @@
<div class="mixing_main">
<div class="mixing_left">
<div class="mixing_left_num">
- <div class="">{{ mixingList && mixingList.tableNum }}</div>
+ <div class="">{{ mixingList.tableNum }}</div>
</div>
- <div class="mixing_left_name">{{ mixingList && mixingList.materialName }}</div>
+ <div class="mixing_left_name">{{ 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.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.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.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.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 ? '待检' : ''
+ {{ mixingList.status === 1 ? '合格' : 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 small_size">
+ {{
+ mixingList.reportNumber &&
+ mixingList.reportNumber.replace(/\s/g, '\n')
+ }}
+ </div>
</div>
</div>
</div>
@@ -47,7 +52,7 @@
data() {
return {
timer: null,//定时器
- mixingList: [],//展示数据
+ mixingList: {},//展示数据
}
},
created() {
@@ -80,8 +85,9 @@
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
+ if (res.statusMsg === 'ok' && res.data) {
+ res.data.reportNumber = "TYZQ1-ZTSS-J1-CGL-20231207-001 TYZQ1-ZTSS-J1-CGL-20231207-002"
+ this.mixingList = res.data
} else {
this.$message.warning('请检查网络或联系管理员!!!')
}
@@ -104,9 +110,8 @@
.mixing_header {
width: 100%;
- height: 3.2rem;
+ height: 9rem;
position: relative;
- padding: 4rem;
display: flex;
justify-content: center;
align-items: center;
@@ -128,7 +133,7 @@
flex: 1;
width: 100%;
height: 100%;
- padding: 6rem;
+ padding: 3rem 4rem 5rem 4rem;
display: flex;
.mixing_left {
@@ -185,7 +190,7 @@
background: linear-gradient(to right, #0D3776 0%, #041A40 100%);
display: flex;
flex-direction: column;
- justify-content: space-between;
+ justify-content: space-around;
padding: 2rem 4rem;
.mixing_rows {
@@ -193,17 +198,22 @@
display: flex;
.mixing_rows_titles {
- flex: none;
color: #FFFFFF;
font-weight: 400;
font-size: 5rem;
}
.mixing_rows_datas {
- flex: none;
+ overflow: hidden;
+ flex: 1;
color: #FFFFFF;
font-weight: 400;
font-size: 5rem;
+ white-space: pre-wrap;
+
+ &.small_size {
+ font-size: 4.3rem;
+ }
}
.standardStyle {
diff --git a/web/src/views/MixingInfo/mixing.vue b/web/src/views/MixingInfo/mixing.vue
index b6801dd..ab40a78 100644
--- a/web/src/views/MixingInfo/mixing.vue
+++ b/web/src/views/MixingInfo/mixing.vue
@@ -263,7 +263,7 @@
> p {
position: absolute;
left: 50%;
- top: 18%;
+ top: 9%;
font-size: 0.7rem;
white-space: nowrap;
transform: translate(-50%, -50%);
--
Gitblit v1.9.3