战令

src/views/serverBattlePass/update/index.vue

@@ -43,7 +43,7 @@
 							</el-button>
 						</el-tooltip>
 					</div>
-          <el-divider />
+					<el-divider />
 					<div class="flex-warp">
 						<el-form-item prop="periodId" label="显示期数">
 							<el-select size="default" placeholder="请选择显示期数" filterable v-model="query.periodId" @change="getProp">
@@ -78,7 +78,7 @@
 							<el-table-column prop="PeriodId" label="当前期数" width="95">
 								<template #default="scope">
 									<div v-if="scope.row.PeriodId">{{ scope.row.PeriodId }}期</div>
-									<div v-else-if="ignoreSelectList.includes(scope.row.id) && query.periodId">{{ query.periodId }}期</div>
+									<div v-else-if="ignoreSelectList.includes(scope.row.id) && query.periodId && checkPeriodId(scope.row)">{{ query.periodId }}期</div>
 								</template>
 							</el-table-column>
 							<el-table-column prop="State" label="状态" width="100">
@@ -88,8 +88,7 @@
 									<div v-else-if="scope.row.BeginTime > Date.now() / 1000" style="color: #66b7cf">未开启</div>
 									<div v-else-if="scope.row.State == 1" style="color: green">开启</div>
 									<div v-else>
-										{{ scope.row.State }}
-										<div v-if="ignoreSelectList.includes(scope.row.id) && query.periodId">永久关闭</div>
+										<div v-if="ignoreSelectList.includes(scope.row.id) && query.periodId && checkPeriodId(scope.row)">永久关闭</div>
 									</div>
 								</template>
 							</el-table-column>
@@ -273,9 +272,10 @@ export default defineComponent({
 			});
 
 			state.tableData.list = [];
+			state.ignoreSelectList = [];
 			gameGMCheckPeriodIdBattlePass({ periodId: state.props.periodId })
 				.then((res) => {
-					console.log('gameGMGetBattlePass: ', res);
+					console.log('gameGMCheckPeriodIdBattlePass: ', state.props, res);
 					if (res.code != 0 || !res.data || !res.data.list) {
 						return;
 					}
@@ -364,10 +364,10 @@ export default defineComponent({
 			gameGMGetBattlePass({ periodId: state.query.periodId })
 				.then((res) => {
 					console.log('gameGMGetBattlePass: ', res);
+					onCheckPeriodId();
 					if (res.code != 0 || !res.data) {
 						return;
 					}
-					onCheckPeriodId();
 					let now = new Date().getTime() / 1000;
 					console.log('gameGMGetBattlePass: time ', now);
 					if (!res.data.list) {
@@ -559,8 +559,14 @@ export default defineComponent({
 		const openDialog = (row) => {
 			listDicRef.value.openDialog(row.id);
 		};
+		const checkPeriodId = (row) => {
+			let sign = state.tableData.list.find((item) => item.PeriodId >= (row.periodId || state.query.periodId) && item.Server == row.id);
+			// console.log('sign', state.tableData.list, row, state.query, sign);
+			return !!sign;
+		};
 		return {
 			listDicRef,
+			checkPeriodId,
 			openDialog,
 			onClose,
 			onEdit,