1

src/App.vue

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

src/api/fhgl.js

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
+import request from "@/utils/request";
+//
+export function loadBrand(limit) {
+=======
 import request from '@/utils/request'
  
 // 负荷管理
@@ -37,6 +42,7 @@ export function GetFhzb () {
 }
 // 生产线负荷
 export function GetScxfh () {
+>>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
   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'
   })
+>>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
 }

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,9 +179,14 @@
 </template>
 <script>
 import * as echarts from "echarts";
+<<<<<<< HEAD
+import { getPie3D, getParametricEquation } from "../../../utils/fhgl";
+const color = ["#099FE3", "#00DBEB", "#50F4C1"];
+=======
 // import "echarts-gl";
 // import { getPie3D, getParametricEquation } from "../../../utils/fhgl";
 // const color = ["#099FE3", "#00DBEB", "#50F4C1"];
+>>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
 export default {
   data() {
     return {
@@ -997,7 +1003,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 +1180,7 @@ export default {
       ];
       const series = this.getPie3D(optionsData, 0.8, 240, 28, 26, 0.5);
       series.push({
-        name: "pie2d",
+        type: "pie3d",
-        type: "pie",
         label: {
           opacity: 1,
           fontSize: 14,
@@ -1262,7 +1269,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,6 +1535,63 @@ export default {
       myChart.setOption(option, true);
     },
 
+<<<<<<< HEAD
+    //
+    // 初始化label样式
+    setLabel() {
+      this.optionData.forEach((item, index) => {
+        item.itemStyle = {
+          color: color[index],
+        };
+        item.label = {
+          normal: {
+            show: true,
+            color: color[index],
+            position: "right",
+            // distance:-10,
+            offset: [0, 3],
+            formatter: [
+              "{d|{d}%}",
+              "————",
+              //   '{c|{c}}{b|台}',
+              "{b|{b}}",
+            ].join("\n"), // 用\n来换行
+            rich: {
+              b: {
+                lineHeight: 25,
+                align: "left",
+                fontSize: 30,
+                color: "#fff",
+              },
+              c: {
+                fontSize: 22,
+                // color: '#fff',
+                textShadowColor: "#1c90a6",
+                textShadowOffsetX: 0,
+                textShadowOffsetY: 2,
+                textShadowBlur: 5,
+                color: color[index],
+              },
+              d: {
+                color: color[index],
+                fontSize: 40,
+                align: "left",
+              },
+            },
+          },
+        };
+        item.labelLine = {
+          normal: {
+            length2: 200,
+            lineStyle: {
+              width: 2,
+              color: color[index],
+            },
+          },
+        };
+      });
+    },
+=======
     // 
         // 初始化label样式
     //     setLabel() {
@@ -1583,6 +1647,7 @@ export default {
     //     };
     //   });
     // },
+>>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
     // // 图表初始化
     // initChart() {
     //   this.statusChart = echarts.init(this.$refs.chart);
@@ -1762,8 +1827,13 @@ export default {
     //   });
     // },
   },
+<<<<<<< HEAD
+  created() {
+    this.setLabel();
+=======
   created(){
     // this.setLabel();
+>>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
   },
   mounted() {
     this.defineEcharts("pdsssdh", this.option1);