新增清洁能源生产日报，新增综合报警系统免登录跳转功能

.env.development

@@ -1,10 +1,10 @@
 
-VUE_APP_API=http://192.168.1.108:6060
-VUE_APP_Matrix=http://192.168.1.108:6060
+# VUE_APP_API=http://192.168.1.108:6060
+# VUE_APP_Matrix=http://192.168.1.108:6060
 
-# VUE_APP_API=http://10.81.3.153:6060
-# # 经济运行 安全监视 
-# VUE_APP_Matrix=http://10.81.3.153:6060
+VUE_APP_API=http://10.81.3.153:6060
+# 经济运行 安全监视 
+VUE_APP_Matrix=http://10.81.3.153:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011

src/components/chart/combination/area-line-chart.vue

@@ -21,181 +21,11 @@ export default {
     },
     lineData: {
       type: Array,
-      default: () => [
-        {
-          text: "日发电量",
-          value: [
-            {
-              text: "1",
-              value: 1,
-            },
-            {
-              text: "2",
-              value: 2,
-            },
-            {
-              text: "3",
-              value: 1,
-            },
-            {
-              text: "4",
-              value: 3,
-            },
-            {
-              text: "5",
-              value: 3,
-            },
-            {
-              text: "6",
-              value: 3,
-            },
-            {
-              text: "7",
-              value: 3,
-            },
-            {
-              text: "8",
-              value: 3,
-            },
-            {
-              text: "9",
-              value: 3,
-            },
-            {
-              text: "10",
-              value: 3,
-            },
-            {
-              text: "11",
-              value: 3,
-            },
-            {
-              text: "12",
-              value: 3,
-            },
-            {
-              text: "13",
-              value: 3,
-            },
-            {
-              text: "14",
-              value: 3,
-            },
-            {
-              text: "15",
-              value: 3,
-            },
-            {
-              text: "16",
-              value: 3,
-            },
-          ],
-        },
-        {
-          text: "上网电量",
-          value: [
-            {
-              text: "1",
-              value: 1,
-            },
-            {
-              text: "2",
-              value: 2,
-            },
-            {
-              text: "3",
-              value: 1,
-            },
-            {
-              text: "4",
-              value: 3,
-            },
-            {
-              text: "5",
-              value: 4,
-            },
-            {
-              text: "6",
-              value: 5,
-            },
-            {
-              text: "7",
-              value: 6,
-            },
-            {
-              text: "8",
-              value: 7,
-            },
-            {
-              text: "9",
-              value: 8,
-            },
-            {
-              text: "10",
-              value: 7,
-            },
-            {
-              text: "11",
-              value: 9,
-            },
-            {
-              text: "12",
-              value: 2,
-            },
-            {
-              text: "13",
-              value: 3,
-            },
-            {
-              text: "14",
-              value: 5,
-            },
-            {
-              text: "15",
-              value: 12,
-            },
-            {
-              text: "16",
-              value: 11,
-            },
-          ],
-        },
-      ],
+      default: () => [],
     },
     areaData: {
       type: Array,
-      default: () => [
-        {
-          name: "1",
-          start: 0,
-          end: 100,
-          state: "green",
-        },
-        {
-          name: "1",
-          start: 100,
-          end: 200,
-          state: "red",
-        },
-        {
-          name: "1",
-          start: 200,
-          end: 300,
-          state: "yellow",
-        },
-        {
-          name: "2",
-          start: 300,
-          end: 800,
-          state: "green",
-        },
-        {
-          name: "3",
-          start: 800,
-          end: 9000,
-          state: "green",
-        },
-      ],
+      default: () => [],
     },
     // 单位
     units: {
@@ -210,24 +40,31 @@ export default {
     // 颜色
     color: {
       type: Array,
-      default: () => ["#323E6F", "#1DA0D7", "#02BB4C", "#DB5520", "#EDB32F", "#EDEB2F"],
+      default: () => [
+        "#323E6F",
+        "#1DA0D7",
+        "#02BB4C",
+        "#DB5520",
+        "#EDB32F",
+        "#EDEB2F",
+      ],
     },
   },
-  data () {
+  data() {
     return {
       id: "",
       chart: null,
     };
   },
   computed: {
-    legend () {
+    legend() {
       let data = [];
       this.lineData.forEach((value, index) => {
         data.push(value.text);
       });
       return data;
     },
-    xAxisData () {
+    xAxisData() {
       let data = [];
       if (this.lineData.length > 0)
         this.lineData[0].value.forEach((value, index) => {
@@ -235,25 +72,27 @@ export default {
         });
       return data;
     },
-    areaChartData () {
+    areaChartData() {
       let data = [];
-      for (var i = 0; i < this.areaData.length; i++) {
-        let item = this.areaData[i];
-        var color = item.color || item.state;
-        data.push({
-          name: item.name,
-          value: [item.start, item.end, item.end - item.start],
-          itemStyle: {
-            normal: {
-              color: color,
+      if (this.areaData && this.areaData.length) {
+        for (var i = 0; i < this.areaData.length; i++) {
+          let item = this.areaData[i];
+          var color = item.color;
+          data.push({
+            name: item.name,
+            value: [item.start, item.end, item.end - item.start],
+            itemStyle: {
+              normal: {
+                color: color,
+              },
             },
-          },
-          exData: item,
-        });
+            exData: item,
+          });
+        }
       }
       return data;
     },
-    areaMax () {
+    areaMax() {
       let max = 0;
       this.areaData.forEach((value) => {
         if (max < value.end) max = value.end;
@@ -262,7 +101,7 @@ export default {
     },
   },
   methods: {
-    renderItem (params, api) {
+    renderItem(params, api) {
       var start = api.coord([api.value(0)]);
       var end = api.coord([api.value(1)]);
       var height = api.size([0, 1])[1];
@@ -281,7 +120,6 @@ export default {
           height: params.coordSys.height,
         }
       );
-
       return (
         rectShape && {
           type: "rect",
@@ -291,8 +129,7 @@ export default {
         }
       );
     },
-    initChart () {
-    
+    initChart() {
       let that = this;
       let chart = echarts.init(this.$el);
 
@@ -311,8 +148,14 @@ export default {
           axisPointer: {
             type: "cross",
           },
-          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
-          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+          backgroundColor:
+            this.$store.state.themeName === "dark"
+              ? "rgba(0,0,0,0.4)"
+              : "rgba(255,255,255,0.5)",
+          borderColor:
+            this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
             color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: 14,
@@ -325,9 +168,15 @@ export default {
           icon: "ract",
           itemWidth: 8,
           itemHeight: 8,
-          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+          inactiveColor:
+            this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
-            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
+            color:
+              this.$store.state.themeName === "dark"
+                ? partten.getColor("grayl")
+                : "#000",
             fontSize: 12,
           },
         },
@@ -335,7 +184,10 @@ export default {
           {
             type: "category",
             axisLabel: {
-              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+              color:
+                this.$store.state.themeName === "dark"
+                  ? partten.getColor("gray")
+                  : "#000",
             },
             axisLine: {
               show: false,
@@ -363,12 +215,18 @@ export default {
             name: this.units[0],
             axisLabel: {
               formatter: "{value} ",
-              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+              color:
+                this.$store.state.themeName === "dark"
+                  ? partten.getColor("gray")
+                  : "#000",
             },
             axisLine: {
               type: "dashed",
               lineStyle: {
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+                color:
+                  this.$store.state.themeName === "dark"
+                    ? partten.getColor("gray")
+                    : "#000",
               },
               width: 5,
             },
@@ -379,12 +237,19 @@ export default {
               lineStyle: {
                 type: "dashed",
                 dashOffset: 10,
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 80,
+                color:
+                  this.$store.state.themeName === "dark"
+                    ? partten.getColor("gray")
+                    : "#000" + 80,
               },
             },
           },
           {
-            data: [this.areaData[0].name],
+            data: [
+              this.areaData && this.areaData.length
+                ? this.areaData[0].name
+                : "",
+            ],
             axisLabel: { show: false },
           },
         ],
@@ -433,7 +298,6 @@ export default {
           data: this.areaChartData,
         });
       }
-
       chart.setOption(option);
 
       return chart;
@@ -442,32 +306,33 @@ export default {
   emits: {
     areaClick: null,
   },
-  created () {
+  created() {
     this.id = "pie-chart-" + util.newGUID();
   },
-  mounted () {
+  mounted() {
     this.$nextTick(() => {
       this.$el.style.width = this.width;
       this.$el.style.height = this.height;
       let that = this;
       let chart = this.initChart();
-      chart.on("click", function(e, p) {
+      chart.on("click", function (e, p) {
+        console.log(e);
         if (e.seriesType == "custom") {
           that.$emit("areaClick", { data: e.data.exData });
         }
       });
     });
   },
-  updated () {
+  updated() {
     this.$nextTick(() => {
       this.initChart();
     });
   },
   watch: {
-      "$store.state.themeName"() {
-        this.initChart();
-      },
+    "$store.state.themeName"() {
+      this.initChart();
     },
+  },
 };
 </script>
 

src/components/chart/combination/multiple-bar-line-chart.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="chart" :id="id"></div>
+  <div class="chart" id="stand-alone-chart"></div>
 </template>
 
 <script>
@@ -22,154 +22,11 @@ export default {
     // 传入数据
     barData: {
       type: Array,
-      default: () => [
-        {
-          title: "日发电量",
-          yAxisIndex: 0,
-          value: [
-            {
-              text: "1日",
-              value: 1,
-            },
-            {
-              text: "2日",
-              value: 2,
-            },
-            {
-              text: "3日",
-              value: 1,
-            },
-            {
-              text: "4日",
-              value: 3,
-            },
-            {
-              text: "5日",
-              value: 3,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-        {
-          title: "上网电量",
-          yAxisIndex: 0,
-          value: [
-            {
-              text: "1日",
-              value: 1,
-            },
-            {
-              text: "2日",
-              value: 2,
-            },
-            {
-              text: "3日",
-              value: 1,
-            },
-            {
-              text: "4日",
-              value: 3,
-            },
-            {
-              text: "5日",
-              value: 3,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-        {
-          title: "购网电量",
-          yAxisIndex: 0,
-          value: [
-            {
-              text: "1日",
-              value: 1,
-            },
-            {
-              text: "2日",
-              value: 2,
-            },
-            {
-              text: "3日",
-              value: 1,
-            },
-            {
-              text: "4日",
-              value: 3,
-            },
-            {
-              text: "5日",
-              value: 3,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-        {
-          title: "风速",
-          yAxisIndex: 1,
-          value: [
-            {
-              text: "1日",
-              value: 1,
-            },
-            {
-              text: "2日",
-              value: 2,
-            },
-            {
-              text: "3日",
-              value: 1,
-            },
-            {
-              text: "4日",
-              value: 3,
-            },
-            {
-              text: "5日",
-              value: 3,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-      ],
+      default: () => [],
     },
     lineData: {
       type: Object,
-      default: () => {
-        return {
-          name: "风速",
-          unit: "km",
-          data: [200, 800, 400, 500, 800, 700, 800, 900, 200],
-        };
-      },
+      default: () => {},
     },
     // 单位
     units: {
@@ -204,7 +61,8 @@ export default {
       id: "",
       chart: null,
       firstAnimation: true,
-      newbarData: null,
+      newbarData: [],
+      newlineData: [],
     };
   },
   watch: {
@@ -215,22 +73,25 @@ export default {
       },
       deep: true,
     },
-    lineData : {
+    lineData: {
       handler(newValue, oldValue) {
         this.newlineData = newValue;
         this.initChart();
       },
       deep: true,
     },
-	"$store.state.themeName"() {
-	  this.initChart();
-	},
+    "$store.state.themeName"() {
+      this.initChart();
+    },
   },
   computed: {
     legend() {
-      return this.newbarData.map((t) => {
-        return t.title;
-      });
+      return [
+        ...this.newbarData.map((t) => {
+          return t.title;
+        }),
+        this.newlineData.name,
+      ];
     },
     xdata() {
       let result = [];
@@ -301,6 +162,25 @@ export default {
           });
         });
       }
+      if (
+        this.newlineData &&
+        this.newlineData.data &&
+        this.newlineData.data.length > 0
+      ) {
+        result.push({
+          name: this.newlineData.name,
+          type: "line",
+          data: this.newlineData.data,
+          smooth: true, //平滑展示
+          yAxisIndex: 1,
+          lineStyle: {
+            color: partten.getColor("yellow"),
+          },
+          itemStyle: {
+            color: partten.getColor("yellow"),
+          },
+        });
+      }
       return result;
     },
   },
@@ -313,8 +193,14 @@ export default {
         color: this.color,
         tooltip: {
           trigger: "axis",
-          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
-          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+          backgroundColor:
+            this.$store.state.themeName === "dark"
+              ? "rgba(0,0,0,0.4)"
+              : "rgba(255,255,255,0.5)",
+          borderColor:
+            this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
             color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: 12,
@@ -327,9 +213,15 @@ export default {
           icon: "ract",
           itemWidth: 8,
           itemHeight: 8,
-          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+          inactiveColor:
+            this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
-            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
+            color:
+              this.$store.state.themeName === "dark"
+                ? partten.getColor("grayl")
+                : "#000",
             fontSize: 12,
           },
         },
@@ -355,46 +247,6 @@ export default {
         series: this.series,
       };
 
-      // line data
-      if (this.newlineData && this.newlineData.data.length > 0) {
-        option.yAxis.push({
-          type: "value",
-          name: this.newlineData.name,
-          axisLabel: {
-            formatter: "{value} ",
-            color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
-          },
-          axisLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
-          },
-          splitLine: {
-            show: false,
-            lineStyle: {
-              type: "dashed",
-              dashOffset: 10,
-              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 80,
-            },
-          },
-        });
-
-        option.series.push({
-          name: this.newlineData.name,
-          type: "line",
-          data: this.newlineData.data,
-          smooth: true, //平滑展示
-          yAxisIndex: option.yAxis.length - 1,
-          lineStyle: {
-            color: partten.getColor("yellow"),
-          },
-          itemStyle: {
-            color: partten.getColor("yellow"),
-          },
-        });
-      }
-
       chart.clear();
       chart.setOption(option);
 
@@ -406,8 +258,9 @@ export default {
     },
   },
   created() {
-    this.id = "pie-chart-" + util.newGUID();
+    // this.id = "pie-chart-" + util.newGUID();
     this.newbarData = this.barData;
+    this.newlineData = this.lineData;
   },
   mounted() {
     this.$nextTick(() => {

src/components/chart/pie/dual-pie-chart.vue

@@ -24,29 +24,8 @@ export default {
       type: String,
       default: "30%",
     },
-    // 内部饼图数据
-    innerData: {
-      type: Array,
-      default: () => [
-        {
-          value: 700,
-          unit: "个",
-          name: "行业大类1",
-        },
-        {
-          value: 679,
-          unit: "个",
-          name: "行业大类2",
-        },
-        {
-          value: 1548,
-          unit: "个",
-          name: "行业大类3",
-        },
-      ],
-    },
-    // 外部饼图数据
-    outerData: {
+    // 饼图数据
+    series: {
       type: Array,
       default: () => [],
     },
@@ -59,6 +38,7 @@ export default {
       type: Boolean,
       default: true,
     },
+    title: { type: String, default: "" },
   },
   data() {
     return {
@@ -70,84 +50,42 @@ export default {
   methods: {
     initChart() {
       let that = this;
-      let legend1 = this.innerData.map((v) => v.name);
-      let legend2 = this.outerData.map((v) => v.name);
-      let legendData = [...legend1, ...legend2];
+      //   let legend1 = this.innerData.map((v) => v.name);
+      //   let legend2 = this.outerData.map((v) => v.name);
+      //   let legendData = [...legend1, ...legend2];
 
       let option = {
-        color: [
-          "#e17e23",
-          "#ba3237",
-          "#c531c7",
-          "#4b55ae",
-          "#ccf0d3",
-          "#05bb4c",
-        ],
+        title: {
+          text: this.title,
+          textStyle: {
+            fontSize: 16,
+            color: "rgba(255, 255, 255, 0.75)",
+            fontWeight: 400,
+          },
+          left: "center",
+        },
         tooltip: {
           trigger: "item",
-          backgroundColor: this.$store.state.themeName === "dark"
-              ? "rgba(0,0,0,0.4)"
-              : "rgba(255,255,255,0.5)",
-          borderColor: this.$store.state.themeName === "dark"
-              ? partten.getColor("gray")
-              : "#000",
-          textStyle: {
-            color: "#fff",
-            fontSize: util.vh(16),
+          formatter: function (params) {
+            console.log(params);
+            return params.marker + params.name + " " + params.value + "%";
           },
         },
-        grid: {
-          top: 32,
-          left: 60,
-          right: 40,
-          bottom: 24,
+        legend: {
+          orient: "vertical",
+          //   left: "left",
+          right: "right",
+          top: "center",
+          textStyle: {
+            color: "rgba(255, 255, 255, 0.75)",
+          },
         },
-        // legend: {
-        //   show: this.showLegend,
-        //   orient: "vertical", //纵向图例
-        //   right: "16",
-        //   bottom: 32,
-        //   itemWidth: 15,
-        //   itemHeight: 15,
-        //   formatter: (name) => {
-        //     if (that.innerData.length) {
-        //       const item = that.innerData.filter((item) => item.name === name)[0];
-        //       return `{name|${name}：}{value| ${item.value}}`;
-        //     }
-        //   },
-        //   //icon: 'circle',
-        //   itemGap: 12, //图例item间距
-        //   textStyle: {
-        //     color: this.$store.state.themeName === "dark"
-        //       ? partten.getColor("gray")
-        //       : "#000",
-        //     fontSize: util.vh(14),
-        //     rich: {
-        //       name: {
-        //         color: this.$store.state.themeName === "dark"
-        //       ? partten.getColor("gray")
-        //       : "#000",
-        //         fontSize: 12,
-        //       },
-        //       value: {
-        //         color: this.$store.state.themeName === "dark"
-        //         ? partten.getColor("grayl")
-        //         : "#000",
-        //         fontSize: 12,
-        //       },
-        //     },
-        //   },
-        //   data: legend1,
-        // },
         series: [
           {
             name: "",
             type: "pie",
-            center: ["50%", "50%"],
-            radius: [0, "35%"],
-            itemStyle: {
-              normal: {},
-            },
+            radius: "50%",
+            data: this.series || [],
             label: {
               normal: {
                 show: false,
@@ -158,45 +96,13 @@ export default {
                 show: false,
               },
             },
-            data: this.innerData,
-          },
-          {
-            name: "",
-            type: "pie",
-            center: ["50%", "50%"],
-            radius: ["55%", "95%"],
-            data: this.outerData,
-            labelLine: {
-              normal: {
-                // length: 40,
-                // length2: 120,
-                lineStyle: {
-                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
-                  fontSize: util.vh(14),
-                },
-              },
-            },
-            itemStyle: {
-              normal: {
-                borderWidth:util.vh(4),
-                borderColor: "#071812",
-              },
-            },
-            label: {
-              normal: {
-                formatter: (params) => {
-                  return "{percent|" + params.percent.toFixed(2) + "%}";
-                },
-                padding: [0, 0, 0, 0],
-                rich: {
-                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
-                  percent: {
-                    fontSize: util.vh(14),
-                    color: this.$store.state.themeName === "dark" ? "#FFFFFF" : "#000000" ,
-                  },
-                },
-              },
-            },
+            // emphasis: {
+            //   itemStyle: {
+            //     shadowBlur: 10,
+            //     shadowOffsetX: 0,
+            //     shadowColor: "rgba(0, 0, 0, 0.5)",
+            //   },
+            // },
           },
         ],
       };

src/components/chart/radar/direction-radar-chart.vue

@@ -27,86 +27,91 @@ export default {
       default: "标题",
     },
     // 值
-    value: {
-      type: Number,
-      default: 90,
+    series: {
+      type: Object,
+      default: () => {},
     },
   },
   data() {
     return {
       id: "",
       chart: null,
+      Data: [],
+      label: [],
       indicator: [
         {
-          name: "北",
+          name: "N",
           max: 100,
         },
         {
-          name: "北北西",
+          name: "NNE",
           max: 100,
         },
         {
-          name: "北西",
+          name: "NE",
           max: 100,
         },
         {
-          name: "西北西",
+          name: "ENE",
           max: 100,
         },
         {
-          name: "西",
+          name: "E",
           max: 100,
         },
         {
-          name: "西南西",
+          name: "ESE",
           max: 100,
         },
         {
-          name: "南西",
+          name: "SE",
           max: 100,
         },
         {
-          name: "南南西",
+          name: "SSE",
           max: 100,
         },
         {
-          name: "南",
+          name: "S",
           max: 100,
         },
         {
-          name: "南南东",
+          name: "SSW",
           max: 100,
         },
         {
-          name: "东南",
+          name: "SW",
           max: 100,
         },
         {
-          name: "东南东",
+          name: "WSW",
           max: 100,
         },
         {
-          name: "东",
+          name: "W",
           max: 100,
         },
         {
-          name: "东北东",
+          name: "WNW",
           max: 100,
         },
         {
-          name: "北东",
+          name: "NW",
           max: 100,
         },
         {
-          name: "北北东",
+          name: "NNW",
           max: 100,
         },
       ],
     };
   },
-  computed: {},
+
   methods: {
     initChart() {
+      console.log(this.series);
+      let nameList =
+        this.series.name && this.series.name.length ? this.series.name : [];
       let option = {
         grid: {
           left: 40,
@@ -115,243 +120,358 @@ export default {
           top: "40%",
           containLabel: false,
         },
-        radar: [
-          // 最低层 80
-          {
-            radius: "70%",
-            center: ["50%", "50%"],
-            splitNumber: 1,
-            nameGap: "10",
-            name: {
-              textStyle: {
-                color: partten.getColor("gray") + 99,
-                fontSize: 12,
-              },
-            },
-            axisLine: {
-              lineStyle: {
-                color: partten.getColor("gray") + 40,
-              },
-            },
-            splitLine: {
-              lineStyle: {
-                width: 1,
-                color: partten.getColor("gray") + 40,
-              },
-            },
-            splitArea: {
-              areaStyle: {
-                color: "transparent",
-              },
-            },
-            indicator: this.indicator,
+        legend: {
+          show: false,
+        },
+        polar: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
           },
-          // 次外层 70 - 80
+        },
+        angleAxis: {
+          type: "value",
+          startAngle: 90,
+          min: 0, //最小刻度
+          max: 360, //最大刻度
+          interval: 360 / nameList.length, //间隔刻度 16方位间隔22.5，可改8方位
+          axisLabel: {
+            show: false,
+            // formatter: function (value, index) {
+            //   return nameList.reverse()[index] || "";
+            // },
+          },
+        },
+        radiusAxis: {},
+        // series: [
+        //   {
+        //     // coordinateSystem: "polar",
+        //     name: "line",
+        //     type: "radar",
+        //     data: this.series.data
+        //       ? [{ name: "a", value: this.series.data.map((i) => i[0]) }]
+        //       : [],
+        //     areaStyle: {
+        //       color: "rgba(227, 127, 127, 1)",
+        //     },
+        //   },
+        // ],
+        series: [
           {
-            radius: ["60%", "70%"],
-            center: ["50%", "50%"],
-            startAngle: 90,
-            splitNumber: 2,
-            name: {
-              show: false,
+            type: "radar",
+            tooltip: {
+              trigger: "item",
             },
-            axisLine: {
-              lineStyle: {
-                color: partten.getColor("gray") + 40,
-                shadowBlur: 1,
-                shadowColor: "#fff",
-                shadowOffsetX: 0.5,
-                shadowOffsetY: 1,
-              },
+            itemStyle: {
+              //此属性的颜色和下面areaStyle属性的颜色都设置成相同色即可实现
+              color: "#087636",
+              borderColor: "#087636",
             },
-            splitLine: {
-              lineStyle: {
-                width: 1,
-                color: partten.getColor("gray") + 40,
-                shadowColor: "#fff",
-                shadowBlur: 0,
-                shadowOffsetX: 0.5,
-                shadowOffsetY: 0.5,
-              },
+            areaStyle: {
+              color: "#087636",
             },
-            splitArea: {
-              areaStyle: {
-                color: "transparent",
+            data: [
+              {
+                value: this.series.data.map((i) => i[0]),
+                name: "风向频率",
               },
-            },
-            indicator: this.indicator,
+            ],
           },
-          // 渐变层 40 - 70
+        ],
+        radar: [
           {
-            radius: ["30%", "60%"],
+            indicator: this.indicator,
             center: ["50%", "50%"],
-            splitNumber: 1,
-            name: {
-              show: false,
-            },
-            axisLine: {
-              lineStyle: {
-                color: partten.getColor("gray") + 40,
-              },
-            },
+            radius: "70%",
             splitLine: {
+              //配置雷达图的每一圈的网格线颜色
               lineStyle: {
-                width: 1,
-                color: partten.getColor("gray"),
+                color: "#262732",
               },
             },
             splitArea: {
-              areaStyle: {
-                shadowBlur: 4,
-                color: {
-                  type: "radial",
-                  x: 0.5,
-                  y: 0.5,
-                  r: 0.5,
-                  colorStops: [
-                    {
-                      offset: 0.5,
-                      color: "transparent", // 0% 处的颜色
-                    },
-                    {
-                      offset: 1,
-                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") : partten.getColor("deepblue") + 60, // 100% 处的颜色
-                    },
-                  ],
-                  global: false, // 缺省为 false
-                },
-              },
-            },
-            indicator: this.indicator,
-          },
-          // 内层 0 - 40
-          {
-            radius: "30%",
-            center: ["50%", "50%"],
-            splitNumber: 1,
-            name: {
+              //配置雷达图的网格线背景
               show: false,
             },
-            axisLine: {
-              lineStyle: {
-                color: partten.getColor("gray") + 40,
-              },
-            },
-            splitLine: {
-              lineStyle: {
-                width: 1,
-                color: partten.getColor("gray"),
-              },
-            },
-            splitArea: {
-              areaStyle: {
-                shadowBlur: 4,
-                color: "transparent",
+            name: {
+              //配置雷达图的每个指示器的名称颜色
+              textStyle: {
+                color: "#838D9E",
               },
             },
-            indicator: this.indicator,
-          },
-        ],
-        series: [
-          // 进度条
-          {
-            z: 1,
-            name: "内部（环形）进度条",
-            type: "gauge",
-            radius: "70%",
-            splitNumber: 5,
             axisLine: {
+              //配置雷达图的射线样式颜色
               lineStyle: {
-                color: [
-                  [
-                    this.value / 360,
-                    new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-                      {
-                        offset: 0,
-                        color: this.$store.state.themeName === "dark" ? partten.getColor(this.color) + 10 : partten.getColor("deepblue") + 10,
-                      },
-                      {
-                        offset: 1,
-                        color: this.$store.state.themeName === "dark" ? partten.getColor(this.color) + 99 : partten.getColor("deepblue") + 99,
-                      },
-                    ]),
-                  ],
-                  [1, "transparent"],
-                ],
-                width: 40,
+                color: "#262732",
               },
             },
-            startAngle: 90,
-            endAngle: 450,
-            clockwise: true,
-            axisLabel: {
-              show: false,
-            },
-            axisTick: {
-              show: false,
-            },
-            splitLine: {
-              show: false,
-            },
-            pointer: {
-              show: false,
-            },
-          },
-          // 指针
-          {
-            name: "指针",
-            type: "gauge",
-            z: 2,
-            min: 0,
-            max: 360,
-            radius: "100%",
-            startAngle: 90,
-            endAngle: 360 + 90,
-            clockwise: false,
-            axisLine: {
-              show: false,
-            },
-            tooltip: {
-              show: false,
-            },
-            axisLabel: {
-              show: false,
-            },
-            axisTick: {
-              show: false,
-            },
-            splitLine: {
-              show: false,
-            },
-            detail: {
-              show: false,
-            },
-            title: {
-              //标题
-              show: false,
-            },
-            data: [
-              {
-                value: this.value,
-              },
-            ],
-            itemStyle: {
-              normal: {
-                color: "#fff",
-              },
-            },
-            pointer: {
-              show: true,
-              length: "70%",
-              radius: "0%",
-              width: util.vh(3), //指针粗细
-              offsetCenter: ["0%", "0%"],
-            },
-            animationDuration: 1000,
           },
         ],
+        // radar: [
+        //   // 最低层 80
+        //   {
+        //     radius: "70%",
+        //     center: ["50%", "50%"],
+        //     splitNumber: 1,
+        //     nameGap: "10",
+        //     name: {
+        //       textStyle: {
+        //         color: partten.getColor("gray") + 99,
+        //         fontSize: 12,
+        //       },
+        //     },
+        //     axisLine: {
+        //       lineStyle: {
+        //         color: partten.getColor("gray") + 40,
+        //       },
+        //     },
+        //     splitLine: {
+        //       lineStyle: {
+        //         width: 1,
+        //         color: partten.getColor("gray") + 40,
+        //       },
+        //     },
+        //     splitArea: {
+        //       areaStyle: {
+        //         color: "transparent",
+        //       },
+        //     },
+        //     indicator: this.indicator,
+        //   },
+        //   // 次外层 70 - 80
+        //   {
+        //     radius: ["60%", "70%"],
+        //     center: ["50%", "50%"],
+        //     startAngle: 90,
+        //     splitNumber: 2,
+        //     name: {
+        //       show: false,
+        //     },
+        //     axisLine: {
+        //       lineStyle: {
+        //         color: partten.getColor("gray") + 40,
+        //         shadowBlur: 1,
+        //         shadowColor: "#fff",
+        //         shadowOffsetX: 0.5,
+        //         shadowOffsetY: 1,
+        //       },
+        //     },
+        //     splitLine: {
+        //       lineStyle: {
+        //         width: 1,
+        //         color: partten.getColor("gray") + 40,
+        //         shadowColor: "#fff",
+        //         shadowBlur: 0,
+        //         shadowOffsetX: 0.5,
+        //         shadowOffsetY: 0.5,
+        //       },
+        //     },
+        //     splitArea: {
+        //       areaStyle: {
+        //         color: "transparent",
+        //       },
+        //     },
+        //     indicator: this.indicator,
+        //   },
+        //   // 渐变层 40 - 70
+        //   {
+        //     radius: ["30%", "60%"],
+        //     center: ["50%", "50%"],
+        //     splitNumber: 1,
+        //     name: {
+        //       show: false,
+        //     },
+        //     axisLine: {
+        //       lineStyle: {
+        //         color: partten.getColor("gray") + 40,
+        //       },
+        //     },
+        //     splitLine: {
+        //       lineStyle: {
+        //         width: 1,
+        //         color: partten.getColor("gray"),
+        //       },
+        //     },
+        //     splitArea: {
+        //       areaStyle: {
+        //         shadowBlur: 4,
+        //         color: {
+        //           type: "radial",
+        //           x: 0.5,
+        //           y: 0.5,
+        //           r: 0.5,
+        //           colorStops: [
+        //             {
+        //               offset: 0.5,
+        //               color: "transparent", // 0% 处的颜色
+        //             },
+        //             {
+        //               offset: 1,
+        //               color:
+        //                 this.$store.state.themeName === "dark"
+        //                   ? partten.getColor("green")
+        //                   : partten.getColor("deepblue") + 60, // 100% 处的颜色
+        //             },
+        //           ],
+        //           global: false, // 缺省为 false
+        //         },
+        //       },
+        //     },
+        //     indicator: this.indicator,
+        //   },
+        //   // 内层 0 - 40
+        //   {
+        //     radius: "30%",
+        //     center: ["50%", "50%"],
+        //     splitNumber: 1,
+        //     name: {
+        //       show: false,
+        //     },
+        //     axisLine: {
+        //       lineStyle: {
+        //         color: partten.getColor("gray") + 40,
+        //       },
+        //     },
+        //     splitLine: {
+        //       lineStyle: {
+        //         width: 1,
+        //         color: partten.getColor("gray"),
+        //       },
+        //     },
+        //     splitArea: {
+        //       areaStyle: {
+        //         shadowBlur: 4,
+        //         color: "transparent",
+        //       },
+        //     },
+        //     indicator: this.indicator,
+        //   },
+        // ],
+        // series: [
+        //   // 进度条
+        //   {
+        //     z: 1,
+        //     name: "内部（环形）进度条",
+        //     type: "gauge",
+        //     radius: "70%",
+        //     splitNumber: 5,
+        //     axisLine: {
+        //       lineStyle: {
+        //         color: [
+        //           ...(this.value.data
+        //             ? this.value.data.map((item) => {
+        //                 return [
+        //                   item.value / 360,
+        //                   new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+        //                     {
+        //                       offset: 0,
+        //                       color:
+        //                         this.$store.state.themeName === "dark"
+        //                           ? partten.getColor(this.color) + 10
+        //                           : partten.getColor("deepblue") + 10,
+        //                     },
+        //                     {
+        //                       offset: 1,
+        //                       color:
+        //                         this.$store.state.themeName === "dark"
+        //                           ? partten.getColor(this.color) + 99
+        //                           : partten.getColor("deepblue") + 99,
+        //                     },
+        //                   ]),
+        //                 ];
+        //               })
+        //             : [
+        //                 0,
+        //                 new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+        //                   {
+        //                     offset: 0,
+        //                     color:
+        //                       this.$store.state.themeName === "dark"
+        //                         ? partten.getColor(this.color) + 10
+        //                         : partten.getColor("deepblue") + 10,
+        //                   },
+        //                   {
+        //                     offset: 1,
+        //                     color:
+        //                       this.$store.state.themeName === "dark"
+        //                         ? partten.getColor(this.color) + 99
+        //                         : partten.getColor("deepblue") + 99,
+        //                   },
+        //                 ]),
+        //               ]),
+        //           [1, "transparent"],
+        //         ],
+        //         width: 40,
+        //       },
+        //     },
+        //     startAngle: 90,
+        //     endAngle: 450,
+        //     clockwise: true,
+        //     axisLabel: {
+        //       show: false,
+        //     },
+        //     axisTick: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       show: false,
+        //     },
+        //     pointer: {
+        //       show: false,
+        //     },
+        //   },
+        //   // 指针
+        //   {
+        //     name: "指针",
+        //     type: "gauge",
+        //     z: 2,
+        //     min: 0,
+        //     max: 360,
+        //     radius: "100%",
+        //     startAngle: 90,
+        //     endAngle: 360 + 90,
+        //     clockwise: false,
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     tooltip: {
+        //       show: false,
+        //     },
+        //     axisLabel: {
+        //       show: false,
+        //     },
+        //     axisTick: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       show: false,
+        //     },
+        //     detail: {
+        //       show: false,
+        //     },
+        //     title: {
+        //       //标题
+        //       show: false,
+        //     },
+        //     data: this.value.data,
+        //     itemStyle: {
+        //       normal: {
+        //         color: "#fff",
+        //       },
+        //     },
+        //     pointer: {
+        //       show: true,
+        //       length: "70%",
+        //       radius: "0%",
+        //       width: util.vh(3), //指针粗细
+        //       offsetCenter: ["0%", "0%"],
+        //     },
+        //     animationDuration: 1000,
+        //   },
+        // ],
       };
-
+      console.log(option);
       this.chart.setOption(option);
     },
   },

src/components/chart/radar/radar-chart.vue

@@ -429,7 +429,7 @@ export default {
           },
         ],
       };
-
+      console.log(option);
       chart.setOption(option);
     },
   },

src/components/windDetail/index.vue

@@ -682,12 +682,10 @@ export default {
         display: flex;
         flex-direction: row;
         align-items: center;
+        justify-content: center;
         margin-left: 20px;
-        padding-left: 15px;
         margin-right: 20px;
-        .text {
-          margin-left: 10px;
-        }
+        white-space: nowrap;
         &.green {
           background-color: rgba(5, 187, 76, 0.2);
           border: 1px solid #05bb4c;

src/router/index.js

@@ -1066,6 +1066,16 @@ export const asyncRoutes = [
         component: () => import("@/views/report/stationReport"),
         children: [
           {
+            path: "scrb",
+            name: "scrb",
+            component: () => import("@/views/report/stationReport/scrb"),
+            meta: {
+              title: "晋能清洁能源生产日报",
+              icon: "",
+              permissions: ["jn_zdz_scrb", "*:*:*"],
+            },
+          },
+          {
             path: "fdxnyrb",
             name: "fdxnyrb",
             component: () => import("@/views/report/stationReport/fdxnyrb"),

src/views/economicsOperation/analyse/standAloneAnalyse/index.vue

@@ -107,7 +107,9 @@
               <div v-else>{{ scope.column.label }}</div>
             </template>
             <template #default="scope" v-if="item.title === '操作'">
-              <span class="historyBtn" @click="seachDetail(scope.row)">详情</span>
+              <span class="historyBtn" @click="seachDetail(scope.row)"
+                >详情</span
+              >
               <span class="historyBtn" @click="seachHistoryData(scope.row)"
                 >历史</span
               >
@@ -274,6 +276,7 @@ export default {
       this.pickerTimer = dayjs(new Date().getTime() - 86400000).format(
         "YYYY-MM-DD"
       );
+      //   this.pickerTimer = "2023-8-29";
       const { data: datas } = await getApicompanyslist();
       this.companyOptions = datas.data;
       this.companyVal = datas.data[0]?.id;
@@ -582,7 +585,7 @@ export default {
     .el-table__fixed-right::before {
       background-color: #2a2a2a;
     }
-    
+
     .el-pagination {
       display: flex;
       justify-content: flex-end;

src/views/economicsOperation/analyse/standAloneAnalyse/raderswithhart.vue

@@ -8,7 +8,16 @@
 <script setup>
 import util from "@tools/util";
 import chartTheme from "./chartTheme.json";
-import { ref, toRaw, computed, onMounted, watch, nextTick } from "vue";
+import {
+  ref,
+  toRaw,
+  computed,
+  onMounted,
+  watch,
+  nextTick,
+  defineProps,
+  onUpdated,
+} from "vue";
 import * as echarts from "echarts";
 const chartId = "chart-" + util.newGUID(); //chartId
 const chartIns = ref(null); //chart 实例
@@ -101,7 +110,7 @@ const option = computed({
         },
         confine: true,
       },
-      series: props.series || [],
+      series: props.series.length ? props.series : [],
       legend: {
         show: true,
         orient: "vertical",
@@ -123,12 +132,12 @@ watch(
   (newVal, oldVal) => {
     if (chartIns.value) {
       const echartIns = toRaw(chartIns.value);
+      echartIns.clear();
       echartIns.setOption(newVal.value);
     }
   },
   { deep: true }
 );
-
 onMounted(() => {
   nextTick(() => {
     echarts.registerTheme("chartTheme", chartTheme);

src/views/economicsOperation/analyse/standAloneAnalyse/windDetailDialog.vue

@@ -106,8 +106,8 @@
       <panel :title="'电量'" class="TabOne_centerChart">
         <multiple-bar-line-chart
           :height="'15vh'"
-          :newbarData="powerChartData"
-          :newlineData="powerChartLineData"
+          :barData="powerChartData"
+          :lineData="powerChartLineData"
           :units="['(kWh)', '(m/s)']"
           :showLegend="true"
         />
@@ -325,14 +325,16 @@
                 :icon="'svg-wind-site'"
               >
                 <div class="wind-info">
-                  <div class="legend mg-r-16">
+                  <div class="legend mg-r-16" v-if="jfplStr.length">
                     <span class="dot"></span>
-                    <span style="color: #fff">{{ jfplStr }}</span>
+                    <span style="color: #fff; white-space: nowrap">{{
+                      jfplStr
+                    }}</span>
                   </div>
                   <direction-radar-chart
                     :width="'80%'"
                     :height="'180px'"
-                    :value="windResourcesData"
+                    :series="windResourcesData"
                     :showLegend="true"
                   />
                 </div>
@@ -730,6 +732,7 @@
             <dual-pie-chart
               width="100%"
               height="350px"
+              title="日切入频率分析"
               :series="dayWindPieData"
             />
           </panel>
@@ -739,6 +742,7 @@
             <dual-pie-chart
               width="100%"
               height="350px"
+              title="月切入频率分析"
               :series="monthWindPieData"
             />
           </panel>
@@ -748,6 +752,7 @@
             <dual-pie-chart
               width="100%"
               height="350px"
+              title="年切入频率分析"
               :series="yearWindPieData"
             />
           </panel>
@@ -755,28 +760,31 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <panel title="日小风停机">
+          <panel title="日小风切出">
             <dual-pie-chart
               width="100%"
               height="350px"
+              title="日切出频率分析"
               :series="dayStopPieData"
             />
           </panel>
         </el-col>
         <el-col :span="8">
-          <panel title="月小风停机">
+          <panel title="月小风切出">
             <dual-pie-chart
               width="100%"
               height="350px"
+              title="月切出频率分析"
               :series="monthStopPieData"
             />
           </panel>
         </el-col>
         <el-col :span="8">
-          <panel title="年小风停机">
+          <panel title="年小风切出">
             <dual-pie-chart
               width="100%"
               height="350px"
+              title="年切出频率分析"
               :series="yearStopPieData"
             />
           </panel>
@@ -911,9 +919,9 @@ export default {
       ],
       lostChartUnit: [],
       LostChartBgColorData: [
-        {
-          name: "",
-        },
+        // {
+        //   name: "",
+        // },
       ],
 
       powerChartData: [],
@@ -1033,15 +1041,7 @@ export default {
       },
 
       jfplStr: "",
-      windResourcesData: {
-        indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
-        data: [
-          {
-            value: [44200, 14200, 20000, 35000, 50000, 38000],
-            name: "",
-          },
-        ],
-      },
+      windResourcesData: {},
 
       rzdfsStr: "",
       rzdfsLen: [],
@@ -1169,10 +1169,10 @@ export default {
           {
             text: "实发功率",
             value: [
-              {
-                text: "1",
-                value: 1,
-              },
+              //   {
+              //     text: "1",
+              //     value: 1,
+              //   },
             ],
           },
           {
@@ -1184,7 +1184,7 @@ export default {
             value: [],
           },
         ];
-        const lostChartUnit = ["实发功率", "保证功率", "风速", "状态"];
+        const lostChartUnit = ["实发功率", "保证功率", "风速"];
         keyArray.forEach((key, keyIndex) => {
           datas.data.forEach((ele) => {
             lostChartData[keyIndex].value.push({
@@ -1247,7 +1247,6 @@ export default {
         recorddate: that.recorddate,
       };
       const { data: datas } = await getApifindRealPowerCharBy24(params);
-      console.log(datas);
       if (datas && datas.data.length > 0) {
         const keyArray = ["value1", "value2", "value3", "value4", "value5"];
         let powerChartData = [
@@ -1292,15 +1291,13 @@ export default {
           let keyEle = keyArray[i];
           for (let j = 0; j < datas.data.length; j++) {
             let ele = datas.data[j];
-            // console.log(ele);
             powerChartData[i].value.push({
-              text: new Date(ele.time).formatDate("hh:mm"),
+              text: new Date(ele.time).formatDate("MM-dd hh:mm"),
               value: ele[keyEle],
             });
             powerChartLineData.data.push(ele.value6);
           }
         }
-        console.log(powerChartData, powerChartLineData);
         that.powerChartData = powerChartData;
         that.powerChartLineData = powerChartLineData;
       }
@@ -1436,7 +1433,7 @@ export default {
       }
     },
 
-    // tab2 - 获取当月报警排行
+    // tab2 - 获取风资源
     async getWindResources() {
       let that = this;
       let params = {
@@ -1447,20 +1444,18 @@ export default {
       if (datas && datas.data) {
         that.jfplStr = datas.data.jfpl || "";
         let windResourcesData = {
-          indicator: [],
-          data: [
-            {
-              name: "",
-              value: [],
-            },
-          ],
+          data: [],
+          name: [],
         };
         if (datas.data.data) {
-          datas.data.data.forEach((ele) => {
-            windResourcesData.indicator.push(ele.name);
-            windResourcesData.data[0].value.push(ele.data1);
+          datas.data.data.forEach((ele, index) => {
+            let jiaodu = (360 / 16) * index;
+            windResourcesData.data.push([ele.data1, jiaodu]);
+            windResourcesData.name.push(ele.name);
           });
+          windResourcesData.data.push([datas.data.data[0].data1, 0]);
         }
+        console.log(windResourcesData);
         that.windResourcesData = windResourcesData;
       }
     },
@@ -1473,15 +1468,15 @@ export default {
         params.url = subUrl;
         params.recorddate = data.recorddate;
         params.wpId = data.wpId;
-        const datas = await getApiComMGTWP(params);
-        // this.changeAllMsg(datas, dataKey)
+        const { data: datas } = await getApiComMGTWP(params);
+        // this.changeAllMsg(datas, dataKey);
         this.changeAllMsgNewChart(datas, dataKey);
       } else {
         params.url = subUrl;
         params.recorddate = data.recorddate;
         params.wtId = data.wtId;
-        const datas = await getApiComMGTWT(params);
-        // this.changeAllMsg(datas, dataKey)
+        const { data: datas } = await getApiComMGTWT(params);
+        // this.changeAllMsg(datas, dataKey);
         this.changeAllMsgNewChart(datas, dataKey);
       }
     },
@@ -1530,6 +1525,7 @@ export default {
             });
           });
         }
+        console.log(mgtData);
         this[dataKey] = mgtData;
       }
     },
@@ -1606,8 +1602,10 @@ export default {
             });
             series.push(barObj);
           });
+        } else {
+          lengedSer = [];
+          series = [];
         }
-
         // let lineObj = {
         // 	type: 'line',
         // 	coordinateSystem: 'polar',
@@ -1618,6 +1616,8 @@ export default {
         // 	data: linSer
         // }
         // series.push(lineObj)
+
+        console.log(lengedSer, series);
         this[strLen] = lengedSer;
         this[dataKey] = series;
       }
@@ -1686,40 +1686,43 @@ export default {
           "#1c99ff",
           "#ebb40f",
         ];
+
         datas.data.forEach((ele, idx) => {
-          let obj = {
-            name: ele.value1,
-            itemStyle: {
-              color: color4[idx],
-            },
-            children: [
-              {
-                name: ele.value2 + "%",
-                value: 1,
-                itemStyle: {
-                  color: color4[idx],
-                },
-                children: [
-                  {
-                    name: ele.name,
-                    value: 1,
-                    label: {
-                      color: "#A0A0A0",
-                    },
-                    labelLine: {
-                      itemStyle: {
-                        width: 1,
-                        type: "dashed",
-                        color: color4[idx],
-                      },
-                    },
-                  },
-                ],
-              },
-            ],
-          };
-          series.push(obj);
+          series.push({ name: ele.name, value: ele.value2 });
+          //   let obj = {
+          //     name: ele.value1,
+          //     itemStyle: {
+          //       color: color4[idx],
+          //     },
+          //     children: [
+          //       {
+          //         name: ele.value2 + "%",
+          //         value: 1,
+          //         itemStyle: {
+          //           color: color4[idx],
+          //         },
+          //         children: [
+          //           {
+          //             name: ele.name,
+          //             value: 1,
+          //             label: {
+          //               color: "#A0A0A0",
+          //             },
+          //             labelLine: {
+          //               itemStyle: {
+          //                 width: 1,
+          //                 type: "dashed",
+          //                 color: color4[idx],
+          //               },
+          //             },
+          //           },
+          //         ],
+          //       },
+          //     ],
+          //   };
+          //   series.push(obj);
         });
+        // console.log(series, dataKey);
         that[dataKey] = series;
       }
     },
@@ -2004,6 +2007,7 @@ export default {
         }
         .titSty {
           color: #fff;
+          white-space: nowrap;
         }
       }
     }

src/views/layout/Header.vue

@@ -181,13 +181,11 @@ export default {
             });
           }
         });
-        // currMenu.push(
-        //   {
-        //     id: "zhbj",
-        //     text: "综合报警",
-        //     path: "",
-        //   },
-        // );
+        currMenu.push({
+          id: "zhbj",
+          text: "综合报警",
+          path: "",
+        });
         return currMenu;
       } else {
         return [];
@@ -197,9 +195,15 @@ export default {
   methods: {
     click(index, data) {
       if (data.id === "zhbj") {
-        let userName = "admin";
-        let jiami = tools.hex_md5(`${userName}gyee_alarm`);
-        let url = `http://10.81.3.154:8078/#/check?userName=${userName}&mark=${jiami}`;
+        let jiami = encrypt(getCookie("jiami")).replace(/\+/g, " ");
+        console.log(jiami);
+
+        // let url = `http://192.168.1.110:3002/#/check?username=${getCookie(
+        //   "username"
+        // )}&jiami=${jiami}`;
+        let url = `http://10.81.3.154:8083/#/check?username=${getCookie(
+          "username"
+        )}&jiami=${jiami}`;
         window.open(url);
         return;
       }
@@ -244,8 +248,8 @@ export default {
     goToAdmin() {
       let jiami = encrypt(getCookie("jiami")).replace(/\+/g, " ");
       console.log(jiami);
-      let url = `http://192.168.1.117:80/#/check?username=${getCookie(
-        //   let url = `http://10.81.3.127:8083/#/check?username=${getCookie(
+      // let url = `http://192.168.1.104:80/#/check?username=${getCookie(
+      let url = `http://10.81.3.127:8083/#/check?username=${getCookie(
         "username"
       )}&jiami=${jiami}`;
       window.open(url);

src/views/report/stationReport/scrb/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url: "http://10.81.3.155:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$cf794177cf764f258f8105c6d3b03f3c$69270c4f955b46b0a1967b3fa0457e5b&id=admin&pw=admin",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

src/views/stateMonitor/DetailMatrix/index.vue

@@ -1691,14 +1691,14 @@ export default {
             height: 50px;
 
             .card-left {
-              width: 38px;
+              width: 45px;
               height: 100%;
               display: flex;
               flex-direction: column;
               align-items: center;
 
               .card-name {
-                font-size: 14px;
+                font-size: 13px;
                 font-family: Arial;
                 font-weight: 400;
                 margin-top: 5px;
@@ -2799,14 +2799,14 @@ export default {
             height: 50px;
 
             .card-left {
-              width: 38px;
+              width: 45px;
               height: 100%;
               display: flex;
               flex-direction: column;
               align-items: center;
 
               .card-name {
-                font-size: 14px;
+                font-size: 13px;
                 font-family: Arial;
                 font-weight: 400;
                 margin-top: 5px;

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrixMonitor/index.vue

@@ -303,7 +303,7 @@
 
 <script>
 import qushiDialog from "@/components/qushi/qushiDialog.vue";
-import headerButton from "../../components/headerButton";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import LightDetail from "@/components/lightDetial/index.vue";
 import api from "@/api/cockpit/matrix/index.js";
@@ -1601,14 +1601,14 @@ p {
           height: 50px;
 
           .card-left {
-            width: 38px;
+            width: 45px;
             height: 100%;
             display: flex;
             flex-direction: column;
             align-items: center;
 
             .card-name {
-              font-size: 14px;
+              font-size: 13px;
               font-family: Arial;
               font-weight: 400;
               margin-top: 5px;