Commit e7e20471 authored by moonby's avatar moonby

Merge branch 'master' of gitee.com:tj-wang-yahui/AMS_HeatSys_Vue_V10

parents d9057921 70111bf1
...@@ -71,13 +71,6 @@ export const postSecAbsTUc = params => { ...@@ -71,13 +71,6 @@ export const postSecAbsTUc = params => {
}) })
} }
// //二网温差
// export const postSecAvgTUc = params => {
// return http.post(`/api/analysis/external/SecAvgTUc`, params).then(res => res).catch(function (error) {
// console.log(error);
// })
// }
//热量分析报表 //热量分析报表
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) {
...@@ -85,3 +78,23 @@ export const postHeatAnalysis = params => { ...@@ -85,3 +78,23 @@ export const postHeatAnalysis = params => {
}) })
} }
//换热站机组用量环比接口(耗水量、耗电量、耗热量)网内
export const postWithinQOQ = params => {
return http.post(`/api/analysis/within/QOQ`, params).then(res => res).catch(function (error) {
console.log(error);
})
}
//换热站机组用量环比接口(耗水量、耗电量、耗热量)网外
export const postExternalQOQ = params => {
return http.post(`/api/analysis/external/QOQ`, params).then(res => res).catch(function (error) {
console.log(error);
})
}
//换热站机组用量同比接口(耗水量、耗电量、耗热量)
export const postYOY = params => {
return http.post(`/api/analysis/external/YOY`, params).then(res => res).catch(function (error) {
console.log(error);
})
}
\ No newline at end of file
<template> <template>
状态 <el-card class="remoteTitle">
<el-table> <div class="card-content">
<div class="demo-button">
<el-button type="primary" size="small" @click="ReadStatus">读取全部</el-button>
<el-button type="primary" size="small" @click="WriteStatus" disabled="false">写入全部</el-button>
</div>
<div class="demo-image">
<div class="block">
<span class="demonstration">读写成功</span>
<el-icon><CircleCheckFilled color="rgb(0,255,0)"/></el-icon>
</div>
<div class="block">
<span class="demonstration">通讯异常</span>
<el-icon><Connection /></el-icon>
</div>
<div class="block">
<span class="demonstration">读写失败</span>
<el-icon><Failed color="rgb(255,0,0)"/></el-icon>
</div>
</div>
</div>
</el-card>
<el-table
ref="tableRef"
v-model:checked="selectedRows"
show-header="true"
:height="tableHeight"
:cell-style="setCellStyle"
border
highlight-current-row
:header-cell-style="setHeaderCellStyle"
:data="visibleData"
v-loading="isLoading"
element-loading-text="数据加载中......"
row-class-name="fixed-row-height"
element-loading-background="rgba(0, 0, 0, 0.8)"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="rowIndex" label="序号" width="45px" fixed />
<el-table-column prop="transferId" label="机组编号" v-if="false" width="80px" fixed />
<el-table-column prop="transferName" label="换热机组" width="150px" fixed />
<el-table-column prop="jDValue" label="华为控制模式" width="80px" />
<el-table-column prop="gainMode" label="增益模式" width="80px" />
<el-table-column prop="weatherMode" label="气象仪模式" width="80px" />
<el-table-column prop="curveMode" label="曲线对应模式" width="80px" />
<el-table-column prop="criclePump1" label="1#循环泵启停" width="80px" />
<el-table-column prop="criclePump2" label="2#循环泵启停" width="80px" />
<el-table-column prop="Pump3" label="3#循环泵启停" width="80px" />
<el-table-column prop="Pump4" label="4#循环泵启停" width="80px" />
<el-table-column prop="ReplenishingPump" label="补水泵启停" width="80px" />
<el-table-column prop="SecPump1" label="1#二级泵启停" width="80px" />
<el-table-column prop="Evc1AutoOrManual" label="1#电动调节阀手动/自动切换" width="100px" />
<el-table-column prop="Evc2AutoOrManual" label="2#电动调节阀手动/自动切换" width="100px" />
<el-table-column prop="Evc3AutoOrManual" label="3#电动调节阀手动/自动切换" width="100px" />
<el-table-column prop="Evc4AutoOrManual" label="4#电动调节阀手动/自动切换" width="100px" />
<el-table-column prop="CriclePump1AutoOrManual" label="一号循环泵 手动/自动切换" width="100px" />
<el-table-column prop="CriclePump2AutoOrManual" label="二号循环泵 手动/自动切换" width="100px" />
<el-table-column prop="CriclePump3AutoOrManual" label="三号循环泵 手动/自动切换" width="100px" />
<el-table-column prop="CriclePump4AutoOrManual" label="四号循环泵 手动/自动切换" width="100px" />
<el-table-column prop="SecCriclePumpAutoOrManual" label="二级泵 手动/自动切换" width="100px" />
<el-table-column fixed="right" label="操作" width="100">
<template #default>
<el-button link type="primary" size="small" @click="ReadStatus">读取</el-button>
<el-button link type="primary" size="small" @click="WriteStatus">写入</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<el-card style="height: 50px; padding: 0;">
<el-progress
:text-inside="true"
:stroke-width="16"
status="success"
:percentage="progress"
/>
</el-card>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, onMounted, onUnmounted, watch } from 'vue'; import { ref, reactive, onMounted, onUnmounted, watch,toRefs } from 'vue';
import http from '../../api/http'; import http from '../../api/http';
import store from "../../store/index"; import store from "../../store/index";
const props = defineProps(['activeRadio']); const enterpriseId = store.getters.getEnterpriseId();
console.log("1actionValue:"+props.activeRadio); const props = defineProps(['activeRadio']);
const tableRef = ref(null);
const selectedRows = ref([]);
const isLoading= ref(true);
const visibleData = ref([]);
const tableHeight = ref(500);
const progress =ref(0);
const state = reactive({
fits: ['Success', 'fale', 'cover', 'none', 'scale-down'],
url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
})
const { fits, url } = toRefs(state);
//监听修改actionValue状态 //监听修改actionValue状态
watch(() =>props.activeRadio, (oldValue, newValue) => { watch(() =>props.activeRadio, (oldValue, newValue) => {
...@@ -18,8 +100,100 @@ ...@@ -18,8 +100,100 @@
initData(); initData();
},{deep:true}); },{deep:true});
function initData(){ function setContentHeight() {
tableHeight.value = window.innerHeight - 300;
}
async function initData(){
isLoading.value = true;
var type = 0;
if(enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){
type = 1;
}
var result = await http.post('/api/remote/GetTransferStatus',{"SupplyType":type, "DeviceId": props.activeRadio});
console.log(result);
visibleData.value = result.data;
isLoading.value = false;
} }
initData(); initData();
</script>
\ No newline at end of file async function ReadStatus(){
if(selectedRows){
selectedRows.value.forEach(item =>{
ReadStation(item);
})
}
}
async function WriteStatus(){
}
async function ReadStation(value){
var result = await http.post('', value);
var jobj = result.data;
console.log(jobj);
}
onMounted(() => {
setContentHeight();
window.addEventListener('resize', setContentHeight);
})
onUnmounted(() => {
window.removeEventListener('resize', setContentHeight);
})
function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {};
css_color['padding-left'] = '0px';
css_color['padding-right'] = '0px';
css_color['borderColor'] = '#97d5fd';
css_color['padding'] = '0px';
return css_color;
}
function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color;
var backcolor = 'd9f1ff';
css_color = { 'background-color': '#' + backcolor, 'padding-left': '0px', 'padding-right': '0px', 'borderColor': '#97d5fd', 'color': '#000', 'text-align': 'center', 'vertical-align': 'top' };
var backcolor = 'd9f1ff';
css_color = { 'background-color': '#' + backcolor, 'padding-left': '0px', 'padding-right': '0px', 'borderColor': '#97d5fd', 'color': '#000', 'text-align': 'center', 'vertical-align': 'top' };
return css_color;
}
</script>
<style scoped>
.remoteTitle{
width: 100%;
}
.card-content {
display: flex;
justify-content: space-between;
}
.demo-image {
width: 70%;
display: right;
flex: 9;
}
.demo-image .block {
padding: 1px 0;
text-align: center;
border-right: solid 1px var(--el-border-color);
display: inline-block;
width: 80px;
box-sizing: border-box;
vertical-align: top;
}
.demo-image .block:last-child {
border-right: none;
}
.demo-image .demonstration {
display: block;
color: var(--el-text-color-secondary);
font-size: 12px;
margin-bottom: 0px;
}
</style>
\ No newline at end of file
This diff is collapsed.
...@@ -364,6 +364,13 @@ const routes = [ ...@@ -364,6 +364,13 @@ const routes = [
meta: { meta: {
title: '视频监控' title: '视频监控'
} }
},{
path: '/Scheduling/WeatherManage',
name: 'WeatherManage',
component: () => import('@/views/Scheduling/WeatherManage.vue'),
meta: {
title: '气象干预'
}
} }
] ]
}, },
......
...@@ -108,7 +108,7 @@ function sortMethod({ order, prop }){ ...@@ -108,7 +108,7 @@ function sortMethod({ order, prop }){
direction = 'DESC' direction = 'DESC'
} }
if(i === "name"){ if(i === "name"){
sortname = "name"; sortname = "UnitName";
}else if(i === "alarmDate"){ }else if(i === "alarmDate"){
sortname = "alarmDate"; sortname = "alarmDate";
} }
...@@ -305,6 +305,7 @@ function gettransfer() { ...@@ -305,6 +305,7 @@ function gettransfer() {
} }
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);
if(result.data !== null){ if(result.data !== null){
tableData.value = result.data.dataInfoList; tableData.value = result.data.dataInfoList;
total.value = result.data.rowCount; total.value = result.data.rowCount;
......
This diff is collapsed.
This diff is collapsed.
<template> <template>
换热站巡更 <!-- 条件筛选卡片 -->
</template> <el-card class="card-contianer">
\ No newline at end of file <div class="div-header">
<el-form-item label="设备:">
<el-cascader :options="options" v-model="AlarmInfo" :props="props" collapse-tags clearable :show-all-levels="false"
placeholder="请选择" style="min-width: 210px;" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getdata" style="min-width: 70px;">查询</el-button>
</el-form-item>
</div>
</el-card>
<el-card class="moduleCard" :height="tableHeight">
<el-table :data="tableData" :row-class-name="rowClassName" :height="tableHeight" v-loading="loading" :cell-style="setCellStyle" id="out-table"
border highlight-current-row :header-cell-style="setHeaderCellStyle" :header-cell-class-name="handleHeadAddClass" >
<el-table-column prop="index" label="编号" :sortable="false" width="70px" fixed />
<el-table-column prop="transferName" label="换热站" :sortable="false" width="170px" fixed />
<el-table-column prop="realName" label="巡更人" :sortable="false" width="150px" fixed />
<el-table-column prop="times" label="日巡次数" :sortable="false" width="120px" fixed />
<el-table-column prop="patrolStatus" label="巡更记录" :sortable="false" width="400px" fixed >
<template #default="scope">
<p v-html="getImgUrl(scope.row.patrolStatus)"></p>
<!-- <span>{{ getImgUrl(scope.row.patrolStatus) }}</span> -->
<!-- <div class="div-form-img">
<el-image class="img-center" v-if="getImgUrl(scope,scope.column.property)" style="width: 20px; height: 20px"
:src="getImgUrl(scope,scope.column.property)" :fit="'cover'" />
</div> -->
</template>
</el-table-column>
</el-table>
</el-card>
</template>
<script lang="ts" setup>
import { ref, reactive, onMounted, onUnmounted } from 'vue';
import http from '../../api/http';
import store from "../../store/index";
const options = reactive([]);
const tableData = ref([]);
const tableHeight = ref(500);
const enterpriseId = ref();
const loading = ref(true);
const sortField = reactive({});
getEnterprise();
function getEnterprise(){
var result = store.getters.getEnterprise();
if (result) {
enterpriseId.value = result[0].enterpriseId;
}
}
const props = { multiple: true, emitPath: false }
function setContentHeight() {
tableHeight.value = window.innerHeight - 195;
}
function handleHeadAddClass({ column }) {
if (sortField[column.property]) {
column.order = sortField[column.property]
}
}
const AlarmInfo = ref([])
getSupplys();
getdata();
function getdata() {
gettransfer();
}
//获取换热机组列表
function getSupplys(){
loading.value = true;
tableData.length = 0;
options.length = 0;
AlarmInfo.length = 0;
var result = store.getters.getEnterprise();
if (result) {
console.log(result)
result.forEach(element=>{
if(element.enterpriseId=== enterpriseId.value){
if(element.enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){
element.serviceCenterList.forEach(center=>{
let c = [];
center.supplyList.forEach(supply => {
let chi = [];
supply.transferList.forEach(unit => {
chi.push({ value: unit.unitId, label: unit.unitName });
});
c.push({ children: chi, label: supply.supplyName});
});
options.push({children: c, label: center.serviceCenterName});
})
}else{
element.supplyList.forEach(element => {
let chi = [];
element.transferList.forEach(unit => {
chi.push({ value: unit.unitId, label: unit.unitName });
})
options.push({ children: chi, label: element.supplyName});
})
}
}
});
}
AlarmInfo.value.push(options[0].children[0].children[0].value);
}
//获取数据列表
function gettransfer() {
loading.value = true;
http.post("/api/patrol/GetPatrolTodeyData", AlarmInfo.value).then((result) => {
console.log(result.data);
if(result.data !== null){
tableData.value = result.data;
}
if(result.data === null){
tableData.value = null;
}
loading.value = false;
});
}
function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {};
css_color['padding-left'] = 'px';
css_color['padding-right'] = '0px';
css_color['borderColor'] = '#97d5fd';
css_color['padding'] = '5px';
return css_color;
}
function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color;
var backcolor = 'd9f1ff';
css_color = { 'background-color': '#' + backcolor, 'padding-left': '0px', 'padding-right': '0px', 'borderColor': '#97d5fd', 'color': '#000', 'text-align': 'center', 'vertical-align': 'top' };
var backcolor = 'd9f1ff';
css_color = { 'background-color': '#' + backcolor, 'padding-left': '0px', 'padding-right': '0px', 'borderColor': '#97d5fd', 'color': '#000', 'text-align': 'center', 'vertical-align': 'top' };
return css_color;
}
function getImgUrl(item) {
item = item.replaceAll("N",'<img style="width: 20px; height: 20px" src="/imgs/status/status_off.png" />')
item = item.replaceAll("N",'<img style="width: 20px; height: 20px" src="/imgs/status/status_run.png" />')
console.log(item)
return item;
}
onMounted(() => {
setContentHeight();
window.addEventListener('resize', setContentHeight);
})
onUnmounted(() => {
window.removeEventListener('resize', setContentHeight);
})
</script>
<style lang="less" scoped>
.moduleCard {
width: auto;
overflow: auto;
padding: 0px;
::v-deep .el-card__body {
padding: 0px;
}
}
.pagination {
padding: 4px;
margin-left: 20px;
height: 30px;
//background-color: #8939cf;
vertical-align: middle;
}
//鼠标所在行的颜色
::v-deep .el-table__body tr:hover>td {
background: linear-gradient(to top, rgb(0, 198, 255), rgb(255, 255, 255)) !important;
}
::v-deep .el-table__body tr.current-row>td {
background-color: #92cbf1 !important;
}
.card-contianer {
width: auto;
height: 70px;
.div-header {
width: 100%;
display: flex;
margin: 20px;
}
}
.el-form-item {
margin-top: -20px;
margin-right: 30px;
}
.el-tag--mini {
height: 21px !important
}
.el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner{
height: 33px; //这里高度根据需求自己设定
}
.el-cascader__tags {
display: inline-flex;
margin-right: 10px;
flex-wrap: nowrap;
}
:deep(.div-form-img) {
display: flex;
align-items: center;
justify-content: center;
}
</style>
\ No newline at end of file
<template> <template>
<el-card class="card-contianer"> <el-card class="card-contianer">
<label>{{radioTitle}}</label> <div>
<el-radio-group v-model="activeRadio" style="margin-left: 50px;">
<el-radio </div>
v-for="(option, index) in options" <label>{{radioTitle}}</label>
:key="index" <el-radio-group v-model="activeRadio" style="margin-left: 50px;">
:label="option.value" <el-radio
> v-for="(option, index) in options"
{{ option.lable }} :key="index"
</el-radio> :label="option.value"
</el-radio-group> >
{{ option.lable }}
</el-radio>
</el-radio-group>
</el-card> </el-card>
<el-tabs :tab-position="tabPosition" style="height: 100%" class="demo-tabs"> <el-tabs :tab-position="tabPosition" style="height: 100%" class="demo-tabs">
<el-tab-pane label="换热站状态" v-if="isTransferStatus"> <el-tab-pane label="换热站状态" v-if="isTransferStatus">
...@@ -182,7 +185,7 @@ ...@@ -182,7 +185,7 @@
.card-contianer { .card-contianer {
display: flex; display: flex;
width: auto; width: 100%;
height: 50px; height: 50px;
align-items: center; align-items: center;
vertical-align: middle; vertical-align: middle;
......
...@@ -151,6 +151,32 @@ ...@@ -151,6 +151,32 @@
<td style="text-align:center;">{{ tableDataList.diffPercent }}</td> <td style="text-align:center;">{{ tableDataList.diffPercent }}</td>
</tr> </tr>
</table> </table>
<div>
<div class="btngrounp">
<el-button
type="primary"
@click="sendClick"
style="margin: 15px 0 0 0"
>打印</el-button
><el-button
type="primary"
@click="exportTableToExcel"
style="margin: 15px 0 0 10px"
>打印预览</el-button
>
<el-button
type="primary"
@click="exportTableToExcel"
style="margin: 15px 0 0 10px"
>导出</el-button
>
<router-link to="/Forecast"><el-button
type="primary"
style="margin: 15px 0 0 10px"
>返回</el-button
></router-link>
</div>
</div>
</el-card> </el-card>
</div> </div>
</div> </div>
...@@ -250,4 +276,9 @@ table.bottomTable td { ...@@ -250,4 +276,9 @@ table.bottomTable td {
border-bottom: #ebeef5 solid 1px; border-bottom: #ebeef5 solid 1px;
padding: 10px 0; padding: 10px 0;
} }
.btngrounp {
width: 300px;
margin: 0 auto;
text-align: center;
}
</style> </style>
\ No newline at end of file
<template>
生产与结算数据分析表
</template>
\ No newline at end of file
<template>
年度参数管理
</template>
\ No newline at end of file
<template>
锅炉参数配置
</template>
\ No newline at end of file
<template>
能源消耗
</template>
\ No newline at end of file
<template>
瞬时热量对比配置
</template>
\ No newline at end of file
<template>
天气工况
</template>
\ No newline at end of file
<template>
气象干预
</template>
\ No newline at end of file
<template>
风力配置管理
</template>
\ No newline at end of file
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