Prechádzať zdrojové kódy

Merge branch 'question-alert' into 'dev'

Question alert

See merge request skyeye/skyeye_frontend/skyeye-admin!29
航飞 楼 1 rok pred
rodič
commit
5214d811e9

+ 5 - 3
src/views/datamanager/alertformdata/hooks/useIssueType.ts

@@ -43,9 +43,11 @@ export function useIssueType() {
   const getNameByType = (source, type, arrayOfOptions) => {
     // arrayOfOptions = [ aiOptions, manualOptions ]
     const targetArray = arrayOfOptions[source - 1];
-    const foundObject = targetArray.find(obj => obj.id === type);
-    if (foundObject) return foundObject.name;
-    else return '-'
+    if (targetArray) {
+      const foundObject = targetArray.find(obj => obj.id === type);
+      if (foundObject) return foundObject.name;
+      else return '-'
+    }
   };
 
   return {

+ 6 - 5
src/views/datamanager/alertformdata/hooks/useWorkLocation.ts

@@ -38,11 +38,12 @@ export function useWorkLocation() {
     const obj = array[workshopId - 1];
 
     if (!obj.children || !Array.isArray(obj.children)) return '-';
-    if (workspaceId < 0 || workspaceId > obj.children.length) return '-';
-    const subObj = obj.children.find(subobj => subobj.value === workspaceId);
-
-    return obj.label + ' - ' + subObj.label;
-  }
+    if (workspaceId < 0) return '-';
+    if (obj.children) {
+      const subObj = obj.children.find(subobj => subobj.value === workspaceId);
+      return obj.label + ' - ' + subObj?.label;
+    }
+  };
 
   return {
     locationOptions,