src/api/kdfh.js

@@ -1,41 +1,34 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
  
 // 可调负荷资源
 export function GetKdfhzy () {
   return request({
-    url: `/api/GetAdjustableload`,
+    url: `/GetAdjustableload`,
-    method: "GET",
+    method: 'GET'
-  });
+  })
 }
 // 可调负荷策略
 export function GetKdfhcl () {
     return request({
       url: `/GetLoadControlStrategy`,
-    method: "GET",
+      method: 'GET'
-  });
+    })
   }
 // 可调负荷分析
 export function GetKdfhfx () {
     return request({
       url: `//GetAdjustableLoadAnalysis`,
-    method: "GET",
+      method: 'GET'
-  });
+    })
   }
 // 刚性可调负荷
 export function GetGang () {
     return request({
       url: `//GetRigidAdjustableLoads`,
-    method: "GET",
+      method: 'GET'
-  });
+    })
   }
 //   柔性可调负荷
-<<<<<<< HEAD
-export function GetRou() {
-  return request({
-    url: `//GetFlexibleAdjustableLoad`,
-    method: "GET",
-  });
-=======
   export function GetRou () {
     return request({
       url: `//GetFlexibleAdjustableLoad`,
@@ -48,5 +41,4 @@ export function GetKdsb () {
     url: `//GetAdjustableDevice`,
     method: 'GET'
   })
->>>>>>> 62a18469e4b1f9e2a4b0bfec7d32a8876b7f566b
 }

src/utils/request.js

@@ -2,7 +2,8 @@
 import axios from "axios";
 import { Message } from "element-ui"; // 请确保你的项目中已经安装了 Element UI
 const request = axios.create({
-  timeout: 50000, // 请求超时：当5s没有响应就会结束请求
+  baseURL: "https://localhost:44352/api/", // 设置基地址，博主这个请求跨域了因此我设置了代理服务器，因此基地址才这么短
+  timeout: 5000, // 请求超时：当5s没有响应就会结束请求
 });
 
 // 添加请求拦截器，一下内容是axios的拦截器，可以不用写

src/views/Zhou/KDFH.vue

@@ -1180,20 +1180,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 +1192,6 @@ export default {
       let res = await GetKdsb();
       console.log(res);
       this.devices = res.data;
->>>>>>> 62a18469e4b1f9e2a4b0bfec7d32a8876b7f566b
     },
   },
   created() {
@@ -1227,7 +1216,7 @@ export default {
     this.xf();
     this.tg();
     this.kdfhzy();
-    this.getkdfhzy();
+    // this.getkdfhzy();
   },
 };
 </script>

vue.config.js

@@ -3,16 +3,5 @@ const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
   transpileDependencies: true,
   lintOnSave: false,
-  publicPath: "./",
+  publicPath: './',
-  devServer: {
-    proxy: {
-      "/api": {
-        target: "http://111.229.30.246:32761",
-        changeOrigin: true,
-        pathRewrite: {
-          "^/api": "/api",
-        },
-      },
-    },
-  },
 });