wenjy
/
aucma-scada-visual-board-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 取消能耗除100系数、功率除1000系数

Browse Source
master
wenjy 2 years ago
parent 02baf64c55
commit b2ef9d6cfe
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
productionboard/src/main/resources/application.yml
Unescape Escape View File

@ -12,6 +12,6 @@ mybatis-plus:
mapper-locations: classpath*:/mapper/**Mapper.xml mapper-locations: classpath*:/mapper/**Mapper.xml
server: server:
port: 6070 port: 6069
in_id: 2 in_id: 1

4
productionboard/src/main/resources/static/js/aluminumLiner/index.js
Unescape Escape View File

@ -7,8 +7,8 @@ $(() => {
if (result.length > 0) { if (result.length > 0) {
if(result[0].deviceEnergy > 0){ if(result[0].deviceEnergy > 0){
statusArray[0] = result[0].deviceStatus == "正常" ? "1" : "0"; statusArray[0] = result[0].deviceStatus == "正常" ? "1" : "0";
statusArray[1] = test(result[0].devicePower,1000); statusArray[1] = result[0].devicePower;
statusArray[2] = test(result[0].deviceEnergy,100); statusArray[2] = result[0].deviceEnergy;
statusArray[3] = result[0].count; statusArray[3] = result[0].count;
dataInformationFunction(statusArray); dataInformationFunction(statusArray);
} }

4
productionboard/src/main/resources/static/js/tankShell/device.js
Unescape Escape View File

@ -84,11 +84,11 @@ const dataInformationFunction = (statusArray) => {
let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;"> let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
<tr style="width: 100%; height: 50%;"> <tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;text-align:center;width: 50%;"><i ${res.deviceStatus == 1 ? 'style="color:rgb(107, 253, 110);"' : 'style="color: rgb(255, 105, 106);"'} class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<span style="color:rgb(107, 253, 110);margin-left: 10px">正常</span>` : `<span style="color:rgb(255, 105, 106);margin-left: 10px">异常</span>`}</td> <td style="border:0px solid red;text-align:center;width: 50%;"><i ${res.deviceStatus == 1 ? 'style="color:rgb(107, 253, 110);"' : 'style="color: rgb(255, 105, 106);"'} class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<span style="color:rgb(107, 253, 110);margin-left: 10px">正常</span>` : `<span style="color:rgb(255, 105, 106);margin-left: 10px">异常</span>`}</td>
<td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${test(res.devicePower,1000)} kW</td> <td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${res.devicePower} kW</td>
</tr> </tr>
<tr style="width: 100%; height: 50%;"> <tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${test(res.deviceEnergy,100)}kW·h</td> <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${res.deviceEnergy}kW·h</td>
<td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td> <td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td>
</tr> </tr>
</table>`; </table>`;

4
productionboard/target/classes/static/js/tankShell/device.js
Unescape Escape View File

@ -84,11 +84,11 @@ const dataInformationFunction = (statusArray) => {
let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;"> let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
<tr style="width: 100%; height: 50%;"> <tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;text-align:center;width: 50%;"><i ${res.deviceStatus == 1 ? 'style="color:rgb(107, 253, 110);"' : 'style="color: rgb(255, 105, 106);"'} class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<span style="color:rgb(107, 253, 110);margin-left: 10px">正常</span>` : `<span style="color:rgb(255, 105, 106);margin-left: 10px">异常</span>`}</td> <td style="border:0px solid red;text-align:center;width: 50%;"><i ${res.deviceStatus == 1 ? 'style="color:rgb(107, 253, 110);"' : 'style="color: rgb(255, 105, 106);"'} class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<span style="color:rgb(107, 253, 110);margin-left: 10px">正常</span>` : `<span style="color:rgb(255, 105, 106);margin-left: 10px">异常</span>`}</td>
<td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${test(res.devicePower,1000)} kW</td> <td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${res.devicePower} kW</td>
</tr> </tr>
<tr style="width: 100%; height: 50%;"> <tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${test(res.deviceEnergy,100)}kW·h</td> <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${res.deviceEnergy}kW·h</td>
<td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td> <td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td>
</tr> </tr>
</table>`; </table>`;

Write Preview
Loading…
Cancel
Save