zyh

.history/src/api/fhgl_20231215142623.js

@@ -0,0 +1,44 @@
+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 () {
+  return request({
+    url: `brand?limit=${limit}`,
+    method: "GET",
+  });
+}

.history/src/api/kdfh_20231215142624.js

@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 可调负荷资源
+export function GetKdfhzy() {
+  return request({
+    url: `/api/GetAdjustableload`,
+    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'
+  })
+}

src/api/fhgl.js

@@ -1,7 +1,49 @@
+<<<<<<< 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) {
+>>>>>>> 8e6643d1bfe6292f1084dc89239993788d0f6bcc
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",

src/api/kdfh.js

@@ -4,6 +4,45 @@ import request from "@/utils/request";
 export function GetKdfhzy() {
   return request({
     url: `/api/GetAdjustableload`,
+<<<<<<< HEAD
+    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'
+  })
+=======
     method: "GET",
   });
 }
@@ -41,4 +80,5 @@ export function GetKdsb() {
     url: `/api/GetAdjustableDevice`,
     method: "GET",
   });
+>>>>>>> 8e6643d1bfe6292f1084dc89239993788d0f6bcc
 }

src/views/Zhou/KDFH.vue

@@ -200,7 +200,14 @@
 <script>
 import "../../utils/echarts-liquidfill.min.js";
 import * as echarts from "echarts";
-import { GetKdfhzy, GetKdfhcl,GetKdfhfx,GetGang,GetRou,GetKdsb} from "@/api/kdfh";
+import {
+  GetKdfhzy,
+  GetKdfhcl,
+  GetKdfhfx,
+  GetGang,
+  GetRou,
+  GetKdsb,
+} from "@/api/kdfh";
 export default {
   name: "FHGL",
   data() {
@@ -263,7 +270,6 @@ export default {
             data: [
               {
                 value: 0.6,
-                all: 100,
                 direction: "left", //波浪方向
               },
             ], // data个数代表波浪数
@@ -297,7 +303,7 @@ export default {
               normal: {
                 formatter: function (params) {
                   // console.log(params);
-                  return params.value * 100 + "{d|%}";
+                  return (params.value * 100).toFixed(0) + "{d|%}";
                 },
                 rich: {
                   d: {
@@ -370,7 +376,7 @@ export default {
             center: ["50%", "50%"],
             data: [
               {
-                value: 0.6,
+                value:0.6,
                 direction: "left", //波浪方向
               },
             ], // data个数代表波浪数
@@ -404,7 +410,7 @@ export default {
               normal: {
                 formatter: function (params) {
                   console.log(params);
-                  return params.value * 100 + "{d|%}";
+                  return (params.value *100).toFixed(0) + "{d|%}";
                 },
                 rich: {
                   d: {
@@ -584,7 +590,7 @@ export default {
         },
       ]);
       const colorSet = [
-        [0.81, color],
+        [(this.xfdata/100), color],
         [1, "#136768"],
       ];
       const rich = {
@@ -709,7 +715,7 @@ export default {
         },
       ]);
       const colorSet = [
-        [0.7, color],
+        [(this.tgdata/100), color],
         [1, "#136768"],
       ];
       const rich = {
@@ -1160,13 +1166,23 @@ export default {
       let res = await GetKdfhzy();
       console.log(res.data[0]);
       let datas = res.data[0];
-      this.xfdata = (datas.PeakClipping / datas.Amount).toFixed(2) *100;
-      this.tgdata = (datas.ValleyFilling / datas.Amount).toFixed(2) *100;
-      this.xflist = [datas.SecondPeakClipping,datas.MinutePeakClipping,datas.HourlyPeakClipping,datas.DayPeakClipping];
-      this.tglist=[datas.SecondValleyFilling,datas.MinuteValleyFilling,datas.HourlyValleyFilling,datas.DayValleyFilling];
+      this.xfdata = (datas.PeakClipping / datas.Amount).toFixed(2) * 100;
+      this.tgdata = (datas.ValleyFilling / datas.Amount).toFixed(2) * 100;
+      this.xflist = [
+        datas.SecondPeakClipping,
+        datas.MinutePeakClipping,
+        datas.HourlyPeakClipping,
+        datas.DayPeakClipping,
+      ];
+      this.tglist = [
+        datas.SecondValleyFilling,
+        datas.MinuteValleyFilling,
+        datas.HourlyValleyFilling,
+        datas.DayValleyFilling,
+      ];
       this.xf();
-    this.tg();
-    this.kdfhzy();
+      this.tg();
+      this.kdfhzy();
     },
     async getkdfhcl() {
       let res = await GetKdfhcl();
@@ -1183,18 +1199,25 @@ export default {
       console.log(res);
       this.ganglist = res.data[0];
       let percent = (res.data[0].Rigidity / res.data[0].GrossValue).toFixed(2);
+      // console.log(this.option.series[0].data[0].value)
       this.option.series[0].data[0].value = percent;
+      var chartDom = document.getElementById("gang");
+      var myChart = echarts.init(chartDom);
+      this.option && myChart.setOption(this.option);
     },
     async getrou() {
       let res = await GetRou();
       console.log(res);
       let percent = (res.data[0].Flexible / res.data[0].GrossValue).toFixed(2);
-      this.option.series[0].data[0].value = percent;
+      this.option2.series[0].data[0].value = percent;
       this.roulist = res.data[0];
+      var chartDom2 = document.getElementById("ruan");
+      var myChart2 = echarts.init(chartDom2);
+      myChart2.setOption(this.option2);
     },
     async getkdsb() {
       let res = await GetKdsb();
-      console.log("可调设备",res.data);
+      console.log("可调设备", res.data);
       this.devices = res.data;
     },
   },
@@ -1216,14 +1239,7 @@ export default {
     this.getgang();
     this.getrou();
   },
-  mounted() {
-    var chartDom = document.getElementById("gang");
-    var myChart = echarts.init(chartDom);
-    this.option && myChart.setOption(this.option);
-    var chartDom2 = document.getElementById("ruan");
-    var myChart2 = echarts.init(chartDom2);
-    this.option2 && myChart2.setOption(this.option2);
-  },
+  mounted() {},
 };
 </script>
 <style lang="less" scoped>
@@ -1395,13 +1411,13 @@ export default {
       height: 360px;
       /deep/ .table {
         .el-table__body-wrapper {
-    overflow-y: auto;
-    max-height: 218px;
-  }
-  //隐藏滚动条
-  .el-table__body-wrapper::-webkit-scrollbar {
-    display: none;
-  }
+          overflow-y: auto;
+          max-height: 218px;
+        }
+        //隐藏滚动条
+        .el-table__body-wrapper::-webkit-scrollbar {
+          display: none;
+        }
       }
     }
   }