提交 d3e2e25c authored 作者: yanpeng's avatar yanpeng

部分修改

上级 85d96731
<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;
......
......@@ -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);
......
......@@ -3,14 +3,23 @@
<div class="content-wrapper">
<div class="policy-monitoring">
<div class="header">
<div class="section" v-for="(section, index) in sectionTab" :key="index"
:style="sections[index].waveBall.length === 2 ? 'width: 350px' : 'width:503px'">
<div
class="section"
v-for="(section, index) in sectionTab"
:key="index"
:style="sections[index].waveBall.length === 2 ? 'width: 350px' : 'width:503px'"
>
<img class="section-title" :src="`/public/icon/riskToday/btn-` + index + `.png`" />
<div class="stats">
<div v-for="value in sections[index].waveBall" @click="highLight(value)">
<div @click="highLight(value.title)" style="cursor: pointer;">
<WaveBall :percent="value.percent" :data="value" :color="section.waterColor" :size="128"
@click="highLight(value)" />
<div @click="highLight(value.title)" style="cursor: pointer">
<WaveBall
:percent="value.percent"
:data="value"
:color="section.waterColor"
:size="128"
@click="highLight(value)"
/>
<div class="waveBall-text">{{ value.title }}</div>
</div>
</div>
......@@ -35,12 +44,20 @@
</div>
<div style="display: flex">
<div class="risk-signals">
<div class="risk-signals-item" v-for="(item, index) in warningList" :key="index"
@click="handleClickToDetailO(item)" :class="{ 'highlighted': item.eventType === highlightedEventType }">
<div class="item-left" :class="{
<div
class="risk-signals-item"
v-for="(item, index) in warningList"
:key="index"
@click="handleClickToDetailO(item)"
:class="{ highlighted: item.eventType === highlightedEventType }"
>
<div
class="item-left"
:class="{
itemLeftStatus1: item.signalLevel === '特别重大',
itemLeftStatus2: item.signalLevel === '重大风险'
}">
}"
>
{{ item.signalLevel ? item.signalLevel : "一般风险" }}
</div>
<div class="item-right">
......@@ -62,8 +79,15 @@
<img src="./icon/box1-right.png" alt="" />
</div>
</div>
<el-carousel ref="carouselRef" style="height: 412px; width: 736px" :autoplay="true" :interval="3000"
arrow="never" indicator-position="none" @change="handleCarouselChange">
<el-carousel
ref="carouselRef"
style="height: 412px; width: 736px"
:autoplay="true"
:interval="3000"
arrow="never"
indicator-position="none"
@change="handleCarouselChange"
>
<el-carousel-item v-for="(News, NewsIndex) in hotNewsList" :key="NewsIndex">
<div class="carousel-item">
<div class="carousel-title">
......@@ -74,9 +98,13 @@
{{ News.category }}
</div>
</div>
<div style="/* 矩形 351 */ width: 664px; height: 1px; background: rgba(234, 236, 238, 1)"></div>
<div
style="/* 矩形 351 */ width: 664px; height: 1px; background: rgba(234, 236, 238, 1)"
></div>
<div class="carousel-content">{{ News.content }}</div>
<div style="/* 矩形 351 */ width: 664px; height: 1px; background: rgba(234, 236, 238, 1)"></div>
<div
style="/* 矩形 351 */ width: 664px; height: 1px; background: rgba(234, 236, 238, 1)"
></div>
<div class="carousel-bottom">
<div class="carousel-bottom">{{ News.date + News.source }}</div>
</div>
......@@ -198,7 +226,7 @@ const sections = ref([
count: 14,
change: "无新增",
unit: "次",
title: "230调查"
title: "232调查"
},
{
percent: 3, // 估算的百分比
......@@ -223,7 +251,7 @@ const handlegetBillRiskSignal = async () => {
if (res.code === 200) {
warningList.value = res.data;
}
} catch (error) { }
} catch (error) {}
};
const hotNewsList = ref([
{
......@@ -269,9 +297,9 @@ const handleClickToDetailO = item => {
window.open(route.href, "_blank");
};
const highlightedEventType = ref('')
const highLight = (title) => {
console.log(title)
const highlightedEventType = ref("");
const highLight = title => {
console.log(title);
// 如果再次点击同一个,取消高亮
if (highlightedEventType.value === title) {
highlightedEventType.value = null;
......
......@@ -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);
......
......@@ -89,7 +89,7 @@
<el-empty
v-if="box2DataList.length === 0"
style="padding-top: 80px"
description="暂无数据1"
description="暂无数据"
:image-size="100"
/>
<div
......
......@@ -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'">
......
......@@ -119,6 +119,11 @@
placement="top"
:show-after="500"
>
<template #content>
<div class="item-tooltip">
{{ item.content }}
</div>
</template>
<div class="item-content">{{ item.content }}</div>
</el-tooltip>
<div class="item-bottom">
......@@ -133,11 +138,17 @@
</div>
</div>
</div>
<simple-pagination
v-model:current-page="warningCurrentPage"
:page-size="warningPageSize"
:total="allWarningList.length"
@page-change="handleWarningPageChange"
/>
</div>
<div class="warning">
<div class="warning-title">
<img src="./assets/warning.png" alt />
<span>新增排华联盟预警</span>
<span>新增排华联盟预警1</span>
</div>
<div class="warning-content">
<div class="content-item" v-for="(item, index) in warningList" :key="index">
......@@ -174,6 +185,12 @@
</div>
</div>
</div>
<simple-pagination
v-model:current-page="warningCurrentPage"
:page-size="warningPageSize"
:total="allWarningList.length"
@page-change="handleWarningPageChange"
/>
</div>
</div>
......@@ -185,13 +202,25 @@
<span>排华联盟领域分布</span>
</div>
<div class="left-content" ref="leftChartRef"></div>
<!-- <div style="padding-left: 15px; padding-right: 15px">
<Echarts :option="leftChartOptions" ref="leftChartRef" height="430px" />
</div> -->
<div class="anti-area-datasource">
<el-image :src="tipsIcon" class="tips-icon"></el-image>
数据来源:美国各政府机构官网,数据时间:2025.22025.3
</div>
</div>
<div class="area-right">
<div class="right-title">
<img src="./assets/circle1.png" alt />
<span>排华联盟国家紧密度</span>
</div>
<div class="right-content" ref="rightChartRef"></div>
<!-- <div class="right-content" ref="rightChartRef"></div> -->
<Echarts :option="rightChartOptions" height="430px" />
<div class="anti-area-datasource">
<el-image :src="tipsIcon" class="tips-icon"></el-image>
数据来源:美国各政府机构官网,数据时间:2025.22025.3
</div>
</div>
</div>
</div>
......@@ -205,6 +234,10 @@ import { getAllUnionList, getDynamic, getPrediction, getUnionCount, getIndustry,
import defaultImg from "../../../../assets/images/default-icon2.png";
import mapJson from "./assets/world.json";
import { ElMessage } from "element-plus";
import SimplePagination from "@/components/SimplePagination.vue";
import tipsIcon from "./assets/icon-tips.png";
import Echarts from "@/components/Chart/index.vue";
import { link } from "d3";
const currentPage = ref(1);
const pageSize = ref(10);
......@@ -826,6 +859,10 @@ function fetchGeoJSON() {
const newsList = ref([]);
const warningList = ref([]);
const warningCurrentPage = ref(1);
const warningPageSize = ref(5);
const allWarningList = ref([]);
const handleWarningPageChange = (page, pageSize) => {};
const getContent = countries => {
if (countries) {
......@@ -846,8 +883,142 @@ const getContent = countries => {
};
const leftChartRef = ref(null);
const leftChartOptions = ref({
tooltip: { trigger: "item", formatter: ({ name, value, percent }) => `${name}<br/>${value}项 ${percent}%` },
series: [
{
type: "pie",
radius: [96, 120],
center: ["50%", "50%"],
avoidLabelOverlap: true,
itemStyle: { borderWidth: 0 },
label: {
show: true,
position: "outside",
alignTo: "edge", // 与官网保持一致
formatter: ({ name, value, percent }) => `{name|${name}} \n\n{value|${value}} {percent|${percent}%}`,
minMargin: 5,
edgeDistance: 10,
lineHeight: 18,
rich: {
name: {
fontSize: 16,
fontFamily: "Microsoft YaHei",
fontWeight: 700,
lineHeight: 24,
color: "rgb(59, 65, 75)"
},
value: {
fontSize: 14,
fontFamily: "Microsoft YaHei",
fontWeight: 400,
lineHeight: 22,
color: "rgb(95, 101, 108)"
},
percent: {
fontSize: 14,
fontFamily: "Microsoft YaHei",
fontWeight: 400,
lineHeight: 22,
color: "rgb(95, 101, 108)"
}
}
},
labelLine: {
show: true,
length: 30, // 与官网length逻辑对齐
length2: 20, // 与官网length2逻辑对齐
maxSurfaceAngle: 80
},
labelLayout: function (params) {
// 完全复刻官网逻辑,仅修改X轴,不碰Y轴
const chartWidth = leftChartRef.value?.getWidth() || params.rect.width;
const isLeft = params.labelRect.x < chartWidth / 2;
const points = params.labelLinePoints;
// 仅修改引导线端点X坐标(核心:保留默认Y轴居中)
points[2][0] = isLeft ? params.labelRect.x : params.labelRect.x + params.labelRect.width;
return {
labelLinePoints: points
};
},
data: []
}
]
});
let leftChart;
const rightChartRef = ref(null);
const rightChartOptions = ref({
title: {
// text: 'Basic Graph'
},
tooltip: {
trigger: "item", // 针对Graph的节点/边触发(必配,否则弹框不生效)
triggerOn: "click",
formatter: function (params) {
// params.data 是当前点击节点的完整数据对象
const { name, value } = params.data;
// 返回HTML字符串,自由拼接展示内容(支持换行、标签、样式)
return `
<div style="text-align: center;">
<span style="font-size:16px; font-weight: bold; margin-bottom:8px;">${name}</span>
<span>:${value || 0}</span>
</div>
`;
}
},
animationDurationUpdate: 1500,
animationEasingUpdate: "quinticInOut",
dataZoom: [
{
type: "slider",
start: 10,
end: 10
}
],
series: [
{
type: "graph",
layout: "circular",
circular: {
rotateLabel: true
},
symbolSize: 50,
roam: true,
label: {
show: true
// position: "outside"
},
edgeSymbol: ["circle", ""],
edgeSymbolSize: [4, 60],
edgeLabel: {
fontSize: 20,
show: true
},
data: [],
links: [],
lineStyle: {
opacity: 0.9,
width: 2,
curveness: 0.3
},
emphasis: {
focus: "adjacency",
lineStyle: {
width: 4
},
label: {
show: true,
position: "outside",
fontWeight: "bold",
fontSize: 16,
distance: 10
}
}
}
]
});
let rightChart;
// 联盟领域分布
......@@ -878,6 +1049,11 @@ const initLeftDonut = async () => {
console.error("获取限制领域分布情况接口失败:", error);
}
leftChartOptions.value.series[0].data = data.map((d, i) => ({
...d,
labelLine: { lineStyle: { color: getColor(colors, d.name), width: 1 } }
}));
const option = {
tooltip: { trigger: "item", formatter: ({ name, value, percent }) => `${name}<br/>${value}项 ${percent}%` },
series: [
......@@ -891,10 +1067,10 @@ const initLeftDonut = async () => {
show: true,
position: "outside",
alignTo: "edge",
formatter: ({ name, value, percent }) => `{name|${name}} {value|${value}} {percent|${percent}%}`,
formatter: ({ name, value, percent }) => `{name|${name}} \n{value|${value}} {percent|${percent}%}`,
minMargin: 5,
edgeDistance: 10,
lineHeight: 15,
edgeDistance: 20,
lineHeight: 28,
rich: {
name: {
fontSize: 16,
......@@ -929,7 +1105,7 @@ const initLeftDonut = async () => {
const isLeft = params.labelRect.x < leftChart.getWidth() / 2;
const points = params.labelLinePoints;
// 导航线终点在标签下方
const lineY = params.labelRect.y + params.labelRect.height;
const lineY = params.labelRect.y + params.labelRect.height / 2;
points[2][0] = isLeft ? params.labelRect.x : params.labelRect.x + params.labelRect.width;
points[2][1] = lineY;
points[1][1] = lineY;
......@@ -948,9 +1124,9 @@ const initLeftDonut = async () => {
};
const initRightDonut = async () => {
if (!rightChartRef.value) return;
if (rightChart) rightChart.dispose();
rightChart = echarts.init(rightChartRef.value);
// if (!rightChartRef.value) return;
// if (rightChart) rightChart.dispose();
// rightChart = echarts.init(rightChartRef.value);
let data = [];
let links = [];
......@@ -1030,77 +1206,10 @@ const initRightDonut = async () => {
console.error("获取限制领域分布情况接口失败:", error);
}
let option = {
title: {
// text: 'Basic Graph'
},
tooltip: {
trigger: "item", // 针对Graph的节点/边触发(必配,否则弹框不生效)
triggerOn: "click",
formatter: function (params) {
// params.data 是当前点击节点的完整数据对象
const { name, value } = params.data;
// 返回HTML字符串,自由拼接展示内容(支持换行、标签、样式)
return `
<div style="text-align: center;">
<span style="font-size:16px; font-weight: bold; margin-bottom:8px;">${name}</span>
<span>:${value || 0}</span>
</div>
`;
}
},
animationDurationUpdate: 1500,
animationEasingUpdate: "quinticInOut",
dataZoom: [
{
type: "slider",
start: 10,
end: 10
}
],
series: [
{
type: "graph",
layout: "circular",
circular: {
rotateLabel: true
},
symbolSize: 80,
roam: true,
label: {
show: true
// position: "outside"
},
edgeSymbol: ["circle", ""],
edgeSymbolSize: [4, 80],
edgeLabel: {
fontSize: 20,
show: true
},
data: data,
// links: [],
links: links,
lineStyle: {
opacity: 0.9,
width: 2,
curveness: 0.3
},
emphasis: {
focus: "adjacency",
lineStyle: {
width: 4
},
label: {
show: true,
position: "outside",
fontWeight: "bold",
fontSize: 16,
distance: 10
}
}
}
]
};
rightChartOptions.value.series[0].links = links;
rightChartOptions.value.series[0].data = data;
console.log("关系紧密图数据 =>", rightChartOptions.value);
// const option = {
// center: ["40%", "25%"],
// backgroundColor: "transparent",
......@@ -1119,7 +1228,7 @@ const initRightDonut = async () => {
// }
// ]
// };
rightChart.setOption(option);
// rightChart.setOption(option);
};
const getColor = (colors, name) => {
......@@ -1765,13 +1874,13 @@ watch(activeDate, async () => {
.news-content {
width: 100%;
height: calc(100% - 48px);
padding: 4px 28px 10px 27px;
height: calc(100% - 100px);
padding: 4px 28px 5px 27px;
overflow-y: auto;
.item {
width: 100%;
height: 126px;
height: 118px;
padding: 16px 0px;
display: flex;
flex-direction: column;
......@@ -1806,6 +1915,10 @@ watch(activeDate, async () => {
}
}
.item-tooltip {
color: red;
}
.item-content {
margin-left: 28px;
width: calc(100% - 28px);
......@@ -1887,6 +2000,9 @@ watch(activeDate, async () => {
background: rgba(255, 255, 255, 0.65);
width: 793px;
height: 700px;
display: flex;
flex-direction: column;
justify-content: space-between;
.warning-title {
width: 100%;
......@@ -1920,14 +2036,15 @@ watch(activeDate, async () => {
height: calc(100% - 48px);
padding: 4px 28px 25px 27px;
overflow-y: auto;
margin-bottom: auto;
.content-item {
width: 100%;
height: auto;
padding: 12px 24px;
box-sizing: border-box;
border: 1px solid rgba(234, 236, 238, 1);
border-radius: 10px;
border-bottom: 1px solid rgba(234, 236, 238, 1);
// border-radius: 10px;
margin-bottom: 12px;
.item-title {
......@@ -1983,6 +2100,7 @@ watch(activeDate, async () => {
.item-content {
width: 100%;
margin-top: 14px;
display: none;
.content-list {
display: flex;
......@@ -2100,9 +2218,24 @@ watch(activeDate, async () => {
.left-content {
width: 100%;
height: calc(100% - 48px);
height: calc(100% - 92px);
padding: 33px 48px 59px 50px;
}
.anti-area-datasource {
text-align: center;
font-family: Source Han Sans CN;
font-size: 14px;
font-weight: 400;
display: flex;
align-items: center;
justify-content: center;
gap: 5px;
.tips-icon {
margin-top: 2px;
width: 16px;
height: 16px;
}
}
}
.area-right {
......@@ -2143,9 +2276,24 @@ watch(activeDate, async () => {
.right-content {
width: 100%;
height: 450px;
height: 430px;
// padding: 33px 48px 59px 50px;
}
.anti-area-datasource {
text-align: center;
font-family: Source Han Sans CN;
font-size: 14px;
font-weight: 400;
display: flex;
align-items: center;
justify-content: center;
gap: 5px;
.tips-icon {
margin-top: 2px;
width: 16px;
height: 16px;
}
}
}
}
}
......
......@@ -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;
......
{
"中国": {
"企业研发人才占比": [
{
"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
......@@ -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, // 估算的百分比
......@@ -1222,7 +1222,6 @@ onUnmounted(() => {
// color:var(--color-main-active);
// }
// }
// }
......
......@@ -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;
}
......
......@@ -280,8 +280,8 @@
<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;
......
......@@ -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>
......@@ -76,8 +76,14 @@
<div class="box3-main-footer">
<div class="info">{{ total }}</div>
<div class="page-box">
<el-pagination :page-size="12" 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>
......@@ -110,9 +116,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 =
......@@ -178,7 +185,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);
......@@ -242,7 +249,7 @@ const majorOpinions = ref([
]);
// 处理页码改变事件
const currentPage = ref(1);
const total = ref(0)
const total = ref(0);
const handleCurrentChange = page => {
currentPage.value = page;
handleGetThinkDynamicsReport();
......@@ -254,8 +261,8 @@ const handleGetThinkTankReportContent = async () => {
console.log("主要观点", res.data);
if (res.code === 200 && res.data) {
majorOpinions.value = res.data.content;
handleGetBox3AnalysisContent(majorOpinions.value)
total.value = res.data.totalElements
handleGetBox3AnalysisContent(majorOpinions.value);
total.value = res.data.totalElements;
}
} catch (error) {
console.error("获取主要观点error", error);
......@@ -263,15 +270,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();
......
......@@ -10,8 +10,13 @@
<!-- <div class="box-header-right">{{ "查看数据源 >" }}</div> -->
<div class="select-box">
<el-select v-model="box1SelectYear" placeholder="选择时间" style="width: 100px">
<el-option v-for="(item, index) in box1YearList" :key="index" :label="item.label + '年'"
:value="item.value" @click="handleGetThinkPolicyIndustry()" />
<el-option
v-for="(item, index) in box1YearList"
:key="index"
:label="item.label + '年'"
:value="item.value"
@click="handleGetThinkPolicyIndustry()"
/>
</el-select>
</div>
</div>
......@@ -28,8 +33,13 @@
<!-- <div class="box-header-right">{{ "查看数据源 >" }}</div> -->
<div class="select-box">
<el-select v-model="box1SelectYear" placeholder="选择时间" style="width: 100px">
<el-option v-for="(item, index) in box1YearList" :key="index" :label="item.label + '年'"
:value="item.value" @click="handleGetThinkPolicyIndustry()" />
<el-option
v-for="(item, index) in box1YearList"
:key="index"
:label="item.label + '年'"
:value="item.value"
@click="handleGetThinkPolicyIndustry()"
/>
</el-select>
</div>
</div>
......@@ -73,8 +83,13 @@
<!-- <div class="box-header-right">{{ "查看数据源 >" }}</div> -->
<div class="select-box">
<el-select v-model="box3SelectMonths" placeholder="选择时间" style="width: 100px">
<el-option v-for="item in box3MonthsList" :key="item.value" :label="item.label + '年'" :value="item.value"
@click="handleGetThinkPolicyIndustryChange()" />
<el-option
v-for="item in box3MonthsList"
:key="item.value"
:label="item.label + '年'"
:value="item.value"
@click="handleGetThinkPolicyIndustryChange()"
/>
</el-select>
</div>
</div>
......@@ -96,8 +111,14 @@
<el-select v-model="selectedYear" placeholder="选择时间" style="width: 120px" @click="handleGetThinkPolicy()">
<el-option v-for="item in yearList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-select class="select-box-sort" v-model="sort" placeholder="倒序" style="width: 120px;" :teleported="true"
:placement="'bottom-start'" :popper-options="{
<el-select
class="select-box-sort"
v-model="sort"
placeholder="倒序"
style="width: 120px"
:teleported="true"
:placement="'bottom-start'"
:popper-options="{
modifiers: [
{
name: 'preventOverflow',
......@@ -108,7 +129,8 @@
enabled: false
}
]
}">
}"
>
<template #prefix>
<img v-if="!sort" src="../thinkDynamics/images/image down.png" class="select-prefix-img" alt="" />
<img v-else src="../thinkDynamics/images/image up.png" class="select-prefix-img" alt="" />
......@@ -132,8 +154,13 @@
{{ item }}
</el-checkbox> -->
<el-checkbox class="filter-checkbox" label="全部领域"></el-checkbox>
<el-checkbox class="filter-checkbox" v-for="research in areaList" :key="research.id"
v-model="selectedAreaList" :label="research.id">
<el-checkbox
class="filter-checkbox"
v-for="research in areaList"
:key="research.id"
v-model="selectedAreaList"
:label="research.id"
>
{{ research.name }}
</el-checkbox>
</div>
......@@ -151,8 +178,13 @@
{{ item }}
</el-checkbox> -->
<el-checkbox class="filter-checkbox" label="全部领域"></el-checkbox>
<el-checkbox class="filter-checkbox" v-for="year in selectableYears" :key="year"
v-model="selectedAreaList" :label="year">
<el-checkbox
class="filter-checkbox"
v-for="year in selectableYears"
:key="year"
v-model="selectedAreaList"
:label="year"
>
{{ year }}
</el-checkbox>
</div>
......@@ -200,8 +232,14 @@
<div class="right-footer">
<div class="info">共 {{ total }} 项</div>
<div class="page-box">
<el-pagination :page-size="12" 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>
......@@ -314,50 +352,7 @@ const handleGetThinkPolicyIndustry = async () => {
};
// 相关政策领域分布
const box2Data = ref([
// {
// name: "集成电路",
// value: 2,
// total: 10,
// per: 20,
// color: "#CE4F51"
// },
// {
// name: "人工智能",
// value: 1,
// total: 6,
// per: 17,
// color: "#055FC2"
// },
// {
// name: "通信网络",
// value: 2,
// total: 7,
// per: 26,
// color: "#13A8A8"
// },
// {
// name: "量子科技",
// value: 1,
// total: 2,
// per: 50,
// color: "#722ED1"
// },
// {
// name: "生物科技",
// value: 3,
// total: 7,
// per: 43,
// color: "#FA8C16"
// },
// {
// name: "能源",
// value: 11,
// total: 20,
// per: 55,
// color: "#69B1FF"
// }
]);
const box2Data = ref([]);
const box2ColorList = ref(["#CE4F51", "#055FC2", "#13A8A8", "#722ED1", "#FA8C16", "#69B1FF"]);
const box2SelectYear = ref("2025");
const box2YearList = ref([
......@@ -560,7 +555,6 @@ const policyList = ref([
// }
// ]
// },
]);
//获取当前时间x年前的日期
......@@ -589,8 +583,8 @@ function getDateMonthsAgo(months) {
return `${year}-${month}-${day}`;
}
const toDetail = (item) => {
window.sessionStorage.setItem("curTabName", item.content)
const toDetail = item => {
window.sessionStorage.setItem("curTabName", item.content);
const route = router.resolve({
name: "ReportDetail",
params: {
......@@ -598,13 +592,13 @@ const toDetail = (item) => {
}
});
window.open(route.href, "_blank");
}
};
const total = ref(0);
const sort = ref(false);
const handleSwithSort = () => {
sort.value = !sort.value;
handleGetThinkPolicy()()
handleGetThinkPolicy()();
};
const currentPage = ref(1);
......@@ -622,7 +616,7 @@ const handleGetThinkPolicy = async () => {
sortFun: sort.value,
currentPage: currentPage.value,
pageSize: 10,
researchTypeIds: selectedAreaList.value.join(',')
researchTypeIds: selectedAreaList.value.join(",")
};
const res = await getThinkPolicy(parmas);
console.log("智库政策", res);
......@@ -656,7 +650,6 @@ onMounted(() => {
width: 100%;
height: 100%;
.top {
height: 420px;
width: 1600px;
......@@ -734,8 +727,6 @@ onMounted(() => {
height: 32px;
}
:deep(.el-select-dropdown) {
left: 0 !important;
/* 强制下拉框左对齐选择框 */
......@@ -816,8 +807,6 @@ onMounted(() => {
#box3Chart {
height: 360px;
}
}
}
}
......@@ -840,7 +829,6 @@ onMounted(() => {
background: rgba(255, 255, 255, 1);
position: relative;
.icon {
width: 16px;
height: 16px;
......@@ -1048,7 +1036,6 @@ onMounted(() => {
margin-top: 24px;
margin-bottom: 24px;
.select-box-header {
display: flex;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论