From d19c7fd240403f2f837e42a7c5e6562c530a787b Mon Sep 17 00:00:00 2001
From: ko1234 <ko.ko@mjmtech.com.tw>
Date: Tue, 17 Dec 2024 11:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6:=20=E7=B6=AD=E4=BF=AE?=
 =?UTF-8?q?=E9=A0=85=E7=9B=AE=E4=BB=A3=E7=A2=BC=E6=AD=A3=E7=A2=BA=E9=A1=AF?=
 =?UTF-8?q?=E7=A4=BA=E3=80=81=E5=91=8A=E8=AD=A6=E6=AC=84=E4=BD=8D=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4=20|=20=E8=A8=AD=E5=82=99=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E5=B0=8F=E9=A1=9E=E6=9B=B4=E6=96=B0=E6=99=82=E6=A9=9F=E5=84=AA?=
 =?UTF-8?q?=E5=8C=96=E3=80=81=E6=AA=94=E6=A1=88=E4=B8=8A=E5=82=B3=E5=9C=96?=
 =?UTF-8?q?=E7=89=87=E6=8F=9B=E8=A1=8C=20|=20=E5=9C=96=E8=B3=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86:=E5=88=AA=E9=99=A4=E8=88=87=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E6=AD=A3=20|?=
 =?UTF-8?q?=20=E7=B6=AD=E9=81=8B=E7=AE=A1=E7=90=86:=E6=AA=94=E6=A1=88?=
 =?UTF-8?q?=E4=B8=8A=E5=82=B3=E5=9C=96=E7=89=87=E6=8F=9B=E8=A1=8C=20|=20?=
 =?UTF-8?q?=E7=B3=BB=E7=B5=B1=E7=9B=A3=E6=8E=A7:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E8=A8=AD=E5=82=99=E6=AD=A3=E7=A2=BA=E9=A1=AF=E7=A4=BA?=
 =?UTF-8?q?=E3=80=81=E7=B3=BB=E7=B5=B1=E5=B0=8F=E5=8D=A1=E7=9A=84=E8=B3=87?=
 =?UTF-8?q?=E6=96=99Loading=E6=95=88=E6=9E=9C=E8=88=87=E9=A1=AF=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=99=82=E9=96=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/forge/useForgeHeatmap.js            | 13 ++--
 .../components/AssetSubList.vue               |  2 +-
 .../AssetManagement/components/AssetTable.vue |  2 +-
 .../components/AlertQuery/AlertTableModal.vue |  6 +-
 .../AlertOutliersTableAddModal.vue            | 68 ++++++++++---------
 .../components/GraphSidebar.vue               | 14 ++--
 .../components/GraphSidebarDropdown.vue       |  2 +-
 .../operation/components/OperationTable.vue   |  2 +-
 src/views/system/System.vue                   | 15 ++--
 .../system/components/SystemFloorBar.vue      |  2 +-
 .../components/SystemInfoModalDesktop.vue     | 40 +++++++----
 11 files changed, 95 insertions(+), 71 deletions(-)

diff --git a/src/hooks/forge/useForgeHeatmap.js b/src/hooks/forge/useForgeHeatmap.js
index f732348..7ae588c 100644
--- a/src/hooks/forge/useForgeHeatmap.js
+++ b/src/hooks/forge/useForgeHeatmap.js
@@ -34,12 +34,13 @@ export default function useForgeHeatmap() {
   const { flatSubData } = useSystemShowData();
 
   const data = computed(() =>
-    flatSubData.value?.map((d) => ({
-      ...d,
-      ...Object.fromEntries(
-        d.points.map(({ point, value }) => [point, 0]) || []
-      ),
-    }))
+    flatSubData.value?.map((d) => {
+      const pointsMap = d.points ? Object.fromEntries(d.points.map(({ point, value }) => [point, 0])) : {};
+      return {
+        ...d,
+        ...pointsMap,
+      };
+    })
   );
 
   watch(
diff --git a/src/views/AssetManagement/components/AssetSubList.vue b/src/views/AssetManagement/components/AssetSubList.vue
index c99273e..c6908e7 100644
--- a/src/views/AssetManagement/components/AssetSubList.vue
+++ b/src/views/AssetManagement/components/AssetSubList.vue
@@ -37,7 +37,7 @@ watch(selectedBtn, (newValue) => {
 watch(
   () => searchParams,
   (newValue) => {
-    if (newValue.value.mainSys_id) {
+    if (newValue.value.mainSys_id && !newValue.value.subSys_id) {
       getSubSystems(parseInt(newValue.value.mainSys_id));
     }
   },
diff --git a/src/views/AssetManagement/components/AssetTable.vue b/src/views/AssetManagement/components/AssetTable.vue
index 7da036e..7c93c08 100644
--- a/src/views/AssetManagement/components/AssetTable.vue
+++ b/src/views/AssetManagement/components/AssetTable.vue
@@ -203,7 +203,7 @@ provide("asset_table_data", {
       <template v-else-if="column.key === 'oriFile'">
         <span v-if="record.oriFile.length === 0"></span>
         <template v-else>
-          <span class="flex">
+          <span class="flex flex-wrap gap-1">
             <a
               v-for="file in record.oriFile"
               :href="`${FILE_BASEURL}/${file?.file_url}`"
diff --git a/src/views/alert/components/AlertQuery/AlertTableModal.vue b/src/views/alert/components/AlertQuery/AlertTableModal.vue
index f68c50a..7dd7d93 100644
--- a/src/views/alert/components/AlertQuery/AlertTableModal.vue
+++ b/src/views/alert/components/AlertQuery/AlertTableModal.vue
@@ -228,12 +228,12 @@ watch(
           class="my-2"
           selectClass="border-info focus-within:border-info"
           name="fix_do_code"
-          Attribute="device_name"
+          Attribute="full_name"
           :options="model_data.model_devList"
           :required="true"
           :disabled="true"
         >
-          <template #topLeft>{{ $t("repair_item_code") }}</template>
+          <template #topLeft>{{ $t("alert.repair_item_code") }}</template>
           <template #bottomLeft
             ><span class="text-error text-base">
               {{ formErrorMsg.fix_do_code }}
@@ -249,7 +249,7 @@ watch(
           :options="model_data.model_companyList"
           :required="true"
         >
-          <template #topLeft>{{ $t("responsible_vendor") }}</template>
+          <template #topLeft>{{ $t("alert.responsible_vendor") }}</template>
           <template #bottomLeft
             ><span class="text-error text-base">
               {{ formErrorMsg.fix_firm }}
diff --git a/src/views/alert/components/AlertSetting/AlertOutliersTableAddModal.vue b/src/views/alert/components/AlertSetting/AlertOutliersTableAddModal.vue
index 1e8a749..ac29ae6 100644
--- a/src/views/alert/components/AlertSetting/AlertOutliersTableAddModal.vue
+++ b/src/views/alert/components/AlertSetting/AlertOutliersTableAddModal.vue
@@ -201,38 +201,42 @@ const closeModal = () => {
         >
           <template #topLeft>{{ $t("alert.qualifications") }}</template>
         </Select>
-        <InputNumber
-          :value="formState"
-          class="my-2"
-          name="highLimit"
-          v-if="!isBool"
-        >
-          <template #topLeft>{{ $t("alert.upper_limit") }}(>=)</template>
-        </InputNumber>
-        <InputNumber
-          :value="formState"
-          class="my-2"
-          name="lowLimit"
-          v-if="!isBool"
-        >
-          <template #topLeft>{{ $t("alert.lower_limit") }}(&lt;=)</template>
-        </InputNumber>
-        <InputNumber
-          :value="formState"
-          class="my-2"
-          name="highDelay"
-          v-if="!isBool"
-        >
-          <template #topLeft>{{ $t("alert.highDelay") }}</template>
-        </InputNumber>
-        <InputNumber
-          :value="formState"
-          class="my-2"
-          name="lowDelay"
-          v-if="!isBool"
-        >
-          <template #topLeft>{{ $t("alert.lowDelay") }}</template>
-        </InputNumber>
+        <div class="flex gap-4 w-full">
+          <InputNumber
+            :value="formState"
+            class="my-2"
+            name="highLimit"
+            v-if="!isBool"
+          >
+            <template #topLeft>{{ $t("alert.upper_limit") }}(>=)</template>
+          </InputNumber>
+          <InputNumber
+            :value="formState"
+            class="my-2"
+            name="lowLimit"
+            v-if="!isBool"
+          >
+            <template #topLeft>{{ $t("alert.lower_limit") }}(&lt;=)</template>
+          </InputNumber>
+        </div>
+        <div class="flex gap-4 w-full">
+          <InputNumber
+            :value="formState"
+            class="my-2"
+            name="highDelay"
+            v-if="!isBool"
+          >
+            <template #topLeft>{{ $t("alert.highDelay") }}</template>
+          </InputNumber>
+          <InputNumber
+            :value="formState"
+            class="my-2"
+            name="lowDelay"
+            v-if="!isBool"
+          >
+            <template #topLeft>{{ $t("alert.lowDelay") }}</template>
+          </InputNumber>
+        </div>
         <div class="w-full mt-5">
           <p class="text-light text-lg ml-1">
             {{ $t("alert.warning_method") }}
diff --git a/src/views/graphManagement/components/GraphSidebar.vue b/src/views/graphManagement/components/GraphSidebar.vue
index ad0a3a9..6948398 100644
--- a/src/views/graphManagement/components/GraphSidebar.vue
+++ b/src/views/graphManagement/components/GraphSidebar.vue
@@ -48,7 +48,10 @@ const graphData = computed(() => {
 const getData = async (id = "") => {
   const res = await getSideBar();
   raw_data.value = res.data;
-  id && updateCurrentDir(data.find((d) => parseInt(id) === d.id));
+  if (id) {
+    const currentDir = raw_data.value.find((d) => parseInt(id) === d.id);
+    updateCurrentDir(currentDir);
+  }
   cancelDropdownAndInput();
 };
 
@@ -132,6 +135,7 @@ const getNewFilename = async (e) => {
     });
     getData(res);
   } else if (
+    e &&
     e?.target.value !== "" &&
     e?.target.value !== selectedItem.value?.title
   ) {
@@ -178,21 +182,19 @@ const addFilename = (root = false) => {
   }
 
   selectedItem.value = newItem;
-  editFilename();
+  // editFilename();
 };
 
 // 刪除filename
 const deleteFilename = async () => {
   openToast("warning", t("msg.sure_to_delete"), "body", async () => {
     await cancelToastOpen();
+    const filterData = raw_data.value.filter(({ id }) => id !== selectedItem.value.id)
     const res = await removeSideBarTreeName(selectedItem.value.id);
     if (res.isSuccess) {
-      raw_data.value = raw_data.value.filter(
-        ({ id }) => id !== selectedItem.value.id
-      );
+      raw_data.value = filterData;
       cancelOpen();
       openToast("success", t("msg.delete_success"));
-      getData();
     } else {
       openToast("error", res.msg);
     }
diff --git a/src/views/graphManagement/components/GraphSidebarDropdown.vue b/src/views/graphManagement/components/GraphSidebarDropdown.vue
index 187f411..2bc32f9 100644
--- a/src/views/graphManagement/components/GraphSidebarDropdown.vue
+++ b/src/views/graphManagement/components/GraphSidebarDropdown.vue
@@ -50,7 +50,7 @@ const props = defineProps({
         class="btn-ghost text-white no-underline border-0 py-3 hover:rounded-lg"
         @click.stop.prevent="
           (e) => {
-            remove(props.selectedItem.key);
+            remove();
           }
         "
       >
diff --git a/src/views/operation/components/OperationTable.vue b/src/views/operation/components/OperationTable.vue
index a9731f5..365a955 100644
--- a/src/views/operation/components/OperationTable.vue
+++ b/src/views/operation/components/OperationTable.vue
@@ -50,7 +50,7 @@ const deleteItem = async (id) => {
       <template v-if="column.key === 'lorf'">
         <span v-if="record.lorf?.length === 0"></span>
         <template v-else>
-          <span class="flex">
+          <span class="flex flex-wrap gap-1">
             <a
               v-for="file in record.lorf"
               :href="`${FILE_BASEURL}/upload/operation/${
diff --git a/src/views/system/System.vue b/src/views/system/System.vue
index 614b59e..325065e 100644
--- a/src/views/system/System.vue
+++ b/src/views/system/System.vue
@@ -68,7 +68,7 @@ const getData = async () => {
       is_show: true,
       currentColor: dev.device_normal_point_color,
       spriteDbId: 10 + dev.main_id,
-      sensorTypes: dev.points.map(({ points }) => points),
+      sensorTypes: dev.points ? dev.points.map(({ points }) => points) : [],
       floor_guid: d.floor_guid,
       is2DActive: false
     })),
@@ -108,12 +108,15 @@ const updateDataByGas = (gas) => {
   if (gas === "all") {
     update_values = raw_data.value
   } else {
-    update_values = raw_data.value.map((d) => (
-      {
+    update_values = raw_data.value.map((d) => ({
       ...d,
-        device_list: d.device_list.filter(({ points }) => points.some(({ points: p }) => p === gas))
-      }
-    ))
+      device_list: d.device_list.filter(({ points }) => {
+        if (points) {
+          return points.some(({ points: p }) => p === gas)
+        }
+        return false
+      })
+    }))
   }
   data.value = update_values
   subscribeData.value = getSubData(update_values);
diff --git a/src/views/system/components/SystemFloorBar.vue b/src/views/system/components/SystemFloorBar.vue
index db27331..7f009fe 100644
--- a/src/views/system/components/SystemFloorBar.vue
+++ b/src/views/system/components/SystemFloorBar.vue
@@ -25,7 +25,7 @@ const getFloors = async () => {
       title: d.full_name,
       key: d.floor_guid,
       active: route.params.floor_id === d.floor_guid,
-      map_url: d.floor_map_url + ".svg"
+      map_url: d.floor_map_url ? d.floor_map_url + ".svg" : null
     }))
   ]
   setItems(data);
diff --git a/src/views/system/components/SystemInfoModalDesktop.vue b/src/views/system/components/SystemInfoModalDesktop.vue
index 9766d49..0c60f0e 100644
--- a/src/views/system/components/SystemInfoModalDesktop.vue
+++ b/src/views/system/components/SystemInfoModalDesktop.vue
@@ -1,32 +1,46 @@
 <script setup>
-import { computed, inject } from "vue";
+import { ref, computed, inject, watch } from "vue";
 import { useI18n } from "vue-i18n";
-
+import dayjs from 'dayjs';
 const { t, locale } = useI18n();
 
 const { selectedDevice, selectedDeviceRealtime } = inject("system_selectedDevice");
-
+const loading = ref(true);
+const updatedTime = ref(null);
 const data = computed(() => {
 
   return selectedDevice.value?.value?.points?.map((d) => ({
-    ...d,
+      ...d,
     value: selectedDeviceRealtime?.value?.find(({ point }) => point === d.points)?.value || "No Data"
-  })) || []
-})
+    })) || []
+});
+
+watch(selectedDeviceRealtime, (newValue) => {
+  if (newValue) {
+    loading.value = false;
+    updatedTime.value = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
+  }
+});
 
 const columns = [{
-  title: t("system.attribute"),
-  key: "full_name"
-},
-{
-  title: t("system.value"),
-  key: "value"
+    title: t("system.attribute"),
+    key: "full_name"
+  },
+  {
+    title: t("system.value"),
+    key: "value"
 }]
 
 </script>
 
 <template>
-  <Table :loading="loading" :columns="columns" :dataSource="data || []" :withStyle="false">
+  <span v-if="updatedTime" class="mt-5 text-info">{{$t("operation.updated_time")}} : {{ updatedTime }}</span>
+  <Table
+    :loading="loading"
+    :columns="columns"
+    :dataSource="data || []"
+    :withStyle="false"
+  >
   </Table>
 </template>