Merge branch 'master' of http://8.140.26.4:10003/caijian/risk-monitor into zym-dev

src/components/base/messageBubble/index.vue

 <template>
-	<div class="box4">
-		<div class="box4-header">
+	<div class="msg-bubble">
+		<div class="msg-bubble-header">
 			<div class="header-icon">
 				<!-- <img src="./image1.png" alt="" /> -->
 				<img src="./message-icon.svg" alt="" />
@@ -10,7 +10,7 @@
 			</div>
 			<div class="more" @click="handleToMoreNews">{{ "更多 +" }}</div>
 		</div>
-		<div class="box4-main">
+		<div class="msg-bubble-main">
 			<div class="message-bubble" v-for="(item, index) in messageList" :key="index" @click="handleClickPerson(item)">
 				<div class="avatar-container">
 					<img :src="item[props.imageUrl] || avatarUser" :alt="item[props.name]" class="avatar" />
@@ -38,7 +38,7 @@
 			<!-- <MessageBubble v-for="(item, index) in messageList" @click="handleClickPsserson(item)"
 				@info-click="handleMediaClick(item)" :key="index" :avatar="item.img ? item.img : DefaultIcon1" :name="item.name"
 				:time="item.time" :source="item.source" :content="item.content" /> -->
-			<!-- <div class="box4-main-item" v-for="(item, index) in messageList" :key="index">
+			<!-- <div class="msg-bubble-main-item" v-for="(item, index) in messageList" :key="index">
 								<div class="left" @click="handleClickPerson(item)">
 									<img :src="item.img ? item.img : DefaultIcon1" alt="" />
 								</div>
@@ -121,7 +121,7 @@ const handleToMoreNews = item => {
 </script>
 
 <style lang="scss" scoped>
-.box4 {
+.msg-bubble {
 	width: 792px;
 	height: 450px;
 	border-radius: 10px;
@@ -129,7 +129,7 @@ const handleToMoreNews = item => {
 	background: rgba(255, 255, 255, 1);
 	border: 1px solid rgb(234, 236, 238);
 
-	.box4-header {
+	.msg-bubble-header {
 		width: 792px;
 		height: 48px;
 		border-bottom: 1px solid rgb(234, 236, 238);
@@ -178,7 +178,7 @@ const handleToMoreNews = item => {
 		}
 	}
 
-	.box4-main {
+	.msg-bubble-main {
 		height: 402px;
 		overflow-y: auto;
 		box-sizing: border-box;

src/components/base/newsList/index.vue

@@ -112,7 +112,7 @@ const handleToNewsAnalysis = (item, index) => {
 		}
 
 		.more {
-			width: 45px;
+			width: 54px;
 			height: 24px;
 			position: absolute;
 			top: 12px;
@@ -134,7 +134,7 @@ const handleToNewsAnalysis = (item, index) => {
 
 		.news-item {
 			display: flex;
-			height: 78px;
+			height: 76px;
 			width: 749px;
 			margin-left: 21px;
 			border-bottom: 1px solid rgba(240, 242, 244, 1);

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

@@ -187,7 +187,7 @@
 							<div class="col-domain" style="color: rgb(59, 65, 75); font-weight: 700">所属领域</div>
 							<div class="col-date" style="color: rgb(59, 65, 75); font-weight: 700">制裁时间</div>
 							<div class="col-member" v-if="rankType !== 'school'" style="color: rgb(59, 65, 75); font-weight: 700">
-								关键人物
+								省份
 							</div>
 						</div>
 						<div class="table-list">
@@ -210,7 +210,8 @@
 									</div>
 								</div>
 								<div class="col-date">{{ item.date }}</div>
-								<div class="col-member" v-if="rankType !== 'school'">{{ item.member }}</div>
+								<!-- <div class="col-member" v-if="rankType !== 'school'">{{ item.member }}</div> -->
+								<div class="col-member" v-if="rankType !== 'school'">{{ item.province }}</div>
 							</div>
 						</div>
 					</template>
@@ -1108,6 +1109,7 @@ const handleGetDomainContainmentRanking = async () => {
 			// 处理返回的数据结构
 			const processedData = processRankingData(res.data);
 			rankList.value = processedData;
+			console.log("排行数据 =>", rankList.value);
 		}
 	} catch (error) {
 		console.error("获取美对华领域打压遏制排行失败:", error);

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

@@ -89,7 +89,7 @@
 									<el-empty
 										v-if="box2DataList.length === 0"
 										style="padding-top: 80px"
-										description="暂无数据1"
+										description="暂无数据"
 										:image-size="100"
 									/>
 									<div

src/views/ZMOverView/components/fourSuppress/components/allGovernment/components/CalendarHeatmap.vue

@@ -45,28 +45,32 @@
       </div>
       <div class="tooltip-main">
         <div class="tooltip-main-item" v-for="item, index in currentDetailList" :key="index">
-          <div class="item-header flex-display">
-            <div class="item-header-left flex-display">
-              <div class="logo">
-                <img style="width:100%; height: 100%" :src="item.orgLogoUrl" alt="logo">
-              </div>
-              <div class="name text-bold">{{ item.orgName }}</div>
-              <div class="status">
-                <div class="status-on text-tip-2" v-if="item.stauts === 2">{{ '已落实' }}</div>
-                <div class="status-off text-tip-2" v-else>{{ '未落实' }}</div>
-              </div>
-            </div>
-            <div class="item-header-right  flex-display">
-              <AreaTag v-for="tag, idx in item.techDomainList.slice(0, 3)" :key="idx" :tagName="tag"></AreaTag>
-            </div>
-          </div>
-          <div class="item-content text-compact">{{ item.name }}</div>
           <div class="item-footer color-bg-active flex-display" @click="handleToDetail(item)">
-            <div class="footer-text text-tip-2 main-color">{{ item.administrativeOrderInfoTitle }}</div>
+            <div class="footer-text text-tip-2 main-color">{{ item.name }}</div>
             <div class="footer-arrow">
               <img src="./right-arrow.svg" alt="">
             </div>
           </div>
+          <div class="item-list" v-for="val, idx in item.list" :key="idx">
+            <div class="item-header flex-display">
+              <div class="item-header-left flex-display">
+                <div class="logo">
+                  <img style="width:100%; height: 100%" :src="val.orgLogoUrl" alt="logo">
+                </div>
+                <div class="name text-primary-80-clor text-bold">{{ val.orgName }}</div>
+                <div class="status">
+                  <div class="status-on text-tip-2" v-if="val.stauts === 2">{{ '已落实' }}</div>
+                  <div class="status-off text-tip-2" v-else>{{ '未落实' }}</div>
+                </div>
+              </div>
+              <div class="item-header-right  flex-display">
+                <AreaTag v-for="tag, idxx in val.techDomainList.slice(0, 3)" :key="idxx" :tagName="tag"></AreaTag>
+              </div>
+            </div>
+            <div class="item-content text-compact">{{ val.name }}</div>
+          </div>
+
+
         </div>
       </div>
     </el-dialog>
@@ -282,7 +286,7 @@ function getOption() {
 
   const titles = months.map((month, index) => ({
     // text: `{month|${month.format('M月')}}                                         {stats|共 ${monthStats[index].total} 项, 已落实 ${monthStats[index].resolved} 项}`,
-    text: index ===0 ?`{month|${month.format('M月')}}                                                              {stats|共 ${monthStats[index].total} 项, 已落实 0 项}`:`                     {month|${month.format('M月')}}                                            {stats|共 ${monthStats[index].total} 项, 已落实 0 项}`,
+    text: index === 0 ? `{month|${month.format('M月')}}                                                              {stats|共 ${monthStats[index].total} 项, 已落实 0 项}` : `                     {month|${month.format('M月')}}                                            {stats|共 ${monthStats[index].total} 项, 已落实 0 项}`,
     left: `${gapPercent + index * (calendarWidthPercent + gapPercent)}%`,
     top: 10,
     textStyle: {
@@ -447,7 +451,20 @@ onMounted(() => {
         const list = params.data[1].raw
         if (list.length > 0) {
           currentDate.value = date
-          currentDetailList.value = list
+          // 按 administrativeOrderInfoTitle 分类
+          const grouped = [];
+          const map = new Map();
+          list.forEach(item => {
+            const key = item.administrativeOrderInfoTitle;
+            if (!map.has(key)) {
+              map.set(key, { name: key, list: [] });
+              grouped.push(map.get(key));
+            }
+            map.get(key).list.push(item);
+          });
+          currentDetailList.value = grouped;
+          console.log('currentDetailList', currentDetailList.value);
+
           // 统计不同 orgName 的个数
           const orgNames = new Set(list.map(item => item.orgName));
           currentOrgNum.value = orgNames.size
@@ -505,8 +522,9 @@ onBeforeUnmount(() => {
 }
 
 .tooltip-main-item {
+  padding: 10px 0;
   width: 622px;
-  height: 144px;
+  /* height: 144px; */
   border-bottom: 1px solid rgb(234, 236, 238);
 }
 
@@ -559,7 +577,7 @@ onBeforeUnmount(() => {
 
 .item-footer {
   width: 622px;
-  height: 30px;
+  height: 40px;
   padding: 0 8px;
   margin-top: 4px;
   border-radius: 4px;

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

@@ -195,7 +195,7 @@
 			<div class="bottom-item">
 				<div class="bottom-item-title">
 					<img :src="icon4" alt="" />
-					<span>美政府部门对华打压遏制历程</span>
+					<span>美政府部门对华工作日程表</span>
 				</div>
 				<div class="bottom-item-select">
 					<!-- <div class="select-btn" :class="{ active: measureType === 'history' }" @click="measureType = 'history'">

src/views/ZMOverView/components/gameProfile/index.vue

@@ -49,7 +49,21 @@
 						</div>
 					</div>
 
-					<div style="width: 100%; height: 620px; padding-top: 24px" id="char"></div>
+					<div v-if="activeButtonId == 2" style="width: 100%; height: 520px; padding-top: 24px" id="char"></div>
+					<!-- <Echarts v-if="activeButtonId == 2" :option="lineOption" height="520px" /> -->
+					<div v-else>
+						<div class="content-line-chart-header">
+							<el-radio-group v-model="selectedIndicator" @change="handleIndicatorChange" size="default">
+								<el-radio
+									v-for="option in indicatorOptions"
+									:key="option.value"
+									:label="option.label"
+									:value="option.value"
+								/>
+							</el-radio-group>
+						</div>
+						<Echarts :option="lineOption" height="520px" />
+					</div>
 				</div>
 				<div style="width: 778px; height: 620px; overflow: auto">
 					<el-table
@@ -128,7 +142,8 @@
 		<div class="card-box" style="margin-top: 16px" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay(true)">
 			<div class="card-title">
 				<img class="icon" src="../../assets/icons/title-icon2.png" />
-				<img class="text" src="../../assets/icons/title-text2.svg" />
+				<!-- <img class="text" src="../../assets/icons/title-text2.svg" /> -->
+				<span class="text-new">中美科技博弈历程</span>
 			</div>
 			<div class="card-main">
 				<!-- <Timeline :data="course" text-key="title" id-key="seq" /> -->
@@ -218,6 +233,8 @@ import { ArrowRight, CaretBottom } from "@element-plus/icons-vue";
 import Timeline from "./Timeline.vue";
 import tableShow from "./tableShow.vue";
 import ButtonList from "@/components/buttonList/buttonList.vue";
+import Echarts from "@/components/Chart/index.vue";
+import mockData from "./mock.json";
 
 import radarChart from "./radarChart3.js";
 import { getCompare, getChartDict, getTechnologyGameAnalysis } from "@/api/zmOverview/risk/index.js";
@@ -242,8 +259,8 @@ import { ElMessage } from "element-plus";
 const buttonList = ref([
 	{
 		id: 1,
-		text: "趋势变化",
-		disabled: true
+		text: "趋势变化"
+		// disabled: true
 	},
 	{
 		id: 2,
@@ -253,6 +270,9 @@ const buttonList = ref([
 const activeButtonId = ref(buttonList.value[1]?.id || 1);
 const setActiveButtonId = id => {
 	activeButtonId.value = id;
+	if (id == 2) {
+		handleGetCompare();
+	}
 };
 
 const course = ref([
@@ -390,6 +410,197 @@ onMounted(async () => {
 
 	// // setChart(option, "char7");
 	startAutoPlay();
+	processIndicatorOptions();
+});
+
+const chartColors = [
+	"rgba(8, 151, 156, 1)",
+	"#FF4D4F",
+	"#FF9900",
+	"#00CC99",
+	"#73c0de",
+	"#3ba272",
+	"#fc8452",
+	"#9a60b4",
+	"#ea7ccc"
+];
+
+// const series = {
+// 	name: key,
+// 	type: "line",
+// 	symbolSize: 15,
+// 	// stack: "Total",
+// 	itemStyle: {
+// 		color: chartColors[Math.floor(Math.random() * chartColors.length)]
+// 	},
+// 	data: []
+// };
+
+const indicatorOptions = ref([]);
+const selectedIndicator = ref("");
+
+// 整理指标选项
+const processIndicatorOptions = () => {
+	const chinaData = mockData["中国"];
+	if (!chinaData) return;
+
+	indicatorOptions.value = Object.keys(chinaData).map(key => ({
+		label: key,
+		value: key
+	}));
+
+	if (indicatorOptions.value.length > 0) {
+		selectedIndicator.value = indicatorOptions.value[0].value;
+		handleIndicatorChange(selectedIndicator.value);
+	}
+};
+
+// 处理指标变化
+const handleIndicatorChange = indicator => {
+	const chinaData = mockData["中国"]?.[indicator] || [];
+	const usaData = mockData["美国"]?.[indicator] || [];
+
+	const years = chinaData.map(item => item.year.toString());
+	const chinaValues = chinaData.map(item => item.value);
+	const usaValues = usaData.map(item => item.value);
+
+	lineOption.value.xAxis.data = years;
+	lineOption.value.series = [
+		{
+			name: "中国",
+			type: "line",
+			symbolSize: 10,
+			itemStyle: {
+				color: "#CE4F51"
+			},
+			areaStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+					{
+						offset: 0,
+						color: "rgb(206, 79, 81, .8)"
+					},
+					{
+						offset: 1,
+						color: "rgb(206, 79, 81, .3)"
+					}
+				])
+			},
+			data: chinaValues
+		},
+		{
+			name: "美国",
+			type: "line",
+			symbolSize: 10,
+			itemStyle: {
+				color: "#055FC2"
+			},
+			areaStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+					{
+						offset: 0,
+						color: "rgb(5, 95, 194,.8)"
+					},
+					{
+						offset: 1,
+						color: "rgb(5, 95, 194, .3)"
+					}
+				])
+			},
+			data: usaValues
+		}
+	];
+};
+
+const lineOption = ref({
+	title: {
+		text: ""
+	},
+	tooltip: {
+		trigger: "axis",
+		confine: true,
+		backgroundColor: "rgba(50, 50, 50, 0.7)",
+		borderColor: "#333",
+		borderWidth: 0,
+		padding: [5, 10],
+		textStyle: {
+			color: "#fff",
+			fontSize: 16
+		}
+	},
+	legend: {
+		show: false
+	},
+	grid: {
+		top: "5%",
+		left: "3%",
+		right: "4%",
+		bottom: "2%",
+		containLabel: true
+	},
+	xAxis: {
+		type: "category",
+		boundaryGap: false,
+		axisLine: {
+			lineStyle: {
+				color: "#ccc",
+				width: 1
+			}
+		},
+		axisTick: {
+			show: true,
+			lineStyle: {
+				color: "#ccc"
+			}
+		},
+		axisLabel: {
+			color: "#ccc",
+			fontSize: 16,
+			fontWeight: 400
+		},
+		data: ["2021", "2022", "2023", "2024", "2025"]
+	},
+	yAxis: {
+		type: "value",
+		// name: "指数",
+		nameLocation: "top",
+		nameGap: 35,
+		nameTextStyle: {
+			color: "#666",
+			fontSize: 13,
+			fontWeight: 600,
+			padding: [0, 0, 10, 0]
+		},
+		axisLine: {
+			show: false,
+			lineStyle: {
+				color: "#ccc",
+				width: 1
+			}
+		},
+		axisTick: {
+			show: false,
+			lineStyle: {
+				color: "#ccc"
+			}
+		},
+		axisLabel: {
+			color: "#ccc",
+			fontSize: 14,
+			fontWeight: 400,
+			formatter: value => {
+				return value.toFixed(0);
+			}
+		},
+		splitLine: {
+			lineStyle: {
+				width: 1,
+				type: "dashed",
+				color: "rgba(12, 78, 125, .3)"
+			}
+		},
+		splitNumber: 8
+	},
+	series: []
 });
 
 const tableData = ref([
@@ -562,7 +773,7 @@ const handleClickBottomBtn = () => {
 <style lang="scss" scoped>
 .content-wrapper {
 	width: 1600px;
-	height: 1600px;
+	height: 1450px;
 	margin: 0 auto;
 
 	.card-box {
@@ -585,6 +796,7 @@ const handleClickBottomBtn = () => {
 			// width: 100%;
 			height: 48px;
 			display: flex;
+			align-items: center;
 
 			.icon {
 				/* 合并 */
@@ -599,6 +811,13 @@ const handleClickBottomBtn = () => {
 				height: 31px;
 				margin: 8px 0px;
 			}
+			.text-new {
+				font-family: YouSheBiaoTiHei;
+				font-size: 24px;
+				font-weight: 400;
+				line-height: 24px;
+				color: rgb(5, 95, 194);
+			}
 		}
 
 		.content-chart-header {
@@ -608,6 +827,10 @@ const handleClickBottomBtn = () => {
 			// line-height: 32px;
 			align-items: center;
 		}
+		.content-line-chart-header {
+			margin-top: 15px;
+			margin-left: 48px;
+		}
 
 		.card-main {
 			height: 650px;
@@ -1022,7 +1245,8 @@ const handleClickBottomBtn = () => {
 	width: 100%;
 	height: auto;
 	/* 高度自适应内容 */
-	display: flex;
+	// display: flex;
+	display: none;
 	flex-direction: row;
 	/* 行方向布局 */
 	flex-wrap: wrap;

src/views/ZMOverView/components/gameProfile/mock.json

+{
+	"中国": {
+		"企业研发人才占比": [
+			{
+				"year": 2021,
+				"value": 79.8
+			},
+			{
+				"year": 2022,
+				"value": 80.1
+			},
+			{
+				"year": 2023,
+				"value": 82.7
+			},
+			{
+				"year": 2024,
+				"value": 81.3
+			},
+			{
+				"year": 2025,
+				"value": 82.1
+			}
+		],
+		"公共研发支出占比": [
+			{
+				"year": 2021,
+				"value": 72.6
+			},
+			{
+				"year": 2022,
+				"value": 72.6
+			},
+			{
+				"year": 2023,
+				"value": 73.7
+			},
+			{
+				"year": 2024,
+				"value": 72.7
+			},
+			{
+				"year": 2025,
+				"value": 73.5
+			}
+		],
+		"创新关联": [
+			{
+				"year": 2021,
+				"value": 78.2
+			},
+			{
+				"year": 2022,
+				"value": 78.1
+			},
+			{
+				"year": 2023,
+				"value": 77.0
+			},
+			{
+				"year": 2024,
+				"value": 78.5
+			},
+			{
+				"year": 2025,
+				"value": 77.0
+			}
+		],
+		"国内产业分布": [
+			{
+				"year": 2021,
+				"value": 99.4
+			},
+			{
+				"year": 2022,
+				"value": 99.9
+			},
+			{
+				"year": 2023,
+				"value": 100.4
+			},
+			{
+				"year": 2024,
+				"value": 100.9
+			},
+			{
+				"year": 2025,
+				"value": 101.4
+			}
+		],
+		"知识与技术产出": [
+			{
+				"year": 2021,
+				"value": 63.6
+			},
+			{
+				"year": 2022,
+				"value": 64.3
+			},
+			{
+				"year": 2023,
+				"value": 64.5
+			},
+			{
+				"year": 2024,
+				"value": 63.4
+			},
+			{
+				"year": 2025,
+				"value": 62.9
+			}
+		],
+		"知识工作者": [
+			{
+				"year": 2021,
+				"value": 79.5
+			},
+			{
+				"year": 2022,
+				"value": 79.7
+			},
+			{
+				"year": 2023,
+				"value": 78.1
+			},
+			{
+				"year": 2024,
+				"value": 78.9
+			},
+			{
+				"year": 2025,
+				"value": 79.4
+			}
+		]
+	},
+	"美国": {
+		"企业研发人才占比": [
+			{
+				"year": 2021,
+				"value": 81.1
+			},
+			{
+				"year": 2022,
+				"value": 81.8
+			},
+			{
+				"year": 2023,
+				"value": 82.8
+			},
+			{
+				"year": 2024,
+				"value": 81.3
+			},
+			{
+				"year": 2025,
+				"value": 82.5
+			}
+		],
+		"公共研发支出占比": [
+			{
+				"year": 2021,
+				"value": 73.8
+			},
+			{
+				"year": 2022,
+				"value": 71.6
+			},
+			{
+				"year": 2023,
+				"value": 72.1
+			},
+			{
+				"year": 2024,
+				"value": 72.6
+			},
+			{
+				"year": 2025,
+				"value": 71.9
+			}
+		],
+		"创新关联": [
+			{
+				"year": 2021,
+				"value": 77.4
+			},
+			{
+				"year": 2022,
+				"value": 77.3
+			},
+			{
+				"year": 2023,
+				"value": 77.2
+			},
+			{
+				"year": 2024,
+				"value": 77.1
+			},
+			{
+				"year": 2025,
+				"value": 77.0
+			}
+		],
+		"国内产业分布": [
+			{
+				"year": 2021,
+				"value": 98.5
+			},
+			{
+				"year": 2022,
+				"value": 101.1
+			},
+			{
+				"year": 2023,
+				"value": 98.4
+			},
+			{
+				"year": 2024,
+				"value": 99.8
+			},
+			{
+				"year": 2025,
+				"value": 98.2
+			}
+		],
+		"知识与技术产出": [
+			{
+				"year": 2021,
+				"value": 64.5
+			},
+			{
+				"year": 2022,
+				"value": 63.4
+			},
+			{
+				"year": 2023,
+				"value": 63.7
+			},
+			{
+				"year": 2024,
+				"value": 63.4
+			},
+			{
+				"year": 2025,
+				"value": 62.7
+			}
+		],
+		"知识工作者": [
+			{
+				"year": 2021,
+				"value": 66.8
+			},
+			{
+				"year": 2022,
+				"value": 71.8
+			},
+			{
+				"year": 2023,
+				"value": 76.8
+			},
+			{
+				"year": 2024,
+				"value": 81.8
+			},
+			{
+				"year": 2025,
+				"value": 86.8
+			}
+		]
+	}
+}
\ No newline at end of file

src/views/ZMOverView/components/newRisk/index.vue

@@ -142,11 +142,11 @@
 									</div>
 									<div class="carousel-footer">
 										<div class="footer-left">
-											<div class="type">{{ News.hotspotType +'——' }}</div>
+											<div class="type">{{ News.hotspotType + "——" }}</div>
 											<div class="text">{{ News.eventTitle }}</div>
 										</div>
 										<div class="footer-right">
-											<img src="@/assets/icons/arrow-right.png" alt="">
+											<img src="@/assets/icons/arrow-right.png" alt="" />
 										</div>
 									</div>
 								</div>
@@ -290,8 +290,8 @@ const sections = ref([
 				count: 0,
 				change: "无新增",
 				unit: "次",
-				title: "230调查",
-				type: "230调查"
+				title: "232调查",
+				type: "232调查"
 			},
 			{
 				percent: 0, // 估算的百分比
@@ -436,8 +436,8 @@ const handleGetLatestRiskUpdates = async () => {
 							count: res.data["232Survey"].total,
 							change: res.data["232Survey"].dailyIncrement,
 							unit: "次",
-							title: "230调查",
-							type: "230调查"
+							title: "232调查",
+							type: "232调查"
 						},
 						{
 							percent: 3, // 估算的百分比
@@ -1221,8 +1221,7 @@ onUnmounted(() => {
 			// 		.text{
 			// 			color:var(--color-main-active);
 			// 		}
-				
-				
+
 			// }
 			// }
 

src/views/comprehensiveSearch/chat/index.vue

@@ -17,7 +17,7 @@
 					</div>
 					<el-input placeholder="新对话" v-model="newChatTitle" style="width: 220px" />
 				</div>
-				<div class="left-main">
+				<!-- <div class="left-main">
 					<div class="left-main-title">{{ "历史对话" }}</div>
 					<div class="left-list">
 						<div class="left-list-item" :class="{ itemActive: currentChatId === item.id }"
@@ -25,7 +25,7 @@
 							{{ item.title }}
 						</div>
 					</div>
-				</div>
+				</div> -->
 			</div>
 			<div class="right">
 				<div class="right-header">{{ curChatTitle }}</div>
@@ -929,7 +929,7 @@ const sendMessage = async () => {
 };
 
 const newChatTitle = ref(""); // 新对话
-const curChatTitle = ref("美国对中国制裁实体清单");
+const curChatTitle = ref("新对话");
 const currentChatId = ref(1);
 const chatList = ref([
 	{

src/views/exportControl/components/info.vue

@@ -13,7 +13,6 @@
 </template>
 
 <script setup>
-
 defineProps({
 	title: {
 		type: String,
@@ -44,7 +43,8 @@ defineProps({
 
 <style scoped lang="scss">
 .info-card {
-	max-width: 388px;
+	flex: 1;
+	// max-width: 388px;
 	min-width: 200px;
 	height: 150px;
 	border-radius: 12px;
@@ -53,7 +53,9 @@ 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;
 }
 

src/views/exportControl/index.vue

@@ -274,14 +274,14 @@
 			<el-row :gutter="20" style="width: 1600px; margin: 0 auto; height: 528px; margin-top: 64px">
 				<CustomTitle id="position3" title="数据总览" />
 				<el-col :span="24">
-					<custom-container title="发布频度" :titleIcon="box3Icon" height="450px">
+					<custom-container title="发布频度" :titleIcon="box3Icon" height="400px">
 						<template #default>
 							<div class="box3">
 								<div class="box3-content">
 									<div class="box3-content-title">实体清单发布频度</div>
 									<el-table :data="tableData1" stripe style="width: 100%">
-										<el-table-column prop="year" label="年份" width="150" />
-										<el-table-column label="发布次数" width="200">
+										<el-table-column prop="year" label="年份" width="200" />
+										<el-table-column label="发布次数" width="300">
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
@@ -293,7 +293,7 @@
 												</div>
 											</template>
 										</el-table-column>
-										<el-table-column label="重点领域" width="280" align="center">
+										<el-table-column label="重点领域" width="220" align="center">
 											<template #default="scope">
 												<div
 													style="display: flex; justify-content: center; align-items: center; gap: 5px"
@@ -309,8 +309,8 @@
 								<div class="box3-content">
 									<div class="box3-content-title">商业管制清单(CCL)更新频度</div>
 									<el-table :data="tableData2" stripe style="width: 100%">
-										<el-table-column prop="year" label="年份" width="150" />
-										<el-table-column label="发布次数" width="200">
+										<el-table-column prop="year" label="年份" width="200" />
+										<el-table-column label="发布次数" width="300">
 											<template #default="scope">
 												<div style="display: flex; align-items: center">
 													<span style="margin-right: 10px; width: 40px">{{ scope.row.num }}次</span>
@@ -322,7 +322,7 @@
 												</div>
 											</template>
 										</el-table-column>
-										<el-table-column label="重点领域" width="280" align="center">
+										<el-table-column label="重点领域" width="220" align="center">
 											<template #default="scope">
 												<div
 													style="display: flex; justify-content: center; align-items: center; gap: 5px"
@@ -2117,12 +2117,20 @@ const handleMediaClick = item => {
 	justify-content: center;
 	// align-items: flex-start;
 	gap: 100px;
+	flex: 1;
+	.box3-content {
+		display: flex;
+		flex-direction: column;
+		// gap: 20px;
+		flex: 1;
+	}
 
 	.box3-content-title {
 		font-size: 18px;
 		font-weight: 700;
 		font-family: Microsoft YaHei;
-		width: 640px;
+		// width: 640px;
+		width: 100%;
 		height: 36px;
 		display: flex;
 		align-items: center;
@@ -2145,7 +2153,7 @@ const handleMediaClick = item => {
 	overflow: auto;
 	display: flex;
 	flex-direction: column;
-	justify-content: space-between;
+	// justify-content: space-between;
 	padding-top: 16px;
 	// padding-bottom: 50px;
 	position: relative;
@@ -2379,7 +2387,8 @@ const handleMediaClick = item => {
 
 			.home-main-header-footer-link,
 			.home-main-header-footer-info {
-				width: 100%;
+				// width: 100%;
+				max-width: 1600px;
 				display: flex;
 				justify-content: center;
 				gap: 16px;

src/views/exportControl/v2.0SingleSanction/components/deepMining/index.vue

 <template>
 	<div class="deep-mining" :class="{ deepMiningChartmode: isInChart }">
 		<div class="side-nav">
-			<div v-for="(item, index) in activeTab" :key="index" class="tab-item" :class="{ active: index === activeIndex }"
-				@click="activeIndex = index">
+			<div
+				v-for="(item, index) in activeTab"
+				:key="index"
+				class="tab-item"
+				:class="{ active: index === activeIndex }"
+				@click="activeIndex = index"
+			>
 				{{ item }}
 				<span v-if="index === activeIndex" class="arrow"></span>
 			</div>
@@ -47,8 +52,13 @@
 									<span class="group-count">{{ group.count }}家</span>
 								</div>
 								<div class="group-children custom-scrollbar" v-show="group.expanded">
-									<div class="entity-item" v-for="item in group.children" :key="item.id"
-										:class="{ active: activeEntityId === item.id }" @click="selectEntity(item)">
+									<div
+										class="entity-item"
+										v-for="item in group.children"
+										:key="item.id"
+										:class="{ active: activeEntityId === item.id }"
+										@click="selectEntity(item)"
+									>
 										<div class="item-icon">
 											<img :src="defaultTitle" alt="" class="item-img" />
 										</div>
@@ -63,12 +73,19 @@
 			<div class="right" @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave">
 				<div class="title-com custom-right-header">
 					<div class="toggle-group">
-						<div class="toggle-btn" :class="{ active: rightActiveTab === 'supplyChain' }"
-							@click="rightActiveTab = 'supplyChain'">
+						<div
+							class="toggle-btn"
+							:class="{ active: rightActiveTab === 'supplyChain' }"
+							@click="rightActiveTab = 'supplyChain'"
+						>
 							<img :src="rightActiveTab === 'supplyChain' ? icon01Active : icon01" alt="" />
 							<span>供应链</span>
 						</div>
-						<div class="toggle-btn" :class="{ active: rightActiveTab === 'equity' }" @click="rightActiveTab = 'equity'">
+						<div
+							class="toggle-btn"
+							:class="{ active: rightActiveTab === 'equity' }"
+							@click="rightActiveTab = 'equity'"
+						>
 							<img :src="rightActiveTab === 'equity' ? icon02Active : icon02" alt="" />
 							<span>股权</span>
 						</div>
@@ -115,8 +132,8 @@ import {
 	getSingleSanctionEntitySupplyChain,
 	getSingleSanctionEntityEquity
 } from "@/api/exportControlV2.0";
-import RelationGraph from './components/RelationGraph.vue';
-import AnalysisBox from '@/components/base/boxBackground/analysisBox.vue';
+import RelationGraph from "./components/RelationGraph.vue";
+import AnalysisBox from "@/components/base/boxBackground/analysisBox.vue";
 
 const sanRecordId = ref("");
 const activeTab = ref(["实体穿透分析"]);
@@ -170,11 +187,11 @@ const handleMouseLeave = () => {
 	isInChart.value = false;
 };
 
-const handleNodeClick = (node) => {
+const handleNodeClick = node => {
 	selectedNode.value = node;
 };
 
-const handleLayoutChange = (type) => {
+const handleLayoutChange = type => {
 	controlActive.value = type;
 	if (type !== 2) {
 		isInChart.value = true;
@@ -184,9 +201,8 @@ const handleLayoutChange = (type) => {
 };
 
 const updateGraphData = () => {
-	const data = rightActiveTab.value === 'supplyChain'
-		? singleSanctionEntitySupplyChainData.value
-		: singleSanctionEntityEquityData.value;
+	const data =
+		rightActiveTab.value === "supplyChain" ? singleSanctionEntitySupplyChainData.value : singleSanctionEntityEquityData.value;
 
 	if (!data) return;
 
@@ -214,7 +230,7 @@ const updateGraphData = () => {
 		links.push({
 			source: `p-${item.id || index}`,
 			target: "0",
-			name: rightActiveTab.value === 'supplyChain' ? "供应商" : (item.type || "持股")
+			name: rightActiveTab.value === "supplyChain" ? "供应商" : item.type || "持股"
 		});
 	});
 
@@ -231,14 +247,14 @@ const updateGraphData = () => {
 		links.push({
 			source: "0",
 			target: `c-${item.id || index}`,
-			name: rightActiveTab.value === 'supplyChain' ? "客户" : (item.type || "投资")
+			name: rightActiveTab.value === "supplyChain" ? "客户" : item.description || "投资"
 		});
 	});
 
 	graphData.value = { nodes, links };
 };
 
-const updateTreeData = (data) => {
+const updateTreeData = data => {
 	if (!data) return;
 
 	treeData.value = {
@@ -318,17 +334,17 @@ const getSingleSanctionEntityListRequest = async () => {
 	}
 };
 
-watch(rightActiveTab, async (newTab) => {
-	if (newTab === 'supplyChain') {
+watch(rightActiveTab, async newTab => {
+	if (newTab === "supplyChain") {
 		await getSingleSanctionEntitySupplyChainRequest();
 	} else {
 		await getSingleSanctionEntityEquityRequest();
 	}
 });
 
-watch(activeEntityId, async (newId) => {
+watch(activeEntityId, async newId => {
 	if (newId) {
-		if (rightActiveTab.value === 'supplyChain') {
+		if (rightActiveTab.value === "supplyChain") {
 			await getSingleSanctionEntitySupplyChainRequest();
 		} else {
 			await getSingleSanctionEntityEquityRequest();
@@ -337,7 +353,7 @@ watch(activeEntityId, async (newId) => {
 });
 
 watch(is50PercentRule, async () => {
-	if (rightActiveTab.value === 'equity') {
+	if (rightActiveTab.value === "equity") {
 		await getSingleSanctionEntityEquityRequest();
 	}
 });
@@ -857,7 +873,6 @@ onMounted(async () => {
 }
 
 .title-com.custom-right-header {
-
 	.box,
 	.text {
 		display: none;

src/views/thinkTank/ReportDetail/reportAnalysis/index.vue

@@ -39,7 +39,7 @@
 				<div class="box2-main">
 					<div class="box2-content" id="box2Chart"></div>
 				</div> -->
-				<AnalysisBox title="涉及科技领域" :showAllBtn="false">
+				<AnalysisBox title="关键词云" :showAllBtn="false">
 					<div class="box2-main">
 						<div class="box2-content" id="box2Chart"></div>
 					</div>
@@ -58,8 +58,12 @@
 								<div class="center">
 									<div class="title">{{ item.content }}</div>
 									<div>
-										<img src="../images/image-open.png" alt="" class="center-image"
-											@click="handleOpenReportOriginal(item)">
+										<img
+											src="../images/image-open.png"
+											alt=""
+											class="center-image"
+											@click="handleOpenReportOriginal(item)"
+										/>
 									</div>
 									<!-- <div class="desc">{{ item.econtent }}</div> -->
 								</div>
@@ -80,12 +84,17 @@
 						<div class="box3-main-footer">
 							<div class="info">共{{ total }}条核心论点</div>
 							<div class="page-box">
-								<el-pagination :page-size="10" background layout="prev, pager, next" :total="total"
-									@current-change="handleCurrentChange" :current-page="currentPage" />
+								<el-pagination
+									:page-size="12"
+									background
+									layout="prev, pager, next"
+									:total="total"
+									@current-change="handleCurrentChange"
+									:current-page="currentPage"
+								/>
 							</div>
 						</div>
 					</div>
-
 				</AnalysisBox>
 			</div>
 		</div>
@@ -102,9 +111,10 @@ import {
 	getThinkTankReportIndustry,
 	getThinkTankReportIndustryCloud
 } from "@/api/thinkTank/overview";
-import { getChartAnalysis } from '@/api/aiAnalysis/index'
+import { getChartAnalysis } from "@/api/aiAnalysis/index";
 import { useRouter } from "vue-router";
 const router = useRouter();
+import "echarts-wordcloud";
 
 // 内容摘要
 const box1Data =
@@ -170,7 +180,7 @@ const box2Data = ref([
 const handleGetThinkTankReportIndustryCloud = async () => {
 	try {
 		const params = {
-			id: router.currentRoute._value.params.id,
+			id: router.currentRoute._value.params.id
 			// industryId: activeArea.value
 		};
 		const res = await getThinkTankReportIndustryCloud(params);
@@ -252,11 +262,11 @@ const tabActiveName = ref("报告分析");
 
 const switchTab = name => {
 	tabActiveName.value = name;
-}
+};
 // 处理页码改变事件
 const currentPage = ref(1);
 const pageSize = ref(10);
-const total = ref(0)
+const total = ref(0);
 const handleCurrentChange = page => {
 	currentPage.value = page;
 	handleGetThinkTankReportContent();
@@ -267,14 +277,14 @@ const handleGetThinkTankReportContent = async () => {
 		const params = {
 			id: router.currentRoute._value.params.id,
 			currentPage: currentPage.value - 1,
-			pageSize: pageSize.value,
+			pageSize: pageSize.value
 		};
 		const res = await getThinkTankReportContent(params);
 		console.log("主要观点", res.data);
 		if (res.code === 200 && res.data) {
 			majorOpinions.value = res.data.content || [];
-			handleGetBox3AnalysisContent(majorOpinions.value)
-			total.value = res.data.totalElements || 0
+			handleGetBox3AnalysisContent(majorOpinions.value);
+			total.value = res.data.totalElements || 0;
 		}
 	} catch (error) {
 		console.error("获取主要观点error", error);
@@ -282,15 +292,14 @@ const handleGetThinkTankReportContent = async () => {
 };
 
 // 获取图表分析内容
-const box3AnalysisContent = ref('')
-const handleGetBox3AnalysisContent = async (textJson) => {
+const box3AnalysisContent = ref("");
+const handleGetBox3AnalysisContent = async textJson => {
 	const params = {
 		text: textJson
-	}
-	const res = await getChartAnalysis(params)
-	console.log('图表解析内容', res);
-
-}
+	};
+	const res = await getChartAnalysis(params);
+	console.log("图表解析内容", res);
+};
 
 onMounted(() => {
 	handleGetThinkTankReportAbstract();
@@ -576,12 +585,9 @@ onMounted(() => {
 								-webkit-line-clamp: 2;
 								-webkit-box-orient: vertical;
 								overflow: hidden;
-
-
 							}
 
 							.center-image {
-
 								width: 16px;
 								height: 24px;
 								margin-top: 12px;
@@ -719,4 +725,4 @@ onMounted(() => {
 		}
 	}
 }
-</style>
+</style>
\ No newline at end of file