diff --git a/src/api/fhgl.js b/src/api/fhgl.js
index d737fed..1da595c 100644
--- a/src/api/fhgl.js
+++ b/src/api/fhgl.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import request from '@/utils/request'
  
 // 负荷管理
@@ -37,6 +38,11 @@ export function GetFhzb () {
 }
 // 生产线负荷
 export function GetScxfh () {
+=======
+import request from "@/utils/request";
+//
+export function loadBrand(limit) {
+>>>>>>> 33de1560eeb2b0f1604115c12dd7230b16dfc72c
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",
diff --git a/src/api/kdfh.js b/src/api/kdfh.js
index 6c25792..766af27 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",
+  });
+>>>>>>> 33de1560eeb2b0f1604115c12dd7230b16dfc72c
 }
diff --git a/src/views/lll/NYJCD.vue b/src/views/lll/NYJCD.vue
index 16e89db..de99f48 100644
--- a/src/views/lll/NYJCD.vue
+++ b/src/views/lll/NYJCD.vue
@@ -649,19 +649,7 @@ export default {
       this.defineEcharts("yrfd", option);
     },
   },
-  created() {
-    // if (window.vuplex) {
-    //   addMessageListener();
-    // } else {
-    //   window.addEventListener("vuplexready", addEventListener);
-    // }
-    // function addMessageListener() {
-    //   window.vuplex.addEventListener("message", function (event) {
-    //     let json = event.data;
-    //     console.log("JSON received" + json);
-    //   });
-    // }
-  },
+  created() {},
   watch: {
     // 监听,当路由发生变化的时候执行
     $route: {