From 8c5980e0a311ee391859146b10ed97b76a10ffda Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 06 九月 2024 15:22:48 +0800
Subject: [PATCH] 优化要求值的展示

---
 src/components/do/b1-inspect-order-plan/circuit-parameters1.vue |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index 68f6cfa..deb5f18 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -86,7 +86,7 @@
               <div style="text-align: center;">{{ n.unit }}</div>
             </el-col>
             <el-col :span="2">
-              <div style="text-align: center;">{{ n.tell }}</div>
+              <div style="text-align: center;" v-html="n.tell"></div>
             </el-col>
             <el-col :span="16">
               <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -129,7 +129,7 @@
               <div style="text-align: center;">{{ n.unit }}</div>
             </el-col>
             <el-col :span="2">
-              <div style="text-align: center;">{{ n.tell }}</div>
+              <div style="text-align: center;" v-html="n.tell"></div>
             </el-col>
             <el-col :span="16">
               <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -180,7 +180,7 @@
               <div style="text-align: center;">{{ n.unit }}</div>
             </el-col>
             <el-col :span="2">
-              <div style="text-align: center;">{{ n.tell }}</div>
+              <div style="text-align: center;" v-html="n.tell"></div>
             </el-col>
             <el-col :span="16">
               <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -223,7 +223,7 @@
               <div style="text-align: center;">{{ n.unit }}</div>
             </el-col>
             <el-col :span="2">
-              <div style="text-align: center;">{{ n.tell }}</div>
+              <div style="text-align: center;" v-html="n.tell"></div>
             </el-col>
             <el-col :span="16">
               <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -432,10 +432,19 @@
                   })
                   this.angleList = angleList
                 }
+                let tell = ''
+                if(item.tell.includes(',')){
+                  item.tell.split(',').forEach((m,i)=>{
+                    tell = tell + m+ (i==item.tell.split(',').length-1?'':'<br/>')
+                  })
+                }else{
+                  tell = item.tell
+                }
+                console.log(tell)
                 let obj = {
                   inspectionItemSubclass: item.inspectionItemSubclass,
                   unit:item.unit,
-                  tell:item.tell,
+                  tell:tell,
                   result:n.result,
                   id:item.id,
                   often:n.often,
@@ -639,7 +648,7 @@
       if(!n.often){
         return
       }
-      if(!n.often.includes('MHz')){
+      if(!n.often.includes('MHz')||!n.often.includes('MHZ')){
         n.often = n.often + 'MHz'
       }
     },

--
Gitblit v1.9.3