121

src/api/fhgl.js

@@ -1,48 +1,42 @@
-<<<<<<< HEAD
 import request from "@/utils/request";
-//
-export function loadBrand(limit) {
-=======
-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 () {
->>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
+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",

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'
-  })
->>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
 }

src/views/lll/NYJCM.vue

@@ -14,6 +14,18 @@
           <img src="../../assets/nyjc/煤 拷贝.png" alt="" />
           <p>今日用煤量</p>
         </div>
+        <div class="img">
+          <img
+            @click="
+              sendMessageToCSharp({
+                type: 'video',
+                message: '煤磨动画',
+              })
+            "
+            src="../../assets/img/nyjcm.png"
+            alt=""
+          />
+        </div>
       </div>
       <div class="rysl">
         <div class="imgBox">
@@ -487,6 +499,9 @@ export default {
       var myChart = this.$echarts.init(chartDom);
       myChart.setOption(option);
     },
+    sendMessageToCSharp(obj) {
+      window.vuplex.postMessage(obj);
+    },
     tableRowClassName({ row, rowIndex }) {
       if ((rowIndex + 1) % 2 === 0) {
         return "success-row";
@@ -796,6 +811,7 @@ export default {
     color: #fff;
     font-size: 22px;
     display: flex;
+    align-items: center;
 
     div {
       display: flex;
@@ -832,6 +848,13 @@ export default {
         }
       }
     }
+    .img {
+      img {
+        width: 100px;
+        height: 100px;
+        cursor: pointer;
+      }
+    }
   }
 
   .rysl {