提交 431aa081 authored 作者: coderBryanFu's avatar coderBryanFu

update

上级 e08df9a5
......@@ -313,6 +313,10 @@ onMounted(() => {
<style lang="scss" scoped>
.wrapper {
width: 100%;
height: 100%;
overflow: hidden;
overflow-y: auto;
.box-header {
position: relative;
height: 48px;
......@@ -365,6 +369,9 @@ onMounted(() => {
box-sizing: border-box;
padding-left: 160px;
display: flex;
position: sticky;
top: 0;
z-index: 99999999;
.header-item {
margin: 0 3px;
}
......
......@@ -110,8 +110,10 @@ onUnmounted(() => {
<style lang="scss" scoped>
.wrap {
width: 1920px;
width: 100%;
height: 100%;
overflow: hidden;
overflow-y: auto;
background-image: url("./assets/images/bg.png");
background-repeat: no-repeat;
background-size: 100% auto;
......
......@@ -1142,7 +1142,7 @@ const billList = ref([]);
const curBillListIndex = ref(0);
const searchExportControlText = ref("");
const infoListColor = ref(["rgba(206, 79, 81, 1)", "rgba(132, 136, 142, 1)", "rgba(132, 136, 142, 1)", "rgba(132, 136, 142, 1)"]);
const infoListColor = ref(["rgba(206, 79, 81, 1)", "rgba(114, 46, 209, 1)", "rgba(132, 136, 142, 1)", "rgba(132, 136, 142, 1)"]);
const infoList = ref([]);
......
......@@ -1272,7 +1272,7 @@ const handleGetBox7Data = async () => {
box7Data.value.title = res.data.map(item => {
return {
name: item.COUNTRY,
img: item.IMAGE ? item.IMAGE : Img1
img: item.COUNTRYIMAGE ? item.COUNTRYIMAGE : Img1
};
});
box7Data.value.data = res.data.map(item => {
......
import { symbolCircle } from "d3";
import * as echarts from "echarts";
const getBarChart = (nameList, valueList) => {
......@@ -65,7 +66,12 @@ const getBarChart = (nameList, valueList) => {
yAxis: valueList[index],
symbol: `image://${item.img}`,
symbolSize: [20, 20],
symbolOffset: [0, 10]
symbolOffset: [0, 10],
// itemStyle: {
// borderRadius: 10, // 设置为圆形
// borderColor: '#fff',
// borderWidth: 2
// }
});
});
return data;
......
......@@ -25,33 +25,32 @@
</div>
<div class="page-content">
<el-row :gutter="20">
<el-col :span="17">
<custom-container block title="新闻内容" :titleIcon="houseIcon" height="1180px">
<template #header-right>
<div class="page-content-right-switch">
<el-switch v-model="highlightEntities" />
高亮实体
</div>
<el-button type="primary" @click="handleToDetail"> 译文 </el-button>
</template>
<div class="left">
<custom-container style="margin-bottom: 16px" block title="新闻内容" :titleIcon="houseIcon" height="1180px">
<template #header-right>
<div class="page-content-right-switch">
<el-switch v-model="highlightEntities" />
高亮实体
</div>
<el-button type="primary" @click="handleToDetail"> 译文 </el-button>
</template>
<template #default>
<!-- 内容区域 - 分三块-->
<div class="page-content-news-abstract">
<div class="news-abstract-header">
<img src="./assets/images/abstract-header.png" alt="" />
</div>
<div class="news-abstract-content">
{{
" 美国众议院共和党人正在起草一项新提案,以限制美国对中国的投资。此前,参议院已将其纳入国防政策立法中。知情人士向Semafor透露,众议院工作人员希望在11月7日前就该提案达成共识,并将财政部的反馈纳入由肯塔基州共和党众议员安迪·巴尔提出的配套提案中(尽管政府停摆可能推迟这一时间表)。随后,众议员将利用该文本与参议员就最终《国防授权法案》的内容进行协商。此前一届国会中,类似的尝试因北卡罗来纳州前众议员帕特里克·麦克亨利的反对而失败,但本届国会中,“所有人都在共同努力”。知情人士补充说,领导人并不担心此举会剥夺特朗普在周四与中国领导人习近平会谈时的谈判筹码,因为财政部已开始实施类似的指导方针。"
}}
</div>
<template #default>
<!-- 内容区域 - 分三块-->
<div class="page-content-news-abstract">
<div class="news-abstract-header">
<img src="./assets/images/abstract-header.png" alt="" />
</div>
<div class="news-abstract-content">
{{
" 美国众议院共和党人正在起草一项新提案,以限制美国对中国的投资。此前,参议院已将其纳入国防政策立法中。知情人士向Semafor透露,众议院工作人员希望在11月7日前就该提案达成共识,并将财政部的反馈纳入由肯塔基州共和党众议员安迪·巴尔提出的配套提案中(尽管政府停摆可能推迟这一时间表)。随后,众议员将利用该文本与参议员就最终《国防授权法案》的内容进行协商。此前一届国会中,类似的尝试因北卡罗来纳州前众议员帕特里克·麦克亨利的反对而失败,但本届国会中,“所有人都在共同努力”。知情人士补充说,领导人并不担心此举会剥夺特朗普在周四与中国领导人习近平会谈时的谈判筹码,因为财政部已开始实施类似的指导方针。"
}}
</div>
<div class="page-content-news-artical">
<div class="page-content-news-artical-zn">
{{ newsContentInfo.newsContent }}
<!-- <p>
</div>
<div class="page-content-news-artical">
<div class="page-content-news-artical-zn">
{{ newsContentInfo.newsContent }}
<!-- <p>
<span class="highlight">华盛顿邮报</span>报道,了解谈判情况的知情人士透露,<span
class="highlight"
>美国众议院</span
......@@ -87,10 +86,10 @@
该人士还补充说,领导层并不担心此举会剥夺<span class="highlight">特朗普</span
><span class="highlight">总统</span>的一个谈判工具。
</p> -->
</div>
</div>
<div class="page-content-news-artical-en">
<!-- <p class="indented-paragraph">
<div class="page-content-news-artical-en">
<!-- <p class="indented-paragraph">
<span class="highlight">House Republicans</span> are drafting a fresh proposal to curb US
investments in China after the <span class="highlight">Senate</span> passed its bill as
part of defense policy legislation, people familiar with the talks told Semafor.
......@@ -120,60 +119,53 @@
<span class="highlight">Xi Jinping</span> on Thursday because
<span class="highlight">Treasury</span> is already implementing parallel guidance.
</p> -->
</div>
</div>
</div>
<div class="page-content-news-img">
<el-image :src="newsContentInfo.newsImage" alt="新闻图片" fit="contain" />
<!-- <el-image :src="newsImg2" alt="新闻图片" fit="contain" />
<div class="page-content-news-img">
<el-image :src="newsContentInfo.newsImage" alt="新闻图片" fit="contain" />
<!-- <el-image :src="newsImg2" alt="新闻图片" fit="contain" />
<el-image :src="newsImg3" alt="新闻图片" fit="contain" /> -->
</div>
</template>
</custom-container>
</el-col>
<el-col :span="7">
<custom-container block title="事件脉络" :titleIcon="houseIcon" height="630px">
<template #default>
<div class="box4">
<div class="box4-item" v-for="(item, idx) in sanctionProcessList" :key="item.title">
<div class="box4-item-left">
<el-image :src="dotIcon" alt="图片" class="box4-item-left-icon" />
<div class="box4-item-left-line" v-if="idx + 1 != sanctionProcessList.length"></div>
</div>
</template>
</custom-container>
<custom-container block title="关系图谱" :titleIcon="linkIcon" height="500px">
<template #default>
<Graph />
</template>
</custom-container>
</div>
<div class="right">
<custom-container style="margin-bottom: 16px" block title="事件脉络" :titleIcon="houseIcon" height="630px">
<template #default>
<div class="box4">
<div class="box4-item" v-for="(item, idx) in sanctionProcessList" :key="item.title">
<div class="box4-item-left">
<el-image :src="dotIcon" alt="图片" class="box4-item-left-icon" />
<div class="box4-item-left-line" v-if="idx + 1 != sanctionProcessList.length"></div>
</div>
<div class="box4-item-right">
<div class="box4-item-right-header">
<span class="box4-item-right-header-title" :title="item.title">{{ item.title }}</span>
<span class="box4-item-right-header-desc">{{ item.desc }}</span>
</div>
<div class="box4-item-right">
<div class="box4-item-right-header">
<span class="box4-item-right-header-title" :title="item.title">{{ item.title }}</span>
<span class="box4-item-right-header-desc">{{ item.desc }}</span>
</div>
<div class="box4-item-right-content">
{{ item.content }}
</div>
<div class="box4-item-right-content">
{{ item.content }}
</div>
</div>
</div>
</template>
</custom-container>
<custom-container block title="相关新闻" :titleIcon="houseIcon" height="500px">
<template #default>
<div class="news-list">
<NewsList :list-data="customNewsData" />
</div>
</template>
</custom-container>
</el-col>
</el-row>
</div>
</template>
</custom-container>
<el-row :gutter="20">
<el-col :span="17">
<custom-container block title="关系图谱" :titleIcon="linkIcon" height="500px">
<template #default>
<Graph />
</template>
</custom-container>
</el-col>
</el-row>
<custom-container block title="相关新闻" :titleIcon="houseIcon" height="500px">
<template #default>
<div class="news-list">
<NewsList :list-data="customNewsData" />
</div>
</template>
</custom-container>
</div>
</div>
</div>
</template>
......@@ -350,7 +342,9 @@ onMounted(() => {
.page-container {
/* padding: 20px; */
width: 100%;
overflow-x: hidden;
height: 100%;
overflow: hidden;
overflow-y: auto;
}
.page-header {
......@@ -446,6 +440,14 @@ onMounted(() => {
.page-content {
padding: 20px 160px;
display: flex;
gap: 17px;
.left {
width: 1063px;
}
.right {
width: 520px;
}
&-news-abstract {
height: 260px;
width: 100%;
......
......@@ -206,8 +206,8 @@ const handleActiveModule = (isIn, module) => {
};
const handleToWorldHot = () => {
showPage.value = 'subject'
moduleActiveId.value = ''
showPage.value = "subject";
moduleActiveId.value = "";
};
onMounted(() => {
......@@ -225,5 +225,7 @@ onMounted(() => {
background-position: center -100px;
background-size: 100% 100%;
padding-top: 50px;
overflow: hidden;
overflow-y: auto;
}
</style>
......@@ -733,8 +733,11 @@ onMounted(async () => {
}
.home-wrapper {
width: 100%;
height: 100%;
overflow: hidden;
overflow-y: auto;
.home-main {
// width: 1400px;
width: 100%;
margin: 0 auto;
background: url("./assets/images/background.png");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论