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"
/>
-
-
-
- {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}
- {{ maxInfo > 1000 ? 'km' : 'm' }}
-
-
总运动距离
-
-
-
- {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}
- {{ minInfo > 1000 ? '千卡' : '卡' }}
-
-
总卡路里
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -114,4 +114,4 @@
return params;
}
-
\ No newline at end of file
+
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;
}
}
-
\ No newline at end of file
+
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');
});
-
\ No newline at end of file
+