From c1474f0c648d6e5534236b2776cb0fcf26bab753 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 27 Dec 2023 10:59:49 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E4=BD=93=E6=B8=A9=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/userInfoModal/motion.vue       | 34 +++++++++----------
 .../components/userInfoModal/publicTitle.vue  |  4 +--
 .../components/userInfoModal/temperature.vue  | 12 +++----
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
index db5329f..6108f91 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
@@ -7,22 +7,22 @@
         :keyType="keyType"
         :user-id="userId"
     />
-    <div class="item-three" style="display: flex; justify-content: center">
-        <div style="width: 15%; text-align: center">
-            <div>
-                <span style="font-size: 25px"> {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}</span>
-                <span style="color: #aa9db6">{{ maxInfo > 1000 ? 'km' : 'm' }}</span>
-            </div>
-            <div style="color: #aa9db6">总运动距离</div>
-        </div>
-        <div style="width: 15%; text-align: center">
-            <div>
-                <span style="font-size: 25px"> {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}</span>
-                <span style="color: #aa9db6">{{ minInfo > 1000 ? '千卡' : '卡' }}</span>
-            </div>
-            <div style="color: #aa9db6">总卡路里</div>
-        </div>
-    </div>
+    <!--    <div class="item-three" style="display: flex; justify-content: center">-->
+    <!--        <div style="width: 15%; text-align: center">-->
+    <!--            <div>-->
+    <!--                <span style="font-size: 25px"> {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}</span>-->
+    <!--                <span style="color: #aa9db6">{{ maxInfo > 1000 ? 'km' : 'm' }}</span>-->
+    <!--            </div>-->
+    <!--            <div style="color: #aa9db6">总运动距离</div>-->
+    <!--        </div>-->
+    <!--        <div style="width: 15%; text-align: center">-->
+    <!--            <div>-->
+    <!--                <span style="font-size: 25px"> {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}</span>-->
+    <!--                <span style="color: #aa9db6">{{ minInfo > 1000 ? '千卡' : '卡' }}</span>-->
+    <!--            </div>-->
+    <!--            <div style="color: #aa9db6">总卡路里</div>-->
+    <!--        </div>-->
+    <!--    </div>-->
 
     <BasicTable :key="refresh" :columns="motionColumns" :api="queryExercisePageApi" :api-params="apiParams" :afterFetch="afterFetch" />
 </template>
@@ -114,4 +114,4 @@
         return params;
     }
 </script>
-<style scoped lang="less"></style>
\ No newline at end of file
+<style scoped lang="less"></style>
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
index 185bafc..091108b 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
@@ -259,7 +259,7 @@
     }
 
     :deep(.ant-select) {
-        min-width: 140px;
+        width: 200px;
     }
 
     .bgc {
@@ -284,4 +284,4 @@
             box-shadow: none;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
index 2ef5940..d98000a 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
@@ -107,14 +107,14 @@
                 let xArr = [];
                 let yArr = [];
                 let yArr1 = [];
-                maxInfo.value = result.maxValue ? result.maxValue : '/';
-                middleInfo.value = result.avgValue ? result.avgValue : '/';
-                minInfo.value = result.minValue ? result.minValue : '/';
+                maxInfo.value = result.maxValueB ? result.maxValueB : '/';
+                middleInfo.value = result.avgValueB ? result.avgValueB : '/';
+                minInfo.value = result.minValueB ? result.minValueB : '/';
                 if (type === '1') return;
                 result.viewDataList.map((item) => {
                     xArr.push(item.date);
-                    yArr.push(item.value ? item.value : 0);
-                    yArr1.push(item.value2 ? item.value2 : 0);
+                    yArr.push(item.ydata1 ? item.ydata1 : 0);
+                    yArr1.push(item.ydata2 ? item.ydata2 : 0);
                 });
                 echart = echarts.init(chartRef.value);
                 const option = {
@@ -205,4 +205,4 @@
         initEchart('0');
     });
 </script>
-<style scoped lang="less"></style>
\ No newline at end of file
+<style scoped lang="less"></style>