From 904436a616ca08fc95e1cbbbd13059835ef37e72 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 23 一月 2025 13:51:37 +0800 Subject: [PATCH] ll --- screen/src/views/LogisticsCenter.vue | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue index 1e57222..caf08ca 100644 --- a/screen/src/views/LogisticsCenter.vue +++ b/screen/src/views/LogisticsCenter.vue @@ -4,7 +4,7 @@ <img src="@/assets/images/LogisticsCenter/bg@2x.png" class="main_bg" alt="" /> <div class="main_header"> <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" /> - <div class="title">瀹夊窘涓儫鎴愬搧闆嗘帶澶у睆</div> + <div class="title">瀹夊窘涓儫鏁版櫤鎴愬搧绠℃帶</div> <div class="time_wrap"> <span class="date">{{ date }}</span> <span class="week">{{ week }}</span> @@ -438,7 +438,7 @@ <div class="item"> <div class="dian"></div> <div class="la">杞﹁締浣嶇疆锛�</div> - <div class="val">{{ modalInfo.aa || '-' }}</div> + <div class="val">{{ modalInfo.position || '-' }}</div> </div> <div class="item"> <div class="dian"></div> @@ -510,6 +510,7 @@ import VScaleScreen from 'v-scale-screen' import Percent from '@/components/percent.vue' import dayjs from 'dayjs' +import axios from "axios" import * as echarts from 'echarts' import 'swiper/css/swiper.min.css' import Swiper from 'swiper' @@ -1008,6 +1009,20 @@ showModal.value = true kzorderInfo({ contractNumber: item.contractNumber }).then(res => { modalInfo.value = res.data + const apiKey = 'd9a554b1808ce10a12a932ed9b0db1d0' + if (modalInfo.value.gisList && modalInfo.value.gisList.length > 0) { + const gisInfo = modalInfo.value.gisList[0] + if (gisInfo && gisInfo.gisList && gisInfo.gisList.length > 0) { + const adsInfo = gisInfo.gisList[gisInfo.gisList.length - 1] + const location = adsInfo.lon1 + ',' + adsInfo.lat1 + axios.get(`https://restapi.amap.com/v3/geocode/regeo?key=${apiKey}&location=${location}`).then(res => { + console.log('res', res.data) + if(res.data.status == 1){ + modalInfo.value.position = res.data.regeocode.formatted_address + } + }) + } + } modalLoading.value = false nextTick(() => { @@ -1997,6 +2012,7 @@ padding: 0px 10px 30px 20px; position: relative; height: 160px; + .content_wrap { display: flex; justify-content: space-between; @@ -2402,13 +2418,15 @@ z-index: -1; } } - .tooltip_wrap{ - .tooltip{ + + .tooltip_wrap { + .tooltip { z-index: 9999999999; top: 34px; transform: translate(70px, -42%); } } + .tag1 { background-color: #28F0CC; border: 1px solid #28F0CC; @@ -2862,12 +2880,12 @@ flex-wrap: wrap; background-color: #0d2845; border-radius: 4px; - padding: 10px 20px 0; + padding: 10px 20px 0px; margin-bottom: 16px; .item { display: flex; - align-items: center; + /* align-items: center; */ font-size: 13px; width: 55%; margin-bottom: 8px; @@ -2882,10 +2900,15 @@ background-color: #fff; border-radius: 50%; margin-right: 4px; + margin-top: 7px; } .la { color: #01D9FE; + width: 70px; + } + .val{ + flex: 1; } } } -- Gitblit v1.9.3