Skip to content

R
risk-monitor
提交 e08df9a5 authored 作者: coderBryanFu's avatar coderBryanFu
浏览文件
操作

update

上级 b6a34c45
显示空白字符变更
内嵌 并排
正在显示 包含 320 行增加 和 223 行删除
src/api/marketAccessRestrictions/index.js
浏览文件 @ e08df9a5
......@@ -73,6 +73,29 @@ export function getStatAreaCompanyList() {
})
}
// 受调查国家分布
/**
* @param {year, sortCode}
*/
export function getSearchCountry(params) {
return request({
method: 'GET',
url: `/api/marketsearchDetails/getSearchCountry`,
params
})
}
// 调查结果分布
/**
* @param {searchId, sortCode}
*/
export function getSearchResult(params) {
return request({
method: 'GET',
url: `/api/marketsearchDetails/searchResult`,
params
})
}
......
src/components/headerInfo.vue
浏览文件 @ e08df9a5
<template>
<div class="info-wrapper">
<div class="header-item">国家科技安全</div>
<div class="header-item">></div>
<!-- <div class="header-item">国家科技安全</div>
<div class="header-item">></div> -->
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div>
<div class="header-item">></div>
<div class="header-item">{{ curTitleName }}</div>
......
src/components/headerMenu.vue
浏览文件 @ e08df9a5
......@@ -244,7 +244,7 @@ const rightList = ref([
left: 0;
width: 100%;
height: 299px;
background: #fff;
background: rgb(249, 249, 249);
display: flex;
.left {
margin-top: 35px;
......
src/views/marketAccessRestrictions/marketAccessHome/index.vue
浏览文件 @ e08df9a5
......@@ -226,7 +226,7 @@
{{ item.signalLevel }}
</div>
<div class="item-right">
<el-popover
<!-- <el-popover
v-if="item.signalTitle?.length > 20"
effect="dark"
:width="480"
......@@ -241,8 +241,10 @@
</el-popover>
<div v-else class="text">
{{ item.signalTitle }}
</div> -->
<div class="text">
{{ item.signalTitle }}
</div>
<div class="time">{{ item.signalTime }}</div>
</div>
</div>
......@@ -282,11 +284,12 @@
<div class="title">{{ news.newsTitle }}</div>
<div class="time">{{ news.newsDate + " · " + news.newsOrg }}</div>
</div>
<el-popover effect="dark" :width="1000" :content="news.newsContent" placement="top-start">
<!-- <el-popover effect="dark" :width="1000" :content="news.newsContent" placement="top-start">
<template #reference>
<div class="right-footer">{{ news.newsContent }}</div>
</template>
</el-popover>
</el-popover> -->
<div class="right-footer">{{ news.newsContent }}</div>
</div>
</div>
</div>
......@@ -424,15 +427,9 @@
/>
</el-select>
</div>
<div class="box7-main-main" id="box7Chart"></div>
<!-- <div class="box7-main-left" id="box7Chart1"></div>
<div class="box7-main-right">
<div class="box7-main-right-top">
</div>
<div class="box7-main-right-main" id="box7Chart2"></div>
</div> -->
<el-empty v-if="box7Data.data.length === 0" description="暂无数据" :image-size="100" />
<div v-if="box7Data.data.length > 0" class="box7-main-main" id="box7Chart"></div>
</div>
</div>
<div class="box8">
......@@ -459,7 +456,8 @@
</el-select>
</div>
</div>
<div class="box8-main" id="box8Chart"></div>
<el-empty v-if="box8Data.length === 0" description="暂无数据" :image-size="100" />
<div v-if="box8Data.length" class="box8-main" id="box8Chart"></div>
</div>
</div>
</div>
......@@ -514,7 +512,6 @@
:key="year.id"
v-model="checkedSurveyYears"
:label="year.id"
style="width: 180px"
class="filter-checkbox"
@change="handleChangeCheckedSurveyYears"
>
......@@ -526,7 +523,7 @@
<div class="left-box2">
<div class="left-box2-header">
<div class="icon"></div>
<div class="title">{{ "涉及领域" }}</div>
<div class="title">{{ "科技领域" }}</div>
</div>
<div class="left-box2-main">
<div class="checkbox-group">
......@@ -535,7 +532,6 @@
:key="area.id"
v-model="checkedAreaList"
:label="area.id"
style="width: 110px"
class="filter-checkbox"
@change="handleChangeCheckedAreas"
>
......@@ -544,6 +540,46 @@
</div>
</div>
</div>
<div class="left-box2">
<div class="left-box2-header">
<div class="icon"></div>
<div class="title">{{ "发布机构" }}</div>
</div>
<div class="left-box2-main">
<div class="checkbox-group">
<el-checkbox
v-for="area in insList"
:key="area.id"
v-model="checkedInsList"
:label="area.id"
class="filter-checkbox"
@change="handleChangeCheckedIns"
>
{{ area.name }}
</el-checkbox>
</div>
</div>
</div>
<div class="left-box2">
<div class="left-box2-header">
<div class="icon"></div>
<div class="title">{{ "受调查国家/地区" }}</div>
</div>
<div class="left-box2-main">
<div class="checkbox-group">
<el-checkbox
v-for="area in countryList"
:key="area.id"
v-model="checkedCountryList"
:label="area.id"
class="filter-checkbox"
@change="handleChangeCheckedCountry"
>
{{ area.name }}
</el-checkbox>
</div>
</div>
</div>
</div>
<div class="right">
<div class="right-header">
......@@ -552,8 +588,11 @@
</div>
<div class="title">{{ "市场准入限制调查" }}</div>
</div>
<div class="right-main">
<el-empty v-if="surveyInfoList.length === 0" description="当前条件下暂无数据" :image-size="200" />
<div
v-else
class="item"
v-for="(item, index) in surveyInfoList"
:key="index"
......@@ -621,7 +660,7 @@ import router from "@/router";
import DivideHeader from "@/components/DivideHeader.vue";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import { getPersonSummaryInfo } from "@/api/common/index";
import getMultiLineChart from "./utils/multiLineChart";
import getPieChart from "./utils/piechart";
import getRadarChart from "./utils/radarChart";
......@@ -658,6 +697,8 @@ import {
getStatArea,
getHylyList,
getSurveyList,
getSearchCountry,
getSearchResult,
getStatAreaCompanyList,
getCompanyPlace
} from "@/api/marketAccessRestrictions/index";
......@@ -759,39 +800,17 @@ const handleGetBox2Data = async () => {
}
} catch (error) {}
};
// 点击风险信号条目，进入调查详情
const handleClickBox2Item = () => {};
// 新闻资讯
const newsList = ref([
{
img: News1,
title: "美政府停摆仍持续，拨款法案存缺陷，但两党磋商露曙光",
content: `美国政府停摆已持续34天，距离历史上最长的停摆纪录仅差一天，参议院已先后13次尝试...`,
from: "11-4 · 华盛顿邮报"
},
{
img: News2,
title: "美参议院通过决议，要求终止特朗普全球关税政策",
content: `参议院以51票赞成、47票反对通过一项决议，旨在终止特朗普实施的全面关税政策，四名......`,
from: "11-4 · 纽约时报"
},
{
img: News3,
title: "美众院通过950亿美元对外援助法案，包含对台军援",
content: `国会众议院在4月通过了大规模对外援助法案，其中包括为“印太安全”提供资金的条款，......`,
from: "11-3 · 洛杉矶时报"
},
{
img: News4,
title: "“大而美”法案在激烈争议中通过",
content: `特朗普力推的大规模税收与支出法案在国会以微弱优势通过。该法案因大幅削减医疗补助和......`,
from: "11-3 · 今日美国"
},
{
img: News5,
title: "美政府“停摆”追平历史最长纪录，民生多领域受重创",
content: `联邦政府“停摆”进入第35天，追平历史纪录。食品救济项目资金中断，数百万低收入民......`,
from: "11-2 · ​福克斯新闻网"
}
// {
// img: News1,
// title: "美政府停摆仍持续，拨款法案存缺陷，但两党磋商露曙光",
// content: `美国政府停摆已持续34天，距离历史上最长的停摆纪录仅差一天，参议院已先后13次尝试...`,
// from: "11-4 · 华盛顿邮报"
// },
]);
// 获取新闻资讯列表
const handleGetBox3Data = async () => {
......@@ -833,16 +852,58 @@ const handleGetBox4Data = async () => {
} catch (error) {}
};
// 点击人物头像，跳转到人物主页
const handleClickPerson = () => {
const handleClickPerson = async item => {
console.log("person", item);
const personTypeList = JSON.parse(window.sessionStorage.getItem("personTypeList"));
console.log("personTypeList", personTypeList);
let type;
let personTypeName = "";
const params = {
personId: item.personId
};
try {
const res = await getPersonSummaryInfo(params);
console.log("人物全局信息", res);
if (res.code === 200 && res.data) {
const arr = personTypeList.filter(item => {
return item.typeId === res.data.personType;
});
console.log("arr", arr);
if (arr && arr.length > 0) {
personTypeName = arr[0].typeName;
console.log("personTypeName", personTypeName);
if (personTypeName === "科技企业领袖") {
type = 1;
} else if (personTypeName === "国会议员") {
type = 2;
} else if (personTypeName === "智库研究人员") {
type = 3;
} else {
personTypeName = "";
ElMessage.warning("找不到当前人员的类型值！");
return;
}
window.sessionStorage.setItem("curTabName", item.personName);
const route = router.resolve({
path: "/characterPage",
query: {
type: 3 // 1 2 3
type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
personId: item.personId
}
});
window.open(route.href, "_blank");
} else {
personTypeName = "";
ElMessage.warning("找不到当前人员的类型值！");
return;
}
} else {
ElMessage.warning("找不到当前人员的类型值！");
return;
}
} catch (error) {}
};
// 调查数量
......@@ -952,7 +1013,7 @@ function transformAllData1(originalData) {
};
}
const chart1Data = ref({
const box5ChartData = ref({
title: ["2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024", "2025"],
data: [
{
......@@ -978,18 +1039,18 @@ const hadleGetStatNum = async () => {
console.log("调查数量", res);
if (res.code === 200 && res.data) {
if (box5BtnActive.value === 1) {
chart1Data.value = transformAllData1(res.data);
box5ChartData.value = transformAllData1(res.data);
} else {
chart1Data.value = transformAllData(res.data);
box5ChartData.value = transformAllData(res.data);
}
console.log("chart1Data", chart1Data.value);
console.log("box5ChartData", box5ChartData.value);
}
} catch (error) {}
};
const handleBox5 = async () => {
await hadleGetStatNum();
let chart1 = getMultiLineChart(chart1Data.value);
let chart1 = getMultiLineChart(box5ChartData.value);
setChart(chart1, "chart1");
};
......@@ -1108,29 +1169,28 @@ const handleGetStatArea = async () => {
}
} catch (error) {}
};
const handleBox6 = async () => {
await handleGetStatArea();
let chart2 = getRadarChart(box6Data.value);
setChart(chart2, "chart2");
};
// 收调查国家分布
const box7SurveyList = ref([
{
label: "337调查",
value: "337调查"
value: "337"
},
{
label: "301调查",
value: "301调查"
value: "301"
},
{
label: "232调查",
value: "232调查"
value: "232"
}
]);
const box7SelectedSurvey = ref("337调查");
const box7SelectedSurvey = ref("337");
const box7YearList = ref([
{
......@@ -1158,175 +1218,149 @@ const box7YearList = ref([
value: "2020"
}
]);
const box7SelectedYear = ref("2025");
const handleChangeBox7Survey = () => {
handleGetBox7Data();
handleBox7();
};
const handleChangeBox7Year = () => {
handleGetBox7Data();
handleBox7();
};
const box7Data = ref({
title: [
{
img: Img1,
name: "中国"
},
{
img: Img2,
name: "俄罗斯"
},
{
img: Img3,
name: "巴西"
},
{
img: Img4,
name: "巴基斯坦"
},
{
img: Img5,
name: "印度"
},
{
img: Img6,
name: "日本"
},
{
img: Img7,
name: "德国"
}
// {
// img: Img1,
// name: "中国"
// },
// {
// img: Img2,
// name: "俄罗斯"
// },
// {
// img: Img3,
// name: "巴西"
// },
// {
// img: Img4,
// name: "巴基斯坦"
// },
// {
// img: Img5,
// name: "印度"
// },
// {
// img: Img6,
// name: "日本"
// },
// {
// img: Img7,
// name: "德国"
// }
],
data: [23, 24, 14, 13, 12, 7, 5]
data: []
});
const handleGetBox7Data = async () => {};
// const box7Chart1Data = ref([
// {
// name: "337调查",
// data: [
// { name: "北京", value: 10, coord: [115.46, 39.92] },
// { name: "上海", value: 9, coord: [120.48, 31.22] },
// { name: "广东", value: 15, coord: [114.23, 23.16] },
// { name: "江苏", value: 30, coord: [117.78, 32.04] },
// { name: "浙江", value: 20, coord: [121.19, 30.26] },
// { name: "四川", value: 4, coord: [105.06, 30.67] },
// { name: "陕西", value: 1, coord: [106.95, 34.27] },
// { name: "辽宁", value: 3, coord: [122.38, 41.8] }
// ]
// },
// {
// name: "301调查",
// data: [
// { name: "北京", value: 10, coord: [112.48, 38.95] },
// { name: "上海", value: 9, coord: [121.5, 33.25] },
// { name: "广东", value: 15, coord: [118.25, 21.18] },
// { name: "江苏", value: 30, coord: [115.8, 34.06] },
// { name: "浙江", value: 20, coord: [124.21, 31.28] },
// { name: "四川", value: 4, coord: [114.08, 32.69] },
// { name: "陕西", value: 1, coord: [109.97, 30.29] },
// { name: "辽宁", value: 3, coord: [113.4, 40.82] }
// ]
// },
// {
// name: "232调查",
// data: [
// { name: "北京", value: 10, coord: [116.44, 39.9] },
// { name: "上海", value: 9, coord: [121.46, 31.2] },
// { name: "广东", value: 15, coord: [113.21, 23.14] },
// { name: "江苏", value: 30, coord: [118.76, 32.02] },
// { name: "浙江", value: 20, coord: [120.19, 30.24] },
// { name: "四川", value: 4, coord: [104.04, 30.67] },
// { name: "陕西", value: 1, coord: [108.95, 34.25] },
// { name: "辽宁", value: 3, coord: [123.36, 41.8] }
// ]
// }
// ]);
// const box7Chart2Data = ref([]);
// const handleGetBox7Data2 = async () => {
// const params = {
// years: box7SelectedYear.value
// };
// try {
// const res = await getCompanyPlace(params);
// console.log("企业地域分布", res);
// if (res.code === 200 && res.data) {
// box7Chart2Data.value = res.data
// .filter(item => {
// return item.ORGPROVINCE;
// })
// .map(item => {
// return {
// name: item.ORGPROVINCE,
// value: item.PROVINCECOUNT
// };
// });
// let box7Chart2 = getBarChart(box7Chart2Data.value);
// setChart(box7Chart2, "box7Chart2");
// } else {
// box7Chart2Data.value = [];
// }
// } catch (error) {}
// };
// handleGetBox7Data2();
const handleGetBox7Data = async () => {
const params = {
sortCode: box7SelectedSurvey.value,
year: box7SelectedYear.value
};
try {
const res = await getSearchCountry(params);
console.log("受调查国家分布", res);
if (res.code === 200 && res.data) {
box7Data.value.title = res.data.map(item => {
return {
name: item.COUNTRY,
img: item.IMAGE ? item.IMAGE : Img1
};
});
box7Data.value.data = res.data.map(item => {
return item.NUM;
});
}
} catch (error) {
console.error("受调查国家分布error", error);
}
};
const handleBox7 = async () => {
await handleGetBox7Data();
const box7Chart = getBarChart(box7Data.value.title, box7Data.value.data);
setChart(box7Chart, "box7Chart");
};
const box8SurveyList = ref([
{
label: "337调查",
value: "337调查"
value: "337"
},
{
label: "301调查",
value: "301调查"
value: "301"
},
{
label: "232调查",
value: "232调查"
value: "232"
}
]);
const box8SelectedSurvey = ref("337调查");
const box8SelectedSurvey = ref("337");
// 调查结果分布
const box8Data = ref([
{
name: "和解/同意令",
value: 50
},
{
name: "裁定不侵权",
value: 46
},
{
name: "裁定侵权",
value: 40
},
{
name: "申诉方撤诉",
value: 31
},
{
name: "其他",
value: 24
}
// {
// name: "和解/同意令",
// value: 50
// },
// {
// name: "裁定不侵权",
// value: 46
// },
// {
// name: "裁定侵权",
// value: 40
// },
// {
// name: "申诉方撤诉",
// value: 31
// },
// {
// name: "其他",
// value: 24
// }
]);
const handleGetBox8Data = async () => {
const params = {
// searchId: '',
sortCode: box8SelectedSurvey.value
};
try {
const box8Chart = getPieChart(box8Data.value);
setChart(box8Chart, "box8Chart");
const res = await getSearchResult(params);
console.log("调查结果分布", res);
if(res.code === 200 && res.data) {
box8Data.value = res.data.map(item => {
return {
name: item.RESULTNAME,
value: item.RESULTNUM
}
})
} else {
box8Data.value = []
}
} catch (error) {
console.error(error);
}
};
const handleBox8 = async () => {
await handleGetBox8Data()
const box8Chart = getPieChart(box8Data.value);
setChart(box8Chart, "box8Chart");
}
const handleChangeBox8Survey = () => {
handleGetBox8Data();
handleBox8();
};
// 资源库
......@@ -1390,15 +1424,13 @@ const surveyYearList = ref([
id: "2021"
}
]);
const checkedSurveyYears = ref(["2025"]);
const handleChangeCheckedSurveyYears = () => {
// console.log(checkedSurveyYears.value);
handleGetSurveyList();
};
const areaList = ref([
// { id: "人工智能", name: "人工智能" },
// { id: "1", name: "人工智能" },
]);
const checkedAreaList = ref(["1"]);
const handleGetAreaList = async () => {
......@@ -1422,6 +1454,52 @@ const handleChangeCheckedAreas = () => {
handleGetSurveyList();
};
// 发布机构
const insList = ref([
{
name: "商务部",
id: "54"
},
{
name: "国际贸易委员会",
id: "262"
},
{
name: "贸易代表办公室",
id: "491"
}
]);
const checkedInsList = ref(["54"]);
const handleChangeCheckedIns = () => {
// console.log(checkedAreaList.value);
handleGetSurveyList();
};
// 受调查国家/地区
const countryList = ref([
{
name: "中国",
id: "0101"
},
{
name: "俄罗斯",
id: "俄罗斯"
},
{
name: "日本",
id: "日本"
},
{
name: "韩国",
id: "韩国"
}
]);
const checkedCountryList = ref(["0101"]);
const handleChangeCheckedCountry = () => {
// console.log(checkedAreaList.value);
handleGetSurveyList();
};
const surveyInfoList = ref([
{
time: "2025 11月12日",
......@@ -1451,6 +1529,8 @@ const handleGetSurveyList = async () => {
sortCode: activeCateId.value,
publishYear: checkedSurveyYears.value.toString(),
Area: checkedAreaList.value.toString(),
publishOrg: checkedInsList.value.toString(),
searchCountry: checkedCountryList.value.toString(),
sortField: "date",
sortOrder: isSort.value ? "asc" : "desc"
};
......@@ -1462,7 +1542,6 @@ const handleGetSurveyList = async () => {
surveyInfoList.value = res.data.content;
} else {
surveyInfoList.value = [];
ElMessage.warning("当前条件下无调查列表数据!");
}
} catch (error) {}
};
......@@ -1489,13 +1568,6 @@ const handleToMoreNews = () => {
window.open(route.href, "_blank");
};
// 返回首页
const handleBackHome = () => {
router.push({
path: "/overview"
});
};
onMounted(async () => {
handleGetBox1Data();
handleGetStatSort();
......@@ -1504,15 +1576,11 @@ onMounted(async () => {
handleGetBox4Data();
handleBox5();
handleBox6();
handleGetBox8Data();
// let box7Chart1 = getMapChart(box7Chart1Data.value);
// setChart(box7Chart1, "box7Chart1");
const box7Chart = getBarChart(box7Data.value.title, box7Data.value.data);
setChart(box7Chart, "box7Chart");
handleBox7();
handleBox8();
await handleGetAreaList();
// handleGetSurveyList();
handleGetSurveyList();
});
</script>
......@@ -2943,14 +3011,15 @@ onMounted(async () => {
// padding: 20px;
display: flex;
.left {
width: 300px;
height: 700px;
width: 360px;
// height: 700px;
padding-bottom: 20px;
border-radius: 10px;
box-shadow: 0px 0px 15px 0px rgba(60, 87, 126, 0.2);
background: rgba(255, 255, 255, 1);
.left-box1 {
margin-top: 17px;
height: 220px;
// height: 220px;
.left-box1-header {
display: flex;
.icon {
......@@ -2977,7 +3046,7 @@ onMounted(async () => {
}
.left-box2 {
margin-top: 17px;
height: 260px;
// height: 260px;
.left-box2-header {
display: flex;
.icon {
......@@ -3006,7 +3075,7 @@ onMounted(async () => {
.right {
margin-left: 16px;
width: 1224px;
min-height: 700px;
// min-height: 700px;
border-radius: 10px;
box-shadow: 0px 0px 15px 0px rgba(60, 87, 126, 0.2);
background: rgba(255, 255, 255, 1);
......@@ -3040,7 +3109,8 @@ onMounted(async () => {
}
.right-main {
padding-top: 6px;
min-height: 586px;
// min-height: 586px;
height: calc(100% - 108px);
max-height: 1540px;
border-bottom: 1px solid rgba(230, 231, 232, 1);
// height: 780px;
......@@ -3240,4 +3310,8 @@ onMounted(async () => {
:deep(.el-input__wrapper.is-focus) {
box-shadow: none !important;
}
.filter-checkbox {
width: 140px;
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论