zyh

src/api/fhgl.js

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

src/utils/fhgl.js

@@ -283,5 +283,3 @@ const getPie3D = (
 };
 
 export { getPie3D, getParametricEquation };
-  
-  

src/views/lll/PDS.vue

@@ -130,7 +130,7 @@ export default {
       url: "",
       list: [],
       res: "",
-      falg: true,
+      falg: false,
       type: "电流",
       option: {
         tooltip: {
@@ -370,6 +370,8 @@ export default {
     },
     sendMessageToCSharp(name) {
       this.falg = true;
+      this.dldy();
+      this.ssfh();
       let that = this;
       window.vuplex.postMessage({
         type: that.$route.query.type,
@@ -440,10 +442,7 @@ export default {
       myChart.setOption(this.option1);
     },
   },
-  mounted() {
+  mounted() {},
-    this.dldy();
-    this.ssfh();
-  },
   beforeDestroy() {
     this.falg = false;
   },