union map

src/assets/json/countryCoordMap.js

@@ -50,7 +50,7 @@ export const countryCoordMap = {
 	// 欧洲
 	俄罗斯: [37.6184, 55.7558], // 俄罗斯莫斯科
 	德国: [10.4515, 51.1657], // 德国柏林
-	英国: [-3.436, 55.3781], // 英国伦敦
+	英国: [-2, 54], // 英国伦敦
 	法国: [2.2137, 46.2276], // 法国巴黎
 	意大利: [12.5674, 41.8719], // 意大利罗马
 	西班牙: [-3.7492, 40.4637], // 西班牙马德里
@@ -218,12 +218,12 @@ export function convertAsiaCenterCoord(coord) {
 	const [lng, lat] = coord;
 
 	// 将以本初子午线为基准的坐标转换为以亚洲为中心的坐标
-	// world-asia-center.json 是将标准坐标的经度减去了 180 度
-	let newLng = lng - 180;
+	// world-asia-center.json 是将标准坐标的经度加上了 180 度（地图向右平移）
+	let newLng = lng + 180;
 
 	// 规范化到 [-180, 180] 范围
-	if (newLng < -180) {
-		newLng += 360;
+	if (newLng > 180) {
+		newLng -= 360;
 	}
 
 	return [newLng, lat];

src/views/ZMOverView/components/fourSuppress/components/allUnion/index.vue

@@ -626,6 +626,7 @@ function createChart() {
 			map: "world",
 			roam: true,
 			zoom: 1.2,
+			nameMap: nameMap,
 			label: {
 				show: false
 			},

src/views/exportControl/components/info.vue

@@ -7,12 +7,19 @@
 				<div class="sub-title">{{ subtitle }}</div>
 			</div>
 			<div class="description">{{ description }}</div>
-			<div v-if="quantity > 0" class="quantity" :style="{ color: color }">{{ quantity }}{{ unit || "个" }}</div>
+			<div v-if="quantity > 0" class="quantity" :style="{ color: color }">
+				{{ quantity }}{{ unit || "个" }}
+				<div class="quantity-title-des" v-if="desMap[title]">
+					<img class="info-icon" :src="infoIcon" alt="" />
+					{{ desMap[title] }}
+				</div>
+			</div>
 		</div>
 	</div>
 </template>
 
 <script setup>
+import infoIcon from "../assets/icons/info-icon.png";
 defineProps({
 	title: {
 		type: String,
@@ -39,6 +46,11 @@ defineProps({
 		default: "#409EFF"
 	}
 });
+const desMap = {
+	实体清单: "中国实体数量",
+	商业管制清单: "受管制物项数量",
+	关键与新兴技术清单: "关键与新兴技术数量"
+};
 </script>
 
 <style scoped lang="scss">
@@ -53,9 +65,7 @@ defineProps({
 	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 	position: relative;
 	overflow: hidden;
-	transition:
-		transform 0.3s ease,
-		box-shadow 0.3s ease;
+	transition: transform 0.3s ease, box-shadow 0.3s ease;
 	cursor: pointer;
 }
 
@@ -117,9 +127,27 @@ defineProps({
 
 .quantity {
 	position: absolute;
-	top: 20px;
+	top: 15px;
 	right: 20px;
 	font-size: 32px;
 	font-weight: 700;
+	width: 150px;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+	.quantity-title-des {
+		display: flex;
+		align-items: center;
+		font-family: Source Han Sans CN;
+		font-size: 14px;
+		font-weight: 400;
+		color: rgba(95, 101, 108, 1);
+		line-height: 1.4;
+		.info-icon {
+			width: 16px;
+			height: 16px;
+			margin-right: 4px;
+		}
+	}
 }
 </style>

src/views/exportControl/index.vue

@@ -50,12 +50,25 @@
 		<div class="home-main" ref="homeMainRef">
 			<div class="home-top-bg"></div>
 			<div class="home-main-header">
-				<SearchContainer style="margin-bottom: 0; margin-top: 48px; height: fit-content" v-if="homeMainRef"
-					placeholder="搜索出口管制" :containerRef="homeMainRef" areaName="实体清单" />
+				<SearchContainer
+					style="margin-bottom: 0; margin-top: 48px; height: fit-content"
+					v-if="homeMainRef"
+					placeholder="搜索出口管制"
+					:containerRef="homeMainRef"
+					areaName="实体清单"
+				/>
 				<div class="home-main-header-footer-info">
-					<InfoCard v-for="(item, index) in infoList" :key="item.id" :title="item.nameZh" :subtitle="item.nameAbbr"
-						:description="item.description" :quantity="item.postCount" unit="次" :color="infoListColor[index]"
-						@click="handleToEntityListNoId(item)" />
+					<InfoCard
+						v-for="(item, index) in infoList"
+						:key="item.id"
+						:title="item.nameZh"
+						:subtitle="item.nameAbbr"
+						:description="item.description"
+						:quantity="item.postCount"
+						unit="次"
+						:color="infoListColor[index]"
+						@click="handleToEntityListNoId(item)"
+					/>
 				</div>
 			</div>
 
@@ -81,8 +94,15 @@
 										<img src="./assets/images/box1-right.png" alt="" />
 									</div>
 								</div>
-								<el-carousel ref="carouselRef" height="370px" :autoplay="true" :interval="3000" arrow="never"
-									indicator-position="none" @change="handleCarouselChange">
+								<el-carousel
+									ref="carouselRef"
+									height="370px"
+									:autoplay="true"
+									:interval="3000"
+									arrow="never"
+									indicator-position="none"
+									@change="handleCarouselChange"
+								>
 									<el-carousel-item v-for="(item, index) in entitiesDataInfoList" :key="item.id + index">
 										<div>
 											<div class="box1-top">
@@ -100,8 +120,11 @@
 													</div>
 													<div class="box1-top-content-item">
 														<span class="box1-top-content-item-title">· 涉及领域：</span>
-														<div class="box1-top-content-item-tags" v-for="(domainItem, index) in item.domains"
-															:key="index">
+														<div
+															class="box1-top-content-item-tags"
+															v-for="(domainItem, index) in item.domains"
+															:key="index"
+														>
 															<el-tag :type="getTagType(domainItem)">{{ domainItem }}</el-tag>
 														</div>
 													</div>
@@ -110,10 +133,18 @@
 											<div class="box1-bottom">
 												<div class="box1-bottom-title">· 涉及主要实体：</div>
 												<div class="box1-bottom-content">
-													<div class="box1-bottom-content-item" v-for="(ett, index) in item.sanEntities" :key="index"
-														@click="handleEntityClick(ett)">
-														<el-image v-if="ett.img" class="box1-bottom-content-item-img" :src="ett.img"
-															alt=""></el-image>
+													<div
+														class="box1-bottom-content-item"
+														v-for="(ett, index) in item.sanEntities"
+														:key="index"
+														@click="handleEntityClick(ett)"
+													>
+														<el-image
+															v-if="ett.img"
+															class="box1-bottom-content-item-img"
+															:src="ett.img"
+															alt=""
+														></el-image>
 														<div v-else class="box1-bottom-content-item-imgUndefined">
 															{{
 																(ett.entityNameZh || ett.enName)?.match(
@@ -186,8 +217,14 @@
 							</div>
 						</template>
 					</custom-container> -->
-					<RiskSignal :list="warningList" @item-click="handleToRiskSignalDetail" @more-click="handleToMoreRiskSignal"
-						riskLevel="signalLevel" postDate="signalTime" name="signalTitle" />
+					<RiskSignal
+						:list="warningList"
+						@item-click="handleToRiskSignalDetail"
+						@more-click="handleToMoreRiskSignal"
+						riskLevel="signalLevel"
+						postDate="signalTime"
+						name="signalTitle"
+					/>
 				</el-col>
 			</el-row>
 
@@ -210,11 +247,19 @@
 					</custom-container>
 				</el-col> -->
 			<div class="center-center">
-				<NewsList :newsList="newsList" @item-click="handleNewsInfoClick" @more-click="handleToMoreNews"
-					content="newsContent" />
-
-				<MessageBubble :messageList="socialMediaList" @person-click="handlePerClick" imageUrl="avatar"
-					@more-click="handleToSocialDetail" />
+				<NewsList
+					:newsList="newsList"
+					@item-click="handleNewsInfoClick"
+					@more-click="handleToMoreNews"
+					content="newsContent"
+				/>
+
+				<MessageBubble
+					:messageList="socialMediaList"
+					@person-click="handlePerClick"
+					imageUrl="avatar"
+					@more-click="handleToSocialDetail"
+				/>
 				<!-- <custom-container title="社交媒体" :titleIcon="dialogIcon" height="450px">
 						<template #default>
 							<div class="dialog-list">
@@ -240,14 +285,19 @@
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
-													<el-progress :percentage="scope.row.percent * 100" :show-text="false"
-														:status="getStatus(scope.row.percent)" />
+													<el-progress
+														:percentage="scope.row.percent * 100"
+														:show-text="false"
+														:status="getStatus(scope.row.percent)"
+													/>
 												</div>
 											</template>
 										</el-table-column>
 										<el-table-column label="重点领域" width="220" align="center">
 											<template #default="scope">
-												<div style="display: flex; justify-content: center; align-items: center; gap: 5px">
+												<div
+													style="display: flex; justify-content: center; align-items: center; gap: 5px"
+												>
 													<el-tag v-for="tag in scope.row.tags" :key="tag" :type="getTagType(tag)">{{
 														tag
 													}}</el-tag>
@@ -264,14 +314,19 @@
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
-													<el-progress :percentage="scope.row.percent * 100" :show-text="false"
-														:status="getStatus(scope.row.percent)" />
+													<el-progress
+														:percentage="scope.row.percent * 100"
+														:show-text="false"
+														:status="getStatus(scope.row.percent)"
+													/>
 												</div>
 											</template>
 										</el-table-column>
 										<el-table-column label="重点领域" width="220" align="center">
 											<template #default="scope">
-												<div style="display: flex; justify-content: center; align-items: center; gap: 5px">
+												<div
+													style="display: flex; justify-content: center; align-items: center; gap: 5px"
+												>
 													<el-tag v-for="tag in scope.row.tags" :key="tag" :type="getTagType(tag)">{{
 														tag
 													}}</el-tag>
@@ -288,8 +343,11 @@
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
-													<el-progress :percentage="scope.row.percent * 100" :show-text="false"
-														:status="getStatus(scope.row.percent)" />
+													<el-progress
+														:percentage="scope.row.percent * 100"
+														:show-text="false"
+														:status="getStatus(scope.row.percent)"
+													/>
 												</div>
 											</template>
 										</el-table-column>
@@ -341,9 +399,13 @@
 			<el-row :gutter="20" style="width: 1600px; margin: 0 auto; margin-top: 39px">
 				<CustomTitle id="position4" title="资源库" style="margin-top: 0px" />
 				<div class="resource-tabs">
-					<div v-for="tab in resourceTabs" :key="tab.value" class="resource-tab-item"
+					<div
+						v-for="tab in resourceTabs"
+						:key="tab.value"
+						class="resource-tab-item"
 						:class="{ active: activeResourceTab === tab.value, disabled: tab.disabled }"
-						@click="handleResourceTabClick(tab)">
+						@click="handleResourceTabClick(tab)"
+					>
 						{{ tab.label }}
 					</div>
 				</div>
@@ -356,15 +418,25 @@
 										<div class="box4-item" v-for="(item, idx) in sanctionProcessList" :key="item.title">
 											<div class="box4-item-left">
 												<el-image :src="dotIcon" alt="图片" class="box4-item-left-icon" />
-												<div class="box4-item-left-line" v-if="idx + 1 != sanctionProcessList.length"></div>
+												<div
+													class="box4-item-left-line"
+													v-if="idx + 1 != sanctionProcessList.length"
+												></div>
 											</div>
 											<div class="box4-item-right">
 												<div class="box4-item-right-header" @click="handleSanc(item)">
-													<span class="box4-item-right-header-title">{{ item.postDate }}—{{ item.title }}</span>
+													<span class="box4-item-right-header-title"
+														>{{ item.postDate }}—{{ item.title }}</span
+													>
 													<span class="box4-item-right-header-desc">{{ item.desc }}</span>
 												</div>
-												<el-tooltip effect="dark" :content="item.content" popper-class="common-prompt-popper"
-													placement="top" :show-after="500">
+												<el-tooltip
+													effect="dark"
+													:content="item.content"
+													popper-class="common-prompt-popper"
+													placement="top"
+													:show-after="500"
+												>
 													<div class="box4-item-right-content">
 														{{ item.content }}
 													</div>
@@ -372,8 +444,12 @@
 											</div>
 										</div>
 									</div>
-									<div class="box4-footer" :style="{ marginTop: sanctionProcessList.length > 0 ? '0px' : 'auto' }">
-										<el-button type="primary" link @click="handleGetMore">查看更多
+									<div
+										class="box4-footer"
+										:style="{ marginTop: sanctionProcessList.length > 0 ? '0px' : 'auto' }"
+									>
+										<el-button type="primary" link @click="handleGetMore"
+											>查看更多
 											<el-icon>
 												<DArrowRight />
 											</el-icon>
@@ -390,8 +466,15 @@
 							</template>
 							<template #default>
 								<div class="box5">
-									<el-table :data="entitiesList" class="sanction-table" stripe empty-text="暂无数据" height="700px"
-										header-row-class-name="table-header" row-class-name="table-row">
+									<el-table
+										:data="entitiesList"
+										class="sanction-table"
+										stripe
+										empty-text="暂无数据"
+										height="700px"
+										header-row-class-name="table-header"
+										row-class-name="table-row"
+									>
 										<!-- <el-table-column prop="index" label="序号" width="80" align="center">
 										<template #default="scope">
 											{{ scope.$index + 1 + (currentPage - 1) * pageSize }}
@@ -401,8 +484,12 @@
 										<el-table-column prop="name" label="实体名称" min-width="200">
 											<template #default="scope">
 												<div class="tableName" @click="handleCompClick(scope.row)">
-													<el-image v-if="scope.row.img" class="box1-bottom-content-item-img" :src="scope.row.img"
-														alt=""></el-image>
+													<el-image
+														v-if="scope.row.img"
+														class="box1-bottom-content-item-img"
+														:src="scope.row.img"
+														alt=""
+													></el-image>
 													<div v-else class="box1-bottom-content-item-imgUndefined">
 														{{
 															(scope.row.name || scope.row.enName)?.match(
@@ -453,13 +540,19 @@
 										<el-table-column prop="revenue" label="50%规则子企业" width="280" align="right">
 											<template #default="scope">
 												<div class="num-item" v-if="scope.row.ruleOrgCount > 0">
-													<div class="name-item" :class="[
-														'revenue-cell',
-														scope.row.revenue === '无营收数据' ? 'no-revenue' : ''
-													]">
+													<div
+														class="name-item"
+														:class="[
+															'revenue-cell',
+															scope.row.revenue === '无营收数据' ? 'no-revenue' : ''
+														]"
+													>
 														{{ scope.row.ruleOrgList[0].orgName }}...等
 													</div>
-													<div style="width: 50px; color: #409eff; cursor: pointer" @click="handleOrgClick(scope.row)">
+													<div
+														style="width: 50px; color: #409eff; cursor: pointer"
+														@click="handleOrgClick(scope.row)"
+													>
 														{{ scope.row.ruleOrgCount }}家>
 													</div>
 												</div>
@@ -471,8 +564,15 @@
 										<!-- <div class="pagination-info">
                     第{{ currentPage }}页，共{{ totalPages }}页
                   </div> -->
-										<el-pagination v-model:current-page="currentPage" :page-size="pageSize" :total="total"
-											:pager-count="5" layout="prev, pager, next" background @current-change="handlePageChange" />
+										<el-pagination
+											v-model:current-page="currentPage"
+											:page-size="pageSize"
+											:total="total"
+											:pager-count="5"
+											layout="prev, pager, next"
+											background
+											@current-change="handlePageChange"
+										/>
 									</div>
 								</div>
 							</template>
@@ -538,8 +638,14 @@
 								</div>
 								<div class="right-footer">
 									<div class="total-count">共 {{ totalAll }} 项</div>
-									<el-pagination v-model:current-page="currentPageAll" :page-size="pageSizeAll" :total="totalAll"
-										layout="prev, pager, next" background @current-change="handlePageChangeAll" />
+									<el-pagination
+										v-model:current-page="currentPageAll"
+										:page-size="pageSizeAll"
+										:total="totalAll"
+										layout="prev, pager, next"
+										background
+										@current-change="handlePageChangeAll"
+									/>
 								</div>
 							</div>
 						</div>
@@ -574,8 +680,12 @@
 				</div>
 			</template>
 		</el-dialog> -->
-		<RuleSubsidiaryDialog v-model="dialogVisible" :company-name="currentRuleCompany" :total-count="currentRuleCount"
-			:data-list="currentOrgList" />
+		<RuleSubsidiaryDialog
+			v-model="dialogVisible"
+			:company-name="currentRuleCompany"
+			:total-count="currentRuleCount"
+			:data-list="currentOrgList"
+		/>
 	</div>
 	<el-dialog v-model="mediaVisible" title="社交媒体信息" width="500" :before-close="handleMediaClose">
 		<div class="dialog-content">
@@ -1223,8 +1333,8 @@ const fetchSanctionList = async () => {
 				const tags = Array.isArray(item.techDomains)
 					? item.techDomains
 					: item.techDomain
-						? [item.techDomain]
-						: item.techDomainList || [];
+					? [item.techDomain]
+					: item.techDomainList || [];
 
 				const fullTime = item.startTime
 					? formatAnyDateToChinese(item.startTime)
@@ -1254,13 +1364,13 @@ const fetchSanctionList = async () => {
 					countTag: item.cnEntityCount
 						? `${item.cnEntityCount}家中国实体`
 						: item.ruleOrgCount
-							? `${item.ruleOrgCount}家关联实体`
-							: item.countTag || ""
+						? `${item.ruleOrgCount}家关联实体`
+						: item.countTag || ""
 				};
 			});
 			totalAll.value = res.totalElements;
 		}
-	} catch (error) { }
+	} catch (error) {}
 };
 
 const handlePageChangeAll = val => {
@@ -1532,7 +1642,7 @@ const handleGetHylyList = async () => {
 			hylymc: "全部分类"
 		};
 		categoryList.value = [obj, ...categoryList.value];
-	} catch (error) { }
+	} catch (error) {}
 };
 
 const chart1Data = ref({
@@ -2032,7 +2142,6 @@ const handleMediaClick = item => {
 	}
 
 	.box3-content {
-
 		// flex: 1;
 		.el-progress--line {
 			width: 82px;
@@ -2176,8 +2285,7 @@ const handleMediaClick = item => {
 		overflow-y: auto;
 
 		.home-top-bg {
-			background:
-				url("./assets/images/background.png"),
+			background: url("./assets/images/background.png"),
 				linear-gradient(180deg, rgba(229, 241, 254, 1) 0%, rgba(246, 251, 255, 0) 30%);
 			background-size: 100% 100%;
 			position: absolute;