diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
index db3e44e..d0092f5 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
@@ -306,7 +306,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
// TODO 发送MQTT指令
// psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,2,"控制成功",controlBy));
// psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,3,"等待终端响应超时",controlBy));
- //发送成功
+ // 发送成功
psdcControlLogMapper.insert(new PsdcControlLog(deviceId, psdcDevice.getDeviceName(), psdcDevice.getDeviceSn(), controlContext, controlValue, controlMethod, 2, "控制成功", controlBy));
atomicInteger.incrementAndGet();
@@ -340,10 +340,10 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
}
- //TODO 发送MQTT指令
+ // TODO 发送MQTT指令
// psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,value,controlMethod,2,"控制成功",controlBy));
// psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,value,controlMethod,3,"等待终端响应超时",controlBy));
- //发送成功
+ // 发送成功
return psdcControlLogMapper.insert(new PsdcControlLog(deviceId, psdcDevice.getDeviceName(), psdcDevice.getDeviceSn(), controlContext, value, controlMethod, 2, "控制成功", controlBy));
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
index b1ca67a..9df5103 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
@@ -199,7 +199,9 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
DeviceVo deviceVo = new DeviceVo();
for (int i = 0; i < listByCode.size(); i++) {
SceneVo sv = listByCode.get(i);
+ // System.out.println("序号 = " + i + "， 元素" + sv + "\n");
if (deviceId == sv.getDeviceId()) {
+ // System.out.println("上行: " + i + "\n");
deviceVo.setDeviceId(sv.getDeviceId());
deviceVo.setDeviceName(sv.getDeviceName());
deviceVo.setDeviceSn(sv.getDeviceSn());
@@ -214,10 +216,12 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
deviceVo.setTemp(sv.getSceneValue());
break;
}
- if (1 == listByCode.size()){
+ if (1 == listByCode.size() || i == listByCode.size() - 1){
ary.add(deviceVo);
}
+
} else {
+ // System.out.println("下发: " + i + "\n");
ary.add(deviceVo);
deviceId = sv.getDeviceId();
deviceVo = new DeviceVo();
@@ -248,9 +252,11 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
}
}
}
+ // System.out.println("终端元素 = " + ary + "\n");
}
psr.setDeviceVos(ary);
}
+ // System.out.println("集合：" + sceneRes + "\n");
return sceneRes;
}
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/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue
index 4b39a4e..759176d 100644
--- a/psdc-ui/src/views/bigview/index.vue
+++ b/psdc-ui/src/views/bigview/index.vue
@@ -144,39 +144,39 @@ function getWenduFun(){
/**运行设备工作信息*/
//蓄热锅炉运行数据
-const xrglRunStatus = ref()
-const xrglThermometerValueIn = ref()
-const xrglThermometerValueOut = ref()
-const xrglTodayUseEnergy = ref()
+const xrglRunStatus = ref('--')
+const xrglThermometerValueIn = ref('--')
+const xrglThermometerValueOut = ref('--')
+const xrglTodayUseEnergy = ref('--')
//蓄热锅炉折线图数据
const xrglTimeList = ref([]);
const xrglTempInTodayList = ref([]);
const xrglTempOutTodayList = ref([]);
//电磁锅炉运行数据
-const dcglRunStatus = ref()
-const dcglThermometerValueIn = ref()
-const dcglThermometerValueOut = ref()
-const dcglTodayUseEnergy = ref()
+const dcglRunStatus = ref('--')
+const dcglThermometerValueIn = ref('--')
+const dcglThermometerValueOut = ref('--')
+const dcglTodayUseEnergy = ref('--')
//电磁锅炉折线图数据
const dcglTimeList = ref([]);
const dcglTempInTodayList = ref([]);
const dcglTempOutTodayList = ref([]);
//空气源热泵运行数据
-const kqyrbRunStatus = ref()
-const kqyrbThermometerValueIn = ref()
-const kqyrbThermometerValueOut = ref()
-const kqyrbTodayUseEnergy = ref()
+const kqyrbRunStatus = ref('--')
+const kqyrbThermometerValueIn = ref('--')
+const kqyrbThermometerValueOut = ref('--')
+const kqyrbTodayUseEnergy = ref('--')
//空气源热泵折线图数据
const kqyrbTimeList = ref([]);
const kqyrbTempInTodayList = ref([]);
const kqyrbTempOutTodayList = ref([]);
//发热电缆运行数据
-const frdlRunStatus = ref()
-const frdlThermometerValueNow = ref()
-const frdlTodayUseEnergy = ref()
+const frdlRunStatus = ref('--')
+const frdlThermometerValueNow = ref('--')
+const frdlTodayUseEnergy = ref('--')
//发热电缆折线图数据
const frdlTimeList = ref([]);
const frdlTempTodayList = ref([]);
@@ -614,8 +614,8 @@ function frdlChartFun(){
};
/**总电表信息*/
-const nowPower = ref()
-const nowEle = ref()
+const nowPower = ref('--')
+const nowEle = ref('--')
const todayUsePowersArr = [];
function getZdbFun(){
getZdb(13).then((res)=>{
diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue
index 6d28824..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)
+ })
})
}
@@ -442,6 +447,7 @@ function getSetTemperatureFun(item){
bottom: 10px;
left: 50%;
transform: translateX(-50%);
+ z-index: 999;
}
::v-deep .el-pagination__total{
color: #f3ffff;
diff --git a/psdc-ui/src/views/control/timer/index.vue b/psdc-ui/src/views/control/timer/index.vue
index 963d8ec..eb614ce 100644
--- a/psdc-ui/src/views/control/timer/index.vue
+++ b/psdc-ui/src/views/control/timer/index.vue
@@ -576,10 +576,10 @@ const { queryParams } = toRefs(data);
}
}
}
-::v-deep .el-input__wrapper{
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
-}
+//::v-deep .el-input__wrapper{
+// border-top-left-radius: 0px;
+// border-bottom-left-radius: 0px;
+//}
::v-deep .el-button{
border-radius: 2px;
}
diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue
index 105b70b..27b4321 100644
--- a/psdc-ui/src/views/emonitor/db/index.vue
+++ b/psdc-ui/src/views/emonitor/db/index.vue
@@ -268,7 +268,10 @@ export default {
myChart2 = echarts.init(document.getElementById("myEcharts2"));
myChart2.setOption({
title: {},
- tooltip: {},
+ tooltip: {
+ trigger: "axis",
+ show: true
+ },
textStyle:{
color:'#BEC3DA'
},
diff --git a/psdc-ui/src/views/emonitor/drgl/index.vue b/psdc-ui/src/views/emonitor/drgl/index.vue
index 2f35688..5007576 100644
--- a/psdc-ui/src/views/emonitor/drgl/index.vue
+++ b/psdc-ui/src/views/emonitor/drgl/index.vue
@@ -358,7 +358,11 @@ export default {
myChart4 = echarts.init(document.getElementById("myEcharts4"));
myChart4.setOption({
title: {},
- tooltip: {},
+ tooltip: {
+ trigger: "axis",
+
+ show: true
+ },
legend: {
data: ['进水', '出水'],
textStyle:{
@@ -399,7 +403,7 @@ export default {
{
name: '进水',
type: 'line',
- stack: 'Total',
+ // stack: 'Total',
itemStyle:{
color:'#2F8EE0'
},
@@ -408,9 +412,9 @@ export default {
{
name: '出水',
type: 'line',
- stack: 'Total',
- itemStyle:{
- color:'#2F8EE0'
+ // stack: 'Total',
+ itemStyle: { //线条颜色
+ color: '#F5901A',
},
data: data.temOut
},
@@ -447,7 +451,10 @@ export default {
myChart3 = echarts.init(document.getElementById("myEcharts3"));
myChart3.setOption({
title: {},
- tooltip: {},
+ tooltip: {
+ trigger: "axis",
+ show: true
+ },
textStyle:{
color:'#BEC3DA'
},
diff --git a/psdc-ui/src/views/emonitor/frdl/index.vue b/psdc-ui/src/views/emonitor/frdl/index.vue
index c127043..38ed214 100644
--- a/psdc-ui/src/views/emonitor/frdl/index.vue
+++ b/psdc-ui/src/views/emonitor/frdl/index.vue
@@ -350,7 +350,10 @@ export default {
myChart4 = echarts.init(document.getElementById("myEcharts4"));
myChart4.setOption({
title: {},
- tooltip: {},
+ tooltip: {
+ trigger: "axis",
+ show: true
+ },
textStyle:{
color:'#BEC3DA'
},
@@ -386,8 +389,8 @@ export default {
name: '当前温度',
type: 'line',
stack: 'Total',
- itemStyle:{
- color:'#2F8EE0'
+ itemStyle: { //线条颜色
+ color: '#F5901A',
},
data: data.tem
},
@@ -424,7 +427,10 @@ export default {
myChart3 = echarts.init(document.getElementById("myEcharts3"));
myChart3.setOption({
title: {},
- tooltip: {},
+ tooltip: {
+ trigger: "axis",
+ show: true
+ },
textStyle:{
color:'#BEC3DA'
},
diff --git a/psdc-ui/src/views/emonitor/kqyrb/index.vue b/psdc-ui/src/views/emonitor/kqyrb/index.vue
index 00b8b77..62bec96 100644
--- a/psdc-ui/src/views/emonitor/kqyrb/index.vue
+++ b/psdc-ui/src/views/emonitor/kqyrb/index.vue
@@ -355,7 +355,10 @@ export default {
myChart4 = echarts.init(document.getElementById("myEcharts4"));
myChart4.setOption({
title: {},
- tooltip: {},
+ tooltip: {
+ trigger: "axis",
+ show: true
+ },
legend: {
data: ['进水', '出水'],
textStyle:{
@@ -396,7 +399,7 @@ export default {
{
name: '进水',
type: 'line',
- stack: 'Total',
+ // stack: 'Total',
itemStyle:{
color:'#2F8EE0'
},
@@ -405,9 +408,9 @@ export default {
{
name: '出水',
type: 'line',
- stack: 'Total',
- itemStyle:{
- color:'#2F8EE0'
+ // stack: 'Total',
+ itemStyle: { //线条颜色
+ color: '#F5901A',
},
data: data.temOut
},
@@ -443,7 +446,10 @@ export default {
myChart3 = echarts.init(document.getElementById("myEcharts3"));
myChart3.setOption({
title: {},
- tooltip: {},
+ tooltip: {
+ trigger: "axis",
+ show: true
+ },
textStyle:{
color:'#BEC3DA'
},
diff --git a/psdc-ui/src/views/emonitor/sp/index.vue b/psdc-ui/src/views/emonitor/sp/index.vue
index 5c021da..2a759d5 100644
--- a/psdc-ui/src/views/emonitor/sp/index.vue
+++ b/psdc-ui/src/views/emonitor/sp/index.vue
@@ -1,7 +1,7 @@
-
{{data.name}}
-
运行状态:{{data.status}}
+
+
运行状态：{{data.status}}
进水温度出水温度温度
- {{item.deviceName}}
-
-
-
+ {{item.deviceName}}
+
+
+
@@ -133,15 +130,13 @@
全选
-
+ 进水温度出水温度温度
- {{item.deviceName}}
-
-
-
+
+ {{item.deviceName}}
+
+
+
@@ -561,7 +556,19 @@ const { queryParams } = toRefs(data);
min-height: 745px;
background-color: #2F3D8A;
}
-
+.taber{
+ width: 400px;
+ margin-left: 52px;
+ display: flex;
+ justify-content: flex-start;
+ line-height: 32px;
+ span{
+ width: 120px;
+ &:nth-child(2),&:nth-child(3){
+ margin-left: 20px;
+ }
+ }
+}
::v-deep .el-button{
border-radius: 2px;
}
diff --git a/psdc-ui/src/views/system/user/profile/index.vue b/psdc-ui/src/views/system/user/profile/index.vue
index 3f777dd..16a3e78 100644
--- a/psdc-ui/src/views/system/user/profile/index.vue
+++ b/psdc-ui/src/views/system/user/profile/index.vue
@@ -147,6 +147,19 @@ getUser();