From 6f614eddd3d470fa2c2ac201f2a9d87909c35d70 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 25 Dec 2021 22:30:23 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=82=AC=EB=A0=B9=EB=B6=80=EA=B0=80=20?=
 =?UTF-8?q?=EB=8D=9C=20=EC=B0=AC=20=EC=83=81=ED=99=A9=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=ED=91=9C=EA=B8=B0=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/ChiefCenter/BottomItem.vue | 10 ++--
 hwe/ts/ChiefCenter/TopItem.vue    | 82 +++++++++++++++++--------------
 hwe/ts/PageChiefCenter.vue        | 17 +++++--
 3 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/hwe/ts/ChiefCenter/BottomItem.vue b/hwe/ts/ChiefCenter/BottomItem.vue
index ea1a90e5..70d63162 100644
--- a/hwe/ts/ChiefCenter/BottomItem.vue
+++ b/hwe/ts/ChiefCenter/BottomItem.vue
@@ -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:
diff --git a/hwe/ts/ChiefCenter/TopItem.vue b/hwe/ts/ChiefCenter/TopItem.vue
index ad345c0b..fee5a5d0 100644
--- a/hwe/ts/ChiefCenter/TopItem.vue
+++ b/hwe/ts/ChiefCenter/TopItem.vue
@@ -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>
diff --git a/hwe/ts/PageChiefCenter.vue b/hwe/ts/PageChiefCenter.vue
index 8dc6518e..f0b999b9 100644
--- a/hwe/ts/PageChiefCenter.vue
+++ b/hwe/ts/PageChiefCenter.vue
@@ -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)) {