1

src/api/fhgl.js

@@ -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";
 
 //
 export function loadBrand(limit) {
->>>>>>> d12dd164c5611f550b3ec7804fac54967e0e4100
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",

src/views/Zhou/KDFH.vue

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