duanhao/SocialNetworks_duan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

post冲突解决

Browse Source
This commit is contained in:
duanhao 2025-08-05 11:26:58 +08:00
parent 3f1e4b60e7
commit 39959ea071
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/GroupEvolution/component/groupPost.vue
View File

@ -1,11 +1,7 @@
<template> <template>
<div class="postList-component"> <div class="postList-component">
<img <img
<<<<<<< HEAD
:src="isAbnormal ? abnormalTitle : groupEvolutionTitle" :src="isAbnormal ? abnormalTitle : groupEvolutionTitle"
=======
src="@/assets/images/groupEvolution/event-list-title.png"
>>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
alt="" alt=""
style="margin-top: -17px; margin-left: -11px" style="margin-top: -17px; margin-left: -11px"
/> />
@ -23,12 +19,9 @@
:class="{ highlighted: post.highlighted }" :class="{ highlighted: post.highlighted }"
@click="handleLeaderPost(post)" @click="handleLeaderPost(post)"
> >
<<<<<<< HEAD
<div class="post-type"> <div class="post-type">
<img src="@/assets/images/groupEvolution/group_icon.png" alt=""> <img src="@/assets/images/groupEvolution/group_icon.png" alt="">
</div> </div>
=======
>>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
<span class="timestamp">{{ post.timestamp }}</span> <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 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> </span>
@ -79,14 +72,10 @@
</template> </template>
<script setup> <script setup>
<<<<<<< HEAD
import abnormalPostItemTitle from "@/assets/images/abnormalGroup/abnormal-action-analysis-item-title.png" import abnormalPostItemTitle from "@/assets/images/abnormalGroup/abnormal-action-analysis-item-title.png"
import groupEvolutionTitle from "@/assets/images/groupEvolution/group-evolution-analysis-titlt.png" import groupEvolutionTitle from "@/assets/images/groupEvolution/group-evolution-analysis-titlt.png"
import abnormalTitle from "@/assets/images/abnormalGroup/abnormal-action-analysis-title.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";
=======
import { ref, computed, defineProps, defineEmits, onMounted, onBeforeUnmount } from "vue"
>>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
const props = defineProps({ const props = defineProps({
posts: { posts: {
type: Array, type: Array,
@ -150,17 +139,12 @@ function resumeScroll() {
} }
onMounted(() => { onMounted(() => {
<<<<<<< HEAD
console.log("打印moudleName:"); console.log("打印moudleName:");
console.log(props.moduleName); console.log(props.moduleName);
console.log(props.posts); console.log(props.posts);
startScroll(); startScroll();
}); });
=======
startScroll()
})
>>>>>>> 203fd7c18d074bb2c7d3724b8d13e9ef244d7e82
onBeforeUnmount(() => { onBeforeUnmount(() => {
pauseScroll() pauseScroll()
}) })

4
src/views/GroupEvolution/groupIdentifyDiscovery/index.vue
View File

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