Commit c75d24bb authored by lwy's avatar lwy

Merge branch 'b-master' of http://gitlab.91isoft.com:90/hikvision/web-project into b-master

parents 59c280d9 35aec1ff
import http from './http' import http from './http'
import {reportHeatAnalysis,reportHeatForecast,reportTransferEnergy,reportTransferArea,reportPrintHeatForecast} from "../../src/dataJson/productData/mock"
//热量分析报表 //热量分析报表
export const postHeatAnalysis = params => { /*export const postHeatAnalysis = params => {
return http.post(`/api/analysis/report/HeatAnalysis`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/HeatAnalysis`, params).then(res => res).catch(function (error) {
console.log(error); console.log(error);
}) })
}*/
//静态资源 热量分析报表
export const postHeatAnalysis = params => {
return Promise.resolve(reportHeatAnalysis);
} }
//明日预测报表(实时或历史查询) //明日预测报表(实时或历史查询)
export const postHeatForecast = params => { /*export const postHeatForecast = params => {
return http.post(`/api/analysis/report/HeatForecast`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/HeatForecast`, params).then(res => res).catch(function (error) {
console.log(error); console.log(error);
}) })
}*/
//静态资源 明日预测报表(实时或历史查询)
export const postHeatForecast = params => {
return Promise.resolve(reportHeatForecast);
} }
//明日预测报表(打印查询) //明日预测报表(打印查询)
export const postPrintHeatForecast = params => { /*export const postPrintHeatForecast = params => {
return http.post(`/api/analysis/report/PrintHeatForecast`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/PrintHeatForecast`, params).then(res => res).catch(function (error) {
console.log(error); console.log(error);
}) })
}*/
//静态资源 明日预测报表(打印查询)
export const postPrintHeatForecast = params => {
return Promise.resolve(reportPrintHeatForecast);
} }
//明日预测报表(保存打印记录) //明日预测报表(保存打印记录)
/*export const postSaveHeatForecast = params => {
return http.post(`/api/analysis/report/SaveHeatForecast`, params).then(res => res).catch(function (error) {
console.log(error);
})
}*/
//静态资源 明日预测报表(保存打印记录)
export const postSaveHeatForecast = params => { export const postSaveHeatForecast = params => {
return http.post(`/api/analysis/report/SaveHeatForecast`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/SaveHeatForecast`, params).then(res => res).catch(function (error) {
console.log(error); console.log(error);
}) })
} }
//换热站能耗报表 //换热站能耗报表
export const postTransferEnergy = params => { /*export const postTransferEnergy = params => {
return http.post(`/api/analysis/report/TransferEnergy`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/TransferEnergy`, params).then(res => res).catch(function (error) {
console.log(error); console.log(error);
}) })
}*/
//静态资源 换热站能耗报表
export const postTransferEnergy = params => {
return Promise.resolve(reportTransferEnergy);
} }
//换热站面积报表 //换热站面积报表
export const postTransferArea = params => { /*export const postTransferArea = params => {
return http.post(`/api/analysis/report/TransferArea`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/TransferArea`, params).then(res => res).catch(function (error) {
console.log(error); console.log(error);
}) })
}*/
//静态资源 换热站面积报表
export const postTransferArea = params => {
return Promise.resolve(reportTransferArea);
} }
//热量实时分析报表 //热量实时分析报表
export const postRealAnalysis = params => { export const postRealAnalysis = params => {
return http.post(`/api/analysis/report/RealAnalysis`, params).then(res => res).catch(function (error) { return http.post(`/api/analysis/report/RealAnalysis`, params).then(res => res).catch(function (error) {
......
This diff is collapsed.
...@@ -87,6 +87,14 @@ ...@@ -87,6 +87,14 @@
import store from "../../store/index"; import store from "../../store/index";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import { vFloatNumber } from "../../utils/directives.js"; import { vFloatNumber } from "../../utils/directives.js";
import {
remoteGetLimit1,
remoteGetLimit2,
remoteGetLimit3,
remoteGetLimit4,
remoteGetLimit5,
remoteGetLimit6, remoteReadLimit
} from "@/dataJson/Remote/remote.js";
const enterpriseId = store.getters.getEnterpriseId(); const enterpriseId = store.getters.getEnterpriseId();
const props = defineProps(['activeRadio']); const props = defineProps(['activeRadio']);
...@@ -122,28 +130,71 @@ ...@@ -122,28 +130,71 @@
function setContentHeight() { function setContentHeight() {
tableHeight.value = window.innerHeight - 300; tableHeight.value = window.innerHeight - 300;
} }
const handleRowClick=(row)=>{
visibleData.value.forEach((item) =>{
nextTick(() => {
if(item.transferId === forms.transferId){
tableRef.value.toggleRowSelection(item,true);
}
});
})
forms.transferId = row.transferId;
forms.transferName = row.transferName;
forms.isDisabled = row.isDisabled;
forms.transferStatus = row.transferStatus;
forms.upperTempLimit = row.upperTempLimit;
forms.underTempLimit = row.underTempLimit;
}
// async function initData(){
// try{
// isLoading.value = true;
// var type = 0;
// if(enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){
// type = 1;
// }
// var result = await http.post('/api/remote/GetLimit',{"SupplyType":type, "DeviceId": props.activeRadio});
// if(result.success){
// visibleData.value = result.data;
// handleRowClick(visibleData.value[0]);
// }else{
// ElMessage.error(result.message);
// }
// }catch(error){
// ElMessage.error("气象仪参数组 未获取到控制内容");
// }
// isLoading.value = false;
// }
// initData();
async function initData(){ async function initData(){
try{ isLoading.value = false;
isLoading.value = true;
var type = 0; var type = 0;
if(enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){ if(enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){
type = 1; type = 1;
} }
var result = await http.post('/api/remote/GetLimit',{"SupplyType":type, "DeviceId": props.activeRadio}); console.log(props.activeRadio);
if(result.success){ if(props.activeRadio === "8310b60c-ee93-4012-898f-88b9bf55a6ad"){
visibleData.value = result.data; visibleData.value = remoteGetLimit1.data;
handleRowClick(visibleData.value[0]);
}else if(props.activeRadio === "d926cd67-70ab-428d-a210-b4fea960f172"){
visibleData.value = remoteGetLimit2.data;
handleRowClick(visibleData.value[0]);
}else if(props.activeRadio === "a20db849-8065-4848-a725-eecc14f95ef3"){
visibleData.value = remoteGetLimit3.data;
handleRowClick(visibleData.value[0]);
}else if(props.activeRadio === "1009fc08-3568-4105-9954-108e837b5328"){
visibleData.value = remoteGetLimit4.data;
handleRowClick(visibleData.value[0]);
}else if(props.activeRadio === "2616ca90-4449-4293-8d71-170ba56a83e5"){
visibleData.value = remoteGetLimit5.data;
handleRowClick(visibleData.value[0]);
}else if(props.activeRadio === "2475b12f-7eb4-42b1-88da-d750bb9f0d72"){
visibleData.value = remoteGetLimit6.data;
handleRowClick(visibleData.value[0]); handleRowClick(visibleData.value[0]);
}else{
ElMessage.error(result.message);
}
}catch(error){
ElMessage.error("气象仪参数组 未获取到控制内容");
} }
isLoading.value = false; isLoading.value = false;
} }
initData(); initData();
async function ReadStatus(row){ async function ReadStatus(row){
row.transferStatus = 0; row.transferStatus = 0;
handleRowClick(row); handleRowClick(row);
...@@ -223,10 +274,74 @@ ...@@ -223,10 +274,74 @@
myIndeterminate.value = !myIndeterminate.value; myIndeterminate.value = !myIndeterminate.value;
progress.value=100; progress.value=100;
} }
//原读取和写入
// async function WriteStation(element){
// try{
// //console.log("write row:"+element.transferName);
// var writeValue = "";
// if(forms.upperTempLimit == null || forms.upperTempLimit == ""){
// ElMessage.success("请输入温度上限!");
// return;
// }
// if(forms.underTempLimit == null || forms.underTempLimit == ""){
// ElMessage.success("请输入温度下限!");
// return;
// }
// element.upperTempLimit=forms.upperTempLimit;
// writeValue +="UpperTempLimit:"+forms.upperTempLimit + ";";
//
// element.underTempLimit=forms.underTempLimit;
// writeValue +="UnderTempLimit:"+forms.underTempLimit + ";";
//
// if(writeValue === ''){
// ElMessage.error(element.transferName +" 未获取到写入数据");
// return;
// }
// //console.log(writeValue);
// var result = await http.post('/api/remote/WriteTransfer', {"TransferId":element.transferId, "WriteValues": writeValue, "PanelType": 7});
// if(result.success){
// ElMessage.success(element.transferName +" "+ result.data);
// element.transferStatus = 1;
// handleRowClick(forms);
// }else{
// ElMessage.error(element.transferName +" "+ result.message);
// if(result.message === "连接异常"){
// element.transferStatus = 3;
// }else{
// element.transferStatus = 2;
// }
// }
// }catch(error){
// ElMessage.error(element.transferName +" "+ error.message);
// element.transferStatus = 3;
// }
// }
// async function ReadStation(row){
// var result = await http.post('/api/remote/ReadLimit', row.transferId);
// if(result.success){
// var jobj = result.data[0];
// //console.log("Value:"+jobj);
// if(jobj && visibleData){
// for(const element of visibleData.value){
// if(element.transferId === row.transferId){
// element.upperTempLimit = jobj.upperTempLimit;
// element.underTempLimit = jobj.underTempLimit;
// element.isDisabled = false;
// element.transferStatus = jobj.transferStatus;
// ElMessage.success(row.transferName +" 读取成功");
// handleRowClick(element);
// //console.log("gainMode:"+jobj.gainMode);
// break;
// }
// };
// }
// }else{
// ElMessage.error(row.transferName +": "+ result.message);
// row.transferStatus = 3;
// }
// }
async function ReadStation(row){ async function ReadStation(row){
var result = await http.post('/api/remote/ReadLimit', row.transferId); var jobj = remoteReadLimit.data[0];
if(result.success){
var jobj = result.data[0];
//console.log("Value:"+jobj); //console.log("Value:"+jobj);
if(jobj && visibleData){ if(jobj && visibleData){
for(const element of visibleData.value){ for(const element of visibleData.value){
...@@ -240,54 +355,10 @@ ...@@ -240,54 +355,10 @@
//console.log("gainMode:"+jobj.gainMode); //console.log("gainMode:"+jobj.gainMode);
break; break;
} }
};
}
}else{
ElMessage.error(row.transferName +": "+ result.message);
row.transferStatus = 3;
} }
} }
async function WriteStation(element){
try{
//console.log("write row:"+element.transferName);
var writeValue = "";
if(forms.upperTempLimit == null || forms.upperTempLimit == ""){
ElMessage.success("请输入温度上限!");
return;
} }
if(forms.underTempLimit == null || forms.underTempLimit == ""){
ElMessage.success("请输入温度下限!");
return;
}
element.upperTempLimit=forms.upperTempLimit;
writeValue +="UpperTempLimit:"+forms.upperTempLimit + ";";
element.underTempLimit=forms.underTempLimit;
writeValue +="UnderTempLimit:"+forms.underTempLimit + ";";
if(writeValue === ''){
ElMessage.error(element.transferName +" 未获取到写入数据");
return;
}
//console.log(writeValue);
var result = await http.post('/api/remote/WriteTransfer', {"TransferId":element.transferId, "WriteValues": writeValue, "PanelType": 7});
if(result.success){
ElMessage.success(element.transferName +" "+ result.data);
element.transferStatus = 1;
handleRowClick(forms);
}else{
ElMessage.error(element.transferName +" "+ result.message);
if(result.message === "连接异常"){
element.transferStatus = 3;
}else{
element.transferStatus = 2;
}
}
}catch(error){
ElMessage.error(element.transferName +" "+ error.message);
element.transferStatus = 3;
}
}
function setCellStyle({ row, column, rowIndex, columnIndex }) { function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {}; let css_color = {};
css_color['padding-left'] = '0px'; css_color['padding-left'] = '0px';
...@@ -318,23 +389,6 @@ ...@@ -318,23 +389,6 @@
const handleSelectionChange = (selection) => { const handleSelectionChange = (selection) => {
selectedRows.value = selection; selectedRows.value = selection;
}; };
const handleRowClick=(row)=>{
visibleData.value.forEach((item) =>{
nextTick(() => {
if(item.transferId === forms.transferId){
tableRef.value.toggleRowSelection(item,true);
}
});
})
forms.transferId = row.transferId;
forms.transferName = row.transferName;
forms.isDisabled = row.isDisabled;
forms.transferStatus = row.transferStatus;
forms.upperTempLimit = row.upperTempLimit;
forms.underTempLimit = row.underTempLimit;
}
const svg = ` const svg = `
<path class="path" d=" <path class="path" d="
M 30 15 M 30 15
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -127,7 +127,9 @@ import { useRoute } from 'vue-router' ...@@ -127,7 +127,9 @@ import { useRoute } from 'vue-router'
import store from "../../store/index"; import store from "../../store/index";
import http from '../../api/http'; import http from '../../api/http';
import { getOneImgUrl, getAllImgUrl } from '../../utils/utils'; import { getOneImgUrl, getAllImgUrl } from '../../utils/utils';
import { boilerArtWork, deviceArt, deviceArt2, deviceArt3,pipeArt,weatherArt } from '../../dataJson/RealPage/boilerArt';
import {weatherReal} from '@/dataJson/exchangeStation/realData/realData'
import { pipeReal } from '../../dataJson/RealPage/RealPipePage';
const props = defineProps(['id', 'refreshTime']); const props = defineProps(['id', 'refreshTime']);
const route = useRoute() const route = useRoute()
const Boiler = ref(); const Boiler = ref();
...@@ -227,23 +229,86 @@ function getSupplysList() { ...@@ -227,23 +229,86 @@ function getSupplysList() {
} }
//获取气象实时数据 //获取气象实时数据
// function getweather() {
// http.post("/api/weather/Real", SupplyId.value).then((result) => {
// temperature.value = result.data["temperature"];
// wind.value = result.data["wind"];
// illumination.value = result.data["illumination"];
// humidity.value = result.data["humidity"];
// })
// }
function getweather() { function getweather() {
http.post("/api/weather/Real", SupplyId.value).then((result) => { temperature.value = weatherArt.data["temperature"];
temperature.value = result.data["temperature"]; wind.value = weatherArt.data["wind"];
wind.value = result.data["wind"]; illumination.value = weatherArt.data["illumination"];
illumination.value = result.data["illumination"]; humidity.value =weatherArt.data["humidity"];
humidity.value = result.data["humidity"];
})
} }
getBoilerData(); getBoilerData();
//获取锅炉实时数据 //获取锅炉实时数据
// function getBoilerData() {
// result.data.realData.forEach(element => {
// BoilerData[element.enName] = element.paramValue;
// })
// result.data.realStatus.forEach(element => {
// status[element.enName] = element.paramValue;
// })
// ExhaustTemp.value = BoilerData["ExhaustTemp"];
// InletPressure.value = BoilerData["InletPressure"];
// InletTemp.value = BoilerData["InletTemp"];
// OutletPressure.value = BoilerData["OutletPressure"];
// OutletTemp.value = BoilerData["OutletTemp"];
// BlastOutletPressure.value = BoilerData["BlastOutletPressure"];
// FirepotPressure.value = BoilerData["FirepotPressure"];
// FirepotTemp.value = BoilerData["FirepotTemp"];
// EconomizerInletTemp.value = BoilerData["EconomizerInletTemp"];
// GasLoad.value = BoilerData["GasLoad"];
// SmokeDetectionT.value = BoilerData["SmokeDetectionT"];
// SmokeDetectionP.value = BoilerData["SmokeDetectionP"];
// SmokeDetectionH2O.value = BoilerData["SmokeDetectionH2O"];
// SmokeDetectionO2.value = BoilerData["SmokeDetectionO2"];
// SmokeDetectionP_diff.value = BoilerData["SmokeDetectionP_diff"];
// SmokeDetectionNO.value = BoilerData["SmokeDetectionNO"];
// NOxEx.value = BoilerData["NOxEx"];
// NOx.value = BoilerData["NOx"];
// OutletInstantaneousFlow.value = BoilerData["OutletInstantaneousFlow"];
// EconomizerInletWaterTemp.value = BoilerData["EconomizerInletWaterTemp"];
// http.post("/api/device/Real", { "enterpriseId": enterpriseId.value, "deviceType": 5 }).then((result) => {
// result.data.realData.forEach(item => {
// if (item.name === "滦河水水表") {
// luanhewater.value = item.tapWaterOutletFlowSum;
// } else {
// underwater.value = item.tapWaterOutletFlowSum;
// }
// })
// })
// http.post("/api/device/Real", { "enterpriseId": enterpriseId.value, "deviceType": 7 }).then((result) => {
// result.data.realData.forEach(item => {
// elecSum.value = item.elecSum;
// })
// })
// http.post("/api/device/Real", { "enterpriseId": enterpriseId.value, "deviceType": 6 }).then((result) => {
// result.data.title.forEach(element => {
// result.data.realData.forEach(item => {
// BoilerData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)];
// })
// })
// InstantFlow.value = BoilerData["InstantFlow"];
// SumFlow.value = BoilerData["SumFlow"];
// InstantHeat.value = BoilerData["InstantHeat"];
// SumHeat.value = BoilerData["SumHeat"];
// })
// }
function getBoilerData() { function getBoilerData() {
http.post("/api/Boiler/Artwork", id.value).then((result) => {
result.data.realData.forEach(element => { boilerArtWork.realData.forEach(element => {
BoilerData[element.enName] = element.paramValue; BoilerData[element.enName] = element.paramValue;
}) })
result.data.realStatus.forEach(element => { boilerArtWork.realStatus.forEach(element => {
status[element.enName] = element.paramValue; status[element.enName] = element.paramValue;
}) })
ExhaustTemp.value = BoilerData["ExhaustTemp"]; ExhaustTemp.value = BoilerData["ExhaustTemp"];
...@@ -266,44 +331,64 @@ function getBoilerData() { ...@@ -266,44 +331,64 @@ function getBoilerData() {
NOx.value = BoilerData["NOx"]; NOx.value = BoilerData["NOx"];
OutletInstantaneousFlow.value = BoilerData["OutletInstantaneousFlow"]; OutletInstantaneousFlow.value = BoilerData["OutletInstantaneousFlow"];
EconomizerInletWaterTemp.value = BoilerData["EconomizerInletWaterTemp"]; EconomizerInletWaterTemp.value = BoilerData["EconomizerInletWaterTemp"];
})
http.post("/api/device/Real", { "enterpriseId": enterpriseId.value, "deviceType": 5 }).then((result) => { // 从 deviceArt 获取水表数据
result.data.realData.forEach(item => { deviceArt.realData.forEach(item => {
if (item.name === "滦河水水表") { if (item.name === "滦河水水表") {
luanhewater.value = item.tapWaterOutletFlowSum; luanhewater.value = item.tapWaterOutletFlowSum;
} else { } else {
underwater.value = item.tapWaterOutletFlowSum; underwater.value = item.tapWaterOutletFlowSum;
} }
}) });
})
http.post("/api/device/Real", { "enterpriseId": enterpriseId.value, "deviceType": 7 }).then((result) => {
result.data.realData.forEach(item => {
elecSum.value = item.elecSum;
})
})
http.post("/api/device/Real", { "enterpriseId": enterpriseId.value, "deviceType": 6 }).then((result) => { // 从 deviceArt2 获取 elecSum 数据
result.data.title.forEach(element => { deviceArt2.realData.forEach(item => {
result.data.realData.forEach(item => { elecSum.value = item.elecSum;
BoilerData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)]; });
})
})
InstantFlow.value = BoilerData["InstantFlow"];
SumFlow.value = BoilerData["SumFlow"];
InstantHeat.value = BoilerData["InstantHeat"];
SumHeat.value = BoilerData["SumHeat"];
})
// 从 deviceArt3 获取瞬时流量和热量数据
deviceArt3.realData.forEach(item => {
InstantFlow.value = item.instantFlow;
SumFlow.value = item.sumFlow;
InstantHeat.value = item.instantHeat;
SumHeat.value = item.sumHeat;
});
} }
getPipeData(); getPipeData();
//实时数据
// function getPipeData() {
// console.log(JSON.stringify(result));
// result.data.title.forEach(element => {
// result.data.realData.forEach(item => {
// BoilerData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)];
// })
// })
// SupplyPipePressure.value = BoilerData["SupplyPipePressure"];
// SupplyPipeTemp.value = BoilerData["SupplyPipeTemp"];
// CirculatingOutPressure.value = BoilerData["CirculatingOutPressure"];
// WaterBoxLiquidLevel.value = BoilerData["WaterBoxLiquidLevel"];
// TroubledWaterSideElecValueBack.value = BoilerData["TroubledWaterSideElecValueBack"];
// FirstDirtSeparatorOutletPressure.value = BoilerData["FirstDirtSeparatorOutletPressure"];
// AfterMixingInletCommonHeaderTemp.value = BoilerData["AfterMixingInletCommonHeaderTemp"];
// FirstDirtSeparatorInletPressure.value = BoilerData["FirstDirtSeparatorInletPressure"];
// MixingPipeTemp.value = BoilerData["MixingPipeTemp"];
// ReturnPipeTemp.value = BoilerData["ReturnPipeTemp"];
// FirstCirculatingFreqBack.value = BoilerData["FirstCirculatingFreqBack"];
// FirstCirculatingElec.value = BoilerData["FirstCirculatingElec"];
// SecondCirculatingFreqBack.value = BoilerData["SecondCirculatingFreqBack"];
// SecondCirculatingElec.value = BoilerData["SecondCirculatingElec"];
// ThirdCirculatingFreqBack.value = BoilerData["ThirdCirculatingFreqBack"];
// ThirdCirculatingElec.value = BoilerData["ThirdCirculatingElec"];
// }
//静态
function getPipeData() { function getPipeData() {
http.post("/api/Pipe/Real", { "enterpriseId": enterpriseId.value, "deviceType": 1 }).then((result) => { pipeArt.title.forEach(element => {
result.data.title.forEach(element => { pipeArt.realData.forEach(item => {
result.data.realData.forEach(item => { BoilerData[element.enName] = item[element.enName];
BoilerData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)]; });
}) });
})
SupplyPipePressure.value = BoilerData["SupplyPipePressure"]; SupplyPipePressure.value = BoilerData["SupplyPipePressure"];
SupplyPipeTemp.value = BoilerData["SupplyPipeTemp"]; SupplyPipeTemp.value = BoilerData["SupplyPipeTemp"];
CirculatingOutPressure.value = BoilerData["CirculatingOutPressure"]; CirculatingOutPressure.value = BoilerData["CirculatingOutPressure"];
...@@ -320,7 +405,6 @@ function getPipeData() { ...@@ -320,7 +405,6 @@ function getPipeData() {
SecondCirculatingElec.value = BoilerData["SecondCirculatingElec"]; SecondCirculatingElec.value = BoilerData["SecondCirculatingElec"];
ThirdCirculatingFreqBack.value = BoilerData["ThirdCirculatingFreqBack"]; ThirdCirculatingFreqBack.value = BoilerData["ThirdCirculatingFreqBack"];
ThirdCirculatingElec.value = BoilerData["ThirdCirculatingElec"]; ThirdCirculatingElec.value = BoilerData["ThirdCirculatingElec"];
})
} }
setInterval(() => { setInterval(() => {
......
...@@ -33,7 +33,8 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue'; ...@@ -33,7 +33,8 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue';
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import store from "../../store/index"; import store from "../../store/index";
import http from '../../api/http'; import http from '../../api/http';
import { weatherArt } from '../../dataJson/RealPage/boilerArt';
import { pipeRealArt } from '../../dataJson/RealPage/measureArt';
const props = defineProps(['id', 'refreshTime']); const props = defineProps(['id', 'refreshTime']);
const route = useRoute() const route = useRoute()
const Pipe = ref(); const Pipe = ref();
...@@ -83,7 +84,6 @@ const BackFlowSum = ref(); ...@@ -83,7 +84,6 @@ const BackFlowSum = ref();
getSupplysList(); getSupplysList();
function getSupplysList() { function getSupplysList() {
var result = store.getters.getEnterprise(); var result = store.getters.getEnterprise();
console.log(result);
if (result) { if (result) {
result.forEach(element => { result.forEach(element => {
if (element.enterpriseId === enterpriseId.value) { if (element.enterpriseId === enterpriseId.value) {
...@@ -112,23 +112,50 @@ function getSupplysList() { ...@@ -112,23 +112,50 @@ function getSupplysList() {
} }
//获取气象实时数据 //获取气象实时数据
// function getweather() {
// http.post("/api/weather/Real", SupplyId.value).then((result) => {
// temperature.value = result.data["temperature"];
// wind.value = result.data["wind"];
// illumination.value = result.data["illumination"];
// humidity.value = result.data["humidity"];
// })
// }
function getweather() { function getweather() {
http.post("/api/weather/Real", SupplyId.value).then((result) => { temperature.value = weatherArt.data["temperature"];
temperature.value = result.data["temperature"]; wind.value = weatherArt.data["wind"];
wind.value = result.data["wind"]; illumination.value = weatherArt.data["illumination"];
illumination.value = result.data["illumination"]; humidity.value =weatherArt.data["humidity"];
humidity.value = result.data["humidity"];
})
} }
getPipeData(); getPipeData();
//获取计量站实时数据 // //获取计量站实时数据
// function getPipeData() {
// let deviceType = 8;
// http.post("/api/pipe/Real", { "enterpriseId": enterpriseId.value, "deviceType": deviceType }).then((result) => {
// // console.log(JSON.stringify(result));
// result.data.title.forEach(element => {
// result.data.realData.forEach(item => {
// if (item.id === id.value) {
// PipeData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)];
// }
// })
// })
// SupplyClearPressure.value = PipeData["SupplyClearPressure"];
// SupplyValuePressure.value = PipeData["SupplyValuePressure"];
// FirstInTemp.value = PipeData["FirstInTemp"];
// SupplyFlow.value = PipeData["SupplyFlow"];
// SupplyFlowSum.value = PipeData["SupplyFlowSum"];
// SupplyHeat.value = PipeData["SupplyHeat"];
// SupplyHeatSum.value = PipeData["SupplyHeatSum"];
// FirstOutTemp.value = PipeData["FirstOutTemp"];
// BackClearPressure.value = PipeData["BackClearPressure"];
// BackFlow.value = PipeData["BackFlow"];
// BackFlowSum.value = PipeData["BackFlowSum"];
// })
// }
//静态
function getPipeData() { function getPipeData() {
let deviceType = 8; pipeRealArt.title.forEach(element => {
http.post("/api/pipe/Real", { "enterpriseId": enterpriseId.value, "deviceType": deviceType }).then((result) => { pipeRealArt.realData.forEach(item => {
console.log(result);
result.data.title.forEach(element => {
result.data.realData.forEach(item => {
if (item.id === id.value) { if (item.id === id.value) {
PipeData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)]; PipeData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)];
} }
...@@ -145,7 +172,6 @@ function getPipeData() { ...@@ -145,7 +172,6 @@ function getPipeData() {
BackClearPressure.value = PipeData["BackClearPressure"]; BackClearPressure.value = PipeData["BackClearPressure"];
BackFlow.value = PipeData["BackFlow"]; BackFlow.value = PipeData["BackFlow"];
BackFlowSum.value = PipeData["BackFlowSum"]; BackFlowSum.value = PipeData["BackFlowSum"];
})
} }
setInterval(() => { setInterval(() => {
getPipeData(); getPipeData();
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
import { createStore } from 'vuex' import { createStore } from 'vuex'
import { orgFn } from '@/api/org' import { orgFn } from '@/api/org'
import { homeGetOrg } from '../dataJson/common/common.js'
import {AIAPIExternalSERVEICE, AIAPIWithinSERVEICE, ExternalSERVEICE, WithinSERVEICE} from '../../public/config' import {AIAPIExternalSERVEICE, AIAPIWithinSERVEICE, ExternalSERVEICE, WithinSERVEICE} from '../../public/config'
const keys = { USER: 'user', ENTERPRISE:'enterprise', SERVEICE:'SERVEICE', AIAPISERVEICE:'AIAPISERVEICE' } const keys = { USER: 'user', ENTERPRISE:'enterprise', SERVEICE:'SERVEICE', AIAPISERVEICE:'AIAPISERVEICE' }
...@@ -194,12 +195,15 @@ const store = createStore({ ...@@ -194,12 +195,15 @@ const store = createStore({
//actions里面的方法是异步操作 //actions里面的方法是异步操作
//异步操作就使用promise //异步操作就使用promise
return new Promise((resolve,reject)=>{ return new Promise((resolve,reject)=>{
orgFn().then(res=>{ /* orgFn().then(res=>{
//console.log(res) //console.log(res)
context.commit('setEnterprise',res.data) context.commit('setEnterprise',res.data)
context.commit('setEnterpriseId',res.data[0].enterpriseId) context.commit('setEnterpriseId',res.data[0].enterpriseId)
resolve(res) resolve(res)
}).catch(err=>reject(err)) }).catch(err=>reject(err))*/
context.commit('setEnterprise',homeGetOrg.data)
context.commit('setEnterpriseId',homeGetOrg.data[0].enterpriseId)
resolve(homeGetOrg)
}) })
} }
} }
......
...@@ -59,7 +59,7 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue'; ...@@ -59,7 +59,7 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue';
import http from '../../api/http'; import http from '../../api/http';
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import store from "../../store/index"; import store from "../../store/index";
import {alarmGetTransAlarmData} from "../../dataJson/alarmData/mock"
//分页设置 //分页设置
const currentPage = ref(1) const currentPage = ref(1)
...@@ -303,7 +303,7 @@ function gettransfer() { ...@@ -303,7 +303,7 @@ function gettransfer() {
AlarmInfo.start = ((currentPage.value - 1) * pageSize.value) + 1; AlarmInfo.start = ((currentPage.value - 1) * pageSize.value) + 1;
AlarmInfo.count = pageSize.value - 1; AlarmInfo.count = pageSize.value - 1;
} }
http.post("/api/alarm/" + type.value, AlarmInfo).then((result) => { /*http.post("/api/alarm/" + type.value, AlarmInfo).then((result) => {
console.log(result.data); console.log(result.data);
console.log(AlarmInfo); console.log(AlarmInfo);
if(result.data !== null){ if(result.data !== null){
...@@ -313,9 +313,10 @@ function gettransfer() { ...@@ -313,9 +313,10 @@ function gettransfer() {
if(result.data === null || AlarmInfo.Id.length < 1){ if(result.data === null || AlarmInfo.Id.length < 1){
tableData.value = null; tableData.value = null;
total.value = 0; total.value = 0;
} }*/
tableData.value=alarmGetTransAlarmData.data.dataInfoList;
loading.value = false; loading.value = false;
}); /* });*/
} }
function setCellStyle({ row, column, rowIndex, columnIndex }) { function setCellStyle({ row, column, rowIndex, columnIndex }) {
...@@ -338,7 +339,7 @@ function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) { ...@@ -338,7 +339,7 @@ function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
} }
// 导出表格 按钮点击后触发事件 // 导出表格 按钮点击后触发事件
async function exportExcel () { async function exportExcel () {
if(tableData.value !== null){ if(tableData.value !== null){
sessionStorage.setItem("DeviceQueryStart", AlarmInfo.startTime); sessionStorage.setItem("DeviceQueryStart", AlarmInfo.startTime);
sessionStorage.setItem("DeviceQueryEnd", AlarmInfo.endTime); sessionStorage.setItem("DeviceQueryEnd", AlarmInfo.endTime);
......
...@@ -265,7 +265,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'; ...@@ -265,7 +265,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
import { watchEffect } from 'vue'; import { watchEffect } from 'vue';
import { add } from 'lodash'; import { add } from 'lodash';
import { vFloatNumber } from "@/utils/directives.js"; import { vFloatNumber } from "@/utils/directives.js";
import {alarmGetTransAlarmStatusData,alarmGetBoilerAlarmStatusData,alarmParaTranssave,alarmParaGetAlarmPara} from "../../dataJson/alarmData/mock"
//分页设置 //分页设置
const currentPage = ref(1) const currentPage = ref(1)
var pageSize = ref(30) var pageSize = ref(30)
...@@ -472,7 +472,7 @@ function getSupplys() { ...@@ -472,7 +472,7 @@ function getSupplys() {
//获取数据列表 //获取数据列表
function gettransfer() { function gettransfer() {
loading.value = true; loading.value = true;
http.post("/api/alarm/" + type.value, AlarmInfo.value).then((result) => { /*http.post("/api/alarm/" + type.value, AlarmInfo.value).then((result) => {
// console.log(result.data); // console.log(result.data);
if (result.data !== null) { if (result.data !== null) {
tableData.value = result.data; tableData.value = result.data;
...@@ -482,6 +482,15 @@ function gettransfer() { ...@@ -482,6 +482,15 @@ function gettransfer() {
} }
loading.value = false; loading.value = false;
}); });
if (result.data !== null) {
tableData.value = result.data;
}
if (result.data === null) {
tableData.value = null;
}*/
tableData.value = alarmGetBoilerAlarmStatusData.data;
loading.value = false;
} }
function setCellStyle({ row, column, rowIndex, columnIndex }) { function setCellStyle({ row, column, rowIndex, columnIndex }) {
...@@ -612,14 +621,28 @@ watchEffect(() => { ...@@ -612,14 +621,28 @@ watchEffect(() => {
const getCnNames = () => { const getCnNames = () => {
// console.log('dept-------------------', dept.value); // console.log('dept-------------------', dept.value);
// console.log("++++++++++++++++++++++++", newType.value); // console.log("++++++++++++++++++++++++", newType.value);
let data = http.post("api/alarm/para/GetAlarmPara", { type: newType.value, id: dept.value }, false); //let data = http.post("api/alarm/para/GetAlarmPara", { type: newType.value, id: dept.value }, false);
data.then(function (val) { /*data.then(function (val) {
cnNames_before.value = val.data.before cnNames_before.value = val.data.before
cnNames_after.value = val.data.after cnNames_after.value = val.data.after
// console.log("cnNames_before===>", cnNames_before); // console.log("cnNames_before===>", cnNames_before);
// console.log("cnNames_after===>", cnNames_after); // console.log("cnNames_after===>", cnNames_after);
// console.log("cnNames_before.transParaBaseId:", cnNames_before.transParaBaseId) // console.log("cnNames_before.transParaBaseId:", cnNames_before.transParaBaseId)
});*/
function getStaticData(newType, dept) {
// 假设 staticData 是您文件中已有的静态数据
const staticData = alarmParaGetAlarmPara;
// 返回一个立即解析的 Promise
return Promise.resolve(staticData);
}
getStaticData(newType.value, dept.value).then(function (val) {
cnNames_before.value = val.data.before;
cnNames_after.value = val.data.after;
}); });
} }
// 表单编辑控制 // 表单编辑控制
...@@ -659,12 +682,10 @@ const selectBeforeParams = (row) => { ...@@ -659,12 +682,10 @@ const selectBeforeParams = (row) => {
param.value.baseId = row[param.value.baseId] param.value.baseId = row[param.value.baseId]
newRow.value = param.value.baseId newRow.value = param.value.baseId
if (param.value.baseId) { if (param.value.baseId) {
const data = http.post("api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false) // const data = http.post("api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
// console.log("查看baseId --- dataaaaa:", data); const data = alarmParaTranssave
data.then(function () {
param.value.cnName = row.cnName param.value.cnName = row.cnName
form_control.value = false form_control.value = false
});
} else { } else {
ElMessage.info("该参数暂不需要修改...") ElMessage.info("该参数暂不需要修改...")
} }
...@@ -690,8 +711,8 @@ const selectAfterParams = (row) => { ...@@ -690,8 +711,8 @@ const selectAfterParams = (row) => {
param.value.baseId = row[param.value.baseId] param.value.baseId = row[param.value.baseId]
newRow.value = param.value.baseId newRow.value = param.value.baseId
if (param.value.baseId) { if (param.value.baseId) {
const data = http.post("/api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false) //const data = http.post("/api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
console.log("查看baseId --- dataaaaa:", data); const data = alarmParaTranssave
data.then(function (val) { data.then(function (val) {
// console.log("valllll:", val); // console.log("valllll:", val);
// 数据回显 // 数据回显
...@@ -716,7 +737,7 @@ const selectAfterParams = (row) => { ...@@ -716,7 +737,7 @@ const selectAfterParams = (row) => {
// 修改亦如此 // 修改亦如此
const btnLoading = ref(false) const btnLoading = ref(false)
const onAdd = async () => { const onAdd = async () => {
btnLoading.value = true btnLoading.value = true
// console.log("!!!!!!!", addParams.value); // console.log("!!!!!!!", addParams.value);
// 提交添加或修改-以上至少有一个选项有值 // 提交添加或修改-以上至少有一个选项有值
if (addParams.value.topMost || addParams.value.upper || addParams.value.lower || addParams.value.downMost) { if (addParams.value.topMost || addParams.value.upper || addParams.value.lower || addParams.value.downMost) {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment