From 73a9e4fb1fdde52b65dd1240f16df71f72bf0e7d Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 20 Dec 2024 19:55:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=8C=E6=8D=A2=E8=A1=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/health/statistic/doctorStatistic/index.vue   |  2 +-
 src/pages/health/statistic/healthStatistic/index.vue   |  2 +-
 src/pages/health/statistic/marStatistic/index.vue      |  2 +-
 .../health/statistic/temperatureStatistic/index.vue    | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/health/statistic/doctorStatistic/index.vue b/src/pages/health/statistic/doctorStatistic/index.vue
index 9ca2a00..ee2cd57 100644
--- a/src/pages/health/statistic/doctorStatistic/index.vue
+++ b/src/pages/health/statistic/doctorStatistic/index.vue
@@ -264,7 +264,7 @@ onLoad(() => {
 
   function formatMultiLineData(data) {
 if (data != null) {
-  return data.replace(/<br\/>/g, '')
+  return data.replace(/<br\/>/g, '\n')
 }
 }
 function dictStr(val, arr) {
diff --git a/src/pages/health/statistic/healthStatistic/index.vue b/src/pages/health/statistic/healthStatistic/index.vue
index 8d8fed6..44af80c 100644
--- a/src/pages/health/statistic/healthStatistic/index.vue
+++ b/src/pages/health/statistic/healthStatistic/index.vue
@@ -278,7 +278,7 @@ onLoad(() => {
 
   function formatMultiLineData(data) {
 if (data != null) {
-  return data.replace(/<br\/>/g, '')
+  return data.replace(/<br\/>/g, '\n')
 }
 }
 function  openOrCloseDate(data) {
diff --git a/src/pages/health/statistic/marStatistic/index.vue b/src/pages/health/statistic/marStatistic/index.vue
index 9dd9a09..7ff44b0 100644
--- a/src/pages/health/statistic/marStatistic/index.vue
+++ b/src/pages/health/statistic/marStatistic/index.vue
@@ -333,7 +333,7 @@ onLoad(() => {
 
   function formatMultiLineData(data) {
 if (data != null) {
-  return data.replace(/<br\/>/g, '')
+  return data.replace(/<br\/>/g, '\n')
 }
 }
 function  openOrCloseDate(data) {
diff --git a/src/pages/health/statistic/temperatureStatistic/index.vue b/src/pages/health/statistic/temperatureStatistic/index.vue
index 08aa2f0..47869fe 100644
--- a/src/pages/health/statistic/temperatureStatistic/index.vue
+++ b/src/pages/health/statistic/temperatureStatistic/index.vue
@@ -106,7 +106,7 @@
     <div class="item">
       <img src="@/static/images/one.png" alt="" />
       <div class="info-sum">
-        <div class="title">正常次数(小于36.9℃)</div>
+        <div class="title">正常( &lt;36.9℃)</div>
         <div class="num">{{ temp.normalTempCount }}<span>次</span></div>
       </div>
     </div>
@@ -129,7 +129,7 @@
     <div class="item">
       <img src="@/static/images/ticketSum.png" alt="" />
       <div class="info-sum">
-        <div class="title">高烧（大于38.5℃）</div>
+        <div class="title">高烧（>38.5℃）</div>
         <div class="num">{{ temp.higherTempCount }}<span>次</span></div>
       </div>
     </div>
@@ -141,7 +141,7 @@
         <view class="list-item">
           <view class="item-header">
             <u--text  lines="2" 
-              :text="item.name+item.time+'  测量 '+item.count+' 次'" size="30rpx" color="#333333" ></u--text>
+              :text="item.name+' '+item.time+'  测量 '+item.count+' 次'" size="30rpx" color="#333333" ></u--text>
           </view>
         <view class="item-row">
           <text class="row-label">最高体温：</text>
@@ -156,7 +156,7 @@
           <text class="row-value">{{ item.average+" ℃"}}</text>
         </view>
         <view class="item-row">
-          <text class="row-label">测量明细：</text>
+          <text class="row-label">测量明细：</text><br>
           <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
         </view>
         </view>
@@ -240,7 +240,7 @@ onLoad(() => {
 
   function formatMultiLineData(data) {
 if (data != null) {
-  return data.replace(/<br\/>/g, '')
+  return data.replace(/<br\/>/g, '\n')
 }
 }
 function  openOrCloseDate(data) {