From 1b004047f00cc846924209051ee654619c56a249 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 06 十二月 2023 16:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/MixingInfo/mixRatio.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/web/src/views/MixingInfo/mixRatio.vue b/web/src/views/MixingInfo/mixRatio.vue
index b4a9937..3393117 100644
--- a/web/src/views/MixingInfo/mixRatio.vue
+++ b/web/src/views/MixingInfo/mixRatio.vue
@@ -1,7 +1,7 @@
<template>
<div class="wrap">
<div class="header">
- <div class="header_name">中铁十四局通甬站前I标管片场拌合站</div>
+ <div class="header_name">中铁十四局通甬站前I标管片场拌和站</div>
</div>
<div class="table">
<div class="row title">{{ info.signboardName }}</div>
@@ -105,7 +105,7 @@
methods: {
getLists() {
const params = {
- pageNum: --this.type, // 传 0 1对应两个页面
+ pageNum: this.type, // 传 1 2对应两个页面
pageSize: 1,
}
this.$api.Infos.getMixRatio(params).then(res => {
@@ -117,12 +117,19 @@
this.info.signboardName = item.signboardName
this.info.proName = item.proName
- this.info.constructionUnit = item.constructionUnit
if (tmixingConsumes && tmixingConsumes.length) {
+ this.info.constructionUnit = tmixingConsumes[0].constructionUnit
this.info.saveStamp = tmixingConsumes[0].saveStamp
this.info.construction = tmixingConsumes[0].construction
-
+ this.dataLists = [
+ {name: '材料名称', type: 'dictName', value: []}, // 材料名称
+ {name: '规格型号', type: 'spec', value: []}, // 规格型号
+ {name: '生产厂家', type: 'manufacturer', value: []}, // 生产厂家
+ {name: '材料含水率(%)', type: 'watFull', value: []}, // 含水率
+ {name: '理论用量(kg/m³)', type: 'planAmnt', value: []}, // 理论用量
+ {name: '实际用量(kg/m³)', type: 'factAmnt', value: []}, // 实际用量
+ ]
tmixingConsumes.forEach(item => {
this.dataLists.forEach(val => {
item[val.type] && val.value.push(item[val.type])
@@ -160,7 +167,7 @@
background-size: 100% auto;
.header_name {
- font-size: 1.6rem;
+ font-size: 1.4rem;
font-weight: bold;
line-height: 3.2rem;
letter-spacing: 2px;
@@ -179,7 +186,7 @@
bottom: 2rem;
left: 2rem;
right: 2rem;
- font-size: 0.8rem;
+ font-size: 0.74rem;
color: #fff;
.title {
@@ -193,10 +200,9 @@
.row {
flex: 1;
width: 100%;
- height: 2rem;
margin: 0 -1px -1px 0;
text-align: center;
- line-height: 2rem;
+ line-height: 1.1rem;
border: 1px solid #01B3EF;
.name {
--
Gitblit v1.9.3