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

update

上级 e08df9a5
...@@ -313,6 +313,10 @@ onMounted(() => { ...@@ -313,6 +313,10 @@ onMounted(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper { .wrapper {
width: 100%;
height: 100%;
overflow: hidden;
overflow-y: auto;
.box-header { .box-header {
position: relative; position: relative;
height: 48px; height: 48px;
...@@ -365,6 +369,9 @@ onMounted(() => { ...@@ -365,6 +369,9 @@ onMounted(() => {
box-sizing: border-box; box-sizing: border-box;
padding-left: 160px; padding-left: 160px;
display: flex; display: flex;
position: sticky;
top: 0;
z-index: 99999999;
.header-item { .header-item {
margin: 0 3px; margin: 0 3px;
} }
......
...@@ -110,8 +110,10 @@ onUnmounted(() => { ...@@ -110,8 +110,10 @@ onUnmounted(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.wrap { .wrap {
width: 1920px; width: 100%;
height: 100%; height: 100%;
overflow: hidden;
overflow-y: auto;
background-image: url("./assets/images/bg.png"); background-image: url("./assets/images/bg.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% auto; background-size: 100% auto;
......
...@@ -1142,7 +1142,7 @@ const billList = ref([]); ...@@ -1142,7 +1142,7 @@ const billList = ref([]);
const curBillListIndex = ref(0); const curBillListIndex = ref(0);
const searchExportControlText = ref(""); 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([]); const infoList = ref([]);
......
...@@ -1272,7 +1272,7 @@ const handleGetBox7Data = async () => { ...@@ -1272,7 +1272,7 @@ const handleGetBox7Data = async () => {
box7Data.value.title = res.data.map(item => { box7Data.value.title = res.data.map(item => {
return { return {
name: item.COUNTRY, name: item.COUNTRY,
img: item.IMAGE ? item.IMAGE : Img1 img: item.COUNTRYIMAGE ? item.COUNTRYIMAGE : Img1
}; };
}); });
box7Data.value.data = res.data.map(item => { box7Data.value.data = res.data.map(item => {
......
import { symbolCircle } from "d3";
import * as echarts from "echarts"; import * as echarts from "echarts";
const getBarChart = (nameList, valueList) => { const getBarChart = (nameList, valueList) => {
...@@ -65,7 +66,12 @@ const getBarChart = (nameList, valueList) => { ...@@ -65,7 +66,12 @@ const getBarChart = (nameList, valueList) => {
yAxis: valueList[index], yAxis: valueList[index],
symbol: `image://${item.img}`, symbol: `image://${item.img}`,
symbolSize: [20, 20], symbolSize: [20, 20],
symbolOffset: [0, 10] symbolOffset: [0, 10],
// itemStyle: {
// borderRadius: 10, // 设置为圆形
// borderColor: '#fff',
// borderWidth: 2
// }
}); });
}); });
return data; return data;
......
...@@ -25,9 +25,8 @@ ...@@ -25,9 +25,8 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<el-row :gutter="20"> <div class="left">
<el-col :span="17"> <custom-container style="margin-bottom: 16px" block title="新闻内容" :titleIcon="houseIcon" height="1180px">
<custom-container block title="新闻内容" :titleIcon="houseIcon" height="1180px">
<template #header-right> <template #header-right>
<div class="page-content-right-switch"> <div class="page-content-right-switch">
<el-switch v-model="highlightEntities" /> <el-switch v-model="highlightEntities" />
...@@ -130,10 +129,14 @@ ...@@ -130,10 +129,14 @@
</div> </div>
</template> </template>
</custom-container> </custom-container>
</el-col> <custom-container block title="关系图谱" :titleIcon="linkIcon" height="500px">
<template #default>
<el-col :span="7"> <Graph />
<custom-container block title="事件脉络" :titleIcon="houseIcon" height="630px"> </template>
</custom-container>
</div>
<div class="right">
<custom-container style="margin-bottom: 16px" block title="事件脉络" :titleIcon="houseIcon" height="630px">
<template #default> <template #default>
<div class="box4"> <div class="box4">
<div class="box4-item" v-for="(item, idx) in sanctionProcessList" :key="item.title"> <div class="box4-item" v-for="(item, idx) in sanctionProcessList" :key="item.title">
...@@ -162,18 +165,7 @@ ...@@ -162,18 +165,7 @@
</div> </div>
</template> </template>
</custom-container> </custom-container>
</el-col> </div>
</el-row>
<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>
</div> </div>
</div> </div>
</template> </template>
...@@ -350,7 +342,9 @@ onMounted(() => { ...@@ -350,7 +342,9 @@ onMounted(() => {
.page-container { .page-container {
/* padding: 20px; */ /* padding: 20px; */
width: 100%; width: 100%;
overflow-x: hidden; height: 100%;
overflow: hidden;
overflow-y: auto;
} }
.page-header { .page-header {
...@@ -446,6 +440,14 @@ onMounted(() => { ...@@ -446,6 +440,14 @@ onMounted(() => {
.page-content { .page-content {
padding: 20px 160px; padding: 20px 160px;
display: flex;
gap: 17px;
.left {
width: 1063px;
}
.right {
width: 520px;
}
&-news-abstract { &-news-abstract {
height: 260px; height: 260px;
width: 100%; width: 100%;
......
...@@ -206,8 +206,8 @@ const handleActiveModule = (isIn, module) => { ...@@ -206,8 +206,8 @@ const handleActiveModule = (isIn, module) => {
}; };
const handleToWorldHot = () => { const handleToWorldHot = () => {
showPage.value = 'subject' showPage.value = "subject";
moduleActiveId.value = '' moduleActiveId.value = "";
}; };
onMounted(() => { onMounted(() => {
...@@ -225,5 +225,7 @@ onMounted(() => { ...@@ -225,5 +225,7 @@ onMounted(() => {
background-position: center -100px; background-position: center -100px;
background-size: 100% 100%; background-size: 100% 100%;
padding-top: 50px; padding-top: 50px;
overflow: hidden;
overflow-y: auto;
} }
</style> </style>
...@@ -733,8 +733,11 @@ onMounted(async () => { ...@@ -733,8 +733,11 @@ onMounted(async () => {
} }
.home-wrapper { .home-wrapper {
width: 100%;
height: 100%;
overflow: hidden;
overflow-y: auto;
.home-main { .home-main {
// width: 1400px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
background: url("./assets/images/background.png"); background: url("./assets/images/background.png");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论