|
|
|
@ -24,11 +24,12 @@
|
|
|
|
|
>
|
|
|
|
|
<ul class="attack-wrap" :class="{ marquee_top: animateFlag }">
|
|
|
|
|
<li
|
|
|
|
|
v-for="item in attackItem"
|
|
|
|
|
v-for="item in newAttackItem"
|
|
|
|
|
:key="item.country"
|
|
|
|
|
class="attack-item"
|
|
|
|
|
>
|
|
|
|
|
<img :src="item.url" alt="" @click="btn1(item)" />
|
|
|
|
|
<img :src="item.url" alt="" />
|
|
|
|
|
<!-- <img :src="item.url" alt="" @click="btn1(item)" /> -->
|
|
|
|
|
<div class="attack-info">
|
|
|
|
|
<span class="attack-num">
|
|
|
|
|
{{ item.attackNum | commaFilter }} <span>次 </span>
|
|
|
|
@ -53,7 +54,7 @@
|
|
|
|
|
>
|
|
|
|
|
<ul class="attack-wrap" :class="{ marquee_top: animateFlagTwo }">
|
|
|
|
|
<li
|
|
|
|
|
v-for="item in attackItemTwo"
|
|
|
|
|
v-for="item in newAttackItemTwo"
|
|
|
|
|
:key="item.country"
|
|
|
|
|
class="attack-item"
|
|
|
|
|
>
|
|
|
|
@ -63,7 +64,8 @@
|
|
|
|
|
</span>
|
|
|
|
|
<span class="attack-country">{{ item.country }}攻击次数</span>
|
|
|
|
|
</div>
|
|
|
|
|
<img :src="item.url" alt="" @click="btn1(item)" />
|
|
|
|
|
<img :src="item.url" alt="" />
|
|
|
|
|
<!-- <img :src="item.url" alt="" @click="btn1(item)" /> -->
|
|
|
|
|
</li>
|
|
|
|
|
</ul>
|
|
|
|
|
</div>
|
|
|
|
@ -372,6 +374,7 @@ export default {
|
|
|
|
|
url: require("@/assets/privateOrder/general/爱尔兰.png"),
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
newAttackItem: [],
|
|
|
|
|
attackItemTwo: [
|
|
|
|
|
{
|
|
|
|
|
country: "浙江省",
|
|
|
|
@ -524,6 +527,7 @@ export default {
|
|
|
|
|
url: require("@/assets/privateOrder/general/江西省.png"),
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
newAttackItemTwo: [],
|
|
|
|
|
animateFlag: false,
|
|
|
|
|
animateFlagTwo: false,
|
|
|
|
|
timer: null,
|
|
|
|
@ -563,21 +567,43 @@ export default {
|
|
|
|
|
methods: {
|
|
|
|
|
//地图受攻击
|
|
|
|
|
mapList() {
|
|
|
|
|
listMap({ pageSize: 20, pageNum: 1 }).then((res) => {
|
|
|
|
|
res.rows.forEach((value) => {
|
|
|
|
|
this.attackItem.forEach((value1, index1) => {
|
|
|
|
|
if (value1.country == value.name) {
|
|
|
|
|
this.attackItem[index1].attackNum = value.count;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
let a1 = new Promise((resolve, reject) => {
|
|
|
|
|
listMap({ pageSize: 5, pageNum: 1, type: 1 })
|
|
|
|
|
.then((res) => {
|
|
|
|
|
resolve(res.rows);
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
reject("");
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
let a2 = new Promise((resolve, reject) => {
|
|
|
|
|
listMap({ pageSize: 5, pageNum: 1, type: 2 })
|
|
|
|
|
.then((res) => {
|
|
|
|
|
resolve(res.rows);
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
reject("");
|
|
|
|
|
});
|
|
|
|
|
this.attackItemTwo.forEach((value2, index2) => {
|
|
|
|
|
if (value2.country == value.name) {
|
|
|
|
|
this.attackItemTwo[index2].attackNum = value.count;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
Promise.all([a1, a2])
|
|
|
|
|
.then((res) => {
|
|
|
|
|
res[0].forEach((value) => {
|
|
|
|
|
this.newAttackItem.push({
|
|
|
|
|
country: value.name,
|
|
|
|
|
attackNum: value.count,
|
|
|
|
|
url: require(`@/assets/privateOrder/general/${value.name}.png`),
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
res[1].forEach((value) => {
|
|
|
|
|
this.newAttackItemTwo.push({
|
|
|
|
|
country: value.name,
|
|
|
|
|
attackNum: value.count,
|
|
|
|
|
url: require(`@/assets/privateOrder/general/${value.name}.png`),
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
this.onload();
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
this.onload();
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|