From dad01b45e4dd64622d1088eeb249b2e43edac88d Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 25 Dec 2021 23:08:18 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20ui=20=EC=9A=94=EC=86=8C=20=EC=95=88?=
 =?UTF-8?q?=EC=A0=95=ED=99=94=20-=20=EC=82=AC=EB=A0=B9=EB=B6=80=20-=20?=
 =?UTF-8?q?=EC=BB=A4=EB=A7=A8=EB=93=9C=20=EB=90=98=EB=8F=8C=EC=95=84?=
 =?UTF-8?q?=EA=B0=80=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/ChiefCenter/TopItem.vue  | 53 ++++++++++++++++-----------------
 hwe/ts/PageChiefCenter.vue      |  3 +-
 hwe/ts/components/BottomBar.vue |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/hwe/ts/ChiefCenter/TopItem.vue b/hwe/ts/ChiefCenter/TopItem.vue
index fee5a5d0..80a08823 100644
--- a/hwe/ts/ChiefCenter/TopItem.vue
+++ b/hwe/ts/ChiefCenter/TopItem.vue
@@ -2,35 +2,38 @@
   <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?`${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 }}
       </div>
     </div>
-    <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 class="row gx-0" v-for="vidx in maxTurn" :key="vidx">
+      <div class="col-2 time_pad f_tnum">
+        {{ turnTimes[vidx - 1] ?? "" }}
       </div>
-    </template>
+      <div
+        class="center turn_pad"
+        v-if="!officer || (!officer.turn) || !(vidx - 1 in officer.turn)"
+      ></div>
+      <div
+        v-else
+        class="tableCell align-self-center col-10 center turn_pad"
+        :style="{
+          fontSize:
+            mb_strwidth(officer.turn[vidx - 1].brief) > 28
+              ? `${28 / mb_strwidth(officer.turn[vidx - 1].brief)}em`
+              : undefined,
+        }"
+      >
+        {{ officer.turn[vidx - 1].brief }}
+      </div>
+    </div>
   </div>
 </template>
 <script lang="ts">
@@ -49,9 +52,9 @@ export default defineComponent({
     style: VueTypes.object.isRequired,
     officer: {
       type: Object as PropType<ChiefResponse["chiefList"][0]>,
-      required: true,
     },
     turnTerm: VueTypes.integer.isRequired,
+    maxTurn: VueTypes.integer.isRequired,
   },
   methods: {
     getNpcColor,
@@ -60,14 +63,10 @@ export default defineComponent({
 
   data() {
     const turnTimes: string[] = [];
-    if (!this.officer) {
-      return {};
-    }
-
-    if (!this.officer.turnTime) {
+    if (!this.officer || !this.officer.turnTime) {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      for (const _ of range(this.officer.turn.length)) {
-        turnTimes.push("-");
+      for (const _ of range(this.maxTurn)) {
+        turnTimes.push("");
       }
     } else {
       const baseTurnTime = parseTime(this.officer.turnTime);
diff --git a/hwe/ts/PageChiefCenter.vue b/hwe/ts/PageChiefCenter.vue
index f0b999b9..e162cb8a 100644
--- a/hwe/ts/PageChiefCenter.vue
+++ b/hwe/ts/PageChiefCenter.vue
@@ -38,6 +38,7 @@
             v-if="officerLevel != chiefLevel"
             :style="mainTableGridRows"
             :officer="officer"
+            :maxTurn="maxChiefTurn"
             :turnTerm="turnTerm"
           />
           <div class="commandBox" v-else>
@@ -352,7 +353,7 @@ export default defineComponent({
   setup(props) {
     const viewTarget = ref<number | undefined>();
 
-    const turnList = ref(new Set<number>([2]));
+    const turnList = ref(new Set<number>());
 
     const targetIsMe = ref<boolean>(false);
     watch(viewTarget, (val) => {
diff --git a/hwe/ts/components/BottomBar.vue b/hwe/ts/components/BottomBar.vue
index f897bb91..c488d3e8 100644
--- a/hwe/ts/components/BottomBar.vue
+++ b/hwe/ts/components/BottomBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg0">
+  <div class="bg0" style="padding-top:20px;">
     <button type="button" class="btn btn-sammo-base2 back_btn" @click="back">
       돌아가기
     </button>