-
+
{{ servers.find((res) => res.id == k).name }}：
- {{ tableData.Numbers[k] || 0 }}
+ {{ num || 0 }}
-
- {{ num }}
+
+ {{ tableData.topNumbers[k] || 0 }}
@@ -92,6 +92,7 @@ interface TableDataState {
};
topOnlineCount: number;
servers: object[];
+ serverIds: [];
serverSwitch: number;
serverCategorize: object[];
}
@@ -115,6 +116,7 @@ export default defineComponent({
topOnlineCount: 0,
serverSwitch: 0,
servers: ServerList,
+ serverIds: [],
serverCategorize: ServerCategorize,
});
const onlineList = () => {
@@ -177,11 +179,11 @@ export default defineComponent({
state.tableData.TotalNumber += res.data.total;
});
console.log(
- 'server index: ',
+ 'gameOnlineList server index: ',
server,
- state.servers.indexOf((r) => r.id == server)
+ state.serverIds.indexOf(server)
);
- }, 1000 * state.servers.indexOf((r) => r.id == server));
+ }, 1000 * state.serverIds.indexOf(server));
};
const onlinesTop = (server: number) => {
if (!server) {
@@ -194,15 +196,22 @@ export default defineComponent({
for (let i in list) {
state.tableData.topNumbers[list[i].server] = list[i].num;
}
+
});
- console.log('server index: ', server, state.servers.indexOf((r) => r.id == server));
- }, 1000 * state.servers.indexOf((r) => r.id == server));
+ console.log(
+ 'gameOnlineTopList server index: ',
+ server,
+ state.serverIds.indexOf(server)
+ );
+ }, 2000 * state.serverIds.indexOf(server));
};
// 页面加载时
onMounted(() => {
allServerList().then((res) => {
- // console.log(res);
+ console.log(res);
state.servers = res;
+
+ state.serverIds = state.servers.map((obj) => obj.id);
});
});
const switchServer = () => {
@@ -219,50 +228,50 @@ export default defineComponent({
diff --git a/src/views/serverBattlePass/update/index.vue b/src/views/serverBattlePass/update/index.vue
index dc22349..01dd25b 100644
--- a/src/views/serverBattlePass/update/index.vue
+++ b/src/views/serverBattlePass/update/index.vue
@@ -34,13 +34,16 @@
:disabled-date="disabledDate"
/>
-
-
-
-
- 发布
-
+
+
+
+
+
+ 发布
+
+
+
@@ -69,7 +72,7 @@
- {{ scope.row.name }}
+ {{ scope.row.name }}
@@ -180,6 +183,8 @@
import { defineComponent, onMounted, reactive, ref, toRefs } from 'vue';
import { gameGMCheckPeriodIdBattlePass, gameGMGetBattlePass, gameGMInsertBattlePass, gameGMUpdateBattlePass } from '/@/api/game/gameConfig';
import BattlePassConfigCategory from '/@/api/config/BattlePassConfigCategory.json';
+import BattlePassLvConfigCategory from '/@/api/config/BattlePassLvConfigCategory.json';
+import BattlePassTaskConfigCategory from '/@/api/config/BattlePassTaskConfigCategory.json';
import { ElLoading, ElMessage } from 'element-plus';
import { uniquePeriodId, zeroFill } from '/@/utils/utils';
import { serverList } from '/@/utils/game';
@@ -291,6 +296,17 @@ export default defineComponent({
return;
}
+ let lvConfigs = BattlePassLvConfigCategory.filter((r) => r.PeriodId == state.props.periodId);
+ if (lvConfigs.length === 0) {
+ ElMessage.error('配置表【BattlePassLvConfig】，期数【' + state.props.periodId + '期】未配置奖励，请检查！');
+ return;
+ }
+ let taskConfigs = BattlePassTaskConfigCategory.filter((r) => r.PeriodId == state.props.periodId);
+ if (taskConfigs.length === 0) {
+ ElMessage.error('配置表【BattlePassTaskConfig】，期数【' + state.props.periodId + '期】未配置奖励，请检查！');
+ return;
+ }
+
const loading = ElLoading.service({
lock: true,
text: 'Loading',
@@ -348,28 +364,33 @@ export default defineComponent({
gameGMGetBattlePass({ periodId: state.query.periodId })
.then((res) => {
console.log('gameGMGetBattlePass: ', res);
- if (res.code != 0 || !res.data || !res.data.list) {
+ if (res.code != 0 || !res.data) {
return;
}
onCheckPeriodId();
let now = new Date().getTime() / 1000;
console.log('gameGMGetBattlePass: time ', now);
+ if (!res.data.list) {
+ res.data.list = [];
+ }
res.data.list.sort((a, b) => {
return b.BeginTime - a.BeginTime;
});
if (!state.query.periodId) {
for (let i in state.servers) {
let battle = res.data.list.filter((r) => r.Server == state.servers[i].id && r.BeginTime <= now);
- battle.sort((a, b) => {
- return b.PeriodId - a.PeriodId;
- });
+ if (battle) {
+ battle.sort((a, b) => {
+ return b.PeriodId - a.PeriodId;
+ });
+ }
let data = {
id: state.servers[i].id,
name: state.servers[i].name,
area: state.servers[i].area,
sort: state.servers[i].sort,
};
- if (battle.length > 0) {
+ if (battle && battle.length > 0) {
data.PeriodId = battle[0].PeriodId;
data.BeginTimeStr = new Date(battle[0].BeginTime * 1000).toLocaleDateString();
data.BeginTime = battle[0].BeginTime;
@@ -539,7 +560,7 @@ export default defineComponent({
listDicRef.value.openDialog(row.id);
};
return {
- listDicRef,
+ listDicRef,
openDialog,
onClose,
onEdit,
@@ -563,9 +584,7 @@ export default defineComponent({