diff --git a/package-lock.json b/package-lock.json
index c79f45e..b9f6cef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "shuinichang",
       "version": "0.1.0",
       "dependencies": {
+        "autofit.js": "^3.0.7",
         "axios": "^1.6.2",
         "babel-preset-es2015": "^6.24.1",
         "core-js": "^3.8.3",
@@ -4344,6 +4345,11 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/autofit.js": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmmirror.com/autofit.js/-/autofit.js-3.0.7.tgz",
+      "integrity": "sha512-Mu6ormG85X8vG99R/66wtiOc8roRJBrwsuDVb16Bia7NqYuf0+0SRyfh9jTbyL0mtK7JRFHVDyfxq93Yajndnw=="
+    },
     "node_modules/autoprefixer": {
       "version": "10.4.16",
       "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.16.tgz",
@@ -17002,6 +17008,11 @@
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true
     },
+    "autofit.js": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmmirror.com/autofit.js/-/autofit.js-3.0.7.tgz",
+      "integrity": "sha512-Mu6ormG85X8vG99R/66wtiOc8roRJBrwsuDVb16Bia7NqYuf0+0SRyfh9jTbyL0mtK7JRFHVDyfxq93Yajndnw=="
+    },
     "autoprefixer": {
       "version": "10.4.16",
       "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.16.tgz",
diff --git a/package.json b/package.json
index 1d7fa98..c43163e 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
+    "autofit.js": "^3.0.7",
     "axios": "^1.6.2",
     "babel-preset-es2015": "^6.24.1",
     "core-js": "^3.8.3",
diff --git a/src/App.vue b/src/App.vue
index f99beea..16d089f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,13 +2,22 @@
   <div id="app">    <router-view />  </div>
 </template>
 <script>
+import autofit from "autofit.js";
 export default {
   data() {
-    return{
-      
-    }
+    return {};
   },
   mounted() {
+    autofit.init(
+      {
+        dh: 3240,
+        dw: 7680,
+        el: "#app",
+        resize: true,
+      },
+      false
+    );
+
     if (window.vuplex) {
       this.addMessageListener();
     } else {
@@ -36,6 +45,9 @@ export default {
       });
     },
   },
+  beforeDestroy() {
+    autofit.off();
+  },
 };
 </script>
 <style>
@@ -47,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 d737fed..ff861cc 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) {
+>>>>>>> 8e6643d1bfe6292f1084dc89239993788d0f6bcc
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",
diff --git a/src/api/kdfh.js b/src/api/kdfh.js
index 6c25792..deed086 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",
+  });
+>>>>>>> 8e6643d1bfe6292f1084dc89239993788d0f6bcc
 }