Merge branch 'develop-1.9.0' of https://github.com/FederatedAI/FATE-B…

…oard into develop-1.9.0
FederatedAI · Aug 24, 2022 · be0c73d · be0c73d
2 parents 20b9d72 + 14d19c6
commit be0c73d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/resources-front-end/src/views/job-dashboard/log/Logs.vue b/resources-front-end/src/views/job-dashboard/log/Logs.vue
@@ -253,13 +253,17 @@ export default {
     },
     getInstanceIdFromFlow() {
       return getInstanceId().then((res) => {
-        const machines = res.data
         const result = []
-        for (const each of machines) {
-          result.push(each.instance_id)
+        for (const [instance_id, instance] of Object.entries(res.data)) {
+          if (instance.host === window.location.host) {
+            this.currentInstanceId = instance.instance_id
+          }
+          result.push(instance.instance_id)
+        }
+        if (!this.currentInstanceId) {
+          this.currentInstanceId = result[0]
         }
         this.instanceId = result
-        this.currentInstanceId = this.instanceId[0]
       })
     },
     initLogSocket() {