fix: 사령부가 덜 찬 상황에서 표기되지 않는 버그 수정

This commit is contained in:
2021-12-25 22:30:23 +09:00
parent 5142c94f84
commit 6f614eddd3
3 changed files with 62 additions and 47 deletions
+5 -5
View File
@@ -9,19 +9,19 @@
<div
class="bg1 nameHeader"
:style="{
color: getNpcColor(officer.npcType ?? 0),
color: getNpcColor(officer?.npcType ?? 0),
textDecoration: isMe ? 'underline' : undefined,
}"
>
{{ officer.name ?? "-" }}
{{ officer?(officer?.name ?? "-"):'' }}
</div>
<div class="bg1 center row gx-0">
<div class="col">{{ officer.officerLevelText }}</div>
<div class="col">{{ (officer.turnTime ?? " - ").slice(-5) }}</div>
<div class="col">{{ officer?.officerLevelText }}</div>
<div class="col">{{ officer?((officer?.turnTime ?? " - ").slice(-5)):'' }}</div>
</div>
<div
class="tableCell align-self-center"
v-for="(turn, idx) in officer.turn"
v-for="(turn, idx) in officer?.turn??[]"
:key="idx"
:style="{
fontSize:
+44 -38
View File
@@ -1,37 +1,36 @@
<template>
<div
:class="['subRows', 'c-bg2', 'chiefCommand']"
:style="style"
>
<div :class="['subRows', 'c-bg2', 'chiefCommand']" :style="style">
<div class="bg1 center row gx-0" style="font-size: 1.2em">
<div class="col-5 align-self-center text-end">
{{ officer.officerLevelText }} :
{{ officer?`${officer.officerLevelText} : `:'' }}
</div>
<div
class="col-7 align-self-center"
:style="{
color: getNpcColor(officer.npcType ?? 0),
color: getNpcColor((officer?.npcType) ?? 0),
}"
>
{{ officer.name }}
{{ officer?.name }}
</div>
</div>
<div class="row gx-0" v-for="(turn, idx) in officer.turn" :key="idx">
<div class="col-2 time_pad f_tnum">
{{ turnTimes[idx] }}
<template v-if="officer">
<div class="row gx-0" v-for="(turn, idx) in officer.turn" :key="idx">
<div class="col-2 time_pad f_tnum">
{{ turnTimes[idx] }}
</div>
<div
class="tableCell align-self-center col-10 center turn_pad"
:style="{
fontSize:
mb_strwidth(turn.brief) > 28
? `${28 / mb_strwidth(turn.brief)}em`
: undefined,
}"
>
{{ turn.brief }}
</div>
</div>
<div
class="tableCell align-self-center col-10 center turn_pad"
:style="{
fontSize:
mb_strwidth(turn.brief) > 28
? `${28 / mb_strwidth(turn.brief)}em`
: undefined,
}"
>
{{ turn.brief }}
</div>
</div>
</template>
</div>
</template>
<script lang="ts">
@@ -49,8 +48,8 @@ export default defineComponent({
props: {
style: VueTypes.object.isRequired,
officer: {
type: Object as PropType<ChiefResponse['chiefList'][0]>,
required: true,
type: Object as PropType<ChiefResponse["chiefList"][0]>,
required: true,
},
turnTerm: VueTypes.integer.isRequired,
},
@@ -60,24 +59,31 @@ export default defineComponent({
},
data() {
const turnTimes: string[] = [];
const turnTimes: string[] = [];
if (!this.officer) {
return {};
}
if (!this.officer.turnTime) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
for(const _ of range(this.officer.turn.length)){
turnTimes.push('-');
}
if (!this.officer.turnTime) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
for (const _ of range(this.officer.turn.length)) {
turnTimes.push("-");
}
else{
const baseTurnTime = parseTime(this.officer.turnTime);
for(const idx of range(this.officer.turn.length)){
turnTimes.push(formatTime(addMinutes(baseTurnTime, idx * this.turnTerm), this.turnTerm >= 5 ? "HH:mm":"mm:ss"));
}
} else {
const baseTurnTime = parseTime(this.officer.turnTime);
for (const idx of range(this.officer.turn.length)) {
turnTimes.push(
formatTime(
addMinutes(baseTurnTime, idx * this.turnTerm),
this.turnTerm >= 5 ? "HH:mm" : "mm:ss"
)
);
}
}
return {
turnTimes,
}
return {
turnTimes,
};
},
});
</script>
+13 -4
View File
@@ -78,8 +78,11 @@
</div>
<div class="row gx-1 gy-1 py-1">
<div class="col-md-4 mx-0 mb-0 mt-1 d-grid">
<div class="alert alert-primary mb-0 center" style="padding:0.5rem 0">
{{ serverNow }}
<div
class="alert alert-primary mb-0 center"
style="padding: 0.5rem 0"
>
{{ serverNow }}
</div>
</div>
@@ -207,7 +210,7 @@
:chiefLevel="chiefLevel"
:chiefList="chiefList"
:style="subTableGridRows"
:isMe="targetIsMe"
:isMe="chiefLevel == officerLevel"
@click="viewTarget = chiefLevel"
/>
<div
@@ -407,7 +410,13 @@ export default defineComponent({
timeDiff.value = serverNowObj.getTime() - clientNowObj.getTime();
if (viewTarget.value === undefined) {
viewTarget.value = tableObj.officerLevel;
if(!tableObj.officerLevel){
viewTarget.value = 12;
}
else{
viewTarget.value = tableObj.officerLevel;
}
}
} catch (e) {
if (isString(e)) {