ZM module

src/api/exportControl.js

@@ -51,7 +51,8 @@ export function getEntitiesDataInfo() {
 			method: "GET",
 			// url: '/api/entitiesDataInfo/latestInfoSelect',
 			// url: "/api/entitiesDataInfo/getLatestInfo",
-			url: "/api/sanctionList/export/getLatestInfo"
+			// url: "/api/sanctionList/export/getLatestInfo"
+			url: "/api/sanctionList/export/getLatestEntityListInfo"
 		})
 	);
 }
@@ -121,7 +122,7 @@ export function getSanctionsInfoCount() {
  * sanReason: string
  * }[]>}
  */
-export function getSanctionProcess(typeName = "实体清单", pageNum = 1, pageSize = 10,isCn = false) {
+export function getSanctionProcess(typeName = "实体清单", pageNum = 1, pageSize = 10, isCn = false) {
 	return request200(
 		request({
 			method: "POST",
@@ -835,7 +836,6 @@ export function getScientificImpactEntityList(startTime) {
 	);
 }
 
-
 /**
  * 概览页--获取出口管制制裁措施
  * @param {Object} data
@@ -854,6 +854,4 @@ export function getExportControlList(data) {
 	);
 }
 
-
-
 //

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

@@ -4,7 +4,8 @@
 	<div class="content-wrapper">
 		<div class="btn-wrapper" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay(true)">
 			<div class="cards-mask">
-				<div class="btn-box" :style="{ transform: `translateX(-${currentIndex * (cardWidth + cardGap)}px)` }">
+				<!-- <div class="btn-box" :style="{ transform: `translateX(-${currentIndex * (cardWidth + cardGap)}px)` }"> -->
+				<div class="btn-box">
 					<div class="btn-item-outer" v-for="(item, indexx) in buttonsData" :key="indexx">
 						<div
 							v-for="(value, index) in item"

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

@@ -969,6 +969,13 @@ const initRightDonut = async () => {
 						color: `rgba(${Math.floor(Math.random() * 256)}, ${Math.floor(Math.random() * 256)}, ${Math.floor(
 							Math.random() * 256
 						)}, 1)`
+					},
+					label: {
+						show: true,
+						position: "outside",
+						fontWeight: "bold",
+						fontSize: 14,
+						color: "#333"
 					}
 				};
 				let item1 = {
@@ -976,7 +983,14 @@ const initRightDonut = async () => {
 					value: res.data[i].amount,
 					x: Math.random() * 10,
 					y: Math.random() * 10,
-					symbolSize: res.data[i].amount * 9
+					symbolSize: res.data[i].amount * 9,
+					label: {
+						show: true,
+						position: "outside",
+						fontWeight: "bold",
+						fontSize: 14,
+						color: "#333"
+					}
 				};
 
 				// 先判断data中是否包含上述数据
@@ -1000,7 +1014,10 @@ const initRightDonut = async () => {
 					},
 					lineStyle: {
 						width: res.data[i].amount,
-						curveness: 0.2
+						curveness: 0.3,
+						color: `rgba(${Math.floor(Math.random() * 256)}, ${Math.floor(Math.random() * 100 + 100)}, ${Math.floor(
+							Math.random() * 256
+						)}, 0.6)`
 					}
 				};
 
@@ -1043,7 +1060,7 @@ const initRightDonut = async () => {
 			{
 				type: "graph",
 				layout: "circular",
-				symbolSize: 50,
+				symbolSize: 80,
 				roam: true,
 				label: {
 					show: true
@@ -1059,7 +1076,13 @@ const initRightDonut = async () => {
 				lineStyle: {
 					opacity: 0.9,
 					width: 2,
-					curveness: 0
+					curveness: 0.3
+				},
+				emphasis: {
+					focus: "adjacency",
+					lineStyle: {
+						width: 4
+					}
 				}
 			}
 		]

src/views/decree/decreeLayout/deepdig/index.vue

@@ -4,7 +4,12 @@
 			<AnalysisBox title="相关政令关联分析" :showAllBtn="false">
 				<div class="box1-main">
 					<div class="left">
-					<el-empty v-if="siderList.length === 0" style="padding-top: 240px;" description="暂无数据" :image-size="100" />
+						<el-empty
+							v-if="siderList.length === 0"
+							style="padding-top: 240px"
+							description="暂无数据"
+							:image-size="100"
+						/>
 						<div
 							class="left-item"
 							:class="{ leftItemActive: siderActiveIndex === index }"
@@ -66,7 +71,12 @@
 								<div class="title">{{ "政令主要内容" }}</div>
 							</div>
 							<div class="list-main">
-							<el-empty v-if="showList.length === 0" style="padding-top: 150px;" description="暂无数据" :image-size="100" />
+								<el-empty
+									v-if="showList.length === 0"
+									style="padding-top: 150px"
+									description="暂无数据"
+									:image-size="100"
+								/>
 								<div class="list-item" v-for="(val, idx) in showList" :key="idx">
 									<div class="id">{{ idx + 1 }}</div>
 									<div class="title">{{ val.content }}</div>
@@ -411,10 +421,11 @@ onMounted(() => {
 						margin-top: 22px;
 						.info-item {
 							display: flex;
-							height: 30px;
+							min-height: 30px;
+							max-height: 60px;
 							margin-bottom: 8px;
 							.item-left {
-								margin-top: 3px;
+								// margin-top: 3px;
 								width: 100px;
 								height: 24px;
 								color: rgba(59, 65, 75, 1);
@@ -425,12 +436,12 @@ onMounted(() => {
 							}
 							.item-right {
 								width: 769px;
-								height: 30px;
+								// height: 30px;
 								color: rgba(59, 65, 75, 1);
 								font-family: Microsoft YaHei;
 								font-size: 16px;
 								font-weight: 400;
-								line-height: 30px;
+								line-height: 25px;
 							}
 							.item-right1 {
 								display: flex;
@@ -491,7 +502,7 @@ onMounted(() => {
 						overflow-y: auto;
 						.list-item {
 							width: 1180px;
-							height: 54px;
+							min-height: 65px;
 							box-sizing: border-box;
 							border-radius: 4px;
 							background: rgba(255, 255, 255, 1);
@@ -515,13 +526,14 @@ onMounted(() => {
 							.title {
 								margin-left: 13px;
 								margin-top: 12px;
-								height: 30px;
+								margin-bottom: 12px;
+								// height: 30px;
 								width: 1100px;
 								color: rgba(59, 65, 75, 1);
 								font-family: Microsoft YaHei;
 								font-size: 16px;
 								font-weight: 400;
-								line-height: 30px;
+								line-height: 25px;
 							}
 							.open {
 								width: 16px;