Skip to content

R
risk-monitor
提交 da965171 authored 作者: 闫鹏's avatar 闫鹏
浏览文件
操作

合并分支 'yp-dev' 到 'master'

Yp dev 查看合并请求 !172
上级 7332aa7d 4090962e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 397 行增加 和 99 行删除
src/api/allUnion.js
浏览文件 @ da965171
......@@ -7,32 +7,41 @@ import request from "@/api/request.js";
* @param {String} params.date - 日期
*/
export function getAllUnionList(params) {
return request({
method: 'GET',
url: `/api/union/union/unionList/${params.date}`
})
return request({
method: "GET",
url: `/api/union/union/unionList/${params.date}`,
params: {
domainId: params.domainId ? params.domainId : null
}
});
}
// 全联盟-获取排华数量
/**
* @header token
*/
export function getUnionCount() {
return request({
method: 'GET',
url: `/api/union/union/unionCount`
})
export function getUnionCount(params) {
return request({
method: "GET",
url: `/api/union/union/unionCount`,
params: {
currentPage: params.page ? params.page : 1,
pageSize: params.pageSize ? params.pageSize : 10,
domainId: params.domainId ? params.domainId : null
}
});
}
// 全联盟-获取排华联盟动态
/**
* @header token
*/
export function getDynamic() {
return request({
method: 'GET',
url: `/api/union/union/dynamic`
})
export function getDynamic(params) {
return request({
method: "GET",
url: `/api/union/union/dynamic`,
params
});
}
// 全联盟-获取排华联盟预警
......@@ -42,10 +51,10 @@ export function getDynamic() {
* @header token
*/
export function getPrediction() {
return request({
method: 'GET',
url: `/api/union/union/prediction`
})
return request({
method: "GET",
url: `/api/union/union/prediction`
});
}
// 全联盟-获取排华联盟领域分布
......@@ -55,10 +64,10 @@ export function getPrediction() {
* @header token
*/
export function getIndustry() {
return request({
method: 'GET',
url: `/api/union/union/industry`
})
return request({
method: "GET",
url: `/api/union/union/industry`
});
}
// 全联盟-获取排华联盟国家紧密度
......@@ -68,8 +77,8 @@ export function getIndustry() {
* @header token
*/
export function getCountryRelation() {
return request({
method: 'GET',
url: `/api/union/union/countryRelation`
})
}
\ No newline at end of file
return request({
method: "GET",
url: `/api/union/union/countryRelation`
});
}
src/api/zmOverview/allElement/index.js
浏览文件 @ da965171
......@@ -2,74 +2,99 @@ import request from "@/api/request.js";
// 全要素统计
export function getElementCount(params) {
return request({
method: 'GET',
url: `/api/element/elementCount/${params.date}`,
})
return request({
method: "GET",
url: `/api/element/elementCount/${params.date}`
});
}
// 美对华科技要素打压遏制数量趋势
export function getElementSuppressTrend(params) {
return request({
method: "GET",
url: `/api/element/DomainContainmentTrend/${params.date}`,
params: {
domainId: params.domainId ? params.domainId : null
}
});
}
// 最新动态
export function getNewDynamics() {
return request({
method: 'GET',
url: `/api/element/newDynamics`,
})
return request({
method: "GET",
url: `/api/element/newDynamics`
});
}
// 美对我要素打压情况
/**
* @param {currentPage, pageSize}
* @param {currentPage, pageSize}
*/
export function getElementSuppress(params) {
return request({
method: 'GET',
url: `/api/element/elementSuppress/${params.date}`,
params
})
return request({
method: "GET",
url: `/api/element/elementSuppress/${params.date}`,
params: {
elementId: params.elementId ? params.elementId : null,
page: params.currentPage,
pageSize: params.pageSize
}
});
}
// 关键词云-上
/**
* @param {date}
* @param {date}
*/
export function getKeyWordUp(params) {
return request({
method: 'GET',
url: `/api/element/getKeyWordUp/${params.date}`,
})
return request({
method: "GET",
url: `/api/element/getKeyWordUp/${params.date}`,
params: {
elementId: params.elementId ? params.elementId : null
}
});
}
// 美自身要素发展情况
/**
* @param {currentPage, pageSize}
* @param {currentPage, pageSize}
*/
export function getElementDevelop(params) {
return request({
method: 'GET',
url: `/api/element/elementDevelop/${params.date}`,
params
})
return request({
method: "GET",
url: `/api/element/elementDevelop/${params.date}`,
params: {
elementId: params.elementId ? params.elementId : null,
page: params.currentPage,
pageSize: params.pageSize
}
});
}
// 关键词云-下
/**
* @param {currentPage, pageSize}
* @param {currentPage, pageSize}
*/
export function getKeyWordDown(params) {
return request({
method: 'GET',
url: `/api/element/getKeyWordDown/${params.date}`,
})
return request({
method: "GET",
url: `/api/element/getKeyWordDown/${params.date}`,
params: {
elementId: params.elementId ? params.elementId : null
}
});
}
// 通过id获取政令详细信息
/**
* @param {id}
* @param {id}
*/
export function getOrderInfo(params) {
return request({
method: 'GET',
url: `/api/element/getOrderInfo/${params.id}`,
params
})
}
\ No newline at end of file
return request({
method: "GET",
url: `/api/element/getOrderInfo/${params.id}`,
params
});
}
src/assets/json/countryCoordMap.js 0 → 100644
浏览文件 @ da965171
差异被折叠。
src/components/Container/index.vue
浏览文件 @ da965171
......@@ -103,6 +103,7 @@ const headerTitleClasses = computed(() => [
border-bottom: 1px solid #ebeef5;
/* background-color: #f8fafc; */
padding-left: 0;
// background: linear-gradient(180deg, rgb(231, 243, 255) 0%, rgba(231, 243, 255, 0) 100%);
}
.header-left {
......@@ -132,10 +133,10 @@ const headerTitleClasses = computed(() => [
}
.header-icon {
width: 20px;
height: 20px;
width: 22px;
height: 18px;
margin-left: 5px;
margin-right: 19px;
margin-right: 14px;
}
.blue-title-block {
......@@ -148,14 +149,13 @@ const headerTitleClasses = computed(() => [
.header-title {
font-family: $base-font-family;
font-size: $base-font-size;
font-size: 20px;
font-weight: 700;
/* color: var(--color-main-active); */
/* color: var(--base-color); */
color: $base-color;
line-height: 48px;
padding: 0 12px;
font-size: 20px;
// padding: 0 12px;
}
.header-title-primary {
......
src/views/ZMOverView/components/fourSuppress/components/addDomain/index.vue
浏览文件 @ da965171
......@@ -141,12 +141,30 @@
@page-change="handleNewsPageChange"
/>
</div>
<!-- <custom-container title="美对华领域打压遏制排行" :titleIcon="icon3" height="700px">
<template #header-right>
<div class="title-right-select">
<el-select
v-model="selectedField"
@change="handleFieldChange"
placeholder="全部领域"
class="field-select"
:style="{ width: '160px' }"
>
<el-option v-for="item in fieldOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</template>
</custom-container> -->
<div class="empty-section">
<div class="bottom-item">
<div class="bottom-item-title">
<img :src="icon3" alt="" />
<span>美对华领域打压遏制排行</span>
</div>
<el-select v-model="selectedField" placeholder="全部领域" class="field-select">
<el-option v-for="item in fieldOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="select-box">
<div class="rank-btns">
......@@ -160,13 +178,18 @@
受打压院校
</div>
</div>
<el-select v-model="selectedField" placeholder="全部领域" class="field-select">
<el-option v-for="item in fieldOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="main-box" v-loading="rankLoading" element-loading-background="rgba(255, 255, 255, 0.5)">
<!-- 机构排行的原有样式 -->
<template v-if="rankType === 'institution'">
<div class="table-header">
<div class="col-rank col-rank-75"></div>
<div class="col-name" style="color: rgb(59, 65, 75); font-weight: 700">部门名称</div>
<div class="col-domain" style="color: rgb(59, 65, 75); font-weight: 700"></div>
<div class="col-date" style="color: rgb(59, 65, 75); font-weight: 700"></div>
<div class="col-member" v-if="rankType !== 'school'" style="color: rgb(59, 65, 75); font-weight: 700">
打压次数
</div>
</div>
<div v-for="(item, index) in rankList" :key="index" class="rank-item">
<div class="rank-num" :class="'rank-' + (index + 1)">{{ index + 1 }}</div>
<img :src="item.orgPicture ? item.orgPicture : defaultImg" alt="" class="rank-icon" />
......@@ -177,7 +200,6 @@
<div class="rank-count">{{ item.count }}次</div>
</div>
</template>
<!-- 企业/院校排行的表格样式 -->
<template v-else>
<div class="table-header">
<div class="col-rank"></div>
......@@ -210,7 +232,6 @@
</div>
</div>
<div class="col-date">{{ item.date }}</div>
<!-- <div class="col-member" v-if="rankType !== 'school'">{{ item.member }}</div> -->
<div class="col-member" v-if="rankType !== 'school'">{{ item.province }}</div>
</div>
</div>
......@@ -315,10 +336,13 @@ import getMultiLineChart from "./multiLineChart";
import CommonPrompt from "../../../../commonPrompt/index.vue";
import leftBtn from "../../assets/left-btn.png";
import rightBtn from "../../assets/right-btn.png";
import icon1 from "./icon/icon-1.png";
import icon3 from "./icon/icon-3.png";
import icon4 from "./icon/icon-4.png";
import defaultImg from "../../../../assets/images/default-icon2.png";
import { fieldOptions } from "@/views/ZMOverView/public.js";
import {
getAllDomainCount,
getDomainContainmentTrend,
......@@ -330,6 +354,7 @@ import { getUSGovernmentLatestDynamic, getDepartmentList, getSanTypeList } from
import { ElMessage } from "element-plus";
import { ArrowLeft, ArrowRight } from "@element-plus/icons-vue";
import SimplePagination from "@/components/SimplePagination.vue";
import CustomContainer from "@/components/Container/index.vue";
const router = useRouter();
......@@ -752,23 +777,23 @@ const svgHeight = computed(() => {
return startY + rows * rowHeight + 50;
});
const fieldOptions = [
{ value: "", label: "全部领域" },
{ value: "1", label: "人工智能" },
{ value: "2", label: "生物科技" },
{ value: "3", label: "新一代信息技术" },
{ value: "4", label: "量子科技" },
{ value: "5", label: "新能源" },
{ value: "6", label: "集成电路" },
{ value: "7", label: "海洋" },
{ value: "8", label: "先进制造" },
{ value: "9", label: "新材料" },
{ value: "10", label: "航空航天" },
{ value: "11", label: "深海" },
{ value: "12", label: "极地" },
{ value: "13", label: "太空" },
{ value: "14", label: "核" }
];
// const fieldOptions = [
// { value: "", label: "全部领域" },
// { value: "1", label: "人工智能" },
// { value: "2", label: "生物科技" },
// { value: "3", label: "新一代信息技术" },
// { value: "4", label: "量子科技" },
// { value: "5", label: "新能源" },
// { value: "6", label: "集成电路" },
// { value: "7", label: "海洋" },
// { value: "8", label: "先进制造" },
// { value: "9", label: "新材料" },
// { value: "10", label: "航空航天" },
// { value: "11", label: "深海" },
// { value: "12", label: "极地" },
// { value: "13", label: "太空" },
// { value: "14", label: "核" }
// ];
// 全领域统计
const buttonsData = ref([]);
......@@ -1614,8 +1639,8 @@ watch(activeDate, () => {
display: flex;
justify-content: space-between;
align-items: center;
padding-left: 17px;
padding-right: 35px;
padding-left: 16px;
padding-right: 16px;
box-sizing: border-box;
background: linear-gradient(180deg, rgba(231, 243, 255, 1) 0%, rgba(231, 243, 255, 0) 100%);
.bottom-item-title {
......@@ -1634,14 +1659,19 @@ watch(activeDate, () => {
color: rgb(5, 95, 194);
}
}
.field-select {
width: 160px;
}
}
.select-box {
width: 691px;
height: 32px;
height: 50px;
margin: 10px auto 5px auto;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #eee;
padding-bottom: 15px;
.rank-btns {
display: flex;
......@@ -1698,7 +1728,7 @@ watch(activeDate, () => {
box-sizing: border-box;
display: flex;
flex-direction: column;
gap: 28px;
gap: 21px;
overflow-y: auto;
.rank-item {
display: flex;
......@@ -1910,6 +1940,9 @@ watch(activeDate, () => {
text-align: center;
flex-shrink: 0;
}
.col-rank-75 {
width: 75px;
}
.col-name {
flex: 1.5;
min-width: 0;
......
src/views/ZMOverView/components/fourSuppress/components/allElement/mock.json 0 → 100644
浏览文件 @ da965171
{
"code": 200,
"message": "操作成功",
"success": true,
"data": [
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-01"
},
{
"elementName": "科研人才",
"elementNum": 1,
"elementDate": "2025-01"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-01"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-02"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-02"
},
{
"elementName": "科研仪器",
"elementNum": 1,
"elementDate": "2025-02"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-03"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-03"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-03"
},
{
"elementName": "科研机构",
"elementNum": 1,
"elementDate": "2025-04"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-04"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-04"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-05"
},
{
"elementName": "科研人才",
"elementNum": 1,
"elementDate": "2025-05"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-05"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-06"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-06"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-06"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-07"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-07"
},
{
"elementName": "科研仪器",
"elementNum": 3,
"elementDate": "2025-07"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-08"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-08"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-08"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-09"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-09"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-09"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-10"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-10"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-10"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-11"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-11"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-11"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2025-12"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2025-12"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2025-12"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2026-01"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2026-01"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2026-01"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2026-02"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2026-02"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2026-02"
},
{
"elementName": "科研机构",
"elementNum": 0,
"elementDate": "2026-03"
},
{
"elementName": "科研人才",
"elementNum": 0,
"elementDate": "2026-03"
},
{
"elementName": "科研仪器",
"elementNum": 0,
"elementDate": "2026-03"
}
]
}
\ No newline at end of file
浏览文件 @ da965171
No preview for this file type
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论