This commit is contained in:
刘龙龙 2023-12-15 14:04:20 +08:00
parent c868ea87a6
commit c06bad699e
2 changed files with 31 additions and 72 deletions

View File

@ -1,49 +1,7 @@
<<<<<<< HEAD
import request from '@/utils/request'
// 负荷管理
export function GetFhgl () {
return request({
url: `brand?limit=${limit}`,
method: 'GET'
})
}
// 负荷分析
export function GetFhfx () {
return request({
url: `brand?limit=${limit}`,
method: 'GET'
})
}
// 变压器负载率
export function GetByqfzl () {
return request({
url: `brand?limit=${limit}`,
method: 'GET'
})
}
// 负荷分类
export function GetFhfl () {
return request({
url: `brand?limit=${limit}`,
method: 'GET'
})
}
// 生产线负荷占比
export function GetFhzb () {
return request({
url: `brand?limit=${limit}`,
method: 'GET'
})
}
// 生产线负荷
export function GetScxfh () {
=======
import request from "@/utils/request"; import request from "@/utils/request";
// //
export function loadBrand(limit) { export function loadBrand(limit) {
>>>>>>> d12dd164c5611f550b3ec7804fac54967e0e4100
return request({ return request({
url: `brand?limit=${limit}`, url: `brand?limit=${limit}`,
method: "GET", method: "GET",

View File

@ -103,9 +103,17 @@
style="width: 100%" style="width: 100%"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
> >
<el-table-column prop="DeviceName" label="可调设备名称" align="center"> <el-table-column
prop="DeviceName"
label="可调设备名称"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column prop="DeviceState" label="开关状态" align="center"> <el-table-column
prop="DeviceState"
label="开关状态"
align="center"
>
<template scope="scope"> <template scope="scope">
<img <img
src="../../assets/KDFH/tongguo.png" src="../../assets/KDFH/tongguo.png"
@ -114,7 +122,11 @@
<img src="../../assets/KDFH/jinggao.png" v-else /> <img src="../../assets/KDFH/jinggao.png" v-else />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="RealTimeLoad" label="实时负荷" align="center"> <el-table-column
prop="RealTimeLoad"
label="实时负荷"
align="center"
>
<template scope="scope"> <template scope="scope">
<span class="count">{{ scope.row.RealTimeLoad }}</span> <span class="count">{{ scope.row.RealTimeLoad }}</span>
<span class="danwei">kW</span> <span class="danwei">kW</span>
@ -1180,20 +1192,10 @@ export default {
this.ganglist = res.data[0]; this.ganglist = res.data[0];
let percent = (res.data[0].Rigidity / res.data[0].GrossValue).toFixed(2); let percent = (res.data[0].Rigidity / res.data[0].GrossValue).toFixed(2);
this.option.series[0].data[0].value = percent; this.option.series[0].data[0].value = percent;
<<<<<<< HEAD
this.ganglist = res.data[0];
=======
>>>>>>> 62a18469e4b1f9e2a4b0bfec7d32a8876b7f566b
}, },
async getrou() { async getrou() {
let res = await GetRou(); let res = await GetRou();
console.log(res); console.log(res);
<<<<<<< HEAD
this.ganglist = res.data[0];
let percent = (res.data[0].Flexible / res.data[0].GrossValue).toFixed(2);
this.option.series[0].data[0].value = percent;
this.roulist = res.data[0];
=======
let percent = (res.data[0].Flexible / res.data[0].GrossValue).toFixed(2); let percent = (res.data[0].Flexible / res.data[0].GrossValue).toFixed(2);
this.option.series[0].data[0].value = percent; this.option.series[0].data[0].value = percent;
this.roulist = res.data[0]; this.roulist = res.data[0];
@ -1202,7 +1204,6 @@ export default {
let res = await GetKdsb(); let res = await GetKdsb();
console.log(res); console.log(res);
this.devices = res.data; this.devices = res.data;
>>>>>>> 62a18469e4b1f9e2a4b0bfec7d32a8876b7f566b
}, },
}, },
created() { created() {
@ -1398,15 +1399,15 @@ export default {
#fhdkcl { #fhdkcl {
width: 100%; width: 100%;
height: 360px; height: 360px;
/deep/ .table{ /deep/ .table {
.el-table__body-wrapper { .el-table__body-wrapper {
overflow-y: auto; overflow-y: auto;
height: 218px; height: 218px;
} }
// //
.el-table__body-wrapper::-webkit-scrollbar { .el-table__body-wrapper::-webkit-scrollbar {
display: none; display: none;
} }
} }
} }
} }
@ -1677,15 +1678,15 @@ export default {
#kdsb { #kdsb {
width: 100%; width: 100%;
height: 500px; height: 500px;
/deep/ .table{ /deep/ .table {
.el-table__body-wrapper { .el-table__body-wrapper {
overflow-y: auto; overflow-y: auto;
height: 530px; height: 530px;
} }
// //
.el-table__body-wrapper::-webkit-scrollbar { .el-table__body-wrapper::-webkit-scrollbar {
display: none; display: none;
} }
} }
} }
} }