From e5278b8b1a5ce56803f2ffcab711c9c5f5339489 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 17 Apr 2025 18:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/hooks/components/DevicePopUpBox.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/hooks/components/DevicePopUpBox.vue b/src/hooks/components/DevicePopUpBox.vue
index 6ac7641..d3b769f 100644
--- a/src/hooks/components/DevicePopUpBox.vue
+++ b/src/hooks/components/DevicePopUpBox.vue
@@ -17,7 +17,7 @@
<div class="num">{{ dataObj.device_num }}</div>
</div>
<div class="info-item">
- 任务数：
+ 任务次数：
<div class="num">{{ dataObj.jobNum }}</div>
</div>
</div>
@@ -55,6 +55,8 @@
const areaCode = props.data.region_code;
dataObj.value.region_name = props.data.region_name;
const res = await getDeviceInfoNum({ areaCode });
+ console.log('首页地图弹框',res);
+
const resJob = await getTotalJobNum({ areaCode });
dataObj.value.jobNum = resJob.data.data;
dataObj.value.device_num = res.data.data.device_num;
@@ -126,7 +128,9 @@
cursor: pointer;
}
}
-
+.content {
+padding: 0px 23px 25px 15px;
+}
.info {
height: 34px;
font-family: Source Han Sans CN, Source Han Sans CN, serif;
@@ -136,9 +140,8 @@
line-height: 19px;
display: flex;
align-items: center;
- padding-left: 15px;
- gap: 0 20px;
margin: 18px 0;
+ justify-content: space-between;
.info-item {
display: flex;
@@ -161,13 +164,13 @@
color: #ffffff;
line-height: 23px;
text-shadow: 0px 0px 12px rgba(68, 105, 255, 0.67);
- padding-left: 15px;
+
margin-bottom: 14px;
}
.status-list {
display: flex;
- justify-content: space-evenly;
+ justify-content: space-between;
align-items: center;
.status-item {
--
Gitblit v1.9.3