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

src/views/KeyNodeDiscern/bridgeCommunication/index.vue

@@ -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%);

src/views/KeyNodeDiscern/components/PostDynamics.vue

@@ -1,6 +1,10 @@
 <template>
-  <div class="post-dynamics-container">
+  <div class="anchorStatistics-component">
-    <!-- <div class="header">事件脉络分析</div> -->
+    <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,26 +104,18 @@ onBeforeUnmount(() => {
 })
 </script>
 
-<style scoped>
+<style scoped lang="less">
-.post-dynamics-container {
+.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;
+    width: 100%;
-  overflow: hidden;
+    height: 80%;
-  position: relative;
     overflow: auto;
-  padding-right: 8px;
   }
   /* 滚动条整体样式 - WebKit浏览器 */
   .post-list-wrapper::-webkit-scrollbar {
-  width: 5px; /* 垂直滚动条宽度 */
+    width: 3px; /* 垂直滚动条宽度 */
     height: 5px; /* 水平滚动条高度 */
   }
 
@@ -157,7 +154,7 @@ onBeforeUnmount(() => {
     gap: 12px;
     flex-shrink: 0;
     cursor: pointer;
-  margin: 8px 0px;
+    margin: 8px 0;
   }
 
   .post-item.highlighted {
@@ -253,4 +250,5 @@ onBeforeUnmount(() => {
     border-radius: 50%;
     border: 1px solid rgba(21, 154, 255, 0.3);
   }
+}
 </style>

src/views/LinkPrediction/characterInteraction/index.vue

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

src/views/LinkPrediction/charactersHiddenInteraction/index.vue

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

src/views/LinkPrediction/socialGroups/index.vue

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