1

src/App.vue

@@ -8,15 +8,15 @@ export default {
     return {};
   },
   mounted() {
-    // autofit.init(
-    //   {
-    //     dh: 3240,
-    //     dw: 7680,
-    //     el: "#app",
-    //     resize: true,
-    //   },
-    //   false
-    // );
+    autofit.init(
+      {
+        dh: 3240,
+        dw: 7680,
+        el: "#app",
+        resize: true,
+      },
+      false
+    );
 
     if (window.vuplex) {
       this.addMessageListener();

src/api/fhgl.js

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

src/api/kdfh.js

@@ -4,45 +4,6 @@ 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",
   });
 }
@@ -80,5 +41,4 @@ export function GetKdsb() {
     url: `/api/GetAdjustableDevice`,
     method: "GET",
   });
->>>>>>> 33de1560eeb2b0f1604115c12dd7230b16dfc72c
 }

src/views/lll/NYJCD.vue

@@ -157,7 +157,9 @@
       </div>
     </div>
     <div class="area1">
-      <router-view />
+      <keep-alive>
+        <router-view />
+      </keep-alive>
     </div>
   </div>
 </template>
@@ -364,13 +366,13 @@ export default {
         message: `${this.click1}_true`,
       });
       if (this.click1 == "配电室") {
-        this.$router.replace(
+        this.$router.push(
           "/area/nyjcd/pds",
           () => {},
           () => {}
         );
       } else {
-        this.$router.replace(
+        this.$router.push(
           `/area/nyjcd/scx1?type=${this.click1}`,
           () => {},
           () => {}

src/views/lll/NYJCD/SCX1.vue

@@ -18,6 +18,7 @@
           <span :class="res == '月' ? 'active' : ''" @click="res = '月'"
             >月</span
           >
+          >
           <span :class="res == '日' ? 'active' : ''" @click="res = '日'"
             >日</span
           >
@@ -178,7 +179,6 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import "echarts-gl";
 import { getPie3D, getParametricEquation } from "../../../utils/fhgl";
 const color = ["#099FE3", "#00DBEB", "#50F4C1"];
 export default {
@@ -997,7 +997,9 @@ export default {
       }
       f = Math.round(num * Math.pow(10, n)) / Math.pow(10, n); // n 幂
       var s = f.toString();
-      var rs = s.indexOf(".");
+      if (s) {
+        var rs = s.indexOf(".");
+      }
       //判定如果是整数，增加小数点再补0
       if (rs < 0) {
         rs = s.length;
@@ -1172,8 +1174,7 @@ export default {
       ];
       const series = this.getPie3D(optionsData, 0.8, 240, 28, 26, 0.5);
       series.push({
-        name: "pie2d",
-        type: "pie",
+        type: "pie3d",
         label: {
           opacity: 1,
           fontSize: 14,
@@ -1262,7 +1263,7 @@ export default {
     },
     defineEcharts(dom, option) {
       var chartDom = document.getElementById(dom);
-      var myChart = this.$echarts.init(chartDom, null, {
+      var myChart = this.$echarts.init(chartDom, option, {
         devicePixelRatio: 10, // 设置为2或更高的值
       });
       myChart.setOption(option);
@@ -1528,9 +1529,9 @@ export default {
       myChart.setOption(option, true);
     },
 
-    // 
-        // 初始化label样式
-        setLabel() {
+    //
+    // 初始化label样式
+    setLabel() {
       this.optionData.forEach((item, index) => {
         item.itemStyle = {
           color: color[index],
@@ -1762,7 +1763,7 @@ export default {
       });
     },
   },
-  created(){
+  created() {
     this.setLabel();
   },
   mounted() {