post冲突解决

src/views/GroupEvolution/component/groupPost.vue

@@ -1,11 +1,7 @@
 <template>
   <div class="postList-component">
     <img
-<<<<<<< HEAD
       :src="isAbnormal ? abnormalTitle : groupEvolutionTitle"
-=======
-      src="@/assets/images/groupEvolution/event-list-title.png"
->>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
       alt=""
       style="margin-top: -17px; margin-left: -11px"
     />
@@ -23,12 +19,9 @@
           :class="{ highlighted: post.highlighted }"
           @click="handleLeaderPost(post)"
         >
-<<<<<<< HEAD
           <div class="post-type">
             <img src="@/assets/images/groupEvolution/group_icon.png" alt="">
           </div>
-=======
->>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
           <span class="timestamp">{{ post.timestamp }}</span>
           <span class="author" v-if="props.moduleName == '群体识别发现'">【{{ post.groupCategory }}】&nbsp;&nbsp;的节点数增加<span style="color: #9DF9FE;">{{ post.nodeAddCount }}</span>个，&nbsp;&nbsp;连边增加<span style="color: #9DF9FE;">{{ post.edgeAddCount }}</span>个
           </span>
@@ -79,14 +72,10 @@
 </template>
 
 <script setup>
-<<<<<<< HEAD
 import abnormalPostItemTitle from "@/assets/images/abnormalGroup/abnormal-action-analysis-item-title.png"
 import groupEvolutionTitle from "@/assets/images/groupEvolution/group-evolution-analysis-titlt.png"
 import abnormalTitle from "@/assets/images/abnormalGroup/abnormal-action-analysis-title.png"
 import { ref, computed, defineProps, defineEmits, onMounted, onBeforeUnmount } from "vue";
-=======
-import { ref, computed, defineProps, defineEmits, onMounted, onBeforeUnmount } from "vue"
->>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
 const props = defineProps({
   posts: {
     type: Array,
@@ -150,17 +139,12 @@ function resumeScroll() {
 }
 
 onMounted(() => {
-<<<<<<< HEAD
   console.log("打印moudleName:");
   console.log(props.moduleName);
   console.log(props.posts);
   
   startScroll();
 });
-=======
-  startScroll()
-})
->>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
 onBeforeUnmount(() => {
   pauseScroll()
 })

src/views/GroupEvolution/groupIdentifyDiscovery/index.vue

@@ -77,13 +77,9 @@ import groupGroupShowImg from "@/assets/images/groupEvolution/groupDisc-title.pn
 import { Icon } from "@iconify/vue"
 import { useGroupDiscoveryStore } from "@/store/groupEvolution/index"
 
-<<<<<<< HEAD
 const groupDiscoveryStore = useGroupDiscoveryStore();
 
 const moduleName = '群体识别发现';
-=======
-const groupDiscoveryStore = useGroupDiscoveryStore()
->>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
 //控制弹窗
 const postDialog = ref(false)