From 985c037e7e77b07ee9f418102675d5fc2c5dedf7 Mon Sep 17 00:00:00 2001
From: lijun <lj7788@126.com>
Date: Tue, 24 Sep 2024 23:52:42 +0800
Subject: [PATCH] update code

---
 src/views/simulationEvaluation/addTask.vue     | 18 ++++++++++++------
 .../components/addStep4.vue                    |  9 ++++++---
 src/views/simulationEvaluation/execution.vue   |  3 +--
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/simulationEvaluation/addTask.vue b/src/views/simulationEvaluation/addTask.vue
index 465a67f..e1c0d3b 100644
--- a/src/views/simulationEvaluation/addTask.vue
+++ b/src/views/simulationEvaluation/addTask.vue
@@ -28,7 +28,7 @@
       <template v-if="(active == 4 && (state == 0 || state == 3)) || (active == 5 && state == 0)">
         <el-button type="primary" @click="doPrev">上一步</el-button>
       </template>
-      <template v-if="active == 4 && state == 3">
+      <template v-if="active == 4 && (state == 3||state==0)">
         <el-button @click="doNext">下一步</el-button>
       </template>
       <el-button @click="doNext" v-if="active < 4">下一步</el-button>
@@ -134,7 +134,7 @@ const startComplie = () => {
       connection_id: modelInfo.connection_id
     })
   ];
-  addLogs({ msg: "开始编译....", type: "info" })
+  addLogs({ msg: "开始部署....", type: "info" })
   request.all(ajaxs).then(d => {
     info.optIds = d.map(it => {
       return {
@@ -173,9 +173,8 @@ const doGetComplieLogs = () => {
     if (info.optIds.filter(d => d.state == 0).length > 0) {
       setTimeout(doGetComplieLogs, 2000);
     } else {
-      //doDeploy();
       state.value = 3;
-      step4.value.updateState(state.value);
+      step4.value.updateState(0);
     }
   });
 }
@@ -233,8 +232,15 @@ const doNext = () => {
       active.value++;
     } 
   } else if (active.value == 4) {
-    active.value++;
-    state.value = 0;
+    let tmp=step4.value.checkForm();
+    if(tmp){
+      active.value++;
+      info.devices=tmp;
+      state.value = 0;
+    }else{
+      ElMessage.error("请选择设备!");
+    }
+    
   } else if (active.value == 5) {
 
   } else {
diff --git a/src/views/simulationEvaluation/components/addStep4.vue b/src/views/simulationEvaluation/components/addStep4.vue
index 6d760ba..e5ed57f 100644
--- a/src/views/simulationEvaluation/components/addStep4.vue
+++ b/src/views/simulationEvaluation/components/addStep4.vue
@@ -118,7 +118,6 @@ const handleChange = (row) => {
     return;
   }
   modelSelection.value = row.device_id + "";
-  emit("selection", row);
 }
 
 const info = reactive({
@@ -162,11 +161,15 @@ function handleQuery() {
 }
 
 const checkForm = () => {
-  let rows = info.tableData.filter((d) => d.checked);
-  return rows.length == 0 ? null : rows;
+  if (modelSelection.value) {
+    let tmps = info.tableData.filter(d => d.device_id == modelSelection.value);
+    return tmps.length > 0 ? tmps[0] : null;
+  }
+  return null;
 };
 const updateState = (s) => {
   info.state = s;
+
 };
 const updateLogs = (logs) => {
   info.logs = logs;
diff --git a/src/views/simulationEvaluation/execution.vue b/src/views/simulationEvaluation/execution.vue
index e83014a..6c8445f 100644
--- a/src/views/simulationEvaluation/execution.vue
+++ b/src/views/simulationEvaluation/execution.vue
@@ -93,8 +93,7 @@ const loadData = () => {
   loading.value = true;
   TaskApi.running().then(d => {
     loading.value = false;
-    info.dataList = (d.data.data.running_task_list || []).map(it => {
-      it.device_name = (it.device_list || []).map(item => item.device_name).join(",");
+    info.dataList = (d.data.data.running_task_list || []).map(it => {      
       it.state = 0;
       return it;
     });