提交 4b3df7bc authored 作者: coderBryanFu's avatar coderBryanFu

update

上级 4b2ec62b
......@@ -11,13 +11,14 @@ import BillLayout from '@/views/bill/index.vue'
import BillIntroduction from '@/views/bill/introdoction/index.vue'
import BillBackground from '@/views/bill/background/index.vue'
import BillTemplate from '@/views/bill/template/index.vue'
import DeepDigLayout from '@/views/bill/deepDig/index.vue'
import DeepDigProcessOverview from '@/views/bill/deepDig/processOverview/index.vue'
import DeepDigProcessAnalysis from '@/views/bill/deepDig/processAnalysis/index.vue'
import DeepDigProgressOverview from '@/views/bill/deepDig/progressAnalysis/index.vue'
import InfluenceLayout from '@/views/bill/influence/index.vue'
import InfluenceIndustry from '@/views/bill/influence/industry/index.vue'
import InfluenceScientificResearch from '@/views/bill/influence/scientificResearch/index.vue'
import BillDeepDigLayout from '@/views/bill/deepDig/index.vue'
import BillDeepDigProcessOverview from '@/views/bill/deepDig/processOverview/index.vue'
import BillDeepDigProcessAnalysis from '@/views/bill/deepDig/processAnalysis/index.vue'
import BillDeepDigProgressOverview from '@/views/bill/deepDig/progressAnalysis/index.vue'
import BillInfluenceLayout from '@/views/bill/influence/index.vue'
import BillInfluenceIndustry from '@/views/bill/influence/industry/index.vue'
import BillInfluenceScientificResearch from '@/views/bill/influence/scientificResearch/index.vue'
import BillRelevantCircumstance from '@/views/bill/relevantCircumstance/index.vue'
// 出口管制
import ExportControl from '@/views/exportControl/index.vue'
......@@ -25,7 +26,7 @@ import ExportControl from '@/views/exportControl/index.vue'
// 政令
import Decree from '@/views/decree/decreeHome/index.vue'
import DecreeLayoutContainer from '@/views/decree/decreeLayout/index.vue'
import OverviewLayout from '@/views/decree/decreeLayout/overview/index.vue'
import DecreeOverviewLayout from '@/views/decree/decreeLayout/overview/index.vue'
import DecreeIntroduction from '@/views/decree/decreeLayout/overview/introduction/index.vue'
import DecreeBackground from '@/views/decree/decreeLayout/overview/background/index.vue'
import DecreeDeepDig from '@/views/decree/decreeLayout/deepdig/index.vue'
......@@ -128,8 +129,8 @@ const routes = [
// 深度挖掘路由
{
path: 'deepDig',
name: 'DeepDigLayout',
component: DeepDigLayout,
name: 'BillDeepDigLayout',
component: BillDeepDigLayout,
redirect: '/billLayout/deepDig/processOverview',
meta: {
title: '深度挖掘'
......@@ -137,20 +138,20 @@ const routes = [
children: [
{
path: 'processOverview',
name: 'DeepDigProcessOverview',
component: DeepDigProcessOverview,
name: 'BillDeepDigProcessOverview',
component: BillDeepDigProcessOverview,
meta: { title: '流程概要' }
},
{
path: 'processAnalysis',
name: 'DeepDigProcessAnalysis',
component: DeepDigProcessAnalysis,
name: 'BillDeepDigProcessAnalysis',
component: BillDeepDigProcessAnalysis,
meta: { title: '流程分析' }
},
{
path: 'progressAnalysis',
name: 'DeepDigProgressAnalysis',
component: DeepDigProgressOverview,
component: BillDeepDigProgressOverview,
meta: { title: '进程分析' }
},
]
......@@ -158,8 +159,8 @@ const routes = [
// 影响分析路由
{
path: 'influence',
name: 'InfluenceLayout',
component: InfluenceLayout,
name: 'BillInfluenceLayout',
component: BillInfluenceLayout,
redirect: '/billLayout/influence/industry',
meta: {
title: '影响分析'
......@@ -167,17 +168,25 @@ const routes = [
children: [
{
path: 'industry',
name: 'InfluenceIndustry',
component: InfluenceIndustry,
name: 'BillInfluenceIndustry',
component: BillInfluenceIndustry,
meta: { title: '对华产业影响' }
},
{
path: 'scientificResearch',
name: 'InfluenceScientificResearch',
component: InfluenceScientificResearch,
name: 'BillInfluenceScientificResearch',
component: BillInfluenceScientificResearch,
meta: { title: '对华科研影响' }
}
]
},
{
path: 'relevantCircumstance',
name: 'BillRelevantCircumstance',
component: BillRelevantCircumstance,
meta: {
title: '相关情况'
}
}
]
},
......@@ -212,8 +221,8 @@ const routes = [
children: [
{
path: 'overview',
name: 'OverviewLayout',
component: OverviewLayout,
name: 'DecreeOverviewLayout',
component: DecreeOverviewLayout,
redirect: '/decreeLayout/overview/introduction',
meta: {
title: '政令概况'
......@@ -250,7 +259,7 @@ const routes = [
meta: {
title: '影响分析'
},
}
]
},
......@@ -317,12 +326,12 @@ const routes = [
title: '深度挖掘'
},
},
]
},
]
const router = createRouter({
......
......@@ -210,7 +210,7 @@ const mainHeaderBtnList = ref([
icon: icon4,
activeIcon: icon4Active,
name: "相关情况",
path: "/billLayout/bill",
path: "/billLayout/relevantCircumstance",
},
]);
......@@ -239,10 +239,8 @@ onMounted(() => {
<style lang="scss" scoped>
.layout-container {
width: 1920px;
height: 1080px;
// width: 100vw;
// height: 100vh;
// overflow: auto;
// height: 1080px;
height: 1016px;
background: rgba(249, 250, 252, 1);
position: relative;
.layout-header {
......
差异被折叠。
const getGraphChart = (nodes, links) => {
const option = {
// title: {
// text: '企业关系网络',
// subtext: '节点图标表示企业,箭头表示关联方向',
// top: 'top',
// left: 'center',
// textStyle: {
// fontSize: 20,
// color: '#2c3e50'
// }
// },
// tooltip: {
// formatter: function (params) {
// if (params.dataType === 'node') {
// return `<div style="font-weight:bold;margin-bottom:5px">${params.data.name}</div>
// <div>类别: ${categories[params.data.category].name}</div>
// <div>关联度: ${params.data.value}</div>`;
// } else {
// return `<div>${nodes[params.data.source].name} → ${nodes[params.data.target].name}</div>
// <div>关联强度: ${params.data.value}</div>`;
// }
// }
// },
legend: {
// data: categories.map(c => c.name),
show: false,
top: 40,
textStyle: {
fontSize: 12
}
},
animation: true,
animationDuration: 1000,
animationEasing: 'cubicOut',
series: [{
type: 'graph',
itemStyle: {
color: '#73C0DE'
},
layout: 'force',
data: nodes,
links: links,
// categories: categories,
roam: true,
label: {
show: true,
position: 'bottom',
formatter: '{b}',
fontSize: 12,
fontWeight: 'bold',
// backgroundColor: 'rgba(255,255,255,0.8)',
padding: [4, 6],
borderRadius: 4
},
lineStyle: {
color: 'source',
curveness: 0,
width: 2,
type: 'dashed',
color: '#AED6FF'
},
edgeSymbol: ['none', 'arrow'],
edgeSymbolSize: [0, 10],
emphasis: {
focus: 'adjacency',
lineStyle: {
width: 4
},
label: {
show: true,
fontSize: 14
}
},
force: {
repulsion: 300,
gravity: 0,
edgeLength: 300
}
}],
// color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de']
};
return option
}
export default getGraphChart
\ No newline at end of file
const getTreeChart = (treeData) => {
const option = {
series: [{
type: 'tree',
layout: 'orthogonal', // 从上到下布局
orient: 'TB', // Top to Bottom
data: treeData,
top: '10%',
bottom: '5%',
left: '10%',
right: '10%',
symbol: 'circle',
symbolSize: 40,
label: {
position: 'bottom',
verticalAlign: 'middle',
align: 'center'
},
leaves: {
label: {
position: 'top',
verticalAlign: 'middle',
align: 'center'
}
},
lineStyle: {
color: '#ccc',
width: 2,
type: 'dashed' // 虚线
},
emphasis: {
focus: 'descendant'
},
expandAndCollapse: false,
initialTreeDepth: 3
}]
};
return option
}
export default getTreeChart
\ No newline at end of file
......@@ -814,69 +814,45 @@ const curDecreeList = ref([
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
title: "为国家安全部署先进核反应堆技术",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
title: "修改对等关税税率以反映与中华人民共和国会谈情况的行政令",
time: "2025年9月15日",
},
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
title: "调整互惠关税范围,并制定实施贸易和安全协议的程序",
time: "2025年9月15日",
},
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
title: "持续努力加强国家网络安全,并修订第13694号行政命令和第14144号行政命令",
time: "2025年9月14日",
},
{
type: "总统政令",
type: "总统备忘录",
status: 3,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
title: "通过第232条款行动确保加工关键矿物及衍生产品的国家安全与经济韧性",
time: "2025年9月14日",
},
{
type: "总统政令",
type: "提名与任命",
status: 2,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 3,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 3,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
title: "终止对不可靠、非受控能源的市场扭曲补贴",
time: "2025年9月11日",
},
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
title: "对所有国家暂停免关税待遇",
time: "2025年9月6日",
}
]);
const releaseTime = ref("近一年发布");
......@@ -931,11 +907,7 @@ const activeHylyId = ref("");
// };
const handleClickCate = (cate) => {
console.log(cate);
activeCate.value = cate.hylymc;
activeHylyId.value = cate.hylyid;
handleGetBillsByType();
activeCate.value = cate;
};
const activeNavIndex = ref(0);
......@@ -2217,9 +2189,11 @@ onMounted(async () => {
display: flex;
justify-content: space-between;
.btn-box {
margin-top: 10px;
width: 1000px;
display: flex;
.btn {
height: 42px;
color: rgba(95, 101, 108, 1);
font-family: Microsoft YaHei;
font-size: 16px;
......@@ -2254,17 +2228,17 @@ onMounted(async () => {
}
.home-main-footer-main {
width: 1600px;
height: 687px;
height: 685px;
box-shadow: 0px 0px 15px 0px rgba(60, 87, 126, 0.2);
background: rgba(255, 255, 255, 1);
margin: 0 auto;
box-sizing: border-box;
padding: 20px;
padding: 10px 20px 0 20px;
overflow-y: auto;
.main-item {
display: flex;
height: 84px;
border-top: 1px solid rgba(234, 236, 238, 1);
border-bottom: 1px solid rgba(234, 236, 238, 1);
.main-item-left {
width: 105px;
.left-box {
......
......@@ -241,7 +241,7 @@
<el-select
v-model="curAreaYear"
placeholder="选择发布时间"
style="width: 120px"
style="width: 100px"
>
<el-option
v-for="item in areaYearList"
......@@ -1444,9 +1444,10 @@ onMounted(async () => {
box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
background: rgba(255, 255, 255, 1);
.box4-header {
width: 452px;
margin: 0 auto;
width: 521px;
height: 53px;
box-sizing: border-box;
padding: 0 20px;
border-bottom: 1px solid rgba(240, 242, 244, 1);
display: flex;
position: relative;
......@@ -1461,7 +1462,7 @@ onMounted(async () => {
}
.header-title {
margin-top: 16px;
margin-left: 26px;
margin-left: 15px;
height: 22px;
color: rgba(20, 89, 187, 1);
font-family: Microsoft YaHei;
......@@ -1471,7 +1472,7 @@ onMounted(async () => {
}
.box4-header-right {
position: absolute;
right: 0;
right: 20px;
top: 10px;
}
}
......
......@@ -12,6 +12,7 @@ const getBarChart1 = (nameList, valueList) => {
},
xAxis: {
type: 'value',
splitLine: {
show: false
},
......@@ -20,6 +21,7 @@ const getBarChart1 = (nameList, valueList) => {
yAxis: {
type: 'category',
data: nameList,
inverse: true,
splitLine: {
show: false
},
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论