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,4 +1,3 @@
-<<<<<<< HEAD
 import request from '@/utils/request'
  
 // 负荷管理
@@ -38,12 +37,6 @@ export function GetFhzb () {
 }
 // 生产线负荷
 export function GetScxfh () {
-=======
-import request from "@/utils/request";
-
-//
-export function loadBrand(limit) {
->>>>>>> e2f5089284f1c05f354c02866f5974611b2c2d6d
   return request({
     url: `brand?limit=${limit}`,
     method: "GET",

src/api/kdfh.js

@@ -4,7 +4,6 @@ import request from "@/utils/request";
 export function GetKdfhzy() {
   return request({
     url: `/api/GetAdjustableload`,
-<<<<<<< HEAD
     method: 'GET'
   })
 }
@@ -42,43 +41,4 @@ 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",
-  });
->>>>>>> e2f5089284f1c05f354c02866f5974611b2c2d6d
 }

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: {
@@ -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 = {
@@ -1162,8 +1168,18 @@ export default {
       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.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();
@@ -1183,14 +1199,21 @@ 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();
@@ -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>

src/views/Zhou/ZNYWJK.vue

@@ -17,7 +17,9 @@
         <div id="dqsxtxx">
           <div class="headers">
             <iframe
-              :src="'webs/index.html' + '?1?221.214.127.18'"
+              :src="
+                'webs/index.html?' + currentdata.channel + '?' + currentdata.ip
+              "
               frameborder="0"
               width="100%"
               height="100%"
@@ -36,7 +38,7 @@
           <h2>摄像头信息</h2>
           <div class="footers">
             <div class="one">
-              <p>鲁西平阴厂区全景</p>
+              <p>{{ currentdata.name }}</p>
             </div>
             <div class="two">
               <p>网络数据</p>
@@ -58,11 +60,13 @@
         <div id="spjk">
           <div class="spjk_one" v-for="(item, index) in sxtlist" :key="index">
             <div class="jiankong">
+              <div class="video" @click="changeUrl(item)"></div>
                 <iframe
                   :src="'webs/index.html?' + item.channel + '?' + item.ip"
                   frameborder="0"
                   width="100%"
                   height="100%"
+                  class="video_if"
                 ></iframe>
             </div>
             <div class="spjk_title">{{ item.name }}</div>
@@ -81,25 +85,17 @@
               @click="res = '生产监控系统'"
               >生产监控系统</span
             >
-            <span
+            <!-- <span
               :class="res == '配电室监控系统' ? 'active' : ''"
               @click="res = '配电室监控系统'"
               >配电室监控系统</span
-            >
+            > -->
           </div>
           <div class="con">
-            <div class="con1" v-for="(item,index) in jklist1">
+            <div :class="currentdata.name==item.name?'con1':'con2'" v-for="(item, index) in jklist1" @click="changeUrl(item)">
               <p>监控{{ index + 1 }}：{{ item.name }}</p>
-            <p>{{ item.date }}</p>
+              <!-- <p>{{ item.date }}</p> -->
             </div>
-            <!-- <div class="con1">
-              <p>监控17：回转窑南侧</p>
-              <p>07:12:18</p>
-            </div>
-            <div class="con2">
-              <p>监控16：篦冷机</p>
-              <p>07:12:18</p>
-            </div> -->
           </div>
         </div>
       </div>
@@ -207,6 +203,11 @@ import screenfull from "screenfull";
 export default {
   data() {
     return {
+      currentdata: {
+        channel: "1",
+        ip: "221.214.127.18",
+        name: "鲁西平阴厂区全景",
+      },
       fjlist: [
         {
           name: "1#后排风机上动触头A相",
@@ -388,6 +389,16 @@ export default {
         },
       ],
       sxtlist: [
+        {
+          channel: "1",
+          ip: "221.214.127.18",
+          name: "鲁西平阴厂区全景",
+        },
+        {
+          channel: "2",
+          ip: "221.214.127.18",
+          name: "1号窑头取样处",
+        },
         {
           channel: "9",
           ip: "221.214.127.18",
@@ -436,81 +447,124 @@ export default {
         {
           name: "鲁西平阴厂区全景",
           date: "07:12:18",
+          channel: "1",
+        ip: "221.214.127.18",
         },
         {
           name: "1号窑头取样处",
           date: "07:12:18",
+          channel: "2",
+        ip: "221.214.127.18",
         },
         {
           name: "2号窑头取样处",
           date: "07:12:18",
+          channel: "3",
+        ip: "221.214.127.18",
         },
         {
           name: "1号窑头监测房",
           date: "07:12:18",
-        },        {
+          channel: "4",
+        ip: "221.214.127.18",
+        },
+        {
           name: "2号窑头监测房",
           date: "07:12:18",
+          channel: "5",
+        ip: "221.214.127.18",
         },
         {
           name: "2号窑尾监测房",
           date: "07:12:18",
+          channel: "6",
+        ip: "221.214.127.18",
         },
         {
           name: "鲁西平阴1号2号3号",
           date: "07:12:18",
+          channel: "7",
+        ip: "221.214.127.18",
         },
         {
           name: "1号窑尾监测房",
           date: "07:12:18",
+          channel: "8",
+        ip: "221.214.127.18",
         },
         {
           name: "2号窑尾取样处",
           date: "07:12:18",
+          channel: "9",
+        ip: "221.214.127.18",
         },
         {
           name: "1号窑尾取样处",
           date: "07:12:18",
-        },        {
+          channel: "10",
+        ip: "221.214.127.18",
+        },
+        {
           name: "辅材均化棚北",
           date: "07:12:18",
+          channel: "11",
+        ip: "221.214.127.18",
         },
         {
           name: "1号水泥磨取样处",
           date: "07:12:18",
+          channel: "12",
+        ip: "221.214.127.18",
         },
         {
           name: "3号窑尾监测房",
           date: "07:12:18",
+          channel: "13",
+        ip: "221.214.127.18",
         },
         {
           name: "原煤均化棚",
           date: "07:12:18",
+          channel: "14",
+        ip: "221.214.127.18",
         },
         {
           name: "3号窑头监测房",
           date: "07:12:18",
+          channel: "15",
+        ip: "221.214.127.18",
         },
         {
           name: "3号窑头在线监测",
           date: "07:12:18",
-        },        {
+          channel: "16",
+        ip: "221.214.127.18",
+        },
+        {
           name: "3号生料库顶取样处",
           date: "07:12:18",
+          channel: "17",
+        ip: "221.214.127.18",
         },
         {
           name: "3号窑尾取样处",
           date: "07:12:18",
+          channel: "18",
+        ip: "221.214.127.18",
         },
         {
           name: "3号煤磨在线监测",
           date: "07:12:18",
+          channel: "19",
+        ip: "221.214.127.18",
         },
         {
           name: "1号水泥在线监测",
           date: "07:12:18",
+          channel: "20",
+        ip: "221.214.127.18",
         },
-      ]
+      ],
     };
   },
   methods: {
@@ -537,6 +591,9 @@ export default {
     handleFullScreen() {
       screenfull.toggle(this.$refs.videos);
     },
+    changeUrl(item) {
+      this.currentdata = item;
+    },
   },
   created() {
     // if (window.vuplex) {
@@ -572,7 +629,8 @@ export default {
             {
               name: "水泥磨东小配电间",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "水泥磨西3排南向北",
               date: "07:12:18",
             },
@@ -596,7 +654,8 @@ export default {
             {
               name: "水泥磨西南角",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "水泥磨西1排南向北",
               date: "07:12:18",
             },
@@ -620,7 +679,8 @@ export default {
             {
               name: "2期煤磨西2排北向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "2期煤磨西1排北向",
               date: "07:12:18",
             },
@@ -644,7 +704,8 @@ export default {
             {
               name: "1期窑头西排4北向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "2期窑头弱电间",
               date: "07:12:18",
             },
@@ -667,7 +728,8 @@ export default {
             {
               name: "1期窑头弱电间",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "1期生料磨西四排北向",
               date: "07:12:18",
             },
@@ -691,7 +753,8 @@ export default {
             {
               name: "1期生料磨西四排南向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "1期窑头西二排北向",
               date: "07:12:18",
             },
@@ -715,7 +778,8 @@ export default {
             {
               name: "1期生料磨西二排南向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "1期煤磨西二排",
               date: "07:12:18",
             },
@@ -738,7 +802,8 @@ export default {
             {
               name: "原材料配电室西向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "矿山1",
               date: "07:12:18",
             },
@@ -762,7 +827,8 @@ export default {
             {
               name: "原生料磨西三排南向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "原生料磨西二排南向",
               date: "07:12:18",
             },
@@ -786,7 +852,8 @@ export default {
             {
               name: "原生料磨西四排南向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "原生料磨弱电机房",
               date: "07:12:18",
             },
@@ -797,7 +864,8 @@ export default {
             {
               name: "原生料磨西三排北向",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "1期窑尾西向",
               date: "07:12:18",
             },
@@ -805,7 +873,7 @@ export default {
               name: "1#框架电力仓库",
               date: "07:12:18",
             },
-          ]
+          ];
         } else {
           this.jklist1 = [
             {
@@ -823,7 +891,8 @@ export default {
             {
               name: "1号窑头监测房",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "2号窑头监测房",
               date: "07:12:18",
             },
@@ -846,7 +915,8 @@ export default {
             {
               name: "1号窑尾取样处",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "辅材均化棚北",
               date: "07:12:18",
             },
@@ -869,7 +939,8 @@ export default {
             {
               name: "3号窑头在线监测",
               date: "07:12:18",
-        },        {
+            },
+            {
               name: "3号生料库顶取样处",
               date: "07:12:18",
             },
@@ -885,13 +956,12 @@ export default {
               name: "1号水泥在线监测",
               date: "07:12:18",
             },
-      ]
+          ];
         }
       },
       deep: true, // 深度观察监听
       immediate: true, // 第一次初始化渲染就可以监听到
-    }
-    
+    },
   },
 };
 </script>
@@ -1176,11 +1246,23 @@ export default {
           .jiankong {
             width: 100%;
             height: 323px;
-            video {
+            position: relative;
+            .video {
               border: none;
               width: 551px;
               height: 301px;
               opacity: 1;
+              cursor: pointer;
+              position: absolute;
+              z-index: 1111111;
+            }
+            .video_if {
+              border: none;
+              width: 551px;
+              height: 301px;
+              opacity: 1;
+              cursor: pointer;
+              position: relative;
             }
           }
 
@@ -1306,10 +1388,11 @@ export default {
             font-size: 24px;
             color: #fff;
             box-sizing: border-box;
+            cursor: pointer;
           }
 
           .con1 {
-            background: url(../../assets/ZNYWJK/蓝.png);
+            background: url(../../assets/ZNYWJK/红.png);
           }
 
           .con2 {