Merge pull request #306 from TaiBIF/issues/issue-#305

Issues/issue #305
TaiBIF · Aug 8, 2019 · 997b7be · 997b7be
2 parents 3495c74 + cb77930
commit 997b7be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/pages/UploadHistory/index.vue b/src/pages/UploadHistory/index.vue
@@ -112,6 +112,7 @@
                 @click="
                   showInfoModal = true;
                   errorType = row.errorType;
+                  errorMessage = row.errorMessage;
                 "
               >
                 檢視錯誤</a
@@ -170,6 +171,9 @@
         <span v-else-if="errorType === 'missing-fields-camera-location'">
           有多筆相機位置
         </span>
+        <span v-else-if="errorType === 'missing-fields'">
+          缺少欄位: {{ errorMessage }}
+        </span>
         <span v-else-if="errorType === 'others'">
           其他錯誤
         </span>
@@ -193,6 +197,7 @@ export default {
     return {
       showInfoModal: false,
       errorType: '',
+      errorMessage: '',
       error: undefined,
       isLoading: false,
     };

diff --git a/src/service/modules/upload.js b/src/service/modules/upload.js
@@ -21,7 +21,6 @@ const getAnnotationQuery = file => {
     annotationType = 'annotation-csv';
   }
 
-  annotationType = '';
   if (annotationType === '') {
     throw 'no annotation-type (not support)';
   }