diff --git a/src/assets/images/tanchuang.png b/src/assets/images/tanchuang.png new file mode 100644 index 0000000..2afaa8d Binary files /dev/null and b/src/assets/images/tanchuang.png differ diff --git a/src/components/Chart32_Inspection(1).vue b/src/components/Chart32_Inspection(1).vue index 3ffced2..26f1e90 100644 --- a/src/components/Chart32_Inspection(1).vue +++ b/src/components/Chart32_Inspection(1).vue @@ -26,7 +26,7 @@ let myChart = null; const option = { title: { - text: '中国海警首次登检菲律宾运补船只 (Y轴镜像)', + text: '事件热度预测', left: 'center' }, tooltip: { trigger: 'axis' }, diff --git a/src/components/Chart33_WavingBlades(1).vue b/src/components/Chart33_WavingBlades(1).vue index f1c59cb..06bca34 100644 --- a/src/components/Chart33_WavingBlades(1).vue +++ b/src/components/Chart33_WavingBlades(1).vue @@ -27,7 +27,7 @@ let myChart = null; const option = { title: { - text: '中方回应菲称我海警挥舞刀具 (Y轴镜像)', + text: '事件热度预测', left: 'center' }, tooltip: { trigger: 'axis' }, diff --git a/src/components/Chart34_RecoveredGoods(1).vue b/src/components/Chart34_RecoveredGoods(1).vue index bf24d52..95dd0ab 100644 --- a/src/components/Chart34_RecoveredGoods(1).vue +++ b/src/components/Chart34_RecoveredGoods(1).vue @@ -24,7 +24,7 @@ let myChart = null; const option = { title: { - text: '中国海警夺回菲方盗窃赃物 (Y轴镜像)', + text: '事件热度预测', left: 'center' }, tooltip: { trigger: 'axis' }, @@ -38,7 +38,7 @@ const option = { series: [{ name: '热度', data: yAxisMirroredData, - type: 'bar', // 使用柱状图 + type: 'line', itemStyle: { color: '#91cc75' } }] }; diff --git a/src/components/Chart35_SpecialForces(1).vue b/src/components/Chart35_SpecialForces(1).vue index 7c4210c..db385fd 100644 --- a/src/components/Chart35_SpecialForces(1).vue +++ b/src/components/Chart35_SpecialForces(1).vue @@ -26,7 +26,7 @@ let myChart = null; const option = { title: { - text: '菲自曝被缴枪的是顶级特种部队 (Y轴镜像)', + text: '时间热度预测', left: 'center' }, tooltip: { trigger: 'axis' }, diff --git a/src/components/Chart36_Dialogue(1).vue b/src/components/Chart36_Dialogue(1).vue index f42afbf..3f98934 100644 --- a/src/components/Chart36_Dialogue(1).vue +++ b/src/components/Chart36_Dialogue(1).vue @@ -27,7 +27,7 @@ let myChart = null; const option = { title: { - text: '菲希望与中国就南海问题对话 (Y轴镜像)', + text: '事件热度预测', left: 'center' }, tooltip: { trigger: 'axis' }, @@ -42,7 +42,6 @@ const option = { name: '热度', data: yAxisMirroredData, type: 'line', - step: 'start', // 使用阶梯线图 itemStyle: { color: '#ee6666' } }] }; diff --git a/src/views/App.vue b/src/views/App.vue index 9f6ca25..4df5e4b 100644 --- a/src/views/App.vue +++ b/src/views/App.vue @@ -2,18 +2,32 @@ @@ -1118,9 +1357,6 @@ onUnmounted(() => { position: relative; z-index: 1; } - - - .time span { font-family: LCD2; font-weight: 400; @@ -1132,7 +1368,6 @@ onUnmounted(() => { margin-right: 80px; margin-top: -148px; } - .search { width: 530px; height: 48px; @@ -1424,7 +1659,7 @@ onUnmounted(() => { .suggestion-containner { margin-left: 10px; margin-top: 15px; - width: 400px; + width: 420px; height: 480px; max-height: 380px; /* 可根据需要调整最大高度 */ @@ -1463,6 +1698,7 @@ onUnmounted(() => { } .span-3 { + width: 200px; font-family: PingFang SC; font-weight: 200; font-size: 14px; @@ -1518,7 +1754,7 @@ onUnmounted(() => { .containner2-alldata { margin-left: 25px; - width: 420px; + width: 450px; display: flex; flex-direction: row; flex-wrap: nowrap; @@ -1543,7 +1779,7 @@ onUnmounted(() => { justify-content: center; align-items: center; color: #C6E3F5; - width: 200px; + width: 400px; list-style-type: none; flex: 1; min-width: 0; @@ -1554,15 +1790,6 @@ onUnmounted(() => { width: 420px; height: 200px; max-height: 200px; - /* 可根据需要调整最大高度 */ - overflow-y: auto; - /* 当内容超出最大高度时显示垂直滚动条 */ - overflow-x: hidden; - /* 隐藏水平滚动条 */ - scrollbar-width: none; - /* Firefox */ - ; - } .color-block1 { @@ -2086,4 +2313,47 @@ onUnmounted(() => { .back-home-btn:active { background-color: #0a1949; } +.chart-tabs { + margin-top: -80px; + display: flex; + justify-content: center; + + gap: 0px; + margin-left: 180px; + +} + +.chart-tabs button { + width: 100px; + height: 30px; + margin-top: 60px; + margin-left: 10px; + border: none; + border-radius: 15px; + background-color: #333; + color: #fff; + cursor: pointer; + transition: all 0.3s ease; +} + +.chart-tabs button.active-tab { + margin-top: 60px; + background-color: #1890ff; + box-shadow: 0 0 10px rgba(24, 144, 255, 0.5); +} + +/* 图表容器样式 */ +#categoryChart { + width: 80%; + height: 400px; +margin-left: -40px; + +} + +/* 响应式调整 */ +@media (max-width: 900px) { + #categoryChart { + height: 200px; + } +} diff --git a/src/views/Navigation.vue b/src/views/Navigation.vue index 0392288..382de02 100644 --- a/src/views/Navigation.vue +++ b/src/views/Navigation.vue @@ -56,19 +56,25 @@ style=" width: 180px;margin-top: 30px;margin-right: 50px;float: right;"> - + + 可点击图片 + class="mao-button" + :class="{ active: route.path === '/Main' }" + @click="goToPage('/Main')" + > + +
@@ -78,7 +84,13 @@ style=" width: 180px;margin-top: 30px;margin-right: 50px;float: right;"> - + + 可点击图片
@@ -88,13 +100,24 @@ style=" width: 180px;margin-top: 30px;margin-right: 50px;float: right;"> - + + 可点击图片
-
+ +
@@ -104,8 +127,34 @@ import { useRouter } from 'vue-router'; import { ref, onMounted,onUnmounted } from 'vue'; import { useRoute } from 'vue-router'; -const route = useRoute(); import { ElLoading } from 'element-plus'; + +// 【新增点】导入统一的弹窗图片 +import tanchuangImage from '../assets/images/tanchuang.png'; + +// 导入页面上显示的图片 +import image111 from '../assets/images/percent/1-1-1.png'; +import image211 from '../assets/images/percent/2-1-1.png'; +import image311 from '../assets/images/percent/3-1-1.png'; + +const route = useRoute(); + +// 弹窗相关状态 +const isModalVisible = ref(false); +const modalImageSrc = ref(''); + +// 【修改点】打开弹窗的函数,固定显示 tanchuang.png +const openModal = () => { + modalImageSrc.value = tanchuangImage; // 总是使用 tanchuang.png + isModalVisible.value = true; +}; + +// 关闭弹窗的函数 +const closeModal = () => { + isModalVisible.value = false; +}; + + // 实时时钟实现 const currentTime = ref(''); @@ -224,6 +273,55 @@ onUnmounted(() => {