From 5493f8d2edb50decbffa6c3384d446ef22743af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E9=BE=99=E9=BE=99?= <2691932099@qq.com>
Date: Fri, 15 Dec 2023 14:00:15 +0800
Subject: [PATCH 1/3] 1

---
 src/api/kdfh.js         | 60 ++++++++++++++++++++---------------------
 src/utils/request.js    |  3 +--
 src/views/Zhou/KDFH.vue | 43 +++++++++++++++--------------
 vue.config.js           | 13 ++++++++-
 4 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/src/api/kdfh.js b/src/api/kdfh.js
index e650e47..ade0d14 100644
--- a/src/api/kdfh.js
+++ b/src/api/kdfh.js
@@ -1,37 +1,37 @@
-import request from '@/utils/request'
- 
+import request from "@/utils/request";
+
 // 可调负荷资源
-export function GetKdfhzy () {
+export function GetKdfhzy() {
   return request({
-    url: `/GetAdjustableload`,
-    method: 'GET'
-  })
+    url: `/api/GetAdjustableload`,
+    method: "GET",
+  });
 }
 // 可调负荷策略
-export function GetKdfhcl () {
-    return request({
-      url: `/GetLoadControlStrategy`,
-      method: 'GET'
-    })
-  }
+export function GetKdfhcl() {
+  return request({
+    url: `/GetLoadControlStrategy`,
+    method: "GET",
+  });
+}
 // 可调负荷分析
-export function GetKdfhfx () {
-    return request({
-      url: `//GetAdjustableLoadAnalysis`,
-      method: 'GET'
-    })
-  }
+export function GetKdfhfx() {
+  return request({
+    url: `//GetAdjustableLoadAnalysis`,
+    method: "GET",
+  });
+}
 // 刚性可调负荷
-export function GetGang () {
-    return request({
-      url: `//GetRigidAdjustableLoads`,
-      method: 'GET'
-    })
-  }
+export function GetGang() {
+  return request({
+    url: `//GetRigidAdjustableLoads`,
+    method: "GET",
+  });
+}
 //   柔性可调负荷
-  export function GetRou () {
-    return request({
-      url: `//GetFlexibleAdjustableLoad`,
-      method: 'GET'
-    })
-  }
\ No newline at end of file
+export function GetRou() {
+  return request({
+    url: `//GetFlexibleAdjustableLoad`,
+    method: "GET",
+  });
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 332ec13..7475945 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,8 +2,7 @@
 import axios from "axios";
 import { Message } from "element-ui"; // 请确保你的项目中已经安装了 Element UI
 const request = axios.create({
-  baseURL: "https://localhost:44352/api/", // 设置基地址，博主这个请求跨域了因此我设置了代理服务器，因此基地址才这么短
-  timeout: 5000, // 请求超时：当5s没有响应就会结束请求
+  timeout: 50000, // 请求超时：当5s没有响应就会结束请求
 });
 
 // 添加请求拦截器，一下内容是axios的拦截器，可以不用写
diff --git a/src/views/Zhou/KDFH.vue b/src/views/Zhou/KDFH.vue
index 0707851..3fab7ed 100644
--- a/src/views/Zhou/KDFH.vue
+++ b/src/views/Zhou/KDFH.vue
@@ -61,10 +61,13 @@
           <p>可调负荷分析</p>
         </div>
         <div class="fenxi">
-          <h2>基线负荷:<span class="title">{{kdfhfxlist.BaseLoad}}</span>kW</h2>
+          <h2>
+            基线负荷:<span class="title">{{ kdfhfxlist.BaseLoad }}</span
+            >kW
+          </h2>
           <div class="one">
             <div class="first_left">
-              <h3>{{kdfhfxlist.PeakClipping}}<span>kW</span></h3>
+              <h3>{{ kdfhfxlist.PeakClipping }}<span>kW</span></h3>
               <p>可参与削锋负荷</p>
             </div>
             <div class="first_center"></div>
@@ -75,7 +78,7 @@
           </div>
           <div class="two">
             <div class="first_left">
-              <h3>{{kdfhfxlist.ValleyFilling}}<span>kW</span></h3>
+              <h3>{{ kdfhfxlist.ValleyFilling }}<span>kW</span></h3>
               <p>可参与填谷负荷</p>
             </div>
             <div class="first_center"></div>
@@ -138,7 +141,7 @@
             <div class="g_two">
               <span class="gang_two"></span>
               <span>刚性可调负荷：</span>
-              <span class="gang_count">{{ganglist.Rigidity}}</span>
+              <span class="gang_count">{{ ganglist.Rigidity }}</span>
               <span>kW</span>
             </div>
             <div class="g_three">
@@ -161,7 +164,7 @@
             <div class="g_one">
               <span class="gang_one"></span>
               <span>设备数量：</span>
-              <span class="gang_count">{{roulist.QuantityFacility}}</span>
+              <span class="gang_count">{{ roulist.QuantityFacility }}</span>
               <span>个</span>
             </div>
             <div class="g_two">
@@ -173,7 +176,7 @@
             <div class="g_three">
               <span class="gang_three"></span>
               <span>总可调负荷：</span>
-              <span class="gang_count">{{ roulist.GrossValue}}</span>
+              <span class="gang_count">{{ roulist.GrossValue }}</span>
               <span>kW</span>
             </div>
           </div>
@@ -249,7 +252,7 @@ export default {
             data: [
               {
                 value: 0.6,
-                all:100,
+                all: 100,
                 direction: "left", //波浪方向
               },
             ], // data个数代表波浪数
@@ -281,9 +284,9 @@ export default {
             ],
             label: {
               normal: {
-                formatter: function(params){
+                formatter: function (params) {
                   console.log(params);
-                  return params.value * 100+ "{d|%}";
+                  return params.value * 100 + "{d|%}";
                 },
                 rich: {
                   d: {
@@ -388,9 +391,9 @@ export default {
             ],
             label: {
               normal: {
-                formatter: function(params){
+                formatter: function (params) {
                   console.log(params);
-                  return params.value * 100+ "{d|%}";
+                  return params.value * 100 + "{d|%}";
                 },
                 rich: {
                   d: {
@@ -469,9 +472,9 @@ export default {
         ValleyFillingAmount: 19254.84, //填谷补贴
       },
       // 刚性可调负荷
-      ganglist:[],
+      ganglist: [],
       // 柔性可调负荷
-      roulist:[],
+      roulist: [],
     };
   },
   methods: {
@@ -1160,17 +1163,17 @@ export default {
       let res = await GetGang();
       console.log(res);
       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;
-      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;
+      this.ganglist = res.data[0];
     },
     async getrou() {
       let res = await GetRou();
       console.log(res);
       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];
     },
   },
   created() {
@@ -1195,7 +1198,7 @@ export default {
     this.xf();
     this.tg();
     this.kdfhzy();
-    // this.getkdfhzy();
+    this.getkdfhzy();
   },
 };
 </script>
diff --git a/vue.config.js b/vue.config.js
index a302d6f..20b6957 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,5 +3,16 @@ 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",
+        },
+      },
+    },
+  },
 });

From c06bad699ee2358a5dcb4b070e8f5a5f0e5ee2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E9=BE=99=E9=BE=99?= <2691932099@qq.com>
Date: Fri, 15 Dec 2023 14:04:20 +0800
Subject: [PATCH 2/3] 1

---
 src/api/fhgl.js         | 42 ----------------------------
 src/views/Zhou/KDFH.vue | 61 +++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 72 deletions(-)

diff --git a/src/api/fhgl.js b/src/api/fhgl.js
index 2d856c1..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) {
->>>>>>> d12dd164c5611f550b3ec7804fac54967e0e4100
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",
diff --git a/src/views/Zhou/KDFH.vue b/src/views/Zhou/KDFH.vue
index 853321c..aab4c4a 100644
--- a/src/views/Zhou/KDFH.vue
+++ b/src/views/Zhou/KDFH.vue
@@ -103,9 +103,17 @@
               style="width: 100%"
               :row-class-name="tableRowClassName"
             >
-              <el-table-column prop="DeviceName" label="可调设备名称" align="center">
+              <el-table-column
+                prop="DeviceName"
+                label="可调设备名称"
+                align="center"
+              >
               </el-table-column>
-              <el-table-column prop="DeviceState" label="开关状态" align="center">
+              <el-table-column
+                prop="DeviceState"
+                label="开关状态"
+                align="center"
+              >
                 <template scope="scope">
                   <img
                     src="../../assets/KDFH/tongguo.png"
@@ -114,7 +122,11 @@
                   <img src="../../assets/KDFH/jinggao.png" v-else />
                 </template>
               </el-table-column>
-              <el-table-column prop="RealTimeLoad" label="实时负荷" align="center">
+              <el-table-column
+                prop="RealTimeLoad"
+                label="实时负荷"
+                align="center"
+              >
                 <template scope="scope">
                   <span class="count">{{ scope.row.RealTimeLoad }}</span>
                   <span class="danwei">kW</span>
@@ -1180,20 +1192,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 +1204,6 @@ export default {
       let res = await GetKdsb();
       console.log(res);
       this.devices = res.data;
->>>>>>> 62a18469e4b1f9e2a4b0bfec7d32a8876b7f566b
     },
   },
   created() {
@@ -1398,15 +1399,15 @@ export default {
     #fhdkcl {
       width: 100%;
       height: 360px;
-      /deep/ .table{
+      /deep/ .table {
         .el-table__body-wrapper {
-    overflow-y: auto;
-    height: 218px;
-  }
-  //隐藏滚动条
-  .el-table__body-wrapper::-webkit-scrollbar {
-    display: none;
-  }
+          overflow-y: auto;
+          height: 218px;
+        }
+        //隐藏滚动条
+        .el-table__body-wrapper::-webkit-scrollbar {
+          display: none;
+        }
       }
     }
   }
@@ -1677,15 +1678,15 @@ export default {
     #kdsb {
       width: 100%;
       height: 500px;
-      /deep/ .table{
+      /deep/ .table {
         .el-table__body-wrapper {
-    overflow-y: auto;
-    height: 530px;
-  }
-  //隐藏滚动条
-  .el-table__body-wrapper::-webkit-scrollbar {
-    display: none;
-  }
+          overflow-y: auto;
+          height: 530px;
+        }
+        //隐藏滚动条
+        .el-table__body-wrapper::-webkit-scrollbar {
+          display: none;
+        }
       }
     }
   }

From e2f5089284f1c05f354c02866f5974611b2c2d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E9=BE=99=E9=BE=99?= <2691932099@qq.com>
Date: Fri, 15 Dec 2023 14:06:56 +0800
Subject: [PATCH 3/3] 1

---
 src/api/kdfh.js | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/api/kdfh.js b/src/api/kdfh.js
index 9e76980..76cb20b 100644
--- a/src/api/kdfh.js
+++ b/src/api/kdfh.js
@@ -10,43 +10,35 @@ export function GetKdfhzy() {
 // 可调负荷策略
 export function GetKdfhcl() {
   return request({
-    url: `/GetLoadControlStrategy`,
+    url: `/api/GetLoadControlStrategy`,
     method: "GET",
   });
 }
 // 可调负荷分析
 export function GetKdfhfx() {
   return request({
-    url: `//GetAdjustableLoadAnalysis`,
+    url: `/api/GetAdjustableLoadAnalysis`,
     method: "GET",
   });
 }
 // 刚性可调负荷
 export function GetGang() {
   return request({
-    url: `//GetRigidAdjustableLoads`,
+    url: `/api/GetRigidAdjustableLoads`,
     method: "GET",
   });
 }
 //   柔性可调负荷
-<<<<<<< HEAD
 export function GetRou() {
   return request({
-    url: `//GetFlexibleAdjustableLoad`,
+    url: `/api/GetFlexibleAdjustableLoad`,
+    method: "GET",
+  });
+}
+//可调设备
+export function GetKdsb() {
+  return request({
+    url: `/api/GetAdjustableDevice`,
     method: "GET",
   });
-=======
-  export function GetRou () {
-    return request({
-      url: `//GetFlexibleAdjustableLoad`,
-      method: 'GET'
-    })
-  }
-//可调设备
-export function GetKdsb () {
-  return request({
-    url: `//GetAdjustableDevice`,
-    method: 'GET'
-  })
->>>>>>> 62a18469e4b1f9e2a4b0bfec7d32a8876b7f566b
 }