提交 698a46f6 authored 作者: 胡卉清's avatar 胡卉清

合并分支 'dev_hhq' 到 'master'

Dev hhq 查看合并请求 !106
......@@ -102,8 +102,8 @@ export default {
display: flex;
align-items: center;
width: 100%;
padding: 0 40px;
width: 1500px;
/* padding: 0 40px; */
width: 1600px;
overflow: auto;
}
......@@ -156,7 +156,7 @@ export default {
.line {
position: absolute;
left: 0;
left: 10px;
right: 0;
top: 50%;
height: 6px;
......
......@@ -8,24 +8,17 @@
</div>
<div style="display: flex; height: 650px; width: 100%">
<div style="width: 50%">
<div
style="
<div style="
display: flex;
justify-content: space-between;
margin-right: 50px;
line-height: 32px;
align-items: center;
"
>
">
<div style="display: flex; margin-left: 50px">
数据来源:
<el-select
class="select-item"
size="default"
style="margin-left: 15px; width: 240px; height: 32px"
v-model="origin"
@change="handleGetCompare()"
>
<el-select class="select-item" size="default" style="margin-left: 15px; width: 240px; height: 32px"
v-model="origin" @change="handleGetCompare()">
<el-option :value="value.id" :label="value.name" v-for="value in originList" />
</el-select>
</div>
......@@ -39,31 +32,40 @@
<div style="width: 672px; height: 486px; padding-top: 50px" id="char"></div>
</div>
<div style="width: 50%; height: 620px; overflow: auto">
<el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border default-expand-all>
<el-table-column prop="targetName" label="指标名称" sortable width="350" />
<el-table-column prop="chinaScore" label="中国">
<div style="width: 50%; height: 620px;overflow: auto;">
<el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="targetCode" border
:tree-props="{ children: 'children' }" default-expand-all :header-cell-style="{ 'border-right': 'none' }"
:cell-style="{ 'border-right': 'none' }">
<!-- 自定义展开图标 -->
<el-table-column prop="targetName" label="指标名称" width="350" />
<el-table-column prop="usScore" label="美国">
<template #default="scope">
<div style="display: flex;">
<div class="progress-text">
{{ scope.row.usScore }}
</div>
<div class="progress-wrapper left" :style="{ '--i': '40px', '--j': '-20px', marginLeft: '20px' }">
<el-progress
:percentage="scope.row.chinaScore"
:stroke-width="20"
class="left-progress"
:show-text="false"
/>
<el-progress :percentage="scope.row.chinaScore" :stroke-width="20" class="left-progress"
:show-text="false" />
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="usScore" label="美国">
<el-table-column prop="chinaScore" label="中国">
<template #default="scope">
<div style="display: flex;">
<div class="progress-wrapper right" :style="{ '--i': '40px', marginRight: '20px' }">
<el-progress
:percentage="scope.row.usScore"
:stroke-width="20"
class="right-progress"
:show-text="false"
/>
<el-progress :percentage="scope.row.usScore" :stroke-width="20" class="right-progress"
:show-text="false" />
</div>
<div class="progress-text" style="color:rgba(206, 79, 81, 1);">
{{ scope.row.chinaScore }}
</div>
</div>
</template>
</el-table-column>
</el-table>
......@@ -80,20 +82,17 @@
</div>
</div>
<div class="btn-box">
<div
v-for="(value, index) in btnList"
:key="index"
class="btn-item disabled"
:style="{
<div v-for="(value, index) in btnList" :key="index" class="btn-item disabled" :style="{
background: value.background
}"
>
}">
<img :src="value.img" style="width: 22px; height: 19px; margin: 0 22px" />
{{ value.text }}
<img
src="./assets/images/btn-icon-arrow.png"
style="margin-left: auto; margin-right: 22px; width: 13px; height: 12px"
/>
<img :src="`./icon/ZM/btn-icon-arrow.png`"
style="margin-left: auto; margin-right: 22px; width: 13px; height: 12px" />
<!-- <img src="./assets/images/btn-icon-arrow.png"
style="margin-left: auto; margin-right: 22px; width: 13px; height: 12px" /> -->
</div>
</div>
</div>
......@@ -102,12 +101,20 @@
<script setup>
import { onMounted, ref, computed } from "vue";
import * as echarts from "echarts";
import { ArrowRight, CaretBottom } from '@element-plus/icons-vue'
import Timeline from "./Timeline.vue";
import tableShow from "./tableShow.vue";
import radarChart from "./radarChart3.js";
import { getCompare, getChartDict, getTechnologyGameAnalysis } from "@/api/zmOverview/risk/index.js";
import { getCompare, getChartDict, getTechnologyGameAnalysis } from '@/api/zmOverview/risk/index.js'
import icon1 from './icon/btn-icon-0.png'
import icon2 from './icon/btn-icon-1.png'
import icon3 from './icon/btn-icon-2.png'
import icon4 from './icon/btn-icon-3.png'
import icon5 from './icon/btn-icon-4.png'
import icon6 from './icon/btn-icon-5.png'
import icon7 from './icon/btn-icon-6.png'
import icon from './icon/btn-icon-7.png'
import Img1 from "./assets/images/btn-icon-0.png";
import Img2 from "./assets/images/btn-icon-1.png";
import Img3 from "./assets/images/btn-icon-2.png";
......@@ -124,28 +131,32 @@ const course = ref([
content:
"计划将国家量子倡议延长至2034年,新增研发中心、测试平台,并首次将NASA的量子研究纳入,旨在加速技术应用与人才发展。",
unit: "美国",
tag: "科技发展战略"
tag: "科技发展战略",
icon: icon1,
},
{
time: "2025-01-21",
title: "将美国实体列入'不可靠实体清单'并采取商品进口限制",
content: "根据《反外国制裁法》等,将17家美国实体列入清单,禁止其从事与中国有关的进出口与新增投资。",
unit: "中国",
tag: "反制措施"
tag: "反制措施",
icon: icon2,
},
{
time: "2025-01-21",
title: "《国家创新驱动发展战略纲要》发布",
content: "纲领性文件,提出了建设世界科技强国的'三步走'战略目标,并系统部署了构建现代产业技术体系等八大战略任务。",
unit: "中国",
tag: "科技发展战略"
tag: "科技发展战略",
icon: icon3
},
{
time: "2025-01-21",
title: "中国网信办约谈英伟达",
content: "中国网信办约谈英伟达,要求就H20算力芯片漏洞后门安全风险问题进行说明。",
unit: "中国",
tag: "反制措施"
tag: "反制措施",
icon: icon4,
},
{
time: "2025-05-09",
......@@ -153,21 +164,24 @@ const course = ref([
content:
"年度国防预算法案,其中系统性地嵌入了大量对华竞争条款,首次将对外投资审查法律化,并在供应链、实体清单等方面加强限制。",
unit: "美国",
tag: "对华打压遏制"
tag: "对华打压遏制",
icon: icon5,
},
{
time: "2025-07-24",
title: "白宫'人工智能(AI)行动计划'",
content: "提出放宽监管、简化环境许可可以加快AI基础设施建设,并涉及促进AI出口、要求联邦采购的AI模型具备中立性等内容。",
unit: "美国",
tag: "科技发展战略"
tag: "科技发展战略",
icon: icon6,
},
{
time: "2025-07-24",
title: "2026财年《商务、司法、科学及相关支出法案》",
content: "法案为商务部工业与安全局(BIS)大幅增加预算,以加强出口管制执法,特别强调审查对华为、中芯国际的出口许可证。",
unit: "美国",
tag: "对华打压遏制"
tag: "对华打压遏制",
icon: icon7,
}
]);
......@@ -192,7 +206,8 @@ const handleGetCompare = async () => {
const res = await getCompare(origin.value);
console.log("中美科技实力对比", res);
if (res.code === 200 && res.data) {
tableData.value = res.data;
tableData.value = res.data[0].children;
// tableData.value = [res.data];
const secondLevelData = res.data[0].children;
const indicatorNames = secondLevelData.map(item => item.targetName);
const chinaScores = secondLevelData.map(item => item.chinaScore);
......@@ -405,6 +420,21 @@ const btnList = ref([
}
}
.progress-text {
/* No.1 92.5 */
width: 80px;
height: 22px;
color: rgba(5, 95, 194, 1);
font-family: Source Han Sans CN;
font-style: Bold;
font-size: 14px;
font-weight: 700;
line-height: 22px;
letter-spacing: 0px;
text-align: left;
}
/* ========== 公共外壳 ========== */
.progress-wrapper {
position: relative;
......@@ -443,8 +473,9 @@ const btnList = ref([
background: rgba(231, 243, 255, 1);
overflow: hidden;
/* 读行内传进来的变量 */
height: var(--i) !important;
height: 10px !important;
margin-left: var(--j) !important;
margin-top: 6px;
}
.left-progress :deep(.el-progress-bar__inner) {
......@@ -454,7 +485,7 @@ const btnList = ref([
/* 设置为矩形,inset() 函数的四个参数都是0表示不裁剪 */
background: #055fc2;
/* 读行内传进来的变量 */
height: var(--i) !important;
height: 10px !important;
margin-left: var(--j) !important;
}
......@@ -464,14 +495,15 @@ const btnList = ref([
clip-path: inset(0 0 0 0);
background: #ffccc7;
overflow: hidden;
height: var(--i) !important;
height: 10px !important;
margin-top: 6px;
}
.right-progress :deep(.el-progress-bar__inner) {
border-radius: 0;
clip-path: inset(0 0 0 0);
background: #ce4f51;
height: var(--i) !important;
height: 10px !important;
}
:deep(.el-table .cell) {
......@@ -558,11 +590,68 @@ const btnList = ref([
text-align: center;
}
.disabled {
opacity: 0.5;
cursor: not-allowed;
pointer-events: none;
filter: grayscale(50%);
background-color: #f5f5f5 !important;
/* 隐藏原生箭头 */
// :deep(.el-table__expand-icon>.el-icon) {
// display: none;
// }
// /* 或者用背景图/伪元素替换 */
// :deep(.el-table__expand-icon>.el-icon::before) {
// content: "▶";
// color: #409eff;
// }
// :deep(.el-table .el-table__expand-icon--expanded::before) {
// content: "▼";
// }
/* 隐藏原生图标 */
:deep(.el-table__expand-icon > .el-icon) {
display: none;
}
/* 自定义未展开图标 */
:deep(.el-table__expand-icon) {
background-image: url('./icon/arrowDown.png');
background-repeat: no-repeat;
background-size: contain;
width: 24px;
height: 24px;
cursor: pointer;
transition: transform 0.3s;
}
/* 自定义展开图标 */
:deep(.el-table__expand-icon.is-expanded) {
background-image: url('./icon/arrowDown.png');
transform: rotate(-90deg);
}
/* 自定义表头背景颜色 */
:deep(.el-table th) {
background-color: #f0f9eb;
}
/* 自定义表头文字颜色 */
:deep(.el-table th .cell) {
color: rgba(59, 65, 75, 1);
font-family: Source Han Sans CN;
font-style: Bold;
font-size: 18px;
font-weight: 700;
line-height: 24px;
letter-spacing: 0px;
text-align: left;
text-align: center;
}
/* 自定义表头边框 */
:deep(.el-table th) {
border-bottom: 2px solid #ebeef5;
}
/* 自定义表头高度 */
:deep(.el-table th) {
padding: 12px 0;
}
</style>
......@@ -74,7 +74,7 @@ const makeOption = () => {
const change = props.data.change;
const unit = props.data.unit;
if (change === 0) {
return `{num|${'无新增'}}`
return `{noChange|${'无新增'}}\n{b|共${props.data.count}${unit}}`
}
return `{num|${change}}{unit| ${unit}}\n{b|共${props.data.count}${unit}}`
},
......@@ -86,7 +86,7 @@ const makeOption = () => {
padding: [-4, 0, 8, 0]
},
noChange: {
fontSize: 24,
fontSize: 20,
fontWeight: 'bold',
color: `${props.color[5]}`,
padding: [0, 0, 8, 0]
......
......@@ -7,7 +7,7 @@
width: sections[index].waveBall.length === 2 ? '350px' : '503px',
background: section.background
}">
<img class="section-title" :src="`/public/icon/riskToday/title-` + (index + 1) + `.png`" />
<img class="section-title" :src="section.title" />
<div class="stats">
<div v-for="value in sections[index].waveBall">
<WaveBall :percent="value.percent" :data="value" :color="section.waterColor" :size="128" />
......@@ -39,7 +39,8 @@
</div>
</div>
<div style="display: flex">
<div class="risk-signals">
<!-- 风险信号列表 -->
<div class="risk-signals" ref="riskSignalsRef">
<div class="risk-signals-item" v-for="(item, index) in warningList" :key="index"
@click="handleClickToDetailO(item)">
<div class="item-left" :class="{
......@@ -70,7 +71,7 @@
<el-carousel ref="carouselRef" style="height: 443px; width: 664px" :autoplay="true" :interval="30000"
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-item" @click="toDetaile(News.id, News.HotspotType)">
<div class="carousel-title">
<div>
<div class="title-text">
......@@ -105,17 +106,21 @@
<script setup>
import { color } from "echarts";
import { onMounted, ref, computed, onBeforeUnmount } from "vue";
import { onMounted, ref, onUnmounted, onBeforeUnmount } from "vue";
import WaveBall from "./WaveBall.vue";
import { getBillRiskSignal } from "@/api/bill/billHome";
import { getLatestRiskUpdates, getLatestRisks } from '@/api/zmOverview/risk/index.js'
import router from "@/router/index";
import icon1 from './icon/title-1.png'
import icon2 from './icon/title-2.png'
import icon3 from './icon/title-3.png'
import icon4 from './icon/title-4.png'
const sectionTab = [
{
textColor: "rgba(9, 88, 217, 1)",
background: "linear-gradient(180.00deg, rgba(9, 88, 217, 1),rgba(9, 88, 217, 0.5) 100%)",
borderColor: "rgba(186, 224, 255, 1)",
waterColor: ["#4E92F4", "#5993EE", "#8EB3ED", "#77A2EB", "#ffffff", "#ffffff"],
title: "政策法规"
title: icon1
},
{
textColor: "rgba(9, 88, 217, 1)",
......@@ -123,7 +128,7 @@ const sectionTab = [
borderColor: "rgba(186, 224, 255, 1)",
waterColor: ["#4AB9BA", "#5DBFC1", "#86CCCF", "#8DD0D2", "#ffffff", "#ffffff"],
title: "出口管制"
title: icon2
},
{
textColor: "rgba(9, 88, 217, 1)",
......@@ -131,7 +136,7 @@ const sectionTab = [
borderColor: "rgba(186, 224, 255, 1)",
waterColor: ["#EF797B", "#ED8C8E", "#EAB0B2", "#E7ABAC", "#ffffff", "#ffffff"],
title: "投融资限制"
title: icon3
},
{
textColor: "rgba(9, 88, 217, 1)",
......@@ -139,7 +144,7 @@ const sectionTab = [
borderColor: "rgba(186, 224, 255, 1)",
waterColor: ["#EFA04F", "#EDA969", "#EABA8C", "#E7AF7A", "#ffffff", "#ffffff"],
title: "市场准入"
title: icon4
}
];
// 模拟从后端获取的数据
......@@ -367,7 +372,6 @@ const hotNewsList = ref([
//最新风险信号
const handleGetLatestRisks = async () => {
try {
const res = await getLatestRisks();
console.log("最新风险信号", res);
if (res.code === 200 && res.data) {
......@@ -391,12 +395,86 @@ const handleCarouselChange = index => {
}
};
// 查看详情
const handleClickToDetail = () => {
window.sessionStorage.setItem("billId", curBill.value.billId);
window.sessionStorage.setItem("curTabName", curBill.value.billName);
const route = router.resolve({
path: "/billLayout",
query: {
billId: curBill.value.billId
}
});
console.log(route);
window.open(route.href, "_blank");
};
// 查看详情 传递参数
const handleClickToDetailO = item => {
window.sessionStorage.setItem("billId", item.billId);
window.sessionStorage.setItem("curTabName", item.name || item.signalTitle);
const route = router.resolve("/billLayout?billId=" + item.billId);
window.open(route.href, "_blank");
};
const handleToRiskManage = () => {
// 这里的路由路径请根据实际情况修改
// router.push('/riskSignalManage');
console.log('跳转到风险信号管理');
};
const toDetaile = (id, type) => {
if (type === '法案') {
let path = "/billLayout/bill/introduction";
let query = { billId: id };
const { href } = router.resolve({ path, query });
window.open(href, "_blank");
} else if (type === '政令') {
const route = router.resolve({
path: "/decreeLayout/overview/introduction",
query: {
id: id
}
});
window.open(route.href, "_blank");
} else if (type === '实体清单' || type === 'CCL') {
const route = router.resolve({
path: "/exportControl/singleSanction",
query: {
id: id
}
});
window.open(route.href, "_blank");
} else if (type === '337') {
const curRoute = router.resolve({
path: "/marketSingleCaseLayout/overview",
query: {
id: "337",
searchId: id
}
});
window.open(curRoute.href, "_blank");
} else if (type === '203') {
const curRoute = router.resolve({
path: "/marketSingleCaseLayout/overview",
query: {
id: "203",
searchId: id
}
});
window.open(curRoute.href, "_blank");
} else if (type === '301') {
const curRoute = router.resolve({
path: "/marketSingleCaseLayout/overview",
query: {
id: "301",
searchId: id
}
});
window.open(curRoute.href, "_blank");
}
//type=涉军企业和SDN未对接
}
const handleSwithCurNews = name => {
if (name === "left") {
carouselRef.value.prev();
......@@ -404,12 +482,37 @@ const handleSwithCurNews = name => {
carouselRef.value.next();
}
};
const riskSignalsRef = ref(null); // 引用risk-signals容器
let intervalId;
onMounted(async () => {
await handleGetLatestRiskUpdates()
await handleGetLatestRisks()
console.log("页面加载完成,可以获取数据了");
const scrollInterval = 2000; // 每隔2秒滚动一次
let currentScroll = 0;
intervalId = setInterval(() => {
if (riskSignalsRef.value) {
const scrollHeight = riskSignalsRef.value.scrollHeight; // 内容总高度
const clientHeight = riskSignalsRef.value.clientHeight; // 可视区域高度
console.log(scrollHeight, clientHeight)
// 如果滚动到底,则回到顶部
if (currentScroll + clientHeight >= scrollHeight) {
currentScroll = 0;
riskSignalsRef.value.scrollTop = currentScroll;
} else {
currentScroll += 10; // 调整这个值可以改变滚动速度
riskSignalsRef.value.scrollTop = currentScroll;
}
}
}, scrollInterval);
});
onUnmounted(() => {
clearInterval(intervalId); // 清除定时器
});
// onBeforeUnmount(() => {
// andleGetLatestRiskUpdates()
......@@ -785,32 +888,29 @@ onMounted(async () => {
.title-text {
/* 美国白宫发布关于进一步延长TikTok执法宽限期的行政令 */
width: 547px;
height: 26px;
// height: 26px;
}
.title-tag {
/* 容器 1563 */
width: 190px;
/* 移除固定 width */
height: 30px;
margin-top: 12px;
/* 自动布局 */
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: flex-start;
gap: 10;
padding: 0px 12px 0px 12px;
padding: 0 12px;
/* 左右内边距控制最小宽度 */
display: inline-flex;
/* ✅ 关键:inline + flex */
justify-content: center;
/* 水平居中 */
align-items: center;
/* 垂直居中 */
border-radius: 20px;
background: rgba(206, 79, 81, 0.1);
color: rgba(206, 79, 81, 1);
font-family: Microsoft YaHei;
font-style: Regular;
font-size: 16px;
font-weight: 400;
line-height: 30px;
letter-spacing: 0px;
text-align: justify;
white-space: nowrap;
/* 防止文字换行 */
box-sizing: border-box;
}
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论