From 290516d0c078914e6b1418e2dbcd5ce4e2dea1b3 Mon Sep 17 00:00:00 2001
From: jiminglei <836545853@qq.com>
Date: Tue, 11 Jul 2023 09:20:25 +0800
Subject: [PATCH] 11

---
 psdc-ui/src/api/control/manual.js          |  4 ++
 psdc-ui/src/views/control/manual/index.vue | 79 ++++++++++++++++------
 2 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/psdc-ui/src/api/control/manual.js b/psdc-ui/src/api/control/manual.js
index eb6cf03..cb71050 100644
--- a/psdc-ui/src/api/control/manual.js
+++ b/psdc-ui/src/api/control/manual.js
@@ -27,4 +27,8 @@ export function getSetTemperature(data) {
 /** 策略执行控制*/
 export function getSenceControl(data) {
     return request.post('/control/manual/senceControl',data)
+}
+/** 策略执行反馈*/
+export function ControlInfo(data) {
+    return request.post('/analyse/nhdb/strategyRes?strategyCode='+data)
 }
\ No newline at end of file
diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue
index 2314e3f..230ae23 100644
--- a/psdc-ui/src/views/control/manual/index.vue
+++ b/psdc-ui/src/views/control/manual/index.vue
@@ -86,6 +86,7 @@
 <!--              </span>-->
 <!--            </div>-->
 <!--          </div>-->
+            <el-button type="primary" @click="controlMsg">执行结果</el-button>
         </el-radio>
 
 
@@ -114,7 +115,7 @@
 import { Download } from '@element-plus/icons-vue'  //element字体图标
 import { ref,reactive,onMounted  } from 'vue'
 import { ElMessageBox,ElMessage, ElLoading} from 'element-plus'
-import { getDevice,getControlLogList,getStrategyList,getStartAndStop,getSetTemperature,getSenceControl,getControlDeviceList } from '@/api/control/manual'
+import { getDevice,getControlLogList,getStrategyList,getStartAndStop,getSetTemperature,getSenceControl,getControlDeviceList,ControlInfo } from '@/api/control/manual'
 
 onMounted(()=>{
   getDeviceFun();
@@ -425,40 +426,76 @@ function confirmClick() {
       getSenceControl(celueItem.commandList).then((res)=>{
         if(res.code == 200){
           clearLastCelue()
-          //执行过程
-          function setFlowItem(i) {
-            if (i >= celueItem.scenesList.length) {
-              return; //递归终止条件
-            }
-            celueItem.scenesList[i].type = 'success';
-            celueItem.scenesList[i].icon = 'Check';
-            setTimeout(function() {
-              setFlowItem(i + 1); //递归调用
-            }, 1000);
-          }
-          setFlowItem(0); //调用递归函数，从数组第一个元素开始赋值
-
           setTimeout(()=>{
             ElMessage.success('导入成功')
+            ControlInfo(celueItem.strategyCode).then((res)=>{
+              console.log('执行结果',res)
+              if(res.data){
+                //执行过程
+                function setFlowItem(i) {
+                  if (i >= res.data.length) {
+                    return; //递归终止条件
+                  }
+                  if(res.data[i]==1){
+                    celueItem.scenesList[i].type = 'success';
+                    celueItem.scenesList[i].icon = 'Check';
+                  }
+                  else{
+                    celueItem.scenesList[i].type = 'warning';
+                    celueItem.scenesList[i].icon = 'Close';
+                  }
+                  setTimeout(function() {
+                    setFlowItem(i + 1); //递归调用
+                  }, 1000);
+                }
+                setFlowItem(0); //调用递归函数，从数组第一个元素开始赋值
+                getControlLogListFun()
+              }else{
+                getControlLogListFun()
+              }
+            })
           },celueItem.scenesList.length * 1000)
           getControlLogListFun()
         }else{
-          for(let i = 0;i < celueItem.scenesList.length;i++) {
-            setTimeout(() => {
-              celueItem.scenesList[i].type = 'warning'
-              celueItem.scenesList[i].icon = 'Close'
-            },celueItem.scenesList.length * 1000)
-          }
           setTimeout(()=>{
             ElMessage.warning('导入失败')
           },celueItem.scenesList.length * 1000)
+          getControlLogListFun()
         }
       })
 
     })
   }
 }
-
+//执行结果
+function controlMsg() {
+  ControlInfo(celueItem.strategyCode).then((res)=>{
+    console.log('执行结果',res)
+    if(res.data){
+      //执行过程
+      function setFlowItem(i) {
+        if (i >= res.data.length) {
+          return; //递归终止条件
+        }
+        if(res.data[i]==1){
+          celueItem.scenesList[i].type = 'success';
+          celueItem.scenesList[i].icon = 'Check';
+        }
+        else{
+          celueItem.scenesList[i].type = 'warning';
+          celueItem.scenesList[i].icon = 'Close';
+        }
+        setTimeout(function() {
+          setFlowItem(i + 1); //递归调用
+        }, 1000);
+      }
+      setFlowItem(0); //调用递归函数，从数组第一个元素开始赋值
+      getControlLogListFun()
+    }else{
+      getControlLogListFun()
+    }
+  })
+}
 /** 控制设备启停*/
 const loading = ref(false)
 function handleDevChangeFun(id,sta){