renkang/xj-screen
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source 
1.体温模块字段变更
This commit is contained in:
weixin
2023-12-27 10:59:49 +08:00
parent 2e106c4731
commit c1474f0c64
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
+16 -16
View File
@@ -7,22 +7,22 @@
:keyType="keyType" :keyType="keyType"
:user-id="userId" :user-id="userId"
/> />
<div class="item-three" style="display: flex; justify-content: center"> <!-- <div class="item-three" style="display: flex; justify-content: center">-->
<div style="width: 15%; text-align: center"> <!-- <div style="width: 15%; text-align: center">-->
<div> <!-- <div>-->
<span style="font-size: 25px"> {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}</span> <!-- <span style="font-size: 25px"> {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}</span>-->
<span style="color: #aa9db6">{{ maxInfo > 1000 ? 'km' : 'm' }}</span> <!-- <span style="color: #aa9db6">{{ maxInfo > 1000 ? 'km' : 'm' }}</span>-->
</div> <!-- </div>-->
<div style="color: #aa9db6">总运动距离</div> <!-- <div style="color: #aa9db6">总运动距离</div>-->
</div> <!-- </div>-->
<div style="width: 15%; text-align: center"> <!-- <div style="width: 15%; text-align: center">-->
<div> <!-- <div>-->
<span style="font-size: 25px"> {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}</span> <!-- <span style="font-size: 25px"> {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}</span>-->
<span style="color: #aa9db6">{{ minInfo > 1000 ? '千卡' : '卡' }}</span> <!-- <span style="color: #aa9db6">{{ minInfo > 1000 ? '千卡' : '卡' }}</span>-->
</div> <!-- </div>-->
<div style="color: #aa9db6">总卡路里</div> <!-- <div style="color: #aa9db6">总卡路里</div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<BasicTable :key="refresh" :columns="motionColumns" :api="queryExercisePageApi" :api-params="apiParams" :afterFetch="afterFetch" /> <BasicTable :key="refresh" :columns="motionColumns" :api="queryExercisePageApi" :api-params="apiParams" :afterFetch="afterFetch" />
</template> </template>
src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
+1 -1
View File
@@ -259,7 +259,7 @@
} }
:deep(.ant-select) { :deep(.ant-select) {
min-width: 140px; width: 200px;
} }
.bgc { .bgc {
src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
+5 -5
View File
@@ -107,14 +107,14 @@
let xArr = []; let xArr = [];
let yArr = []; let yArr = [];
let yArr1 = []; let yArr1 = [];
maxInfo.value = result.maxValue ? result.maxValue : '/'; maxInfo.value = result.maxValueB ? result.maxValueB : '/';
middleInfo.value = result.avgValue ? result.avgValue : '/'; middleInfo.value = result.avgValueB ? result.avgValueB : '/';
minInfo.value = result.minValue ? result.minValue : '/'; minInfo.value = result.minValueB ? result.minValueB : '/';
if (type === '1') return; if (type === '1') return;
result.viewDataList.map((item) => { result.viewDataList.map((item) => {
xArr.push(item.date); xArr.push(item.date);
yArr.push(item.value ? item.value : 0); yArr.push(item.ydata1 ? item.ydata1 : 0);
yArr1.push(item.value2 ? item.value2 : 0); yArr1.push(item.ydata2 ? item.ydata2 : 0);
}); });
echart = echarts.init(chartRef.value); echart = echarts.init(chartRef.value);
const option = { const option = {