提交 93476144 authored 作者: coderBryanFu's avatar coderBryanFu

update

上级 05fba319
......@@ -2,7 +2,7 @@
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" href="/logo.svg" type="image/svg+xml">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>某方向风险监测预警系统</title>
</head>
......
<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48.000000" height="48.000000" fill="none" customFrame="#000000">
<rect id="logo" width="48.000000" height="48.000000" x="0.000000" y="0.000000" />
<circle id="椭圆 4" cx="24" cy="24" r="24" fill="rgb(5,95,194)" />
<path id="多边形 2(边框)" d="M35.8806 15.2356C37.3616 16.013 38.2893 17.5475 38.2893 19.2201L38.2893 28.7796C38.2893 30.4522 37.3616 31.9868 35.8806 32.7641L26.0912 37.9022C24.7817 38.5895 23.2181 38.5895 21.9085 37.9022L12.1191 32.7641C10.6381 31.9868 9.71045 30.4522 9.71045 28.7796L9.71045 19.2201C9.71045 17.5475 10.6381 16.013 12.1191 15.2356L21.9085 10.0975C23.2181 9.4102 24.7817 9.4102 26.0912 10.0975L35.8806 15.2356ZM34.1378 18.5561L24.3484 13.4179C24.2939 13.3893 24.2375 13.3678 24.1794 13.3535C24.1214 13.3392 24.0615 13.332 23.9999 13.332C23.9382 13.332 23.8784 13.3392 23.8203 13.3535C23.7622 13.3678 23.7059 13.3893 23.6513 13.4179L13.8619 18.5561C13.8002 18.5884 13.7449 18.6277 13.696 18.6737C13.6471 18.7197 13.6047 18.7725 13.5686 18.8321C13.5326 18.8918 13.5055 18.9539 13.4875 19.0186C13.4695 19.0833 13.4604 19.1505 13.4604 19.2201L13.4605 28.7796C13.4605 28.8493 13.4695 28.9164 13.4875 28.9811C13.5055 29.0458 13.5326 29.1079 13.5686 29.1676C13.6047 29.2272 13.6471 29.28 13.696 29.326C13.7449 29.3721 13.8002 29.4113 13.8619 29.4436L23.6513 34.5818C23.7059 34.6104 23.7622 34.6319 23.8203 34.6462C23.8784 34.6605 23.9382 34.6677 23.9999 34.6677C24.0615 34.6677 24.1213 34.6605 24.1795 34.6462C24.2375 34.6319 24.2939 34.6104 24.3484 34.5818L34.1378 29.4436C34.1995 29.4113 34.2548 29.3721 34.3037 29.3261L34.3037 29.3261C34.3526 29.28 34.3951 29.2272 34.4311 29.1676C34.4672 29.1079 34.4942 29.0458 34.5123 28.9811L34.5123 28.981C34.5303 28.9164 34.5393 28.8492 34.5393 28.7796L34.5393 19.2201C34.5393 19.1505 34.5303 19.0833 34.5123 19.0186C34.4942 18.9539 34.4672 18.8918 34.4311 18.8321C34.3951 18.7725 34.3526 18.7197 34.3038 18.6737L34.3037 18.6736C34.2548 18.6276 34.1995 18.5884 34.1378 18.5561Z" fill="rgb(255,255,255)" fill-rule="evenodd" />
<rect id="矩形 4" width="29.250000" height="7.500000" x="9.375000" y="20.250000" fill="rgb(5,95,194)" />
<path id="椭圆 5(边框)" d="M24 18C27.3137 18 30 20.6863 30 24C30 27.3137 27.3137 30 24 30C20.6863 30 18 27.3137 18 24C18 20.6863 20.6863 18 24 18ZM24 21.75C23.8027 21.75 23.6118 21.7741 23.4271 21.8225L23.4271 21.8225C23.3246 21.8493 23.224 21.8836 23.1253 21.9253C23.013 21.9728 22.9059 22.0286 22.8041 22.0927L22.8041 22.0927C22.6622 22.182 22.5306 22.2875 22.409 22.409C22.2875 22.5305 22.1821 22.6622 22.0928 22.804C22.0286 22.9059 21.9728 23.013 21.9253 23.1253C21.8835 23.224 21.8493 23.3246 21.8224 23.4272L21.8224 23.4272C21.7741 23.6118 21.75 23.8027 21.75 24C21.75 24.1973 21.7741 24.3882 21.8224 24.5728L21.8225 24.5729C21.8493 24.6754 21.8836 24.776 21.9253 24.8746C21.9728 24.987 22.0286 25.0941 22.0927 25.1959L22.0928 25.1959L22.0928 25.196C22.1821 25.3378 22.2875 25.4695 22.409 25.591C22.5305 25.7125 22.6622 25.8179 22.8041 25.9073C22.9059 25.9714 23.013 26.0272 23.1253 26.0747C23.224 26.1164 23.3246 26.1507 23.4271 26.1775C23.6118 26.2258 23.8027 26.25 24 26.25C24.1973 26.25 24.3882 26.2259 24.5728 26.1776L24.5728 26.1776L24.5729 26.1775C24.6754 26.1507 24.776 26.1164 24.8746 26.0747C24.987 26.0272 25.0941 25.9714 25.196 25.9072C25.3378 25.8179 25.4695 25.7125 25.591 25.591C25.7125 25.4695 25.8179 25.3378 25.9072 25.196L25.9072 25.196C25.9714 25.0941 26.0272 24.987 26.0747 24.8747C26.1165 24.776 26.1507 24.6754 26.1776 24.5728C26.2259 24.3882 26.25 24.1973 26.25 24C26.25 23.8027 26.2258 23.6118 26.1775 23.4271C26.1507 23.3246 26.1164 23.224 26.0747 23.1253C26.0272 23.013 25.9714 22.9059 25.9072 22.8041L25.9072 22.804C25.8179 22.6622 25.7125 22.5305 25.591 22.409C25.4695 22.2875 25.3378 22.1821 25.196 22.0928L25.1959 22.0927C25.0941 22.0286 24.987 21.9728 24.8747 21.9253C24.776 21.8836 24.6754 21.8493 24.5729 21.8225L24.5728 21.8224C24.3882 21.7741 24.1973 21.75 24 21.75Z" fill="rgb(255,255,255)" fill-rule="evenodd" />
<rect id="矩形 3" width="3.750000" height="7.500000" x="22.125000" y="28.875000" fill="rgb(255,255,255)" />
</svg>
......@@ -22,7 +22,14 @@ const router = createRouter({
// 路由守卫 - 设置页面标题
router.beforeEach((to, from, next) => {
if (to.meta.title) {
if (to.meta.dynamicTitle) {
console.log('to', to);
document.title = window.sessionStorage.getItem("billId");
} else {
document.title = to.meta.title
}
}
next();
});
......
......@@ -22,7 +22,7 @@ const billRoutes = [
name: "BillHome",
component: BillHome,
meta: {
title: "法案首页"
title: "科技法案概览"
}
},
{
......@@ -41,26 +41,30 @@ const billRoutes = [
component: BillLayout,
redirect: "/billLayout/bill/introduction",
meta: {
title: "法案分析"
title: "法案分析",
dynamicTitle: true // 标记需要动态设置标题
},
children: [
{
path: "introduction",
name: "BillIntroduction",
component: BillIntroduction,
meta: { title: "法案简介" }
// meta: {
// title: "法案简介"
// }
},
{
path: "background",
name: "BillBackground",
component: BillBackground,
meta: { title: "法案背景" }
// meta: { title: "法案背景" }
},
{
path: "template",
name: "BillTemplate",
component: BillTemplate,
meta: { title: "内容概要" }
// meta: { title: "内容概要" }
}
]
},
......@@ -70,27 +74,27 @@ const billRoutes = [
name: "BillDeepDigLayout",
component: BillDeepDigLayout,
redirect: "/billLayout/deepDig/processOverview",
meta: {
title: "深度挖掘"
},
// meta: {
// title: "深度挖掘"
// },
children: [
{
path: "processOverview",
name: "BillDeepDigProcessOverview",
component: BillDeepDigProcessOverview,
meta: { title: "流程概要" }
// meta: { title: "流程概要" }
},
{
path: "processAnalysis",
name: "BillDeepDigProcessAnalysis",
component: BillDeepDigProcessAnalysis,
meta: { title: "流程分析" }
// meta: { title: "流程分析" }
},
{
path: "poliContribution",
name: "BillDeepDigPoliContribution",
component: BillDeepDigPoliContribution,
meta: { title: "政治献金" }
// meta: { title: "政治献金" }
}
]
},
......@@ -100,21 +104,21 @@ const billRoutes = [
name: "BillInfluenceLayout",
component: BillInfluenceLayout,
redirect: "/billLayout/influence/industry",
meta: {
title: "影响分析"
},
// meta: {
// title: "影响分析"
// },
children: [
{
path: "industry",
name: "BillInfluenceIndustry",
component: BillInfluenceIndustry,
meta: { title: "对华产业影响" }
// meta: { title: "对华产业影响" }
},
{
path: "scientificResearch",
name: "BillInfluenceScientificResearch",
component: BillInfluenceScientificResearch,
meta: { title: "对华科研影响" }
// meta: { title: "对华科研影响" }
}
]
},
......@@ -122,9 +126,9 @@ const billRoutes = [
path: "relevantCircumstance",
name: "BillRelevantCircumstance",
component: BillRelevantCircumstance,
meta: {
title: "相关情况"
}
// meta: {
// title: "相关情况"
// }
}
]
},
......
......@@ -22,19 +22,12 @@ const marketAccessRestrictionsRoutes = [
path: "/marketAccessLayout",
name: "MarketAccessLayout",
component: MarketAccessLayout,
redirect: "/marketAccessLayout/overview",
redirect: "/marketAccessLayout/case",
meta: {
title: "市场准入限制布局"
},
children: [
{
path: "overview",
name: "MarketAccessOverview",
component: MarketAccessOverview,
meta: {
title: "调查概况"
}
},
{
path: "case",
name: "MarketAccessCase",
......@@ -43,7 +36,14 @@ const marketAccessRestrictionsRoutes = [
title: "调查案件"
}
},
{
path: "overview",
name: "MarketAccessOverview",
component: MarketAccessOverview,
meta: {
title: "数据统计"
}
}
]
},
......
......@@ -14,7 +14,7 @@ const overViewRoutes = [
name: "overView",
component: overView,
meta: {
title: "中美博弈概览"
title: "中美科技博弈概览"
}
},
// GJ概览页面路由
......
......@@ -943,7 +943,18 @@ const curBill = ref({
// 查看详情
const handleClickToDetail = () => {
window.sessionStorage.setItem("billId", curBill.value.billId);
const route = router.resolve("/billLayout?billId=" + curBill.value.billId);
const route = router.resolve(
{
path: "/billLayout",
query: {
billId: curBill.value.billId,
},
}
);
console.log(route);
window.open(route.href, "_blank");
};
// 查看详情 传递参数
......
import * as echarts from "echarts";
const getBarChart = (nameList, valueList) => {
const option = {
tooltip: {},
grid: {
top: '8%',
right: '6%',
bottom: '6%',
left: '6%',
containLabel: true
},
yAxis: {
type: 'value',
splitLine: {
show: false
},
show: false
},
xAxis: {
type: 'category',
data: nameList.map(item => {
return item.name
}),
splitLine: {
show: false
},
axisTick: {
show: false
},
axisLine: {
show: false
},
axisLabel: {
show: true
}
},
series: [{
type: 'bar',
data: valueList,
label: {
show: true,
position: 'top',
textStyle: {
color: 'rgba(5, 95, 194, 1)',
fontSize: 16,
fontWeight: 700,
fontFamily: 'Microsoft YaHei'
},
formatter: function (params) {
return params.value
}
},
barWidth: 20,
markPoint: {
symbol: 'circle',
symbolSize: 0,
data: (function () {
const data = [];
nameList.forEach((item, index) => {
data.push({
name: 'icon',
// value: '',
xAxis: index,
yAxis: valueList[index],
symbol: `image://${item.img}`,
symbolSize: [20, 20],
symbolOffset: [0, 10]
});
});
return data;
})()
},
itemStyle: {
color: function (params) {
return new echarts.graphic.LinearGradient(0, 1, 0, 0,
[{
offset: 0,
color: 'rgba(5, 95, 194, 0)'
},
{
offset: 1,
color: 'rgba(5, 95, 194, 1)'
}
]);
},
barBorderRadius: [10, 10, 4, 4],
}
}]
}
return option
}
export default getBarChart
\ No newline at end of file
......@@ -40,7 +40,7 @@ const getMultiLineChart = (data) => {
],
series: [
{
name: data.data[0].name,
name: data.data[0]?.name,
type: 'line',
areaStyle: {
......@@ -55,10 +55,10 @@ const getMultiLineChart = (data) => {
emphasis: {
focus: 'series'
},
data: data.data[0].value
data: data.data[0]?.value
},
{
name: data.data[1].name,
name: data.data[1]?.name,
type: 'line',
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
......@@ -72,10 +72,10 @@ const getMultiLineChart = (data) => {
emphasis: {
focus: 'series'
},
data: data.data[1].value,
data: data.data[1]?.value,
},
{
name: data.data[2].name,
name: data.data[2]?.name,
type: 'line',
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
......@@ -89,7 +89,7 @@ const getMultiLineChart = (data) => {
emphasis: {
focus: 'series'
},
data: data.data[2].value,
data: data.data[2]?.value,
}
]
}
......
const getPieChart = (data,colorList) => {
const getPieChart = (data) => {
let option = {
color: colorList,
// color: colorList,
series: [
{
type: 'pie',
radius: [70, 100],
height: '100%',
left: 'center',
width: '100%',
itemStyle: {
borderColor: '#fff',
borderWidth: 1
},
label: {
alignTo: 'edge',
formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
minMargin: 5,
edgeDistance: 10,
lineHeight: 15,
rich: {
time: {
fontSize: 10,
color: '#999'
type: 'pie',
radius: [90, 115],
height: '100%',
left: 'center',
width: '100%',
itemStyle: {
borderColor: '#fff',
borderWidth: 1
},
label: {
alignTo: 'edge',
formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
minMargin: 5,
edgeDistance: 10,
lineHeight: 25,
rich: {
name: {
color: 'rgba(59, 65, 75, 1)',
fontFamily: 'Microsoft YaHei',
fontSize: 16,
fontWeight: 'bold',
},
time: {
fontSize: 16,
fontFamily: 'Microsoft YaHei',
color: '#rgba(95, 101, 108, 1)'
}
}
}
},
labelLine: {
length: 15,
length2: 0,
maxSurfaceAngle: 80
},
labelLayout: function (params) {
const isLeft = params.labelRect.x < 556 / 2;
const points = params.labelLinePoints;
// Update the end point.
points[2][0] = isLeft
? params.labelRect.x
: params.labelRect.x + params.labelRect.width;
return {
labelLinePoints: points
};
},
data: data
}]
},
labelLine: {
length: 15,
length2: 0,
maxSurfaceAngle: 80
},
labelLayout: function (params) {
const isLeft = params.labelRect.x < 556 / 2;
const points = params.labelLinePoints;
// Update the end point.
points[2][0] = isLeft
? params.labelRect.x
: params.labelRect.x + params.labelRect.width;
return {
labelLinePoints: points
};
},
data: data
}]
}
return option
}
......
......@@ -59,18 +59,19 @@ import { useRoute } from "vue-router";
const route = useRoute();
const btnList = ref([
{
name: "调查概况",
icon: icon1,
acitveIcon: icon1Active,
path: "/marketAccessLayout/overview"
},
{
name: "调查案件",
icon: icon2,
acitveIcon: icon2Active,
path: "/marketAccessLayout/case"
}
},
{
name: "数据统计",
icon: icon1,
acitveIcon: icon1Active,
path: "/marketAccessLayout/overview"
},
]);
const curSurvey = computed(() => {
......@@ -95,7 +96,7 @@ const curSurvey = computed(() => {
}
});
const activeBtnName = ref("调查概况");
const activeBtnName = ref("调查案件");
const handleClickBtn = item => {
activeBtnName.value = item.name;
......@@ -107,7 +108,13 @@ const handleClickBtn = item => {
});
};
onMounted(() => {});
onMounted(() => {
if(route.path === '/marketAccessLayout/overview') {
activeBtnName.value = '数据统计'
} else {
activeBtnName.value = '调查案件'
}
});
</script>
......
......@@ -3,6 +3,18 @@ import * as echarts from "echarts";
const getBarChart = (nameList, valueList) => {
const option = {
tooltip: {},
title: {
text: '单位:万人',
left: 660,
top: 10,
textStyle: {
color: 'rgba(95, 101, 108, 1)',
fontSize: 14,
fontFamily: 'Microsoft YaHei',
fontstyle: 'Regular',
fontWeight: 'normal'
}
},
grid: {
top: '5%',
right: '3%',
......
......@@ -16,6 +16,7 @@
class="nav-item"
:class="{ navItemActive: item.isActive }"
v-for="(item, index) in navList"
v-show="item.isShow"
:key="index"
@click="handleClickNav(index)"
>
......@@ -64,26 +65,29 @@ import { useRoute } from "vue-router";
const route = useRoute();
const navList = ref([
{
name: "调查简介",
name: "调查概况",
icon: NavIcon1,
activeIcon: NavIcon1Active,
isActive: true,
isShow: true,
path: "/marketSingleCaseLayout/overview"
},
{
name: route.query.id === "337" ? "深度挖掘" : "报告解析",
name: "报告解析",
icon: NavIcon2,
activeIcon: NavIcon2Active,
isActive: false,
isShow: route.query.id === '337',
path: "/marketSingleCaseLayout/deepdig"
},
{
name: "影响分析",
icon: NavIcon3,
activeIcon: NavIcon3Active,
isActive: false,
isShow: true,
path: "/marketSingleCaseLayout/deepdig"
}
// {
// name: "影响分析",
// icon: NavIcon3,
// activeIcon: NavIcon3Active,
// isActive: false,
// path: "/marketSingleCaseLayout/deepdig"
// }
]);
const handleClickNav = index => {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论