手动控制渲染可控设备,策略导入执行

master
wj 2 years ago
parent 01e9b4bfad
commit bbd949abcf
  1. 8
      psdc-ui/src/api/control/manual.js
  2. 23
      psdc-ui/src/views/control/manual/index.vue

@ -4,6 +4,10 @@ import request from '@/utils/request'
export function getDevice() { export function getDevice() {
return request.get('/control/manual/deviceStatusList') return request.get('/control/manual/deviceStatusList')
} }
/** 获取可控设备*/
export function getControlDeviceList() {
return request.get('/control/manual/controlDeviceList')
}
/** 获取调控日志列表*/ /** 获取调控日志列表*/
export function getControlLogList(data) { export function getControlLogList(data) {
return request.post('/control/manual/controlLogList',data) return request.post('/control/manual/controlLogList',data)
@ -19,4 +23,8 @@ export function getStartAndStop(data) {
/** 设置温度*/ /** 设置温度*/
export function getSetTemperature(data) { export function getSetTemperature(data) {
return request.post('/control/manual/setTemperature',data) return request.post('/control/manual/setTemperature',data)
}
/** 策略执行控制*/
export function getSenceControl(data) {
return request.post('/control/manual/senceControl',data)
} }

@ -25,6 +25,7 @@
</el-form-item> </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" 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> <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 { Download } from '@element-plus/icons-vue' //element
import { ref,reactive,onMounted } from 'vue' import { ref,reactive,onMounted } from 'vue'
import { ElMessageBox,ElMessage } from 'element-plus' 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(()=>{ onMounted(()=>{
getDeviceFun(); getDeviceFun();
@ -100,15 +101,15 @@ onMounted(()=>{
/** 获取所有设备*/ /** 获取所有设备*/
const deviceArr = ref([]) const deviceArr = ref([])
function getDeviceFun(){ function getDeviceFun(){
getDevice().then((res)=>{ getControlDeviceList().then((res)=>{
deviceArr.value = res.data; deviceArr.value = res.data;
// //
for(let i = 0;i < res.data.length;i++){ // for(let i = 0;i < res.data.length;i++){
for(let j = 0;j < res.data[i].control_elements.length;j++){ // for(let j = 0;j < res.data[i].control_elements.length;j++){
console.log(res.data[i].control_elements[j].tempValue) // console.log(res.data[i].control_elements[j].tempValue)
res.data[i].control_elements[j].tempValue = 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){ function selectCeLue(item){
// //
//1 //1
@ -202,12 +204,15 @@ function selectCeLue(item){
// //
console.log(JSON.stringify(dataArr, null, 4)); console.log(JSON.stringify(dataArr, null, 4));
SenceControlArr.value = JSON.stringify(dataArr, null, 4)
} }
// //
function confirmClick() { function confirmClick() {
ElMessageBox.confirm(`确定执行 ${radio.value} ?`).then(() => { ElMessageBox.confirm(`确定执行 ${radio.value} ?`).then(() => {
drawerIshow.value = false; drawerIshow.value = false;
getSenceControl(SenceControlArr.value).then((res)=>{
console.log(res)
})
}) })
} }

Loading…
Cancel
Save