Skip to content

R
risk-monitor
提交 a9b8232b authored 作者: 张烨's avatar 张烨
浏览文件
操作

Merge branch 'master' into zy-dev

上级 c8abcacd d0c0200e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 856 行增加 和 116 行删除
src/App.vue
浏览文件 @ a9b8232b
......@@ -2,7 +2,7 @@
<div id="app">
<div class="pro-wrapper">
<div class="home-page">
<ModuleHeader/>
<ModuleHeader />
<div class="main-container">
<router-view />
</div>
......@@ -22,8 +22,8 @@
</div>
</div>
<div class="tool-box" @click="handleClickToolBox">
<div class="tool-item">
<div class="tool-box">
<!-- <div class="tool-item">
<img src="@/assets/icons/tool-item-icon1.png" alt="" />
</div>
<div class="tool-item">
......@@ -34,7 +34,26 @@
</div>
<div class="tool-item">
<img src="@/assets/icons/tool-item-icon4.png" alt="" />
</div>
</div> -->
<el-tooltip content="智能写报" placement="left" :offset="10">
<div class="tool-item" @click="handleOpenPage('znxb')">
<img src="@/assets/icons/tool-item-icon1.png" alt="" />
</div>
</el-tooltip>
<el-tooltip content="智能翻译" placement="left" :offset="10">
<div class="tool-item" @click="handleClickToolBox">
<img src="@/assets/icons/tool-item-icon2.png" alt="" />
</div>
</el-tooltip>
<!-- <div class="tool-item">
<img src="@/assets/icons/tool-item-icon3.png" alt="" />
</div> -->
<el-tooltip content="智能问答" placement="left" :offset="10">
<div class="tool-item" @click="handleOpenPage('znwd')">
<img src="@/assets/icons/tool-item-icon4.png" alt="" />
</div>
</el-tooltip>
</div>
<!-- <div class="ai-btn" @click="openAiBox">
......@@ -121,7 +140,7 @@ const handleGetPersonType = async () => {
personTypeList.value = [];
}
window.sessionStorage.setItem("personTypeList", JSON.stringify(personTypeList.value));
} catch (error) { }
} catch (error) {}
};
const isCurrentOverview = computed(() => {
......@@ -252,6 +271,14 @@ const handleClickTitle = item => {
}
};
const handleOpenPage = page => {
const pageObj = {
znwd: "/chat",
znxb: "/writtingAsstaint"
};
window.open(pageObj[page], "_blank");
};
const handleClickToolBox = () => {
ElMessage.warning("当前功能正在开发中，敬请期待！");
};
......@@ -291,7 +318,7 @@ body {
text-align: justify;
}
.el-popper[data-popper-placement^="top"]>.el-popper__arrow:before {
.el-popper[data-popper-placement^="top"] > .el-popper__arrow:before {
display: none;
}
......
src/api/companyPages/index.js
浏览文件 @ a9b8232b
......@@ -129,3 +129,42 @@ export function getSupplyList(params) {
params,
})
}
// 企业市值:市值变化
export function getMarketCapList(params) {
return request({
method: 'GET',
url: `/api/enterprisePage/marketCap/${params}`,
})
}
// 企业发展:营收折线图
export function getRevenueList(params) {
return request({
method: 'GET',
url: `/api/enterprisePage/revenue/${params}`,
})
}
// 企业发展:净利润折线图
export function getNetProfitList(params) {
return request({
method: 'GET',
url: `/api/enterprisePage/netProfit/${params}`,
})
}
// 企业发展:人员情况折线图
export function getPersonnelList(params) {
return request({
method: 'GET',
url: `/api/enterprisePage/personnel/${params}`,
})
}
// 企业发展: 市场占比折线图
export function getMarketShareList(params) {
return request({
method: 'GET',
url: `/api/enterprisePage/marketShare/${params}`,
})
}
\ No newline at end of file
src/api/thinkTank/overview.js
浏览文件 @ a9b8232b
......@@ -222,9 +222,14 @@ export function getThinkTankReportAbstract(params) {
//获取报告主要观点
export function getThinkTankReportContent(params) {
const { id, currentPage, pageSize } = params
return request({
method: 'GET',
url: `/api/thinkTankReport/content/${params}`,
url: `/api/thinkTankReport/content/${id}`,
params: {
currentPage,
pageSize,
}
})
}
......
src/components/NewsList.vue
浏览文件 @ a9b8232b
......@@ -10,23 +10,20 @@
</div>
</div>
<div class="box3-main">
<div class="box3-item" v-for="(news, index) in list" :key="index" @click="handleClickToNewsDetail(news)">
<div class="box3-item" v-for="(news, index) in normalizedList" :key="index"
@click="handleClickToNewsDetail(news)">
<div class="left">
<img
:src="getProxyUrl(news.newsImage) || defaultImg"
alt=""
referrerpolicy="no-referrer"
@error="e => (e.target.src = errImg||News1)"
/>
<img :src="getProxyUrl(news.newsImage) || defaultImg" alt="" referrerpolicy="no-referrer"
@error="e => (e.target.src = errImg || News1)" />
</div>
<div class="right">
<div class="right-top">
<div class="title">{{ news.newsTitle||news.title }}</div>
<div class="title">{{ news.newsTitle || news.title }}</div>
<div class="time">
{{ news.newsDate ? news.newsDate.slice(5) : "" }} {{ news.newsOrg ? "-" + news.newsOrg : "" }}
</div>
</div>
<div class="right-footer">{{ news.newsContent||news.description }}</div>
<div class="right-footer">{{ news.newsContent || news.description }}</div>
</div>
</div>
</div>
......@@ -34,15 +31,21 @@
</template>
<script setup>
import { computed } from "vue";
import router from "@/router/index";
import News1 from "@/assets/images/news1.png"; // 错误图片
import defaultNew from "@/assets/images/default-icon-news.png"; // 默认图片
let { list,errImg,defaultImg } = defineProps({
let { list, newsList, errImg, defaultImg } = defineProps({
list: {
type: Array,
default: () => []
},
// 兼容历史用法：部分页面使用 newsList 作为入参
newsList: {
type: Array,
default: undefined
},
defaultImg: {
type: String,
default: defaultNew
......@@ -53,6 +56,11 @@ let { list,errImg,defaultImg } = defineProps({
}
});
// 统一对外渲染数据源：优先使用 list，其次兼容 newsList
const normalizedList = computed(() => {
return (Array.isArray(list) && list.length ? list : newsList) || [];
});
// 处理图片代理
const getProxyUrl = url => {
if (!url) return "";
......@@ -74,7 +82,7 @@ const handleClickToNewsDetail = news => {
const route = router.resolve({
path: "/newsAnalysis",
query: {
newsId: news.newsId
newsId: news.newsId ?? news.id
}
});
window.open(route.href, "_blank");
......@@ -183,9 +191,11 @@ const handleToMoreNews = () => {
width: 657px;
display: flex;
justify-content: space-between;
&:hover {
text-decoration: underline;
color: var(--color-main-active);
.title {
color: var(--color-main-active);
}
......
src/components/base/boxBackground/analysisBox.vue
浏览文件 @ a9b8232b
......@@ -70,7 +70,7 @@ const handleCollect = () => {
}
const emit = defineEmits(['save','download','collect'])
const emit = defineEmits(['save', 'download', 'collect'])
</script>
......
src/components/base/messageBubble/index.vue
浏览文件 @ a9b8232b
<template>
<div class="box4">
<div class="box4-header">
<div class="msg-bubble">
<div class="msg-bubble-header">
<div class="header-icon">
<!-- <img src="./image1.png" alt="" /> -->
<img src="./message-icon.svg" alt="" />
......@@ -10,7 +10,7 @@
</div>
<div class="more" @click="handleToMoreNews">{{ "更多 +" }}</div>
</div>
<div class="box4-main">
<div class="msg-bubble-main">
<div class="message-bubble" v-for="(item, index) in messageList" :key="index" @click="handleClickPerson(item)">
<div class="avatar-container">
<img :src="item[props.imageUrl] || avatarUser" :alt="item[props.name]" class="avatar" />
......@@ -38,7 +38,7 @@
<!-- <MessageBubble v-for="(item, index) in messageList" @click="handleClickPsserson(item)"
@info-click="handleMediaClick(item)" :key="index" :avatar="item.img ? item.img : DefaultIcon1" :name="item.name"
:time="item.time" :source="item.source" :content="item.content" /> -->
<!-- <div class="box4-main-item" v-for="(item, index) in messageList" :key="index">
<!-- <div class="msg-bubble-main-item" v-for="(item, index) in messageList" :key="index">
<div class="left" @click="handleClickPerson(item)">
<img :src="item.img ? item.img : DefaultIcon1" alt="" />
</div>
......@@ -121,7 +121,7 @@ const handleToMoreNews = item => {
</script>
<style lang="scss" scoped>
.box4 {
.msg-bubble {
width: 792px;
height: 450px;
border-radius: 10px;
......@@ -129,7 +129,7 @@ const handleToMoreNews = item => {
background: rgba(255, 255, 255, 1);
border: 1px solid rgb(234, 236, 238);
.box4-header {
.msg-bubble-header {
width: 792px;
height: 48px;
border-bottom: 1px solid rgb(234, 236, 238);
......@@ -178,7 +178,7 @@ const handleToMoreNews = item => {
}
}
.box4-main {
.msg-bubble-main {
height: 402px;
overflow-y: auto;
box-sizing: border-box;
......
src/components/base/moduleHeader/index.vue
浏览文件 @ a9b8232b
......@@ -36,7 +36,7 @@
<div class="name">{{ "管理员" }}</div>
</div>
</div>
<div class="menu-box" v-if="isShowMenu" @mouseenter="handleHoverMenu(true)" @mouseleave="handleHoverMenu(false)">
<div class="menu-box" v-show="isShowMenu" @mouseenter="handleHoverMenu(true)" @mouseleave="handleHoverMenu(false)">
<div class="menu-content">
<div class="menu-item" v-for="(item, index) in menuList" :key="index" @click="handleToModule(item)">
<div class="icon">
......@@ -372,11 +372,16 @@ onMounted(() => {
top: 52px;
left: 0;
box-sizing: border-box;
border: 1px solid rgba(255, 255, 255, 1);
border-radius: 10px;
backdrop-filter: blur(30px);
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 0.8);
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
box-shadow: 0px 8px 32px 0px rgba(31, 38, 135, 0.15);
background: rgba(255, 255, 255, 0.25);
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
border: 1px solid rgba(255, 255, 255, 0.3);
background: linear-gradient(135deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0.2) 100%);
box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.2);
.menu-content {
width: 562px;
......
src/components/base/newsList/index.vue
浏览文件 @ a9b8232b
......@@ -112,7 +112,7 @@ const handleToNewsAnalysis = (item, index) => {
}
.more {
width: 45px;
width: 54px;
height: 24px;
position: absolute;
top: 12px;
......@@ -134,7 +134,7 @@ const handleToNewsAnalysis = (item, index) => {
.news-item {
display: flex;
height: 78px;
height: 76px;
width: 749px;
margin-left: 21px;
border-bottom: 1px solid rgba(240, 242, 244, 1);
......
src/router/modules/devStyle.js
浏览文件 @ a9b8232b
//样式主页
const StylePages = () => import("@/components/devStyle/components/index.vue");
const StylePages = () => import("@/styles/components/index.vue");
const stylePagesRoutes = [
// 智库系统的主要路由
......
src/styles/components/CommonPage/index.vue 0 → 100644
浏览文件 @ a9b8232b
<script setup lang="ts">
import { ElRow, ElCol } from 'element-plus';
import '@/styles/common.scss'
const span = 12
</script>
<template>
<el-row class="wrapper">
<el-col :span="span">
<pre>
{{ `import '@/styles/common.scss';
<template>
<div class="background-as-card"></div>
</template>
`}}
</pre>
<div class="background-as-card">
<div v-for="item in [1, 2, 3, 4]" :key="item">
{{ item }}
</div>
</div>
</el-col>
</el-row>
</template>
<style lang="scss" scoped>
.wrapper {
background-color: rgba(0, 0, 0, 0.068);
padding: 10px;
}
</style>
\ No newline at end of file
src/styles/components/RadioPage/index.vue 0 → 100644
浏览文件 @ a9b8232b
<script setup lang="ts">
import { ElRadioGroup, ElRadioButton, ElRow, ElCol } from 'element-plus';
import { ref } from 'vue';
import '@/styles/radio.scss';
const radio = ref(1)
const span = 12
</script>
<template>
<el-row>
<el-col :span="span">
<pre>
{{ `import '@/styles/radio.scss';
<template>
<el-radio-group class="radio-group-as-gap-btn">
</el-radio-group>
</template>
`}}
</pre>
<el-radio-group v-model="radio" class="radio-group-as-gap-btn">
<el-radio-button :value="1">选项1</el-radio-button>
<el-radio-button :value="2">选项2</el-radio-button>
<el-radio-button :value="3">选项3</el-radio-button>
</el-radio-group>
</el-col>
</el-row>
</template>
<style lang="scss" scoped></style>
\ No newline at end of file
src/styles/components/TabsPage/index.vue 0 → 100644
浏览文件 @ a9b8232b
<script setup lang="ts">
import { ElTabs, ElTabPane, ElSpace, ElRow, ElCol } from 'element-plus';
import { ref } from 'vue';
import '@/styles/tabs.scss'
const span = 12
</script>
<template>
<el-row>
<el-col :span="span">
<pre>
{{ `import '@/styles/tabs.scss';
<template>
<el-tabs stretch class="tabs-header-as-card tabs-nav-no-wrap tabs-bar-as-btn">
</el-tabs>
</template>
`}}
</pre>
<el-tabs stretch class="tabs-header-as-card tabs-nav-no-wrap tabs-bar-as-btn">
<el-tab-pane label="tab1">tab1</el-tab-pane>
<el-tab-pane label="tab2">tab2</el-tab-pane>
<el-tab-pane label="tab3">tab3</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
</template>
<style lang="scss" scoped></style>
\ No newline at end of file
src/components/devStyle/components/index.vue → src/styles/components/index.vue
浏览文件 @ a9b8232b
<template>
<el-scrollbar>
<div class="common-page">
<el-space direction="vertical" :size="20" alignment="flex-start">
<el-space direction="vertical" :size="20" alignment="flex-start" fill>
<div class="text-title-0-show">开发样式</div>
<div class="text-title-1-show">样式变量</div>
<ConstStyle />
<div class="text-title-1-show">文字样式</div>
<TextStyle />
<div class="text-title-1-show">通用样式/组件</div>
<el-tabs tabPosition="left">
<el-tab-pane label="通用" lazy>
<common-page />
</el-tab-pane>
<el-tab-pane label="单选框" lazy>
<radio-page />
</el-tab-pane>
<el-tab-pane label="选项卡" lazy>
<tabs-page />
</el-tab-pane>
</el-tabs>
</el-space>
</div>
</el-scrollbar>
......@@ -16,5 +28,10 @@
import "@/styles/container.scss"
import TextStyle from './textStyle.vue';
import ConstStyle from './constStyle.vue';
import { ElTabs, ElTabPane, ElSpace } from "element-plus";
import RadioPage from './RadioPage/index.vue';
import TabsPage from './TabsPage/index.vue';
import CommonPage from './CommonPage/index.vue';
</script>
</script>
\ No newline at end of file
<style lang="scss" scoped></style>
\ No newline at end of file
src/styles/radio.scss 0 → 100644
浏览文件 @ a9b8232b
@use '@/styles/common.scss';
.radio-group-as-gap-btn {
@extend .text-tip-1;
.el-radio-button {
--el-radio-button-checked-bg-color: var(--bg-white-100);
--el-radio-button-checked-border-color: var(--bg-black-10);
border-radius: 4px;
}
.el-radio-button.is-active {
--el-radio-button-checked-text-color: var(--color-primary-100);
--el-radio-button-checked-bg-color: var(--color-primary-10);
--el-radio-button-checked-border-color: var(--color-primary-5);
border-radius: 4px;
}
}
\ No newline at end of file
src/views/ZMOverView/components/fourSuppress/components/addDomain/index.vue
浏览文件 @ a9b8232b
......@@ -187,7 +187,7 @@
<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 class="table-list">
......@@ -210,7 +210,8 @@
</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.member }}</div> -->
<div class="col-member" v-if="rankType !== 'school'">{{ item.province }}</div>
</div>
</div>
</template>
......@@ -1108,6 +1109,7 @@ const handleGetDomainContainmentRanking = async () => {
// 处理返回的数据结构
const processedData = processRankingData(res.data);
rankList.value = processedData;
console.log("排行数据 =>", rankList.value);
}
} catch (error) {
console.error("获取美对华领域打压遏制排行失败:", error);
......
src/views/ZMOverView/components/fourSuppress/components/allElement/index.vue
浏览文件 @ a9b8232b
......@@ -89,7 +89,7 @@
<el-empty
v-if="box2DataList.length === 0"
style="padding-top: 80px"
description="暂无数据1"
description="暂无数据"
:image-size="100"
/>
<div
......@@ -712,7 +712,7 @@ onUnmounted(() => {
.main {
width: 1598px;
height: 884px;
// height: 884px;
margin: 0 auto;
margin-top: 14px;
display: flex;
......@@ -726,9 +726,9 @@ onUnmounted(() => {
background: rgba(255, 255, 255, 0.65);
}
.left {
& > .left {
width: 472px;
display: none;
.box1 {
width: 472px;
height: 884px;
......@@ -915,11 +915,12 @@ onUnmounted(() => {
}
.right {
width: 1110px;
width: 100%;
.box2 {
width: 1110px;
height: 434px;
width: 100%;
// height: 434px;
height: 700px;
.box2-header {
height: 48px;
......@@ -957,30 +958,34 @@ onUnmounted(() => {
}
.box2-main {
height: 386px;
// height: 386px;
height: 646px;
background: rgba(255, 255, 255, 0.65);
display: flex;
justify-content: center;
gap: 16px;
.inner-box1 {
width: 640px;
height: 368px;
width: 50%;
// height: 368px;
height: 100%;
overflow: hidden;
box-sizing: border-box;
border: 1px solid rgba(234, 236, 238, 1);
border-radius: 10px;
// border: 1px solid rgba(234, 236, 238, 1);
// border-radius: 10px;
display: flex;
.left {
width: 320px;
border-right: 1px solid rgba(234, 236, 238, 1);
// width: 320px;
width: 100%;
// border-right: 1px solid rgba(234, 236, 238, 1);
.left-main {
margin-top: 9px;
height: 270px;
// margin-top: 9px;
height: 600px;
.left-item {
width: 100%;
height: 54px;
border: 1px solid transparent;
display: flex;
......@@ -1009,7 +1014,7 @@ onUnmounted(() => {
}
.text {
width: 260px;
width: 95%;
height: 30px;
margin-left: 12px;
color: rgba(59, 65, 75, 1);
......@@ -1035,7 +1040,7 @@ onUnmounted(() => {
}
.left-footer {
margin-top: 30px;
// margin-top: 30px;
height: 60px;
display: flex;
justify-content: center;
......@@ -1049,7 +1054,7 @@ onUnmounted(() => {
overflow: hidden;
overflow-y: auto;
cursor: pointer;
display: none;
.title {
width: 283px;
min-height: 24px;
......@@ -1157,8 +1162,10 @@ onUnmounted(() => {
}
.inner-box2 {
width: 412px;
height: 368px;
// width: 412px;
width: 760px;
// height: 368px;
height: 617px;
box-sizing: border-box;
border: 1px solid rgba(234, 236, 238, 1);
border-radius: 10px;
......@@ -1185,8 +1192,8 @@ onUnmounted(() => {
}
.box2Chart {
width: 412px;
height: 368px;
width: 760px;
height: 617px;
}
}
}
......@@ -1194,8 +1201,9 @@ onUnmounted(() => {
.box3 {
margin-top: 16px;
width: 1110px;
height: 434px;
width: 100%;
// height: 434px;
height: 700px;
.box3-header {
height: 48px;
......@@ -1233,30 +1241,32 @@ onUnmounted(() => {
}
.box3-main {
height: 386px;
height: 646px;
background: rgba(255, 255, 255, 0.65);
display: flex;
justify-content: center;
gap: 16px;
.inner-box1 {
width: 640px;
height: 368px;
width: 50%;
// height: 368px;
height: 100%;
overflow: hidden;
box-sizing: border-box;
border: 1px solid rgba(234, 236, 238, 1);
border-radius: 10px;
// border: 1px solid rgba(234, 236, 238, 1);
// border-radius: 10px;
display: flex;
.left {
width: 320px;
border-right: 1px solid rgba(234, 236, 238, 1);
width: 100%;
// border-right: 1px solid rgba(234, 236, 238, 1);
.left-main {
margin-top: 9px;
height: 270px;
// margin-top: 9px;
height: 600px;
.left-item {
width: 100%;
height: 54px;
border: 1px solid transparent;
display: flex;
......@@ -1285,7 +1295,7 @@ onUnmounted(() => {
}
.text {
width: 260px;
width: 95%;
height: 30px;
margin-left: 12px;
color: rgba(59, 65, 75, 1);
......@@ -1311,7 +1321,7 @@ onUnmounted(() => {
}
.left-footer {
margin-top: 30px;
// margin-top: 30px;
height: 60px;
display: flex;
justify-content: center;
......@@ -1325,7 +1335,7 @@ onUnmounted(() => {
overflow: hidden;
overflow-y: auto;
cursor: pointer;
display: none;
.title {
width: 283px;
min-height: 24px;
......@@ -1433,8 +1443,8 @@ onUnmounted(() => {
}
.inner-box2 {
width: 412px;
height: 368px;
width: 760px;
height: 617px;
box-sizing: border-box;
border: 1px solid rgba(234, 236, 238, 1);
border-radius: 10px;
......@@ -1461,8 +1471,8 @@ onUnmounted(() => {
}
.box3Chart {
width: 412px;
height: 368px;
width: 760px;
height: 617px;
}
}
}
......
src/views/ZMOverView/components/fourSuppress/components/allGovernment/components/CalendarHeatmap.vue
浏览文件 @ a9b8232b
......@@ -45,28 +45,32 @@
</div>
<div class="tooltip-main">
<div class="tooltip-main-item" v-for="item, index in currentDetailList" :key="index">
<div class="item-header flex-display">
<div class="item-header-left flex-display">
<div class="logo">
<img style="width:100%; height: 100%" :src="item.orgLogoUrl" alt="logo">
</div>
<div class="name text-bold">{{ item.orgName }}</div>
<div class="status">
<div class="status-on text-tip-2" v-if="item.stauts === 2">{{ '已落实' }}</div>
<div class="status-off text-tip-2" v-else>{{ '未落实' }}</div>
</div>
</div>
<div class="item-header-right flex-display">
<AreaTag v-for="tag, idx in item.techDomainList.slice(0, 3)" :key="idx" :tagName="tag"></AreaTag>
</div>
</div>
<div class="item-content text-compact">{{ item.name }}</div>
<div class="item-footer color-bg-active flex-display" @click="handleToDetail(item)">
<div class="footer-text text-tip-2 main-color">{{ item.administrativeOrderInfoTitle }}</div>
<div class="footer-text text-tip-2 main-color">{{ item.name }}</div>
<div class="footer-arrow">
<img src="./right-arrow.svg" alt="">
</div>
</div>
<div class="item-list" v-for="val, idx in item.list" :key="idx">
<div class="item-header flex-display">
<div class="item-header-left flex-display">
<div class="logo">
<img style="width:100%; height: 100%" :src="val.orgLogoUrl" alt="logo">
</div>
<div class="name text-primary-80-clor text-bold">{{ val.orgName }}</div>
<div class="status">
<div class="status-on text-tip-2" v-if="val.stauts === 2">{{ '已落实' }}</div>
<div class="status-off text-tip-2" v-else>{{ '未落实' }}</div>
</div>
</div>
<div class="item-header-right flex-display">
<AreaTag v-for="tag, idxx in val.techDomainList.slice(0, 3)" :key="idxx" :tagName="tag"></AreaTag>
</div>
</div>
<div class="item-content text-compact">{{ val.name }}</div>
</div>
</div>
</div>
</el-dialog>
......@@ -282,7 +286,7 @@ function getOption() {
const titles = months.map((month, index) => ({
// text: `{month|${month.format('M月')}} {stats|共 ${monthStats[index].total} 项, 已落实 ${monthStats[index].resolved} 项}`,
text: index ===0 ?`{month|${month.format('M月')}} {stats|共 ${monthStats[index].total} 项, 已落实 0 项}`:` {month|${month.format('M月')}} {stats|共 ${monthStats[index].total} 项, 已落实 0 项}`,
text: index === 0 ? `{month|${month.format('M月')}} {stats|共 ${monthStats[index].total} 项, 已落实 0 项}` : ` {month|${month.format('M月')}} {stats|共 ${monthStats[index].total} 项, 已落实 0 项}`,
left: `${gapPercent + index * (calendarWidthPercent + gapPercent)}%`,
top: 10,
textStyle: {
......@@ -447,7 +451,20 @@ onMounted(() => {
const list = params.data[1].raw
if (list.length > 0) {
currentDate.value = date
currentDetailList.value = list
// 按 administrativeOrderInfoTitle 分类
const grouped = [];
const map = new Map();
list.forEach(item => {
const key = item.administrativeOrderInfoTitle;
if (!map.has(key)) {
map.set(key, { name: key, list: [] });
grouped.push(map.get(key));
}
map.get(key).list.push(item);
});
currentDetailList.value = grouped;
console.log('currentDetailList', currentDetailList.value);
// 统计不同 orgName 的个数
const orgNames = new Set(list.map(item => item.orgName));
currentOrgNum.value = orgNames.size
......@@ -505,8 +522,9 @@ onBeforeUnmount(() => {
}
.tooltip-main-item {
padding: 10px 0;
width: 622px;
height: 144px;
/* height: 144px; */
border-bottom: 1px solid rgb(234, 236, 238);
}
......@@ -559,7 +577,7 @@ onBeforeUnmount(() => {
.item-footer {
width: 622px;
height: 30px;
height: 40px;
padding: 0 8px;
margin-top: 4px;
border-radius: 4px;
......
src/views/ZMOverView/components/fourSuppress/components/allGovernment/index.vue
浏览文件 @ a9b8232b
......@@ -195,7 +195,7 @@
<div class="bottom-item">
<div class="bottom-item-title">
<img :src="icon4" alt="" />
<span>美政府部门对华打压遏制历程</span>
<span>美政府部门对华工作日程表</span>
</div>
<div class="bottom-item-select">
<!-- <div class="select-btn" :class="{ active: measureType === 'history' }" @click="measureType = 'history'">
......
src/views/ZMOverView/components/gameProfile/index.vue
浏览文件 @ a9b8232b
......@@ -49,7 +49,21 @@
</div>
</div>
<div style="width: 100%; height: 620px; padding-top: 24px" id="char"></div>
<div v-if="activeButtonId == 2" style="width: 100%; height: 520px; padding-top: 24px" id="char"></div>
<!-- <Echarts v-if="activeButtonId == 2" :option="lineOption" height="520px" /> -->
<div v-else>
<div class="content-line-chart-header">
<el-radio-group v-model="selectedIndicator" @change="handleIndicatorChange" size="default">
<el-radio
v-for="option in indicatorOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-radio-group>
</div>
<Echarts :option="lineOption" height="520px" />
</div>
</div>
<div style="width: 778px; height: 620px; overflow: auto">
<el-table
......@@ -128,7 +142,8 @@
<div class="card-box" style="margin-top: 16px" @mouseenter="stopAutoPlay" @mouseleave="startAutoPlay(true)">
<div class="card-title">
<img class="icon" src="../../assets/icons/title-icon2.png" />
<img class="text" src="../../assets/icons/title-text2.svg" />
<!-- <img class="text" src="../../assets/icons/title-text2.svg" /> -->
<span class="text-new">中美科技博弈历程</span>
</div>
<div class="card-main">
<!-- <Timeline :data="course" text-key="title" id-key="seq" /> -->
......@@ -218,6 +233,8 @@ import { ArrowRight, CaretBottom } from "@element-plus/icons-vue";
import Timeline from "./Timeline.vue";
import tableShow from "./tableShow.vue";
import ButtonList from "@/components/buttonList/buttonList.vue";
import Echarts from "@/components/Chart/index.vue";
import mockData from "./mock.json";
import radarChart from "./radarChart3.js";
import { getCompare, getChartDict, getTechnologyGameAnalysis } from "@/api/zmOverview/risk/index.js";
......@@ -242,8 +259,8 @@ import { ElMessage } from "element-plus";
const buttonList = ref([
{
id: 1,
text: "趋势变化",
disabled: true
text: "趋势变化"
// disabled: true
},
{
id: 2,
......@@ -253,6 +270,9 @@ const buttonList = ref([
const activeButtonId = ref(buttonList.value[1]?.id || 1);
const setActiveButtonId = id => {
activeButtonId.value = id;
if (id == 2) {
handleGetCompare();
}
};
const course = ref([
......@@ -390,6 +410,197 @@ onMounted(async () => {
// // setChart(option, "char7");
startAutoPlay();
processIndicatorOptions();
});
const chartColors = [
"rgba(8, 151, 156, 1)",
"#FF4D4F",
"#FF9900",
"#00CC99",
"#73c0de",
"#3ba272",
"#fc8452",
"#9a60b4",
"#ea7ccc"
];
// const series = {
// name: key,
// type: "line",
// symbolSize: 15,
// // stack: "Total",
// itemStyle: {
// color: chartColors[Math.floor(Math.random() * chartColors.length)]
// },
// data: []
// };
const indicatorOptions = ref([]);
const selectedIndicator = ref("");
// 整理指标选项
const processIndicatorOptions = () => {
const chinaData = mockData["中国"];
if (!chinaData) return;
indicatorOptions.value = Object.keys(chinaData).map(key => ({
label: key,
value: key
}));
if (indicatorOptions.value.length > 0) {
selectedIndicator.value = indicatorOptions.value[0].value;
handleIndicatorChange(selectedIndicator.value);
}
};
// 处理指标变化
const handleIndicatorChange = indicator => {
const chinaData = mockData["中国"]?.[indicator] || [];
const usaData = mockData["美国"]?.[indicator] || [];
const years = chinaData.map(item => item.year.toString());
const chinaValues = chinaData.map(item => item.value);
const usaValues = usaData.map(item => item.value);
lineOption.value.xAxis.data = years;
lineOption.value.series = [
{
name: "中国",
type: "line",
symbolSize: 10,
itemStyle: {
color: "#CE4F51"
},
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "rgb(206, 79, 81, .8)"
},
{
offset: 1,
color: "rgb(206, 79, 81, .3)"
}
])
},
data: chinaValues
},
{
name: "美国",
type: "line",
symbolSize: 10,
itemStyle: {
color: "#055FC2"
},
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "rgb(5, 95, 194,.8)"
},
{
offset: 1,
color: "rgb(5, 95, 194, .3)"
}
])
},
data: usaValues
}
];
};
const lineOption = ref({
title: {
text: ""
},
tooltip: {
trigger: "axis",
confine: true,
backgroundColor: "rgba(50, 50, 50, 0.7)",
borderColor: "#333",
borderWidth: 0,
padding: [5, 10],
textStyle: {
color: "#fff",
fontSize: 16
}
},
legend: {
show: false
},
grid: {
top: "5%",
left: "3%",
right: "4%",
bottom: "2%",
containLabel: true
},
xAxis: {
type: "category",
boundaryGap: false,
axisLine: {
lineStyle: {
color: "#ccc",
width: 1
}
},
axisTick: {
show: true,
lineStyle: {
color: "#ccc"
}
},
axisLabel: {
color: "#ccc",
fontSize: 16,
fontWeight: 400
},
data: ["2021", "2022", "2023", "2024", "2025"]
},
yAxis: {
type: "value",
// name: "指数",
nameLocation: "top",
nameGap: 35,
nameTextStyle: {
color: "#666",
fontSize: 13,
fontWeight: 600,
padding: [0, 0, 10, 0]
},
axisLine: {
show: false,
lineStyle: {
color: "#ccc",
width: 1
}
},
axisTick: {
show: false,
lineStyle: {
color: "#ccc"
}
},
axisLabel: {
color: "#ccc",
fontSize: 14,
fontWeight: 400,
formatter: value => {
return value.toFixed(0);
}
},
splitLine: {
lineStyle: {
width: 1,
type: "dashed",
color: "rgba(12, 78, 125, .3)"
}
},
splitNumber: 8
},
series: []
});
const tableData = ref([
......@@ -562,7 +773,7 @@ const handleClickBottomBtn = () => {
<style lang="scss" scoped>
.content-wrapper {
width: 1600px;
height: 1600px;
height: 1450px;
margin: 0 auto;
.card-box {
......@@ -585,6 +796,7 @@ const handleClickBottomBtn = () => {
// width: 100%;
height: 48px;
display: flex;
align-items: center;
.icon {
/* 合并 */
......@@ -599,6 +811,13 @@ const handleClickBottomBtn = () => {
height: 31px;
margin: 8px 0px;
}
.text-new {
font-family: YouSheBiaoTiHei;
font-size: 24px;
font-weight: 400;
line-height: 24px;
color: rgb(5, 95, 194);
}
}
.content-chart-header {
......@@ -608,6 +827,10 @@ const handleClickBottomBtn = () => {
// line-height: 32px;
align-items: center;
}
.content-line-chart-header {
margin-top: 15px;
margin-left: 48px;
}
.card-main {
height: 650px;
......@@ -1022,7 +1245,8 @@ const handleClickBottomBtn = () => {
width: 100%;
height: auto;
/* 高度自适应内容 */
display: flex;
// display: flex;
display: none;
flex-direction: row;
/* 行方向布局 */
flex-wrap: wrap;
......
src/views/ZMOverView/components/gameProfile/mock.json 0 → 100644
浏览文件 @ a9b8232b
{
"中国": {
"企业研发人才占比": [
{
"year": 2021,
"value": 79.8
},
{
"year": 2022,
"value": 80.1
},
{
"year": 2023,
"value": 82.7
},
{
"year": 2024,
"value": 81.3
},
{
"year": 2025,
"value": 82.1
}
],
"公共研发支出占比": [
{
"year": 2021,
"value": 72.6
},
{
"year": 2022,
"value": 72.6
},
{
"year": 2023,
"value": 73.7
},
{
"year": 2024,
"value": 72.7
},
{
"year": 2025,
"value": 73.5
}
],
"创新关联": [
{
"year": 2021,
"value": 78.2
},
{
"year": 2022,
"value": 78.1
},
{
"year": 2023,
"value": 77.0
},
{
"year": 2024,
"value": 78.5
},
{
"year": 2025,
"value": 77.0
}
],
"国内产业分布": [
{
"year": 2021,
"value": 99.4
},
{
"year": 2022,
"value": 99.9
},
{
"year": 2023,
"value": 100.4
},
{
"year": 2024,
"value": 100.9
},
{
"year": 2025,
"value": 101.4
}
],
"知识与技术产出": [
{
"year": 2021,
"value": 63.6
},
{
"year": 2022,
"value": 64.3
},
{
"year": 2023,
"value": 64.5
},
{
"year": 2024,
"value": 63.4
},
{
"year": 2025,
"value": 62.9
}
],
"知识工作者": [
{
"year": 2021,
"value": 79.5
},
{
"year": 2022,
"value": 79.7
},
{
"year": 2023,
"value": 78.1
},
{
"year": 2024,
"value": 78.9
},
{
"year": 2025,
"value": 79.4
}
]
},
"美国": {
"企业研发人才占比": [
{
"year": 2021,
"value": 81.1
},
{
"year": 2022,
"value": 81.8
},
{
"year": 2023,
"value": 82.8
},
{
"year": 2024,
"value": 81.3
},
{
"year": 2025,
"value": 82.5
}
],
"公共研发支出占比": [
{
"year": 2021,
"value": 73.8
},
{
"year": 2022,
"value": 71.6
},
{
"year": 2023,
"value": 72.1
},
{
"year": 2024,
"value": 72.6
},
{
"year": 2025,
"value": 71.9
}
],
"创新关联": [
{
"year": 2021,
"value": 77.4
},
{
"year": 2022,
"value": 77.3
},
{
"year": 2023,
"value": 77.2
},
{
"year": 2024,
"value": 77.1
},
{
"year": 2025,
"value": 77.0
}
],
"国内产业分布": [
{
"year": 2021,
"value": 98.5
},
{
"year": 2022,
"value": 101.1
},
{
"year": 2023,
"value": 98.4
},
{
"year": 2024,
"value": 99.8
},
{
"year": 2025,
"value": 98.2
}
],
"知识与技术产出": [
{
"year": 2021,
"value": 64.5
},
{
"year": 2022,
"value": 63.4
},
{
"year": 2023,
"value": 63.7
},
{
"year": 2024,
"value": 63.4
},
{
"year": 2025,
"value": 62.7
}
],
"知识工作者": [
{
"year": 2021,
"value": 66.8
},
{
"year": 2022,
"value": 71.8
},
{
"year": 2023,
"value": 76.8
},
{
"year": 2024,
"value": 81.8
},
{
"year": 2025,
"value": 86.8
}
]
}
}
\ No newline at end of file
src/views/ZMOverView/components/newRisk/index.vue
浏览文件 @ a9b8232b
......@@ -142,11 +142,11 @@
</div>
<div class="carousel-footer">
<div class="footer-left">
<div class="type">{{ News.hotspotType +'——' }}</div>
<div class="type">{{ News.hotspotType + "——" }}</div>
<div class="text">{{ News.eventTitle }}</div>
</div>
<div class="footer-right">
<img src="@/assets/icons/arrow-right.png" alt="">
<img src="@/assets/icons/arrow-right.png" alt="" />
</div>
</div>
</div>
......@@ -290,8 +290,8 @@ const sections = ref([
count: 0,
change: "无新增",
unit: "次",
title: "230调查",
type: "230调查"
title: "232调查",
type: "232调查"
},
{
percent: 0, // 估算的百分比
......@@ -436,8 +436,8 @@ const handleGetLatestRiskUpdates = async () => {
count: res.data["232Survey"].total,
change: res.data["232Survey"].dailyIncrement,
unit: "次",
title: "230调查",
type: "230调查"
title: "232调查",
type: "232调查"
},
{
percent: 3, // 估算的百分比
......@@ -1221,8 +1221,7 @@ onUnmounted(() => {
// .text{
// color:var(--color-main-active);
// }
// }
// }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论