From e40c2d5988a9ad1afa26421bf8cfdfffba1e0ff3 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 30 八月 2023 18:01:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/experiment/checkTheReport/index.vue | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/src/components/experiment/checkTheReport/index.vue b/src/components/experiment/checkTheReport/index.vue
index f6bbd14..3f4d022 100644
--- a/src/components/experiment/checkTheReport/index.vue
+++ b/src/components/experiment/checkTheReport/index.vue
@@ -5,7 +5,7 @@
</div>
<div class="center">
<h1>鍘熸潗鏂欐娴嬫姤鍛�</h1>
- <table>
+ <table height="30px">
<tr>
<td>鏉愭枡鍚嶇О</td>
<td colspan="5">{{reportData.name}}</td>
@@ -40,13 +40,15 @@
<td>妫�娴嬬粨鏋�</td>
<td>鍗曢」鍒ゆ柇</td>
</tr>
- <tr v-for="(item,index) in reportData.products" :key="item">
+ <tr v-for="(item,index) in arr" :key="index">
<td>{{index+1}}</td>
<td>{{item.ipName}}</td>
<td>{{item.unit}}</td>
<td>{{item.required}}</td>
<td>{{item.testValue}}</td>
- <td>{{item.testState === 1 ? "鈭�" : "X"}}</td>
+ <td >
+ {{isIfState(item.testState) }}
+ </td>
</tr>
<tr>
<td colspan="6">妫�楠岀粨璁猴細{{reportData.type == 1 ? "鍚堟牸" : "涓嶅悎鏍�"}}</td>
@@ -57,24 +59,42 @@
</td>
</tr>
</table>
- <el-row class="date-group" :gutter="20">
- <el-col :span="12">妫�娴嬨�佹棩鏈燂細<span>{{reportData.createTime}}</span></el-col>
- <el-col :span="12">瀹℃牳銆佹棩鏈燂細<span>{{reportData.checkTime}}</span></el-col>
+ <el-row class="date-group">
+ <p>妫�娴嬨�佹棩鏈燂細<span>{{reportData.createTime}}</span></p>
+ <p>瀹℃牳銆佹棩鏈燂細<span>{{reportData.checkTime}}</span></p>
</el-row>
<p class="footer">
- <span>缂栧彿:</span><span>{{reportData.rcode}}</span>
- <span> 鍙戣鏃ユ湡:</span><span>{{now}}</span>
- <span> 淇濆瓨鏈熼檺:</span><span>闀挎湡</span>
+ <span>缂栧彿锛�</span><span>{{reportData.rcode}} </span>
+ <span>鍙戣鏃ユ湡锛�</span><span>{{now}} </span>
+ <span>淇濆瓨鏈熼檺锛�</span><span>闀挎湡</span>
</p>
</div>
</div>
</template>
<script>
export default({
+ name: 'Preview',
data() {
return {
logoSrc : require("@/assets/404_images/logo.png"),
- now: new Date().toLocaleDateString()
+ now: new Date().toLocaleDateString(),
+ arr: []
+ }
+ },
+ mounted(){
+ this.arr = this.reportData.products;
+ if(this.reportData.products.length < 10){
+ let size = this.reportData.products.length;
+ let num=10-size
+ for(let i=0;i< num;i++){
+ this.arr.push({
+ code: null,
+ ipName: "",
+ required: "",
+ testState: null,
+ testValue: "",
+ unit: ""})
+ }
}
},
methods:{
@@ -84,6 +104,11 @@
let month = (dt.getMonth() + 1).toString().padStart(2,'0');
let date = dt.getDate().toString().padStart(2,'0');
return `${year}-${month}-${date}`;
+ },
+ isIfState(val){
+ if(val===1)return "鈭�"
+ else if(val===null || val=== undefined) return null
+ else return "X"
}
},
props:["reportData"]
@@ -110,7 +135,6 @@
}
table{
width:100%;
- height:100vh;
border-collapse: collapse;
font-size: 18px;
}
@@ -118,21 +142,25 @@
border: 2px solid black;
}
tr,td,th{
- padding: 5px 5px;
+ padding: 15px 10px;
}
- .date-group .el-col{
- text-align: center;
- padding: 50px 0px;
- font-size: 18px;
+ .date-group{
+ width: 90%;
+ margin-left: 5%;
+ p{
+ width: 50%;
+ float: left;
+ text-align: center;
+ padding: 50px 0px;
+ font-size: 18px;
+ }
}
.footer{
- margin: 0;
- padding: 0;
width:90%;
margin-left: 5%;
- color: gray;
+ color: lightgray;
text-align: center;
- margin-top: 250px;
+ margin-top: 300px;
}
}
}
--
Gitblit v1.9.3