From 1da4ccbf33281b669c40488be047700a298927de Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:55:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/LogisticsCenter.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 195f64b..39a0f91 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -56,8 +56,8 @@
</div>
<div class="hover_wrap">
<div class="triangle"></div>
- <div class="title">璋冩嫧鍑哄簱閲忥細{{ StockOutData.currentProvinceNum || 0 }}绠�</div>
- <div class="title">鍏朵粬鍑哄簱閲忥細{{ StockOutData.currentOtherNum || 0 }}绠�</div>
+ <div class="title" v-if="StockOutData.currentProvinceNum || StockOutData.currentProvinceNum == 0">璋冩嫧鍑哄簱閲忥細{{ StockOutData.currentProvinceNum.toFixed(0) }}绠�</div>
+ <div class="title" v-if="StockOutData.currentOtherNum || StockOutData.currentOtherNum == 0">鍏朵粬鍑哄簱閲忥細{{ StockOutData.currentOtherNum.toFixed(0) }}绠�</div>
</div>
</div>
@@ -1031,7 +1031,7 @@
image: fahuoImg, // 鍥炬爣鍥剧墖URL
imageSize: new AMap.Size(28, 32), // 鍥炬爣瀹為檯澶у皬
}),
- title: '鏍囪鐐�1', // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
+ title: obj.deliveryEnterprise, // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
})
map.add(marker1)
const marker2 = new AMap.Marker({
@@ -1041,7 +1041,7 @@
image: shouImg, // 鍥炬爣鍥剧墖URL
imageSize: new AMap.Size(28, 32), // 鍥炬爣瀹為檯澶у皬
}),
- title: '鏍囪鐐�1', // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
+ title: obj.receiveEnterprise, // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
})
map.add(marker2)
// 缁樺埗杞ㄨ抗
@@ -2569,7 +2569,6 @@
}
.title {
- font-weight: 600;
color: #e2ebfd;
}
}
--
Gitblit v1.9.3