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 @@
+
确定
@@ -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)
+ })
})
}