From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/views/wel/components/statistics.vue | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/views/wel/components/statistics.vue b/src/views/wel/components/statistics.vue
index 7896992..3761b0c 100644
--- a/src/views/wel/components/statistics.vue
+++ b/src/views/wel/components/statistics.vue
@@ -17,7 +17,7 @@
<div class="itemcenter">
<div>{{ test[item]?.name || '--' }}</div>
<span class="shu">{{ newtitleData[item].total_num }}</span>
- <span>个</span>
+ <span>{{unitMap[test[item]?.name]}}</span>
</div>
</div>
<div class="status-list">
@@ -39,7 +39,7 @@
<span class="label">{{ getStatusLabel(test[item]?.name, statusKey) }}</span>
<span class="count">
{{ newtitleData[item].status_map[statusKey] }}
- {{ test[item]?.name === '无人机' ? '架' : '个' }}
+ {{ unitMap[test[item]?.name]}}
</span>
</div>
</template>
@@ -61,7 +61,7 @@
<span class="label">{{ getStatusLabel(test[item]?.name, statusKey) }}</span>
<span class="count">
{{ newtitleData[item].status_map[statusKey] }}
- {{ test[item]?.name === '无人机' ? '架' : '个' }}
+ {{ unitMap[test[item]?.name]}}
</span>
</div>
</template>
@@ -104,7 +104,7 @@
></span>
<span class="label">{{ getStatusLabel(test[item]?.name, statusIndex) }}</span>
<span class="count"
- >{{ status }} {{ test[item]?.name === '无人机' ? '架' : '个' }}</span
+ >{{ status }} {{ unitMap[test[item]?.name]}}</span
>
</div>
</template>
@@ -117,12 +117,12 @@
<script setup>
import { useStore } from 'vuex';
import { computed } from 'vue';
-import titleImg1 from '@/assets/images/workbench/st3.png';
-import titleImg2 from '@/assets/images/workbench/st4.png';
-import titleImg3 from '@/assets/images/workbench/st8.png';
-import titleImg4 from '@/assets/images/workbench/st5.png';
-import titleImg5 from '@/assets/images/workbench/st6.png';
-import titleImg6 from '@/assets/images/workbench/st9.png';
+import titleImg1 from '@/assets/images/workbench/st3.svg';
+import titleImg2 from '@/assets/images/workbench/st4.svg';
+import titleImg3 from '@/assets/images/workbench/st8.svg';
+import titleImg4 from '@/assets/images/workbench/st5.svg';
+import titleImg5 from '@/assets/images/workbench/st6.svg';
+import titleImg6 from '@/assets/images/workbench/st9.svg';
import { getStatics } from '@/api/home/index';
import { useRouter } from 'vue-router';
const router = useRouter();
@@ -267,10 +267,12 @@
};
const unitMap = {
- drone: '架',
- nest: '个',
- monitor: '个',
- mobile: '个',
+ '无人机流量': '架',
+ '无人机': '架',
+ '机巢': '个',
+ '机巢保险': '个',
+ '监控设备': '个',
+ '移动机巢': '个',
};
watch(
() => [
@@ -308,7 +310,7 @@
font-weight: bold;
font-size: 16px;
color: #363636;
- font-family: 'YouSheBiaoTiHei';
+ font-family: 'Source Han Sans CN';
}
img {
@@ -337,8 +339,8 @@
align-items: center;
img {
- width: 43px;
- height: 44px;
+ width: 64px;
+ height: 64px;
}
}
@@ -347,15 +349,18 @@
font-weight: 400;
font-size: 14px;
color: #343434;
-
+ div{
+ margin-top: 5px;
+ }
.shu {
font-weight: bold;
font-size: 36px;
color: #363636;
display: inline-block;
transform: skewX(-5deg);
- font-family: 'YouSheBiaoTiHei';
+ font-family: 'Source Han Sans CN';
// font-size: calc(12px + 0.5vw);
+ margin-right: 2px;
}
span {
@@ -411,8 +416,8 @@
align-items: center;
img {
- width: 43px;
- height: 44px;
+ width: 64px;
+ height: 64px;
}
}
@@ -428,7 +433,8 @@
color: #363636;
display: inline-block;
transform: skewX(-5deg);
- font-family: 'YouSheBiaoTiHei';
+ font-family: 'Source Han Sans CN';
+ margin-right: 2px;
}
span {
--
Gitblit v1.9.3