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

update

上级 4b2ec62b
...@@ -11,13 +11,14 @@ import BillLayout from '@/views/bill/index.vue' ...@@ -11,13 +11,14 @@ import BillLayout from '@/views/bill/index.vue'
import BillIntroduction from '@/views/bill/introdoction/index.vue' import BillIntroduction from '@/views/bill/introdoction/index.vue'
import BillBackground from '@/views/bill/background/index.vue' import BillBackground from '@/views/bill/background/index.vue'
import BillTemplate from '@/views/bill/template/index.vue' import BillTemplate from '@/views/bill/template/index.vue'
import DeepDigLayout from '@/views/bill/deepDig/index.vue' import BillDeepDigLayout from '@/views/bill/deepDig/index.vue'
import DeepDigProcessOverview from '@/views/bill/deepDig/processOverview/index.vue' import BillDeepDigProcessOverview from '@/views/bill/deepDig/processOverview/index.vue'
import DeepDigProcessAnalysis from '@/views/bill/deepDig/processAnalysis/index.vue' import BillDeepDigProcessAnalysis from '@/views/bill/deepDig/processAnalysis/index.vue'
import DeepDigProgressOverview from '@/views/bill/deepDig/progressAnalysis/index.vue' import BillDeepDigProgressOverview from '@/views/bill/deepDig/progressAnalysis/index.vue'
import InfluenceLayout from '@/views/bill/influence/index.vue' import BillInfluenceLayout from '@/views/bill/influence/index.vue'
import InfluenceIndustry from '@/views/bill/influence/industry/index.vue' import BillInfluenceIndustry from '@/views/bill/influence/industry/index.vue'
import InfluenceScientificResearch from '@/views/bill/influence/scientificResearch/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' import ExportControl from '@/views/exportControl/index.vue'
...@@ -25,7 +26,7 @@ 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 Decree from '@/views/decree/decreeHome/index.vue'
import DecreeLayoutContainer from '@/views/decree/decreeLayout/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 DecreeIntroduction from '@/views/decree/decreeLayout/overview/introduction/index.vue'
import DecreeBackground from '@/views/decree/decreeLayout/overview/background/index.vue' import DecreeBackground from '@/views/decree/decreeLayout/overview/background/index.vue'
import DecreeDeepDig from '@/views/decree/decreeLayout/deepdig/index.vue' import DecreeDeepDig from '@/views/decree/decreeLayout/deepdig/index.vue'
...@@ -128,8 +129,8 @@ const routes = [ ...@@ -128,8 +129,8 @@ const routes = [
// 深度挖掘路由 // 深度挖掘路由
{ {
path: 'deepDig', path: 'deepDig',
name: 'DeepDigLayout', name: 'BillDeepDigLayout',
component: DeepDigLayout, component: BillDeepDigLayout,
redirect: '/billLayout/deepDig/processOverview', redirect: '/billLayout/deepDig/processOverview',
meta: { meta: {
title: '深度挖掘' title: '深度挖掘'
...@@ -137,20 +138,20 @@ const routes = [ ...@@ -137,20 +138,20 @@ const routes = [
children: [ children: [
{ {
path: 'processOverview', path: 'processOverview',
name: 'DeepDigProcessOverview', name: 'BillDeepDigProcessOverview',
component: DeepDigProcessOverview, component: BillDeepDigProcessOverview,
meta: { title: '流程概要' } meta: { title: '流程概要' }
}, },
{ {
path: 'processAnalysis', path: 'processAnalysis',
name: 'DeepDigProcessAnalysis', name: 'BillDeepDigProcessAnalysis',
component: DeepDigProcessAnalysis, component: BillDeepDigProcessAnalysis,
meta: { title: '流程分析' } meta: { title: '流程分析' }
}, },
{ {
path: 'progressAnalysis', path: 'progressAnalysis',
name: 'DeepDigProgressAnalysis', name: 'DeepDigProgressAnalysis',
component: DeepDigProgressOverview, component: BillDeepDigProgressOverview,
meta: { title: '进程分析' } meta: { title: '进程分析' }
}, },
] ]
...@@ -158,8 +159,8 @@ const routes = [ ...@@ -158,8 +159,8 @@ const routes = [
// 影响分析路由 // 影响分析路由
{ {
path: 'influence', path: 'influence',
name: 'InfluenceLayout', name: 'BillInfluenceLayout',
component: InfluenceLayout, component: BillInfluenceLayout,
redirect: '/billLayout/influence/industry', redirect: '/billLayout/influence/industry',
meta: { meta: {
title: '影响分析' title: '影响分析'
...@@ -167,17 +168,25 @@ const routes = [ ...@@ -167,17 +168,25 @@ const routes = [
children: [ children: [
{ {
path: 'industry', path: 'industry',
name: 'InfluenceIndustry', name: 'BillInfluenceIndustry',
component: InfluenceIndustry, component: BillInfluenceIndustry,
meta: { title: '对华产业影响' } meta: { title: '对华产业影响' }
}, },
{ {
path: 'scientificResearch', path: 'scientificResearch',
name: 'InfluenceScientificResearch', name: 'BillInfluenceScientificResearch',
component: InfluenceScientificResearch, component: BillInfluenceScientificResearch,
meta: { title: '对华科研影响' } meta: { title: '对华科研影响' }
} }
] ]
},
{
path: 'relevantCircumstance',
name: 'BillRelevantCircumstance',
component: BillRelevantCircumstance,
meta: {
title: '相关情况'
}
} }
] ]
}, },
...@@ -212,8 +221,8 @@ const routes = [ ...@@ -212,8 +221,8 @@ const routes = [
children: [ children: [
{ {
path: 'overview', path: 'overview',
name: 'OverviewLayout', name: 'DecreeOverviewLayout',
component: OverviewLayout, component: DecreeOverviewLayout,
redirect: '/decreeLayout/overview/introduction', redirect: '/decreeLayout/overview/introduction',
meta: { meta: {
title: '政令概况' title: '政令概况'
......
...@@ -210,7 +210,7 @@ const mainHeaderBtnList = ref([ ...@@ -210,7 +210,7 @@ const mainHeaderBtnList = ref([
icon: icon4, icon: icon4,
activeIcon: icon4Active, activeIcon: icon4Active,
name: "相关情况", name: "相关情况",
path: "/billLayout/bill", path: "/billLayout/relevantCircumstance",
}, },
]); ]);
...@@ -239,10 +239,8 @@ onMounted(() => { ...@@ -239,10 +239,8 @@ onMounted(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.layout-container { .layout-container {
width: 1920px; width: 1920px;
height: 1080px; // height: 1080px;
// width: 100vw; height: 1016px;
// height: 100vh;
// overflow: auto;
background: rgba(249, 250, 252, 1); background: rgba(249, 250, 252, 1);
position: relative; position: relative;
.layout-header { .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([ ...@@ -814,69 +814,45 @@ const curDecreeList = ref([
{ {
type: "总统政令", type: "总统政令",
status: 1, status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令", title: "为国家安全部署先进核反应堆技术",
time: "2025年9月16日", time: "2025年9月16日",
}, },
{ {
type: "总统政令", type: "总统政令",
status: 1, status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令", title: "修改对等关税税率以反映与中华人民共和国会谈情况的行政令",
time: "2025年9月16日", time: "2025年9月15日",
}, },
{ {
type: "总统政令", type: "总统政令",
status: 1, status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令", title: "调整互惠关税范围,并制定实施贸易和安全协议的程序",
time: "2025年9月16日", time: "2025年9月15日",
}, },
{ {
type: "总统政令", type: "总统政令",
status: 1, status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令", title: "持续努力加强国家网络安全,并修订第13694号行政命令和第14144号行政命令",
time: "2025年9月16日", time: "2025年9月14日",
}, },
{ {
type: "总统政令", type: "总统备忘录",
status: 3, status: 3,
title: "关于进一步延长TikTok执法宽限期的行政令", title: "通过第232条款行动确保加工关键矿物及衍生产品的国家安全与经济韧性",
time: "2025年9月16日", time: "2025年9月14日",
}, },
{ {
type: "总统政令", type: "提名与任命",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 2, status: 2,
title: "关于进一步延长TikTok执法宽限期的行政令", title: "终止对不可靠、非受控能源的市场扭曲补贴",
time: "2025年9月16日", time: "2025年9月11日",
}, },
{ {
type: "总统政令", type: "总统政令",
status: 1, status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令", title: "对所有国家暂停免关税待遇",
time: "2025年9月16日", time: "2025年9月6日",
}, }
{
type: "总统政令",
status: 3,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 3,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
{
type: "总统政令",
status: 1,
title: "关于进一步延长TikTok执法宽限期的行政令",
time: "2025年9月16日",
},
]); ]);
const releaseTime = ref("近一年发布"); const releaseTime = ref("近一年发布");
...@@ -931,11 +907,7 @@ const activeHylyId = ref(""); ...@@ -931,11 +907,7 @@ const activeHylyId = ref("");
// }; // };
const handleClickCate = (cate) => { const handleClickCate = (cate) => {
console.log(cate); activeCate.value = cate;
activeCate.value = cate.hylymc;
activeHylyId.value = cate.hylyid;
handleGetBillsByType();
}; };
const activeNavIndex = ref(0); const activeNavIndex = ref(0);
...@@ -2217,9 +2189,11 @@ onMounted(async () => { ...@@ -2217,9 +2189,11 @@ onMounted(async () => {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.btn-box { .btn-box {
margin-top: 10px;
width: 1000px; width: 1000px;
display: flex; display: flex;
.btn { .btn {
height: 42px;
color: rgba(95, 101, 108, 1); color: rgba(95, 101, 108, 1);
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-size: 16px; font-size: 16px;
...@@ -2254,17 +2228,17 @@ onMounted(async () => { ...@@ -2254,17 +2228,17 @@ onMounted(async () => {
} }
.home-main-footer-main { .home-main-footer-main {
width: 1600px; width: 1600px;
height: 687px; height: 685px;
box-shadow: 0px 0px 15px 0px rgba(60, 87, 126, 0.2); box-shadow: 0px 0px 15px 0px rgba(60, 87, 126, 0.2);
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
margin: 0 auto; margin: 0 auto;
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 10px 20px 0 20px;
overflow-y: auto; overflow-y: auto;
.main-item { .main-item {
display: flex; display: flex;
height: 84px; height: 84px;
border-top: 1px solid rgba(234, 236, 238, 1); border-bottom: 1px solid rgba(234, 236, 238, 1);
.main-item-left { .main-item-left {
width: 105px; width: 105px;
.left-box { .left-box {
......
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<el-select <el-select
v-model="curAreaYear" v-model="curAreaYear"
placeholder="选择发布时间" placeholder="选择发布时间"
style="width: 120px" style="width: 100px"
> >
<el-option <el-option
v-for="item in areaYearList" v-for="item in areaYearList"
...@@ -1444,9 +1444,10 @@ onMounted(async () => { ...@@ -1444,9 +1444,10 @@ onMounted(async () => {
box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1); box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
.box4-header { .box4-header {
width: 452px; width: 521px;
margin: 0 auto;
height: 53px; height: 53px;
box-sizing: border-box;
padding: 0 20px;
border-bottom: 1px solid rgba(240, 242, 244, 1); border-bottom: 1px solid rgba(240, 242, 244, 1);
display: flex; display: flex;
position: relative; position: relative;
...@@ -1461,7 +1462,7 @@ onMounted(async () => { ...@@ -1461,7 +1462,7 @@ onMounted(async () => {
} }
.header-title { .header-title {
margin-top: 16px; margin-top: 16px;
margin-left: 26px; margin-left: 15px;
height: 22px; height: 22px;
color: rgba(20, 89, 187, 1); color: rgba(20, 89, 187, 1);
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
...@@ -1471,7 +1472,7 @@ onMounted(async () => { ...@@ -1471,7 +1472,7 @@ onMounted(async () => {
} }
.box4-header-right { .box4-header-right {
position: absolute; position: absolute;
right: 0; right: 20px;
top: 10px; top: 10px;
} }
} }
......
...@@ -12,6 +12,7 @@ const getBarChart1 = (nameList, valueList) => { ...@@ -12,6 +12,7 @@ const getBarChart1 = (nameList, valueList) => {
}, },
xAxis: { xAxis: {
type: 'value', type: 'value',
splitLine: { splitLine: {
show: false show: false
}, },
...@@ -20,6 +21,7 @@ const getBarChart1 = (nameList, valueList) => { ...@@ -20,6 +21,7 @@ const getBarChart1 = (nameList, valueList) => {
yAxis: { yAxis: {
type: 'category', type: 'category',
data: nameList, data: nameList,
inverse: true,
splitLine: { splitLine: {
show: false show: false
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论