冲突修改

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/Decision1Mx.vue

@@ -55,7 +55,7 @@
 			</div>
 			<div class="query-actions">
 				<button class="btn" @click="mxClick()">搜索</button>
-				<button class="btn green">明细信息</button>
+				<button class="btn green" >明细信息</button>
 				<button class="btn" @click="exportExcel()">导出</button>
 			</div>
 		</div>

src/views/Decision/Decision2Cndb.vue

@@ -960,6 +960,7 @@ export default {
     tooltip(param, callback) {
       var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
 
+<<<<<<< HEAD
       var result = param[0].axisValue;
       param.forEach((value, index) => {
         result +=
@@ -996,6 +997,41 @@ export default {
     },
   },
 };
+=======
+				var result = param[0].axisValue;
+				param.forEach((value, index) => {
+					result += "<br />" +
+						`<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${color[index]};"></span>` +
+						value.seriesName + "：" + value.value;
+				});
+				callback(result);
+				return true;
+			},
+			dbfx() {
+				var that = this;
+				console.log('dbid:',that.tableId)
+				if (that.tableId.length == 2) {
+					that.dialogVisible = true;
+					this.AjaxDbfx();
+					this.clearDb();
+				}
+			},
+			clearDb() { //清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.dbData = [];
+				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
+				this.clearDb();
+			},
+			onSort(){
+				this.clearDb();
+			}
+		}
+	};
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
 </script>
 
 <style lang="less">

src/views/Decision/Decision2Xldb.vue

@@ -190,6 +190,11 @@ export default {
   data() {
     let that = this;
     return {
+<<<<<<< HEAD
+=======
+      detailId: "", //详情id
+      idArr: [],
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
       oneData: [],
       tableIdArr: [], //放checkbox的id数组
       tableId: [],
@@ -209,14 +214,27 @@ export default {
             is_num: false,
             is_light: false,
             width: "50px",
+<<<<<<< HEAD
             template: function () {
               return "<input class='check curCheckBox' type='CheckBox'/>";
             },
             click: function (event, data) {
+=======
+            template: function() {
+              return "<input class='check curCheckBox' type='CheckBox'/>";
+            },
+            click: function(event, data) {
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               // checkbox 事件
               // event.target checkbox or td 需进行判断
               // event.target.checked 判断 checkbox 是否选中
               // data  当前数据
+<<<<<<< HEAD
+=======
+              // console.log(that);
+              // console.log(event.target);
+              // console.log(event.target.checked);
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               var dataId = that.tableIdArr[data.index - 1];
               if (event.target.checked == false && that.checkLength <= 2) {
                 that.tableId.forEach((item, i) => {

src/views/Decision/Decision2Xmdb.vue

@@ -170,6 +170,11 @@ export default {
   data() {
     let that = this;
     return {
+<<<<<<< HEAD
+=======
+      detailId: "", //详情id
+      idArr: [],
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
       tableIdArr: [], //放checkbox的id数组
       tableId: [],
       checkLength: 0, //对标分析只能选择2个
@@ -398,11 +403,69 @@ export default {
             field: "cz",
             is_num: false,
             is_light: false,
+<<<<<<< HEAD
             template: function () {
               return "<a class='action'>详情</a>";
             },
             click: function (event, data) {
               var dataId = that.tableIdArr[data.index - 1];
+=======
+            template: function() {
+              return "<a class='action'>详情</a>";
+            },
+            click: function(event, data) {
+              console.log("dataDetail:", data);
+			   if (data.name.includes("麻黄山一期")) {
+                that.detailId = "MHS01_GC";
+                console.log("麻黄山一期");
+              } else if (data.name.includes("麻黄山二期")) {
+                that.detailId = "MHS02_GC";
+                console.log("麻黄山二期");
+              }
+              else if (data.name.includes("牛首山一期")) {
+                that.detailId = "NSS01_GC";
+                console.log("牛首山一期");
+              } else if (data.name.includes("牛首山二期")) {
+                that.detailId = "NSS02_GC";
+                console.log("牛首山二期");
+              } else if (data.name.includes("牛首山三期")) {
+                that.detailId = "NSS03_GC";
+                console.log("牛首山三期");
+              }else if (data.name.includes("青山一期")) {
+                that.detailId = "QS01_GC";
+                console.log("青山一期");
+              } else if (data.name.includes("青山二期")) {
+                that.detailId = "QS02_GC";
+                console.log("青山二期");
+              } else if (data.name.includes("青山三期")) {
+                that.detailId = "QS03_GC";
+                console.log("青山三期");
+              }
+			  else if (data.name.includes("石板泉一期")) {
+                that.detailId = "SBQ01_GC";
+                console.log("石板泉一期");
+              } else if (data.name.includes("石板泉二期")) {
+                that.detailId = "SBQ02_GC";
+                console.log("石板泉二期");
+              } else if (data.name.includes("石板泉三期")) {
+                that.detailId = "SBQ03_GC";
+                console.log("石板泉三期");
+              }else if (data.name.includes("石板泉四期")) {
+                that.detailId = "SBQ04_GC";
+                console.log("石板泉四期");
+              }
+			  else if (data.name.includes("香山一期")) {
+                that.detailId = "XS01_GC";
+                console.log("香山一期");
+              } else if (data.name.includes("香山二期")) {
+                that.detailId = "XS02_GC";
+                console.log("香山二期");
+              }
+            //   var dataId = that.tableIdArr[data.index - 1];
+              console.log("dataIndex:", data.index);
+              console.log("that.tableIdArr:", that.tableIdArr);
+            //   console.log("dataId:", dataId);
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               that.clearDb();
               that.detailShow = 2;
               // var that = this;
@@ -411,7 +474,13 @@ export default {
                 baseURL: "http://10.155.32.4:9001/",
                 subUrl: "benchmarking/details",
                 data: {
+<<<<<<< HEAD
                   id: dataId,
+=======
+					id:that.detailId,
+                //   id: dataId,
+                  // id:that.idArr.length==1?that.detailId:dataId,
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
@@ -472,10 +541,17 @@ export default {
             field: "check",
             is_num: false,
             is_light: false,
+<<<<<<< HEAD
             template: function () {
               return "<input class='check curCheckBox checkItem' type='CheckBox'/>";
             },
             click: function (event, data) {
+=======
+            template: function() {
+              return "<input class='check curCheckBox checkItem' type='CheckBox'/>";
+            },
+            click: function(event, data) {
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               var dataId = that.tableIdArr[data.index - 1];
               if (event.target.checked == false && that.checkLength <= 2) {
                 that.tableId.forEach((item, i) => {
@@ -683,6 +759,10 @@ export default {
         subUrl: "benchmarking/wplist",
         success(res) {
           that.value1.push(res.data[0].id);
+<<<<<<< HEAD
+=======
+          console.log('value1:',that.value1)
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
           that.ChangZhan = res.data;
           that.AjaxCommon();
         },
@@ -697,6 +777,10 @@ export default {
     },
     XiangMuVal(val) {
       var that = this;
+<<<<<<< HEAD
+=======
+        console.log('xianmguVal:',val)
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
       that.API.requestData({
         method: "GET",
         baseURL: "http://10.155.32.4:9001/",
@@ -706,6 +790,10 @@ export default {
         },
         success(res) {
           that.XiangMu = res.data;
+<<<<<<< HEAD
+=======
+          console.log('Xiangmu:',res.data)
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
         },
       });
     },
@@ -757,6 +845,15 @@ export default {
         },
         success(res) {
           that.ajaxData = res.data;
+<<<<<<< HEAD
+=======
+          that.idArr = res.data;
+          // console.log("idArr:", that.idArr);
+          // if(res.data.length==1){
+          // 	that.detailId = res.data[0].id
+          // 	console.log('detailId:',that.detailId)
+          // }
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -769,6 +866,10 @@ export default {
             slssdl = [];
           res.data.forEach((item, index) => {
             that.tableIdArr.push(item.id);
+<<<<<<< HEAD
+=======
+            // console.log("ajaxTable:", that.tableIdArr);
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
             dataTab.push({
               //表格
               index: index + 1,

src/views/Decision/Decision3.vue

@@ -1065,6 +1065,7 @@ export default {
     tooltip(param, callback) {
       var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
 
+<<<<<<< HEAD
       var result = param[0].axisValue;
       param.forEach((value, index) => {
         result +=
@@ -1116,6 +1117,61 @@ export default {
           var dataTab = [];
           res.data.forEach((item, index) => {
             that.tableIdArr.push(item.id);
+=======
+				var result = param[0].axisValue;
+				param.forEach((value, index) => {
+					result += "<br />" +
+						`<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${color[index]};"></span>` +
+						value.seriesName + "：" + value.value;
+				});
+				callback(result);
+				return true;
+			},
+			dbfx() {
+				var that = this;
+				if (that.tableId.length == 2) {
+					that.dialogVisible = true;
+					this.AjaxDbfx();
+					this.clearDb();
+				}
+			},
+			clearDb() { //清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.dbData = [];
+				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
+				this.clearDb();
+			},
+			detailClick(data) {
+				var that = this;
+				// console.log('DetailData:',data)
+				var dataId = that.tableIdArr[data.index - 1];
+				console.log('dataIndex:',data.index)
+				console.log('that.tableIdArr:',that.tableIdArr)
+				console.log('dataId:',dataId)
+				that.clearDb();
+				that.detailShow = 2;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/details",
+					data: {
+						// id: dataId,
+						id:that.idArr.length==1?that.detailId:dataId,
+						beginDate: that.value4,
+						endDate: that.value5,
+						target: '',
+						sort: ''
+					},
+					success(res) {
+						console.log('resDetail:',res)
+						var dataTab = [];
+						res.data.forEach((item, index) => {
+							that.tableIdArr.push(item.id);
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
 
             dataTab.push({
               //表格

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/Home/Home.vue

@@ -1057,22 +1057,26 @@ export default {
             {
               name: "当日预测电量",
               value: res.data.jczbmap.rycfdl,
-              total: res.data.jczbmap.rfdlsx,
+              // total: res.data.jczbmap.rfdlsx,
+              total: res.data.jczbmap.rycfdl >= res.data.jczbmap.rfdl ? res.data.jczbmap.rycfdl + 100 : res.data.jczbmap.rfdl + 100,
             },
             {
               name: "实际发电量",
               value: res.data.jczbmap.rfdl,
-              total: res.data.jczbmap.rfdlsx,
+              // total: res.data.jczbmap.rfdlsx,
+              total: res.data.jczbmap.rycfdl >= res.data.jczbmap.rfdl ? res.data.jczbmap.rycfdl + 100 : res.data.jczbmap.rfdl + 100,
             },
             {
               name: "当月预测电量",
               value: res.data.jczbmap.yycfdl,
-              total: res.data.jczbmap.yfdlsx,
+              // total: res.data.jczbmap.yfdlsx,
+              total: res.data.jczbmap.yycfdl >= res.data.jczbmap.yfdl ? res.data.jczbmap.yycfdl + 200 : res.data.jczbmap.yfdl + 200,
             },
             {
               name: "实际发电量",
               value: res.data.jczbmap.yfdl,
-              total: res.data.jczbmap.yfdlsx,
+              // total: res.data.jczbmap.yfdlsx,
+              total: res.data.jczbmap.yycfdl >= res.data.jczbmap.yfdl ? res.data.jczbmap.yycfdl + 200 : res.data.jczbmap.yfdl + 200,
             },
           ];
 

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/WindSite/pages/Home/Home.vue

@@ -7,7 +7,7 @@
       <div class="mg-b-16">
         <btn-group-double :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select" />
       </div>
-      <row>
+      <row v-if="paramsId.includes('FDC')">
         <wind-site-weather :time="nowTime" :data="tqmap" />
         <panel-3 class="wind-site-info">
           <row align="middle">
@@ -156,6 +156,156 @@
           </row>
         </panel-3>
       </row>
+       <row v-if="paramsId.includes('GDC')">
+        <wind-site-weather :time="nowTime" :data="tqmap" />
+        <panel-3 class="wind-site-info">
+          <row align="middle">
+            <div class="info-item">
+              <div class="value">{{ jczbmap.zjrl }}</div>
+              <div class="text">装机容量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.rfdl }}</div>
+              <div class="text">日发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.yfdl }}</div>
+              <div class="text">月发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.nfdl }}</div>
+              <div class="text">年发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.ylyxs }}</div>
+              <div class="text">月利用小时</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.nlyxs }}</div>
+              <div class="text">年利用小时</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.ssfs }}</div>
+              <!-- <div class="text">实时风速</div> -->
+              <div class="text">平均功率</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.sjgl }}</div>
+              <div class="text">实时功率</div>
+            </div>
+          </row>
+        </panel-3>
+        <panel-3 class="wind-running-info">
+          <row align="middle">
+            <div class="fengji">
+              <div class="fengji-icon svg-icon svg-icon-white">
+                <svg-icon class="" svgid="svg-风机" />
+              </div>
+              <div class="info">
+                <div class="text green">接入光伏</div>
+                <div class="value">{{ jczbmap.jrts }}</div>
+              </div>
+            </div>
+            <div class="situation">
+              <row class="icon-status">
+                <div class="status">
+                  <span class="svg-icon svg-icon-green">
+                    <svg-icon svgid="svg-standby" />
+                  </span>
+                  <span class="text green"> 
+                    待机
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-purple">
+                    <svg-icon svgid="svg-normal-power" />
+                  </span>
+                  <span class="text purple">
+                    运行
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-pink">
+                    <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
+                  </span>
+                  <span class="text pink">
+                    限电
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-red">
+                    <svg-icon svgid="svg-gz-downtime" />
+                  </span>
+                  <span class="text red">
+                    故障
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-orange">
+                    <svg-icon svgid="svg-jx-downtime" />
+                  </span>
+                  <span class="text orange">
+                    检修
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-gray">
+                    <svg-icon svgid="svg-offline" />
+                  </span>
+                  <span class="text gray">
+                    离线
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-white">
+                    <svg-icon svgid="svg-intranet-involvement" />
+                  </span>
+                  <span class="text white">
+                    受累
+                  </span>
+                </div>
+              </row>
+              <row>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.djnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.zcfdnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.xdjclnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.gztjnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.jxtjnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.dwslnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.lxnum }}
+                  </span>
+                </div>
+              </row>
+            </div>
+          </row>
+        </panel-3>
+      </row>
       <div class="first-info mg-t-16 mg-b-16">
         <div style="flex:0 1 450px;">
           <panel title="场站">
@@ -163,10 +313,14 @@
           </panel>
         </div>
         <div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
-          <panel title="4小时功率曲线图">
+          <panel title="4小时功率曲线图" v-if="paramsId.includes('FDC')">
             <multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value" :units="Powertrend.units"
               :showLegend="true" />
           </panel>
+           <panel title="4小时功率曲线图" v-if="paramsId.includes('GDC')">
+            <multiple-line-chart height="18.519vh" v-if="Powertrend1" :list="Powertrend1.value" :units="Powertrend1.units"
+              :showLegend="true" />
+          </panel>
         </div>
         <div class="mg-l-16" style="flex:0 0 400px;">
           <panel class="light-matrix-panel">
@@ -228,7 +382,6 @@ import Panel3 from "../../../../components/coms/panel/panel3.vue";
 import LightMatrix from "./light-matrix.vue";
 import Station from "./Station.vue";
 import WindSiteWeather from "./wind-site-weather.vue";
-
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 
 export default {
@@ -241,6 +394,8 @@ export default {
     return {
       timmer: null, // 计时器
       timmer2: null,
+      paramsId:"",
+      resCode:"",
       nowTime: "", // 时间
       fjmap: [], // 分机矩阵
       tqmap: {}, // 天气数据
@@ -290,7 +445,7 @@ export default {
         units: ["", ""],
       },
 
-      // 4小时功率曲线图
+      // 4小时功率曲线图(风电场)
       Powertrend: {
         value: [
           {
@@ -299,6 +454,15 @@ export default {
           },
         ],
       },
+      // 4小时功率曲线图(光电场)
+      Powertrend1: {
+        value: [
+          {
+            title: "",
+            value: [],
+          },
+        ],
+      },
 
       // 月发电量对比
       MonthCompare: {
@@ -381,9 +545,12 @@ export default {
     },
 
     select (res) {
+      let that = this;
       this.$router.replace({
         path: `/monitor/windsite/home/${res.code}`,
       });
+      that.resCode = res.code;
+      console.log('resCode:',res)
     },
     // 根据风机状态码返回对应 class
     getColor (fjzt) {
@@ -422,7 +589,10 @@ export default {
         },
         success (res) {
           if (res.data) {
+            console.log('resWpinfo:',res.data)
             that.tqmap = res.data.tqmap;
+            that.tqmap.name = res.data.jczbmap.name
+            that.tqmap.resCode = that.resCode
             let fjmap = [];
             let keys = ["value1", "value2", "value3", "value4", "value5", "value6", "value7", "value9"];
             let Powertrend = {
@@ -471,6 +641,52 @@ export default {
                 },
               ],
             };
+             let Powertrend1 = {
+              // 图表所用单位
+              units: ["(万KWh)", "(风速)"],
+              value: [
+                {
+                  title: "应发功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "实发功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "理论功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "预测功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "保证功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "平均功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "小时预测功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "最有功率律",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+              ],
+            };
 
             let dayPieChartKey = [
               {
@@ -519,6 +735,10 @@ export default {
                   text: new Date(ele.time).formatDate("hh:mm"),
                   value: ele[key],
                 });
+                    Powertrend1.value[keyIndex].value.push({
+                  text: new Date(ele.time).formatDate("hh:mm"),
+                  value: ele[key],
+                });
               });
             });
 
@@ -544,6 +764,7 @@ export default {
 
             that.fjmap = fjmap;
             that.Powertrend = Powertrend;
+            that.Powertrend1 = Powertrend1;
             that.jczbmap = res.data.jczbmap;
             that.pieChartData = {
               dayData,
@@ -553,6 +774,7 @@ export default {
           } else {
             that.fjmap = [];
             that.Powertrend = {};
+            that.Powertrend1 = {};
             that.jczbmap = {};
             that.pieChartData = {
               dayData: [],
@@ -671,6 +893,7 @@ export default {
   created () {
     let that = this;
     that.wpId = that.$route.params.wpId;
+    that.paramsId = that.$route.params.wpId;
     that.$nextTick(() => {
       that.getWp();
       that.requestData(false);

src/views/WindSite/pages/Home/wind-site-weather.vue

@@ -1,7 +1,9 @@
 // 天气分析
 <template>
   <div class="wind-site-weather">
-    <div class="title">风场 {{ nowTime }} 实况</div>
+    <!-- <div class="title">风场 {{ nowTime }} 实况</div> -->
+        <div class="title" v-if="paramsId.includes('FDC')">风场 {{ nowTime }} 实况</div>
+        <div class="title" v-else-if="paramsId.includes('GDC')">光电场 {{ nowTime }} 实况</div>
     <div class="weather">
       <div class="weather-info">
         <span class="svg-icon">
@@ -60,12 +62,13 @@
 </template>
 
 <script>
+import Home from "./Home.vue"
 import Col from "@/components/coms/grid/col.vue";
 import Row from "@/components/coms/grid/row.vue";
 import SvgIcon from "@/components/coms/icon/svg-icon.vue";
 
 export default {
-  components: { Row, Col, SvgIcon },
+  components: { Home,Row, Col, SvgIcon },
   props:{
     time: String,
     data:{
@@ -75,6 +78,7 @@ export default {
   },
   data() {
     return {
+      // paramsId:"",
       sourceMap: {},
       nowTime: "",
       weather: "阴", // 气象法
@@ -88,14 +92,20 @@ export default {
       sunset: "18:50", // 日落
     };
   },
-  created(){},
+  created(){
+    let that = this;
+    that.paramsId = that.$route.params.wpId
+    console.log("paramsId:",that.$route.params.wpId)
+  },
   mounted(){
     this.sourceMap=this.data;
+   
   },
 
   watch:{
     data(res){
       this.sourceMap=res;
+       console.log('map:',this.sourceMap)
     },
     time(value){
       this.nowTime = value

src/views/performanceAnalysis/index.vue

@@ -26,7 +26,7 @@
     <div class="df-table">
       <ComTable height="78vh" :data="tableData"></ComTable>
     </div>
-    <el-dialog title="切入切出风速整合历史" v-model="dialogShow" width="85%" top="10vh" custom-class="modal"
+    <el-dialog title="单机历史性能分析" v-model="dialogShow" width="85%" top="10vh" custom-class="modal"
       :close-on-click-modal="true" @closed="dialogType = ''">
       <div class="query mg-b-8">
         <div class="query-items">

src/views/specific/fnlyl.vue

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -190,7 +190,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

@@ -1755,6 +1755,7 @@ export default {
         months = this.monthChange(this.monthValue);
       }
       _this.API.requestData({
+<<<<<<< HEAD
         showLoading,
         method: "GET",
         baseURL: "http://10.155.32.4:8034",
@@ -1769,6 +1770,24 @@ export default {
             for (let key in item) {
               if (_this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
                 item[key] = item[key].toFixed(2);
+=======
+          showLoading,
+          method: "GET",
+          baseURL: 'http://10.155.32.4:8034',
+          subUrl: "/specific/maincenterlist",
+          data:{
+            month: months
+          },
+          success(res) {
+            console.log('resSecord:',res)
+            let currentMonth = {}
+            let currentYear = {}
+            res.data['当月'].map(item => {
+              for (let key in item) {
+                if(_this.isNumber(item[key]) && key.indexOf('Compare') === -1) {
+                  item[key] = item[key].toFixed(2)
+                }
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               }
             }
             if (item.wpid === "麻黄山风电场") {
@@ -1815,6 +1834,7 @@ export default {
         months = this.monthChange(this.monthValue);
       }
       _this.API.requestData({
+<<<<<<< HEAD
         showLoading,
         method: "GET",
         baseURL: "http://10.155.32.4:8034",
@@ -1827,6 +1847,22 @@ export default {
             for (let key in item) {
               if (_this.isNumber(item[key]) && item.type !== "比较") {
                 item[key] = item[key].toFixed(2);
+=======
+          showLoading,
+          method: "GET",
+          baseURL: 'http://10.155.32.4:8034',
+          subUrl: "/specific/maintoplist",
+          data:{
+            month: months
+          },
+          success(res) {
+            console.log('resMonth:',res)
+            res.data.map(item => {
+              for (let key in item) {
+                if(_this.isNumber(item[key]) && item.type !== '比较') {
+                  item[key] = item[key].toFixed(2)
+                }
+>>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               }
             }
             if (item.type === "本期") {

src/views/specific/ztzhl.vue

@@ -190,7 +190,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) => {