From bbd949abcf849285f3ef20a4514afc2873a83b8d Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Thu, 1 Jun 2023 14:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E5=8F=AF=E6=8E=A7=E8=AE=BE=E5=A4=87=EF=BC=8C=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E5=AF=BC=E5=85=A5=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/src/api/control/manual.js          |  8 ++++++++
 psdc-ui/src/views/control/manual/index.vue | 23 +++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/psdc-ui/src/api/control/manual.js b/psdc-ui/src/api/control/manual.js
index 902edf6..eb6cf03 100644
--- a/psdc-ui/src/api/control/manual.js
+++ b/psdc-ui/src/api/control/manual.js
@@ -4,6 +4,10 @@ import request from '@/utils/request'
 export function getDevice() {
     return request.get('/control/manual/deviceStatusList')
 }
+/** 获取可控设备*/
+export function getControlDeviceList() {
+    return request.get('/control/manual/controlDeviceList')
+}
 /** 获取调控日志列表*/
 export function getControlLogList(data) {
     return request.post('/control/manual/controlLogList',data)
@@ -19,4 +23,8 @@ export function getStartAndStop(data) {
 /** 设置温度*/
 export function getSetTemperature(data) {
     return request.post('/control/manual/setTemperature',data)
+}
+/** 策略执行控制*/
+export function getSenceControl(data) {
+    return request.post('/control/manual/senceControl',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 c9a9bcb..cd5e9cf 100644
--- a/psdc-ui/src/views/control/manual/index.vue
+++ b/psdc-ui/src/views/control/manual/index.vue
@@ -25,6 +25,7 @@
               </el-form-item>
 
               <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><input class="tempInput" v-model="inputs.tempValue"/></el-form-item>
+<!--              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><input class="tempInput"/></el-form-item>-->
 
               <div class="submit" v-show="item.control_elements.length > 0 ? true : false"  @click="getSetTemperatureFun(item)">确定</div>
 
@@ -89,7 +90,7 @@
 import { Download } from '@element-plus/icons-vue'  //element字体图标
 import { ref,reactive,onMounted } from 'vue'
 import { ElMessageBox,ElMessage } from 'element-plus'
-import { getDevice,getControlLogList,getStrategyList,getStartAndStop,getSetTemperature } from '@/api/control/manual'
+import { getDevice,getControlLogList,getStrategyList,getStartAndStop,getSetTemperature,getSenceControl,getControlDeviceList } from '@/api/control/manual'
 
 onMounted(()=>{
   getDeviceFun();
@@ -100,15 +101,15 @@ onMounted(()=>{
 /** 获取所有设备*/
 const deviceArr = ref([])
 function getDeviceFun(){
-  getDevice().then((res)=>{
+  getControlDeviceList().then((res)=>{
     deviceArr.value = res.data;
     //拼接温度单位
-    for(let i = 0;i < res.data.length;i++){
-      for(let j = 0;j < res.data[i].control_elements.length;j++){
-        console.log(res.data[i].control_elements[j].tempValue)
-        res.data[i].control_elements[j].tempValue = res.data[i].control_elements[j].tempValue + '℃'
-      }
-    }
+    // for(let i = 0;i < res.data.length;i++){
+    //   for(let j = 0;j < res.data[i].control_elements.length;j++){
+    //     console.log(res.data[i].control_elements[j].tempValue)
+    //     res.data[i].control_elements[j].tempValue = res.data[i].control_elements[j].tempValue + '℃'
+    //   }
+    // }
   })
 }
 /** 设备控制处理*/
@@ -174,6 +175,7 @@ function getStrategyListFun(){
   })
 }
 //选择策略
+const SenceControlArr = ref([])
 function selectCeLue(item){
   //拼数组对象
   //1、
@@ -202,12 +204,15 @@ function selectCeLue(item){
 
   //最终要传参的格式
   console.log(JSON.stringify(dataArr, null, 4));
+  SenceControlArr.value = JSON.stringify(dataArr, null, 4)
 }
 //执行
 function confirmClick() {
   ElMessageBox.confirm(`确定执行 ${radio.value} ?`).then(() => {
     drawerIshow.value = false;
-
+    getSenceControl(SenceControlArr.value).then((res)=>{
+      console.log(res)
+    })
   })
 }