解决dist.zip文件的合并冲突

This commit is contained in:
duanhao 2025-08-14 09:49:40 +08:00
commit 6b95cc62e6
7 changed files with 140 additions and 154 deletions

BIN
dist.zip

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

View File

@ -335,7 +335,7 @@ const wordCloudData = ref([
.top-container {
width: 100%;
height: 88px;
background-image: url("@/assets/images/head/leaderOptionText.png");
background-image: url("@/assets/images/head/big-title.png");
background-repeat: no-repeat;
background-size: cover;
fill: linear-gradient(270deg, rgba(6, 61, 113, 0.1) 0%, rgba(8, 30, 56, 0.38) 100%);

View File

@ -1,6 +1,10 @@
<template>
<div class="post-dynamics-container">
<!-- <div class="header">事件脉络分析</div> -->
<div class="anchorStatistics-component">
<img
src="@/assets/images/head/ContextoftheincidentTitle.png"
alt=""
style="margin-top: -17px; margin-left: -11px"
/>
<div
class="post-list-wrapper"
ref="listRef"
@ -38,14 +42,14 @@
<script setup>
import { ref, computed, onMounted, onBeforeUnmount } from "vue"
const props = defineProps({
posts: {
type: Array,
default: () => []
}
})
const emit = defineEmits(["handle:openDialog"])
const emit = defineEmits(["click:openDialog"])
const animationDuration = computed(() => `${props.posts.length * 3}s`)
const maxInfluence = 10000
@ -55,7 +59,8 @@ const getInfluenceWidth = (influence) => {
return `${Math.min(percentage, 100)}%`
}
const handleLeaderPost = (item) => {
emit("handle:openDialog", item)
emit("click:openDialog", item)
console.log(item)
}
const listRef = ref(null)
@ -99,53 +104,45 @@ onBeforeUnmount(() => {
})
</script>
<style scoped>
.post-dynamics-container {
<style scoped lang="less">
.anchorStatistics-component {
width: 100%;
height: 100%;
font-family: "PingFang SC", sans-serif;
display: flex;
flex-direction: column;
border: none;
}
.post-list-wrapper {
flex-grow: 1;
overflow: hidden;
position: relative;
.post-list-wrapper {
width: 100%;
height: 80%;
overflow: auto;
padding-right: 8px;
}
/* 滚动条整体样式 - WebKit浏览器 */
.post-list-wrapper::-webkit-scrollbar {
width: 5px; /* 垂直滚动条宽度 */
}
/* 滚动条整体样式 - WebKit浏览器 */
.post-list-wrapper::-webkit-scrollbar {
width: 3px; /* 垂直滚动条宽度 */
height: 5px; /* 水平滚动条高度 */
}
}
/* 滚动条滑块 */
.post-list-wrapper::-webkit-scrollbar-thumb {
/* 滚动条滑块 */
.post-list-wrapper::-webkit-scrollbar-thumb {
background: rgba(147, 210, 255, 0.3); /* 蓝色半透明滑块 */
border-radius: 4px;
}
}
/* 鼠标悬停在滑块上的效果 */
.post-list-wrapper::-webkit-scrollbar-thumb:hover {
/* 鼠标悬停在滑块上的效果 */
.post-list-wrapper::-webkit-scrollbar-thumb:hover {
background: rgba(147, 210, 255, 0.5); /* 更明显的蓝色 */
}
.scrolling-content {
}
.scrolling-content {
display: flex;
flex-direction: column;
gap: 1px;
animation-name: scroll-up;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
.post-list-wrapper:hover .scrolling-content {
.post-list-wrapper:hover .scrolling-content {
animation-play-state: paused;
}
}
.post-item {
.post-item {
display: flex;
align-items: center;
height: 36px;
@ -157,72 +154,72 @@ onBeforeUnmount(() => {
gap: 12px;
flex-shrink: 0;
cursor: pointer;
margin: 8px 0px;
}
margin: 8px 0;
}
.post-item.highlighted {
.post-item.highlighted {
background: linear-gradient(90deg, rgba(63, 169, 245, 0.4) 0%, rgba(0, 84, 187, 0) 100%);
}
}
.post-type {
.post-type {
display: flex;
align-items: center;
gap: 8px;
flex-shrink: 0;
}
}
.post-type-text {
.post-type-text {
color: #8efbff;
font-size: 14px;
font-weight: 400;
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25);
}
}
.timestamp {
.timestamp {
flex-shrink: 0;
}
}
.author {
.author {
flex-grow: 1;
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.influence-section {
.influence-section {
display: flex;
align-items: center;
gap: 8px;
flex-shrink: 0;
}
.influence-label {
}
.influence-label {
width: 90px;
display: flex;
justify-content: flex-start;
}
.influence-bar {
}
.influence-bar {
width: 200px;
height: 10px;
position: relative;
display: flex;
align-items: center;
}
}
.bar-track {
.bar-track {
width: 100%;
height: 2px;
background-color: rgba(208, 222, 238, 0.1);
position: absolute;
}
}
.bar-fill {
.bar-fill {
position: absolute;
height: 2px;
background: linear-gradient(270deg, #00f3ff 0%, #00527d 100%);
}
}
.bar-handle-wrapper {
.bar-handle-wrapper {
position: absolute;
top: 50%;
transform: translateY(-50%);
@ -231,18 +228,18 @@ onBeforeUnmount(() => {
display: flex;
justify-content: center;
align-items: center;
}
}
.bar-handle {
.bar-handle {
width: 10px;
height: 10px;
border-radius: 50%;
background-color: #e0f1ff;
position: relative;
box-shadow: 0 0 6px 0 rgba(13, 97, 255, 0.8);
}
}
.bar-handle::before {
.bar-handle::before {
content: "";
position: absolute;
top: 50%;
@ -252,5 +249,6 @@ onBeforeUnmount(() => {
height: 16px;
border-radius: 50%;
border: 1px solid rgba(21, 154, 255, 0.3);
}
}
</style>

View File

@ -62,10 +62,6 @@
粉丝量&nbsp;&nbsp;
<p>{{ curSelectedUser.fans }}</p>
</div>
<div class="posts">
发帖数&nbsp;&nbsp;
<p>{{ curSelectedUser.postNum }}</p>
</div>
</div>
</div>
</div>

View File

@ -61,10 +61,6 @@
粉丝量&nbsp;&nbsp;
<p>{{ curSelectedUser.fans }}</p>
</div>
<div class="posts">
发帖数&nbsp;&nbsp;
<p>{{ curSelectedUser.postNum }}</p>
</div>
</div>
</div>
</div>

View File

@ -82,10 +82,6 @@
粉丝量&nbsp;&nbsp;
<p>{{ curSelectedUser.fans }}</p>
</div>
<div class="posts">
发帖数&nbsp;&nbsp;
<p>{{ curSelectedUser.postNum }}</p>
</div>
</div>
</div>
</div>