From a970199e2417318743ca3f7852dca896906ac574 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 30 八月 2023 09:09:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/components/experiment/template_testReport/index.vue | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/views/template_testReport/index.vue b/src/components/experiment/template_testReport/index.vue
similarity index 98%
rename from src/views/template_testReport/index.vue
rename to src/components/experiment/template_testReport/index.vue
index 575e579..ecc76e1 100644
--- a/src/views/template_testReport/index.vue
+++ b/src/components/experiment/template_testReport/index.vue
@@ -30,7 +30,7 @@
<div class="name">
<div style="width:140px; text-align-last: justify;">
<div>濮旀墭鍗曚綅</div>
- <span style="font-size: 14px;display: block;margin: 10px 50px 0px;">Client</span>
+ <span style="font-size: 14px;display: block;margin: 10px 45px 0px;">Client</span>
</div>
<div class="line"> 娴嬭瘯鍚嶇О</div>
</div>
@@ -469,9 +469,8 @@
<script>
export default {
- props:{
-
- },
+ name:'TestReport',
+ props:["reportData"],
data(){
return {
resultTable:[
@@ -500,15 +499,13 @@
<style lang="scss" scoped>
.content-wrapper{
- background-color: #f0f2f5;
- width: 100%;
- height: 100vh;
- overflow-y: auto;
+ // background-color: #f0f2f5;
+ // width: 100%;
+ // height: 100vh;
+ // overflow-y: auto;
.content-main{
- margin: -50px auto;
- width: 50%;
- // background-color: #fff;
- // background-color: #bfa;
+ margin: -100px auto;
+ width: 90%;
.cover{
margin: 80px 0px;
padding:0px 50px;
--
Gitblit v1.9.3