Yuleiqi/pre-warning-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
于磊奇 2025-06-19 13:01:11 +08:00
commit fcc2926209
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/Main.vue
View File

@ -7,6 +7,7 @@
<div class="tooltip-containner-data"> <div class="tooltip-containner-data">
<li><img :src="currentItem.img" alt="" style=""></li> <li><img :src="currentItem.img" alt="" style=""></li>
<li v-if="currentItem.title.includes('中国海警首次登检菲律宾运补船只')"><chart32_-inspection /></li> <li v-if="currentItem.title.includes('中国海警首次登检菲律宾运补船只')"><chart32_-inspection /></li>
<<<<<<< HEAD
<li v-else-if="currentItem.title.includes('中方回应菲称我海警挥舞刀具')"> <Chart33_WavingBlades /></li> <li v-else-if="currentItem.title.includes('中方回应菲称我海警挥舞刀具')"> <Chart33_WavingBlades /></li>
<li v-else-if="currentItem.title.includes('中国海警夺回菲方盗窃赃物')"><Chart34_RecoveredGoods /></li> <li v-else-if="currentItem.title.includes('中国海警夺回菲方盗窃赃物')"><Chart34_RecoveredGoods /></li>
<li v-else-if="currentItem.title.includes('菲自曝被中国海警缴枪的是顶级特种部队')"><Chart35_SpecialForces /></li> <li v-else-if="currentItem.title.includes('菲自曝被中国海警缴枪的是顶级特种部队')"><Chart35_SpecialForces /></li>
@ -15,6 +16,17 @@
<li style="margin-left: 10px; margin-top:20px;"><img src="../assets/images/logo/point.png" <li style="margin-left: 10px; margin-top:20px;"><img src="../assets/images/logo/point.png"
alt="" style="margin-bottom: -7px;">最初首发者：&nbsp;&nbsp;&nbsp;{{ currentItem.earler }} </li> alt="" style="margin-bottom: -7px;">最初首发者：&nbsp;&nbsp;&nbsp;{{ currentItem.earler }} </li>
<li style="margin-left: 10px;"><img src="../assets/images/logo/point.png" alt="" style="margin-bottom: -7px;">积极评论者：{{ currentItem.comenter <li style="margin-left: 10px;"><img src="../assets/images/logo/point.png" alt="" style="margin-bottom: -7px;">积极评论者：{{ currentItem.comenter
=======
<li v-else-if="currentItem.title.includes('中方回应菲称我海警挥舞刀具')">
<Chart33_WavingBlades />
</li>
<li v-else-if="currentItem.title.includes('中国海警夺回菲方盗窃赃物')">
<Chart34_RecoveredGoods />
</li>
<li style="margin-left: 10px; margin-top: 20px;"><img src="../assets/images/logo/point.png"
alt="">最初首发者：&nbsp;&nbsp;&nbsp;{{ currentItem.earler }} </li>
<li style="margin-left: 10px;"><img src="../assets/images/logo/point.png" alt="">积极评论者：{{ currentItem.comenter
>>>>>>> 33171231818e20d0f810df4ae56f3620727af4df
}}</li> }}</li>
<li style="margin-left: 200px;margin-top: -45px;"><img src="../assets/images/logo/point.png" alt="" style="margin-bottom: -7px;">锚点用户{{ <li style="margin-left: 200px;margin-top: -45px;"><img src="../assets/images/logo/point.png" alt="" style="margin-bottom: -7px;">锚点用户{{
currentItem.keyuser }}</li> currentItem.keyuser }}</li>
@ -223,13 +235,15 @@ import { useRouter } from 'vue-router';
import IndexView from './App.vue'; import IndexView from './App.vue';
import ScrollContainer from '@/components/ScrollContainer.vue'; import ScrollContainer from '@/components/ScrollContainer.vue';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import axios from 'axios';
import { useActionStore } from '@/store'; import { useActionStore } from '@/store';
import Chart32_Inspection from '@/components/Chart32_Inspection(1).vue'; import Chart32_Inspection from '@/components/Chart32_Inspection(1).vue';
import Chart33_WavingBlades from '@/components/Chart33_WavingBlades(1).vue'; import Chart33_WavingBlades from '@/components/Chart33_WavingBlades(1).vue';
import Chart34_RecoveredGoods from '@/components/Chart34_RecoveredGoods(1).vue'; import Chart34_RecoveredGoods from '@/components/Chart34_RecoveredGoods(1).vue';
<<<<<<< HEAD
import Chart35_SpecialForces from '@/components/Chart35_SpecialForces(1).vue'; import Chart35_SpecialForces from '@/components/Chart35_SpecialForces(1).vue';
import Chart36_Dialogue from '@/components/Chart36_Dialogue(1).vue'; import Chart36_Dialogue from '@/components/Chart36_Dialogue(1).vue';
=======
>>>>>>> 33171231818e20d0f810df4ae56f3620727af4df
let myChart = null; let myChart = null;
@ -870,6 +884,7 @@ const currentItem = ref(currentDataSet.value[0]);
// 切换选中项的方法 // 切换选中项的方法
const selectItem = (item) => { const selectItem = (item) => {
currentItem.value = item; currentItem.value = item;
console.log(currentItem.value);
showTooltip.value = true; // 点击时显示 tooltip showTooltip.value = true; // 点击时显示 tooltip
}; };