diff --git a/src/App.vue b/src/App.vue
index 16d089f..2ca483a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -59,10 +59,10 @@ export default {
 }
 
 #app {
-  /* width: 7680px;
-  height: 3240px; */
-  width: 100vw;
-  height: 100vh;
+  width: 7680px;
+  height: 3240px;
+  /* width: 100vw;
+  height: 100vh; */
   overflow: hidden;
   /* background-image: url(./assets/img/左遮罩.png), url(./assets/img/右遮罩.png),
     url(./assets/img/遮罩上.png), url(./assets/img/下遮罩.png); */
diff --git a/src/api/fhgl.js b/src/api/fhgl.js
index ff861cc..f7e9aff 100644
--- a/src/api/fhgl.js
+++ b/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) {
->>>>>>> 8e6643d1bfe6292f1084dc89239993788d0f6bcc
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",
diff --git a/src/api/kdfh.js b/src/api/kdfh.js
index deed086..76cb20b 100644
--- a/src/api/kdfh.js
+++ b/src/api/kdfh.js
@@ -4,45 +4,6 @@ import request from "@/utils/request";
 export function GetKdfhzy() {
   return request({
     url: `/api/GetAdjustableload`,
-<<<<<<< HEAD
-    method: 'GET'
-  })
-}
-// 可调负荷策略
-export function GetKdfhcl () {
-    return request({
-      url: `/api/GetLoadControlStrategy`,
-      method: 'GET'
-    })
-  }
-// 可调负荷分析
-export function GetKdfhfx () {
-    return request({
-      url: `/api/GetAdjustableLoadAnalysis`,
-      method: 'GET'
-    })
-  }
-// 刚性可调负荷
-export function GetGang () {
-    return request({
-      url: `/api/GetRigidAdjustableLoads`,
-      method: 'GET'
-    })
-  }
-//   柔性可调负荷
-  export function GetRou () {
-    return request({
-      url: `/api/GetFlexibleAdjustableLoad`,
-      method: 'GET'
-    })
-  }
-//可调设备
-export function GetKdsb () {
-  return request({
-    url: `/api/GetAdjustableDevice`,
-    method: 'GET'
-  })
-=======
     method: "GET",
   });
 }
@@ -80,5 +41,4 @@ export function GetKdsb() {
     url: `/api/GetAdjustableDevice`,
     method: "GET",
   });
->>>>>>> 8e6643d1bfe6292f1084dc89239993788d0f6bcc
 }