五项损失率选项bug修改、五损详情显示bug修改、报警排行统计图显示bug修改、风能利用率修改

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

@@ -226,7 +226,8 @@ export default {
           result.push({
             name: value.title,
             type: "bar",
-            barWidth: "10%",
+            barWidth: "8%",
+            // barWidth: "10%",
             animation: this.firstAnimation && this.showAnimation,
             yAxisIndex: value.yAxisIndex,
             data: value.value.map((t) => {

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

@@ -292,6 +292,7 @@ export default {
       );
     },
     initChart () {
+      console.log("units:",this.units)
       let that = this;
       let chart = echarts.init(this.$el);
 

src/views/Decision/Decision2Xmdb.vue

@@ -740,6 +740,7 @@ export default {
         subUrl: "benchmarking/wplist",
         success(res) {
           that.value1.push(res.data[0].id);
+          console.log('value1:',that.value1)
           that.ChangZhan = res.data;
           that.AjaxCommon();
         },
@@ -754,6 +755,7 @@ export default {
     },
     XiangMuVal(val) {
       var that = this;
+        console.log('xianmguVal:',val)
       that.API.requestData({
         method: "GET",
         baseURL: "http://10.155.32.4:9001/",
@@ -763,6 +765,7 @@ export default {
         },
         success(res) {
           that.XiangMu = res.data;
+          console.log('Xiangmu:',res.data)
         },
       });
     },
@@ -815,7 +818,7 @@ export default {
         success(res) {
           that.ajaxData = res.data;
           that.idArr = res.data;
-          console.log("idArr:", that.idArr);
+          // console.log("idArr:", that.idArr);
           // if(res.data.length==1){
           // 	that.detailId = res.data[0].id
           // 	console.log('detailId:',that.detailId)
@@ -832,7 +835,7 @@ export default {
             slssdl = [];
           res.data.forEach((item, index) => {
             that.tableIdArr.push(item.id);
-            console.log("ajaxTable:", that.tableIdArr);
+            // console.log("ajaxTable:", that.tableIdArr);
             dataTab.push({
               //表格
               index: index + 1,

src/views/Decision/Decision3Db.vue

@@ -193,11 +193,13 @@
 						wpid: val
 					},
 					success(res) {
+						console.log('resXiangmu:',res.data)
 						that.XiangMu = res.data;
 					}
 				});
 			},
 			XiangMuChange(val) {
+				console.log('XiangmuVal:',val)
 				var that = this;
 				that.value2 = val;
 				that.AjaxCommon();

src/views/HealthControl/Health2.vue

@@ -20,7 +20,8 @@
         </div> -->
       </div>
       <div class="info-chart">
-        <panel class="info-chart-panel" :title="'损失电量分析'">
+        <!-- <panel class="info-chart-panel" :title="'损失电量分析'"> -->
+           <panel class="info-chart-panel" :title="'健康趋势'">
           <vertival-bar-line-chart :bardata="bardata" :lineData="lineData" :height="'250px'" />
         </panel>
       </div>

src/views/HealthControl/Health3.vue

@@ -20,7 +20,8 @@
         </div> -->
       </div>
       <div class="info-chart">
-        <panel class="info-chart-panel" :title="'损失电量分析'">
+        <!-- <panel class="info-chart-panel" :title="'损失电量分析'"> -->
+           <panel class="info-chart-panel" :title="'健康趋势'">
           <vertival-bar-line-chart :bardata="bardata" :lineData="lineData" :height="'250px'" />
         </panel>
       </div>
@@ -207,6 +208,7 @@ export default {
           wpId: that.wpId
         },
         success (res) {
+          console.log('resMap:',res)
           that.listBarData1= [
             { name: "未来 {c1|15分钟} 预测电量", value: res.data.ycdl15minute },
             { name: "未来 {c1|4小时} 预测电量", value: res.data.ycdl1hour },

src/views/NewPages/area-line-chart.vue

@@ -0,0 +1,487 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
+
+export default {
+  name: "multiple-bar-chart",
+  componentName: "multiple-bar-chart",
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "800px",
+    },
+    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,
+            },
+          ],
+        },
+      ],
+    },
+    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",
+        },
+      ],
+    },
+    // 单位
+    units: {
+      type: Array,
+      // default: () => ["健康趋势", "风机健康状态数量"],
+       default: () => ["(实时功率)", "(风速)"],
+    },
+    // 显示 legend
+    showLegend: {
+      type: Boolean,
+      default: true,
+    },
+    // 颜色
+    color: {
+      type: Array,
+      default: () => ["#323E6F", "#1DA0D7", "#02BB4C", "#DB5520", "#EDB32F", "#EDEB2F"],
+    },
+  },
+  data () {
+    return {
+      id: "",
+      chart: null,
+    };
+  },
+  computed: {
+    legend () {
+      let data = [];
+      this.lineData.forEach((value, index) => {
+        data.push(value.text);
+      });
+      return data;
+    },
+    xAxisData () {
+      let data = [];
+      if (this.lineData.length > 0)
+        this.lineData[0].value.forEach((value, index) => {
+          data.push(value.text);
+        });
+      return data;
+    },
+    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,
+            },
+          },
+          exData: item,
+        });
+      }
+      return data;
+    },
+    areaMax () {
+      let max = 0;
+      this.areaData.forEach((value) => {
+        if (max < value.end) max = value.end;
+      });
+      return max;
+    },
+  },
+  methods: {
+    renderItem (params, api) {
+      var start = api.coord([api.value(0)]);
+      var end = api.coord([api.value(1)]);
+      var height = api.size([0, 1])[1];
+
+      var rectShape = echarts.graphic.clipRectByRect(
+        {
+          x: start[0],
+          y: start[1] - height / 2,
+          width: end[0] - start[0],
+          height: height,
+        },
+        {
+          x: params.coordSys.x,
+          y: params.coordSys.y,
+          width: params.coordSys.width,
+          height: params.coordSys.height,
+        }
+      );
+
+      return (
+        rectShape && {
+          type: "rect",
+          transition: ["shape"],
+          shape: rectShape,
+          style: api.style(),
+        }
+      );
+    },
+    initChart () {
+      console.log("units:",this.units)
+      console.log("areaData:",this.areaData)
+      let that = this;
+      let chart = echarts.init(this.$el);
+
+      let option = {
+        color: this.color,
+        grid: {
+          left: 40,
+          right: 40,
+          bottom: 40,
+          top: 32,
+          containLabel: true,
+        },
+        tooltip: {
+          show: true,
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+          backgroundColor: "rgba(0,0,0,0.4)",
+          borderColor: partten.getColor("gray"),
+          textStyle: {
+            color: "#fff",
+            fontSize: 14,
+          },
+        },
+        legend: {
+          show: this.showLegend,
+          data: this.legend,
+          right: 120,
+          icon: "ract",
+          itemWidth: 8,
+          itemHeight: 8,
+          inactiveColor: partten.getColor("gray"),
+          textStyle: {
+            color: partten.getColor("grayl"),
+            fontSize: 12,
+          },
+        },
+        xAxis: [
+          {
+            type: "category",
+             name: this.units[2],
+            axisLabel: {
+              
+              color: partten.getColor("gray"),
+            },
+            // axisLine: {
+            //   show: false,
+            // },
+               axisLine: {
+              type: "dashed",
+              lineStyle: {
+                color: partten.getColor("gray"),
+              },
+              width: 5,
+            },
+            axisTick: {
+              show: false,
+            },
+            data: this.xAxisData,
+          },
+          {
+            show: false,
+            min: 0,
+            max: this.areaMax,
+            axisLabel: {
+              show: false,
+              formatter: function (val) {
+                return Math.max(0, val - 0) + " ms";
+              },
+            },
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            name: this.units[0],
+            axisLabel: {
+              formatter: "{value} ",
+              color: partten.getColor("gray"),
+            },
+            axisLine: {
+              type: "dashed",
+              lineStyle: {
+                color: partten.getColor("gray"),
+              },
+              width: 5,
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              lineStyle: {
+                type: "dashed",
+                dashOffset: 10,
+                color: partten.getColor("gray") + 80,
+              },
+            },
+          },
+          {
+            data: [this.areaData[0].name],
+            axisLabel: { show: false },
+          },
+        ],
+        series: [],
+      };
+
+      // line data
+      if (this.lineData.length > 0) {
+        this.lineData.forEach((value, index) => {
+          console.log('valueTEXT:',value)
+          option.series.push({
+            name: value.text,
+            type: "line",
+            data: value.value,
+            smooth: true, //平滑展示
+            yAxisIndex: 0,
+            // lineStyle: {
+            //   color: partten.getColor("green"),
+            // },
+            // itemStyle: {
+            //   color: partten.getColor("green"),
+            // },
+          });
+        });
+      }
+
+      // 区域
+      if (this.areaData && this.areaData.length > 0) {
+        option.series.push({
+          type: "custom",
+          renderItem: this.renderItem,
+          yAxisIndex: 1,
+          xAxisIndex: 1,
+          itemStyle: {
+            opacity: 0.2,
+          },
+          tooltip: {
+            show: false,
+            formatter: function (params) {
+              return params.marker + params.name + ": " + params.value[2] + "s";
+            },
+          },
+          encode: {
+            x: [1, 2],
+            y: 0,
+          },
+          data: this.areaChartData,
+        });
+      }
+
+      chart.setOption(option);
+
+      return chart;
+    },
+  },
+  emits: {
+    areaClick: null,
+  },
+  created () {
+    this.id = "pie-chart-" + util.newGUID();
+  },
+  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) {
+        if (e.seriesType == "custom") {
+          that.$emit("areaClick", { data: e.data.exData });
+        }
+      });
+    });
+  },
+  updated () {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+};
+</script>
+
+<style lang="less">
+.chart {
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+</style>

src/views/NewPages/dj1.vue

@@ -108,6 +108,14 @@
           @areaClick="areaBarChartClick"
           :showLegend="true"
         />
+        <!-- <multiple-bar-line-chart1
+          :height="'16.6667vh'"
+          :barData="powerChartData"
+          :lineData="powerChartLineData"
+          :units="['(kWh)']"
+          :showLegend="true"
+        /> -->
+        
       </panel>
       <panel :title="'电量'" class="mg-b-16">
         <multiple-bar-line-chart
@@ -718,6 +726,7 @@
 
 <script>
 import AreaLineChart from "../../components/chart/combination/area-line-chart.vue";
+// import MultipleBarLineChart1 from "./multiple-bar-line-chart.vue";
 import MultipleBarLineChart from "../../components/chart/combination/multiple-bar-line-chart.vue";
 import MarkerLineChart from "../../components/chart/line/multiple-line-chart.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
@@ -729,6 +738,7 @@ export default {
   components: {
     panel,
     AreaLineChart,
+    // MultipleBarLineChart1,
     MultipleBarLineChart,
     Table,
     MarkerLineChart,
@@ -1054,6 +1064,7 @@ export default {
           recorddate: that.recorddate,
         },
         success(res) {
+          console.log('resLostChart:',res)
           const keyArray = ["value1", "value2", "value3"];
 
           let lostChartData = [
@@ -1360,6 +1371,7 @@ export default {
           recorddate: that.recorddate,
         },
         success(res) {
+          console.log('windRes:',res)
           that.jfplStr = res.data.jfpl || "";
 
           let windResourcesData = {
@@ -1392,6 +1404,7 @@ export default {
         subUrl,
         data,
         success(res) {
+          console.log('resMGT:',res)
           that[dataKey.split("Data")[0] + "Str"] = res.data.jfpl || "";
 
           let mgtData = {
@@ -1638,6 +1651,7 @@ export default {
       display: flex;
 
       .legend {
+        white-space: nowrap;
         font-size: 12px;
         flex: 0 0 80px;
         height: 20px;

src/views/NewPages/multiple-bar-line-chart.vue

@@ -0,0 +1,434 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
+
+export default {
+  name: "multiple-bar-chart",
+  componentName: "multiple-bar-chart",
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "13.889vh",
+    },
+    // 传入数据
+    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,
+            },
+          ],
+        },
+      ],
+    },
+    lineData: {
+      type: Object,
+      default: () => {
+        return {
+          name: "风速",
+          unit: "km",
+          data: [200, 800, 400, 500, 800, 700, 800, 900, 200],
+        };
+      },
+    },
+    // 单位
+    units: {
+      type: Array,
+      default: () => ["(万KWh)", "(风速)"],
+    },
+    // 显示 legend
+    showLegend: {
+      type: Boolean,
+      default: true,
+    },
+    // 颜色
+    color: {
+      type: Array,
+      default: () => [
+        "#05bb4c",
+        "#4b55ae",
+        "#fa8c16",
+        "#f8de5b",
+        "#1a93cf",
+        "#c531c7",
+        "#bd3338",
+      ],
+    },
+    showAnimation: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      id: "",
+      chart: null,
+      firstAnimation: true,
+      newbarData: null,
+    };
+  },
+  watch: {
+    barData: {
+      handler(newValue, oldValue) {
+        this.newbarData = newValue;
+        this.initChart();
+      },
+      deep: true,
+    },
+    lineData : {
+      handler(newValue, oldValue) {
+        this.newlineData = newValue;
+        this.initChart();
+      },
+      deep: true,
+    },
+  },
+  computed: {
+    legend() {
+      return this.newbarData.map((t) => {
+        return t.title;
+      });
+    },
+    xdata() {
+      let result = [];
+      if (
+        this.newbarData &&
+        this.newbarData.length > 0 &&
+        this.newbarData[0].value.length > 0
+      ) {
+        result = this.newbarData[0].value.map((t) => {
+          return t.text;
+        });
+      }
+      return result;
+    },
+    ydata() {
+      let result = [];
+      this.units.forEach((value, index) => {
+        let data = null;
+        if (index == 0) {
+          data = {
+            type: "value",
+            name: value,
+            axisLabel: {
+              formatter: "{value} ",
+              fontSize: 12,
+            },
+            //分格线
+            splitLine: {
+              lineStyle: {
+                color: "#5a6162",
+                type: "dashed",
+              },
+            },
+          };
+        } else {
+          data = {
+            type: "value",
+            name: value,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+            },
+            //分格线
+            splitLine: {
+              show: false,
+            },
+          };
+        }
+
+        result.push(data);
+      });
+
+      return result;
+    },
+    series() {
+      let result = [];
+      if (this.newbarData && this.newbarData.length > 0) {
+        this.newbarData.forEach((value, index) => {
+          result.push({
+            name: value.title,
+            type: "bar",
+            barWidth: "10%",
+            animation: this.firstAnimation && this.showAnimation,
+            yAxisIndex: value.yAxisIndex,
+            data: value.value.map((t) => {
+              return t.value;
+            }),
+          });
+        });
+      }
+      return result;
+    },
+  },
+  methods: {
+    resize() {},
+    initChart() {
+      let chart = echarts.init(this.$el);
+
+      let option = {
+        color: this.color,
+        tooltip: {
+          trigger: "axis",
+          backgroundColor: "rgba(0,0,0,0.4)",
+          borderColor: partten.getColor("gray"),
+          textStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+        },
+        legend: {
+          show: this.showLegend,
+          data: this.legend,
+          right: 56,
+          icon: "ract",
+          itemWidth: 8,
+          itemHeight: 8,
+          inactiveColor: partten.getColor("gray"),
+          textStyle: {
+            color: partten.getColor("grayl"),
+            fontSize: 12,
+          },
+        },
+        grid: {
+          top: 32,
+          left: 40,
+          right: this.ydata.length > 1 ? 40 : 14,
+          bottom: 24,
+        },
+        xAxis: [
+          {
+            type: "category",
+            data: this.xdata,
+            axisPointer: {
+              type: "shadow",
+            },
+            axisLabel: {
+              fontSize: 12,
+            },
+          },
+        ],
+        yAxis: this.ydata,
+        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: partten.getColor("gray"),
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+            lineStyle: {
+              type: "dashed",
+              dashOffset: 10,
+              color: partten.getColor("gray") + 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);
+
+      this.resize = function () {
+        chart.resize();
+      };
+
+      window.addEventListener("resize", this.resize);
+    },
+  },
+  created() {
+    this.id = "pie-chart-" + util.newGUID();
+    this.newbarData = this.barData;
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.$el.style.width = this.width;
+      this.$el.style.height = this.height;
+      this.initChart();
+      this.firstAnimation = false;
+    });
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  unmounted() {
+    window.removeEventListener("resize", this.resize);
+  },
+};
+</script>
+
+<style lang="less">
+.chart {
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+</style>

src/views/specific/fdl.vue

@@ -192,6 +192,7 @@
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
         <panel title="公司发电量分析" :showLine="false">
+             <panel title="发电量分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/fnlyl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司可利用率分析" :showLine="false">
+        <!-- <panel title="公司可利用率分析" :showLine="false"> -->
+            <panel title="风能利用率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/fwjsl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司复位及时率分析" :showLine="false">
+        <!-- <panel title="公司复位及时率分析" :showLine="false"> -->
+          <panel title="复位及时率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/gzssl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司故障损失率分析" :showLine="false">
+        <!-- <panel title="公司故障损失率分析" :showLine="false"> -->
+            <panel title="故障损失率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/mtbf.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司MTBF分析" :showLine="false">
+        <!-- <panel title="公司MTBF分析" :showLine="false"> -->
+             <panel title="MTBF分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/mttr.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司MTTR分析" :showLine="false">
+        <!-- <panel title="公司MTTR分析" :showLine="false"> -->
+           <panel title="MTTR分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/slssl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司受累损失率分析" :showLine="false">
+        <!-- <panel title="公司受累损失率分析" :showLine="false"> -->
+           <panel title="受累损失率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/whssl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司维护损失率分析" :showLine="false">
+        <!-- <panel title="公司维护损失率分析" :showLine="false"> -->
+          <panel title="维护损失率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/xdssl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司限电损失率分析" :showLine="false">
+        <!-- <panel title="公司限电损失率分析" :showLine="false"> -->
+           <panel title="限电损失率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/xnssl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司性能损失率分析" :showLine="false">
+        <!-- <panel title="公司性能损失率分析" :showLine="false"> -->
+           <panel title="性能损失率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/xqjsl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司消缺及时率分析" :showLine="false">
+        <!-- <panel title="公司消缺及时率分析" :showLine="false"> -->
+           <panel title="消缺及时率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/zhcydl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司综合场用电量分析" :showLine="false">
+        <!-- <panel title="公司综合场用电量分析" :showLine="false"> -->
+           <panel title="综合场用电量分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/specific/ztfx.vue

@@ -1679,6 +1679,7 @@ export default {
             month: months
           },
           success(res) {
+            console.log('resSecord:',res)
             let currentMonth = {}
             let currentYear = {}
             res.data['当月'].map(item => {
@@ -1741,6 +1742,7 @@ export default {
             month: months
           },
           success(res) {
+            console.log('resMonth:',res)
             res.data.map(item => {
               for (let key in item) {
                 if(_this.isNumber(item[key]) && item.type !== '比较') {

src/views/specific/ztzhl.vue

@@ -191,7 +191,8 @@
     </el-row>
     <el-row :gutter="20" class="table-panel">
       <el-col :span="24">
-        <panel title="公司状态转换率分析" :showLine="false">
+        <!-- <panel title="公司状态转换率分析" :showLine="false"> -->
+             <panel title="状态转换率分析" :showLine="false">
           <!-- <vertival-bar-line-chart
             :height="'360px'"
             :units="units"

src/views/warningRank/index.vue

@@ -130,6 +130,7 @@ export default {
             orderByColumn:"",
           },
           success(res) {
+            console.log('res:',res)
             let chartData = [];
 
             res.data.forEach((ele, index) => {