diff --git a/src/App.vue b/src/App.vue
index 16d089f..b457c31 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -57,12 +57,11 @@ export default {
   font-family: "MicrosoftYaHei" !important;
   background: transparent;
 }
-
 #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 d737fed..fbc93f0 100644
--- a/src/api/fhgl.js
+++ b/src/api/fhgl.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import request from '@/utils/request'
  
 // 负荷管理
@@ -37,6 +38,12 @@ export function GetFhzb () {
 }
 // 生产线负荷
 export function GetScxfh () {
+=======
+import request from "@/utils/request";
+
+//
+export function loadBrand(limit) {
+>>>>>>> d04cb2e83c5d1995fd6ee2f4753d145bed175248
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",
diff --git a/src/api/kdfh.js b/src/api/kdfh.js
index 6c25792..2735661 100644
--- a/src/api/kdfh.js
+++ b/src/api/kdfh.js
@@ -4,6 +4,7 @@ import request from "@/utils/request";
 export function GetKdfhzy() {
   return request({
     url: `/api/GetAdjustableload`,
+<<<<<<< HEAD
     method: 'GET'
   })
 }
@@ -41,4 +42,43 @@ export function GetKdsb () {
     url: `/api/GetAdjustableDevice`,
     method: 'GET'
   })
+=======
+    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",
+  });
+>>>>>>> d04cb2e83c5d1995fd6ee2f4753d145bed175248
 }
diff --git a/src/views/lll/NYJCM.vue b/src/views/lll/NYJCM.vue
index 7b38a3d..1b90552 100644
--- a/src/views/lll/NYJCM.vue
+++ b/src/views/lll/NYJCM.vue
@@ -113,7 +113,7 @@
                 align="center"
                 ><template slot-scope="scope">
                   <span style="color: #abb9fe"> {{ scope.row.date4 }}</span>
-                  <span>tCO2/t</span>
+                  <span>tC/GJ</span>
                 </template>
               </el-table-column>
             </el-table>