Merge branch 'yx' into wsy

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

@@ -213,21 +213,21 @@ export default {
       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,11 +235,11 @@ 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.state;
+        var color = item.color || item.state;
         data.push({
           name: item.name,
           value: [item.start, item.end, item.end - item.start],
@@ -253,7 +253,7 @@ export default {
       }
       return data;
     },
-    areaMax() {
+    areaMax () {
       let max = 0;
       this.areaData.forEach((value) => {
         if (max < value.end) max = value.end;
@@ -262,7 +262,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];
@@ -291,7 +291,7 @@ export default {
         }
       );
     },
-    initChart() {
+    initChart () {
       let that = this;
       let chart = echarts.init(this.$el);
 
@@ -350,7 +350,7 @@ export default {
             max: this.areaMax,
             axisLabel: {
               show: false,
-              formatter: function(val) {
+              formatter: function (val) {
                 return Math.max(0, val - 0) + " ms";
               },
             },
@@ -421,7 +421,7 @@ export default {
           },
           tooltip: {
             show: false,
-            formatter: function(params) {
+            formatter: function (params) {
               return params.marker + params.name + ": " + params.value[2] + "s";
             },
           },
@@ -435,7 +435,7 @@ export default {
 
       chart.setOption(option);
 
-      chart.on("click", function(e, p) {
+      chart.on("click", function (e, p) {
         if (e.seriesType == "custom") {
           that.$emit("areaClick", { data: e.data.exData });
         }
@@ -445,17 +445,17 @@ 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;
       this.initChart();
     });
   },
-  updated() {
+  updated () {
     this.$nextTick(() => {
       this.initChart();
     });

src/views/HealthControl/Health10.vue

@@ -3,19 +3,19 @@
     <el-row :gutter="20" class="table-panel">
       <el-col :span="6">
         <panel :title="'等级评价'" :showLine="false">
-          <Table :data="tableData1" :canScroll="false" />
+          <Table :data="top5Table" :canScroll="false" />
         </panel>
       </el-col>
       <el-col :span="6">
         <panel :title="'健康报告'" :showLine="false">
-          <Table :data="tableData2" :canScroll="false" />
+          <Table :data="dateTable" :canScroll="false" />
         </panel>
       </el-col>
       <el-col :span="12" class="wrong-list">
         <panel :title="'故障信息'" :showLine="false">
           <div class="data-list" style="display:flex;">
-            <Table :data="tableData3" :canScroll="false" />
-            <Table :data="tableData4" :canScroll="false" />
+            <Table :data="top10TableLeft" :canScroll="false" />
+            <Table :data="top10TableRight" :canScroll="false" />
           </div>
         </panel>
       </el-col>
@@ -43,27 +43,28 @@
               <div style="height:calc(100vh - 174px);">
                 <table style="width:100%;" border="0" cellspacing="0">
                   <tbody>
-                    <tr v-for="index of 8" :key="index">
+                    <tr v-for="(item, index) of partsArray" :key="index">
                       <td style="width:50px;">
-                        发电机
+                        {{item[1]}}
                       </td>
                       <td style="width:105px;">
-                        <div style="background-color: #00bf4d;width:10px;height:10px;margin:0 auto;"></div>
+                        <div :style="'background-color: ' + item[0] + ';width:10px;height:10px;margin:0 auto;'"></div>
                       </td>
                       <td style="width:400px;">
                         <div class="percent-item">
-                          85%
+                          {{item[3]}}%
                           <div class="percent-bar" style="margin-right: 4px;">
-                            <div class="percent-value" style="width:80%"></div>
+                            <div class="percent-value" :style="'width:' + item[3] +'%'"></div>
                           </div>
-                          剩余9999/建个故障9999
+                          <!-- 剩余9999/建个故障9999 -->
+                          {{item[4]}}
                         </div>
                       </td>
                       <td style="width:200px;">
-                        <table-line-chart :height="'20px'" />
+                        <table-line-chart :height="'20px'" :list="item[8]" />
                       </td>
                       <td style="width:#00bf4d">
-                        29.33
+                        {{item[6]}}
                       </td>
                     </tr>
                   </tbody>
@@ -80,12 +81,13 @@
             <span class="des-title">预计损失电量<span class="num">73824.0</span><span class="unit">Kwh</span></span>
             <span class="des-title">预计检修时长<span class="num">29.33</span><span class="unit">H</span></span>
           </div>
-          <img-line-chart height="270px" :list="line.value" :units="line.units" /></div
-      ></el-col>
+          <img-line-chart height="270px" :list="line.value" :units="line.units" />
+        </div>
+      </el-col>
     </el-row>
     <div class="fc-info mg-b-16">
       <panel :title="'曲线'" :showLine="false">
-        <zoom-line-chart height="35vh" :list="line1.value" :units="line1.units" />
+        <zoom-line-chart height="35vh" :list="powerChartData.value" :units="powerChartData.units" />
       </panel>
     </div>
   </div>
@@ -102,7 +104,7 @@ import ImgLineChart from "../../components/chart/line/img-line-chart.vue";
 import ZoomLineChart from '../../components/chart/line/zoom-line-chart.vue';
 
 export default {
-  setup() {},
+  setup () { },
   components: {
     Panel,
     Table,
@@ -110,169 +112,107 @@ export default {
     ImgLineChart,
     ZoomLineChart,
   },
-  data() {
+  data () {
+    const that = this;
     return {
-      tableData1: {
+      top5Table: {
         column: [
           {
-            name: " ",
-            field: "name",
+            name: "排名",
+            field: "index",
             width: "10%",
           },
           {
             name: "日期",
-            field: "v1",
+            field: "date",
             width: "45%",
           },
           {
-            name: "登记",
-            field: "v2",
+            name: "等级",
+            field: "rank",
             width: "45%",
           },
         ],
-        data: [
-          {
-            name: "1",
-            v1: "2018-05-31 00:00:00",
-            v2: "C",
-          },
-          {
-            name: "2",
-            v1: "2018-05-31 00:00:00",
-            v2: "C",
-          },
-          {
-            name: "3",
-            v1: "2018-05-31 00:00:00",
-            v2: "C",
-          },
-          {
-            name: "4",
-            v1: "2018-05-31 00:00:00",
-            v2: "C",
-          },
-          {
-            name: "5",
-            v1: "2018-05-31 00:00:00",
-            v2: "C",
-          },
-        ],
+        data: []
       },
-      tableData2: {
+      dateTable: {
         column: [
           {
-            name: " ",
-            field: "name",
+            name: "排名",
+            field: "index",
             width: "10%",
           },
           {
             name: "日期",
-            field: "v1",
-            width: "45%",
+            field: "date",
+            width: "60%",
           },
           {
             name: "健康情况",
-            field: "v2",
-            width: "45%",
-            template: function(data) {
-              return "<div style='display: flex;'><div style='width: 50%;'>" + data + "</div><div style='width: 50%;'><div style='border: 1px solid #182238;background: #303f6e;width: 70%;margin: 0 auto;color:#FFF'>查看报告</div></div></div>";
+            field: "",
+            width: "30%",
+            template () {
+              return "<div style='border: 1px solid #182238;background: #303f6e;width: 70%;margin: 0 auto;color:#FFF;cursor: pointer;'>查看报告</div>";
             },
           },
         ],
-        data: [
-          {
-            name: "1",
-            v1: "2018-05-31 00:00:00",
-            v2: "差",
-          },
-          {
-            name: "2",
-            v1: "2018-05-31 00:00:00",
-            v2: "差",
-          },
-          {
-            name: "3",
-            v1: "2018-05-31 00:00:00",
-            v2: "差",
-          },
-          {
-            name: "4",
-            v1: "2018-05-31 00:00:00",
-            v2: "差",
-          },
-          {
-            name: "5",
-            v1: "2018-05-31 00:00:00",
-            v2: "差",
-          },
-        ],
+        data: []
       },
-      tableData3: {
+      top10TableLeft: {
         column: [
           {
-            name: "",
-            field: "name",
+            name: "排名",
+            field: "index",
             width: "8%",
           },
           {
             name: "故障名称",
-            field: "v1",
-            template: function(data) {
-              return "<div style='overflow: hidden;text-overflow:ellipsis;white-space: nowrap;'>" + data + "</div>";
-            },
+            field: "warnDesc"
           },
           {
             name: "故障时间",
-            field: "v2",
+            field: "startTime",
             width: "35%",
           },
           {
             name: "修复时间",
-            field: "v3",
+            field: "stopTime",
           },
           {
             name: "时长",
-            field: "v4",
+            field: "stopHours",
           },
         ],
-        data: [
+        data: [],
+      },
+      top10TableRight: {
+        column: [
           {
-            name: "1",
-            v1: "风机叶轮刹车系统",
-            v2: "2018-05-31 16:28:38",
-            v3: "2018-05-31",
-            v4: "0.09",
+            name: "排名",
+            field: "index",
+            width: "8%",
           },
           {
-            name: "2",
-            v1: "风机叶轮刹车系统",
-            v2: "2018-05-31 16:28:38",
-            v3: "2018-05-31",
-            v4: "0.09",
+            name: "故障名称",
+            field: "warnDesc"
           },
           {
-            name: "3",
-            v1: "风机叶轮刹车系统",
-            v2: "2018-05-31 16:28:38",
-            v3: "2018-05-31",
-            v4: "0.09",
+            name: "故障时间",
+            field: "startTime",
+            width: "35%",
           },
           {
-            name: "4",
-            v1: "风机叶轮刹车系统",
-            v2: "2018-05-31 16:28:38",
-            v3: "2018-05-31",
-            v4: "0.09",
+            name: "修复时间",
+            field: "stopTime",
           },
           {
-            name: "5",
-            v1: "风机叶轮刹车系统",
-            v2: "2018-05-31 16:28:38",
-            v3: "2018-05-31",
-            v4: "0.09",
+            name: "时长",
+            field: "stopHours",
           },
         ],
+        data: [],
       },
+      partsArray: [],
       tableData4: {
         column: [
           {
@@ -283,7 +223,7 @@ export default {
           {
             name: "故障名称",
             field: "v1",
-            template: function(data) {
+            template: function (data) {
               return "<div style='overflow: hidden;text-overflow:ellipsis;white-space: nowrap;'>" + data + "</div>";
             },
           },
@@ -445,134 +385,13 @@ export default {
           },
         ],
       },
-      line1: {
-        units: ["功率", "风速"],
-        value: [
-          {
-            title: "应发功率",
-            yAxisIndex: 0,
-            value: [
-              {
-                text: "05-02 00:00",
-                value: 1,
-              },
-              {
-                text: "05-04 00:00",
-                value: 13,
-              },
-              {
-                text: "05-06 00:00",
-                value: 14,
-              },
-              {
-                text: "05-08 00:00",
-                value: 12,
-              },
-              {
-                text: "05-10 00:00",
-                value: 3,
-              },
-              {
-                text: "05-12 00:00",
-                value: 5,
-              },
-              {
-                text: "05-14 00:00",
-                value: 1,
-              },
-              {
-                text: "05-16 00:00",
-                value: 1,
-              },
-              {
-                text: "05-18 00:00",
-                value: 13,
-              },
-              {
-                text: "05-20 00:00",
-                value: 14,
-              },
-              {
-                text: "05-22 00:00",
-                value: 12,
-              },
-              {
-                text: "05-24 00:00",
-                value: 3,
-              },
-              {
-                text: "05-26 00:00",
-                value: 5,
-              },
-              {
-                text: "05-28 00:00",
-                value: 1,
-              },
-            ],
-          },
-          {
-            title: "实际功率",
-            yAxisIndex: 0,
-            value: [
-              {
-                text: "05-02 00:00",
-                value: 1,
-              },
-              {
-                text: "05-04 00:00",
-                value: 3,
-              },
-              {
-                text: "05-06 00:00",
-                value: 4,
-              },
-              {
-                text: "05-08 00:00",
-                value: 1,
-              },
-              {
-                text: "05-10 00:00",
-                value: 13,
-              },
-              {
-                text: "05-12 00:00",
-                value: 15,
-              },
-              {
-                text: "05-14 00:00",
-                value: 11,
-              },
-              {
-                text: "05-16 00:00",
-                value: 5,
-              },
-              {
-                text: "05-18 00:00",
-                value: 4,
-              },
-              {
-                text: "05-20 00:00",
-                value: 1,
-              },
-              {
-                text: "05-22 00:00",
-                value: 3,
-              },
-              {
-                text: "05-24 00:00",
-                value: 3,
-              },
-              {
-                text: "05-26 00:00",
-                value: 1,
-              },
-              {
-                text: "05-28 00:00",
-                value: 13,
-              },
-            ],
-          },
-        ],
+      powerChartData: {
+        units: [""],
+        value: [{
+          title: "",
+          yAxisIndex: 0,
+          value: []
+        }],
       },
       line2: {
         units: ["功率", "风速"],
@@ -643,7 +462,165 @@ export default {
       },
     };
   },
-  created() {},
+
+  created () {
+    this.wtId = this.$route.params.wtId;
+    this.getTop5();
+    this.renderDateTable();
+    this.getTop10();
+    this.getMtbfByBj();
+    this.getFindPowerChar();
+  },
+
+  methods: {
+    // 获取等级评价
+    getTop5 () {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthsub/gadaytop5",
+        data: {
+          wtId: that.wtId
+        },
+        success (res) {
+          let top5TableData = [];
+          let index = 1;
+          for (let key in res.data) {
+            let ele = res.data[key];
+            top5TableData.push({
+              index,
+              date: ele[1],
+              rank: ele[2],
+              wpId: ele[3],
+              wtId: ele[4]
+            });
+            index++;
+          }
+          that.top5Table.data = top5TableData;
+        }
+      });
+    },
+
+    // 渲染健康报告表格
+    renderDateTable (day = 5) {
+      let tableData = [];
+      for (let i = 0; i < day; i++) {
+        tableData.push({
+          index: (i + 1),
+          date: new Date((new Date().getTime() - 3600 * 1000 * 24 * (i + 1))).formatDate("yyyy-MM-dd hh:mm:ss"),
+          wtId: this.wtId
+        });
+      }
+      this.dateTable.data = tableData;
+    },
+
+    // 获取等级评价
+    getTop10 () {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthsub/queryStopTop10",
+        data: {
+          wtId: that.wtId
+        },
+        success (res) {
+          let leftData = [];
+          let rightData = [];
+
+          res.data.forEach((ele, index) => {
+            const item = {
+              index: (index + 1),
+              warnDesc: ele.warnDesc,
+              startTime: new Date(ele.startTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+              stopTime: new Date(ele.stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+              stopHours: ele.stopHours
+            };
+            if (index < 5) {
+              leftData.push(item);
+            } else {
+              rightData.push(item);
+            }
+          });
+
+          that.top10TableLeft.data = leftData;
+          that.top10TableRight.data = rightData;
+        }
+      });
+    },
+
+    // 获取八大部件
+    getMtbfByBj () {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthsub/getWtMttrandMtbfByBj",
+        data: {
+          wtId: that.wtId
+        },
+        success (res) {
+          let partsArray = [];
+          for (let key in res.data) {
+            let linChartData = [];
+            res.data[key][2].split(",").forEach((ele, index) => {
+              linChartData.push({
+                text: (index + 1),
+                value: ele,
+              });
+            });
+            res.data[key].push(linChartData);
+            partsArray.push(res.data[key])
+          }
+          that.partsArray = partsArray;
+        }
+      });
+    },
+
+    // 获取发电曲线
+    getFindPowerChar () {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthsub/findPowerChar",
+        timeout: 300000,
+        data: {
+          wtId: that.wtId
+        },
+        success (res) {
+          let chartUnits = ["(WM)", "(m/s)"];
+          let chartData = [{
+            title: "理论功率",
+            yAxisIndex: 0,
+            value: []
+          }, {
+            title: "实际功率",
+            yAxisIndex: 0,
+            value: []
+          }, {
+            title: "实时风速",
+            yAxisIndex: 1,
+            value: []
+          }];
+
+          res.data.timearr.forEach((time, index) => {
+            chartData[0].value.push({
+              text: new Date(time).formatDate("MM-dd hh:mm"),
+              value: res.data.llgl[index]
+            });
+            chartData[1].value.push({
+              text: new Date(time).formatDate("MM-dd hh:mm"),
+              value: res.data.sjgl[index]
+            });
+            chartData[2].value.push({
+              text: new Date(time).formatDate("MM-dd hh:mm"),
+              value: res.data.ssfs[index]
+            });
+          });
+          that.powerChartData.value = chartData;
+          that.powerChartData.units = chartUnits;
+        }
+      });
+    },
+  }
 };
 </script>
 

src/views/NewPages/alarm-center-1.vue

@@ -6,18 +6,8 @@
           <div class="query-item">
             <div class="lable">风场：</div>
             <div class="search-input">
-              <el-select
-                v-model="wpvalue"
-                clearable
-                placeholder="请选择"
-                popper-class="select"
-              >
-                <el-option
-                  v-for="item in wpoptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                >
+              <el-select v-model="wpvalue" clearable placeholder="请选择" popper-class="select">
+                <el-option v-for="item in wpoptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </div>
@@ -25,39 +15,21 @@
           <div class="query-item">
             <div class="lable">开始日期：</div>
             <div class="search-input">
-              <el-date-picker
-                v-model="startdate"
-                type="date"
-                placeholder="选择日期"
-                popper-class="date-select"
-              >
+              <el-date-picker v-model="startdate" type="date" placeholder="选择日期" popper-class="date-select">
               </el-date-picker>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">结束日期：</div>
             <div class="search-input">
-              <el-date-picker
-                v-model="enddate"
-                type="date"
-                placeholder="选择日期"
-                popper-class="date-select"
-              >
+              <el-date-picker v-model="enddate" type="date" placeholder="选择日期" popper-class="date-select">
               </el-date-picker>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">规则：</div>
-              <el-cascader
-                style="width: 240px"
-                size="mini"
-                popper-class="search-select"
-                :options="cascaderOptions"
-                :props="cascaderProps"
-                v-model="cascaderSel"
-                collapse-tags
-                :clearable='true'
-              ></el-cascader>
+            <el-cascader style="width: 240px" size="mini" popper-class="search-select" :options="cascaderOptions"
+              :props="cascaderProps" v-model="cascaderSel" collapse-tags :clearable='true'></el-cascader>
           </div>
         </div>
         <div class="query-actions">
@@ -71,31 +43,25 @@
       <table-2 :data="tableData" :height="'88vh'">
         <template v-for="(item, i) in column" :key="i" #[item]="scope">
           <div class="bar">
-            <div
-              class="bar-percent"
-              :style="{
+            <div class="bar-percent" :style="{
                 width:
                   (scope.data.count &&
                     scope.data.count / (scope.data.count + scope.data.time)) *
                     100 +
                   'px',
-              }"
-            ></div>
+              }"></div>
             <span class="value">{{
               scope.data.count && scope.data.count
-            }}</span>
+              }}</span>
           </div>
           <div class="bar">
-            <div
-              class="bar-percent"
-              :style="{
+            <div class="bar-percent" :style="{
                 width:
                   (scope.data.count &&
                     scope.data.time / (scope.data.count + scope.data.time)) *
                     100 +
                   'px',
-              }"
-            ></div>
+              }"></div>
             <span class="value">{{ scope.data.count && scope.data.time }}</span>
           </div>
         </template>
@@ -109,7 +75,7 @@ import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table2 from "../../components/coms/table/table2.vue";
 export default {
   components: { Panel3, Table2 },
-  data() {
+  data () {
     return {
       wpvalue: "",
       wpoptions: "",
@@ -195,12 +161,12 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     this.search();
   },
   methods: {
-    tabSelect(tab) {},
-    async search() {
+    tabSelect (tab) { },
+    async search () {
       const { data } = await this.API.requestData({
         subUrl: "powercompare/windfarmAjax",
       });
@@ -209,7 +175,7 @@ export default {
       this.wpvalue = data.data[0].id;
       this.searchData();
     },
-    async searchTree() {
+    async searchTree () {
       console.warn(this.cascaderSel);
       let arr = [];
       let columnObj = [
@@ -234,7 +200,7 @@ export default {
       this.searchData()
       console.warn(arr);
     },
-    async searchData() {
+    async searchData () {
       const { data } = await this.API.requestData({
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "alarm/count/query/new",

src/views/NewPages/alarm-center-2.vue

@@ -6,18 +6,8 @@
           <div class="query-item">
             <div class="lable">风场：</div>
             <div class="search-input">
-              <el-select
-                v-model="wpvalue"
-                clearable
-                placeholder="请选择"
-                popper-class="select"
-              >
-                <el-option
-                  v-for="item in wpoptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                >
+              <el-select v-model="wpvalue" clearable placeholder="请选择" popper-class="select">
+                <el-option v-for="item in wpoptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </div>
@@ -25,28 +15,18 @@
           <div class="query-item">
             <div class="lable">开始日期：</div>
             <div class="search-input">
-              <el-date-picker
-                v-model="startdate"
-                type="date"
-                placeholder="选择日期"
-                popper-class="date-select"
-              >
+              <el-date-picker v-model="startdate" type="date" placeholder="选择日期" popper-class="date-select">
               </el-date-picker>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">结束日期：</div>
             <div class="search-input">
-              <el-date-picker
-                v-model="enddate"
-                type="date"
-                placeholder="选择日期"
-                popper-class="date-select"
-              >
+              <el-date-picker v-model="enddate" type="date" placeholder="选择日期" popper-class="date-select">
               </el-date-picker>
             </div>
           </div>
-        
+
         </div>
         <div class="query-actions">
           <button class="btn green" @click="searchData">搜索</button>
@@ -58,31 +38,25 @@
       <table-2 :data="tableData" :height="'88vh'">
         <template v-for="(item, i) in column" :key="i" #[item]="scope">
           <div class="bar">
-            <div
-              class="bar-percent"
-              :style="{
+            <div class="bar-percent" :style="{
                 width:
                   (scope.data.count &&
                     scope.data.count / (scope.data.count + scope.data.time)) *
                     100 +
                   'px',
-              }"
-            ></div>
+              }"></div>
             <span class="value">{{
               scope.data.count && scope.data.count
-            }}</span>
+              }}</span>
           </div>
           <div class="bar">
-            <div
-              class="bar-percent"
-              :style="{
+            <div class="bar-percent" :style="{
                 width:
                   (scope.data.count &&
                     scope.data.time / (scope.data.count + scope.data.time)) *
                     100 +
                   'px',
-              }"
-            ></div>
+              }"></div>
             <span class="value">{{ scope.data.count && scope.data.time }}</span>
           </div>
         </template>
@@ -96,7 +70,7 @@ import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table2 from "../../components/coms/table/table2.vue";
 export default {
   components: { Panel3, Table2 },
-  data() {
+  data () {
     return {
       wpvalue: "",
       wpoptions: "",
@@ -181,27 +155,25 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     this.search();
     this.searchTree();
   },
   methods: {
-    tabSelect(tab) {},
-    async search() {
+    tabSelect (tab) { },
+    async search () {
       const { data } = await this.API.requestData({
         subUrl: "powercompare/windfarmAjax",
       });
-      console.warn(data);
       this.wpoptions = data.data;
       this.wpvalue = data.data[0].id;
       this.searchData();
     },
-    async searchTree() {
+    async searchTree () {
       const { data } = await this.API.requestData({
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "Stoptype/treeType",
       });
-      console.warn(data);
       this.cascaderOptions = data.data;
       let arr = [];
       let columnObj = [
@@ -223,7 +195,7 @@ export default {
       this.column = arr;
       this.columnObj = columnObj;
     },
-    async searchData() {
+    async searchData () {
       const { data } = await this.API.requestData({
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "shutdown/list",
@@ -233,7 +205,6 @@ export default {
           startDate: new Date(this.enddate).formatDate("yyyy-MM-dd"),
         },
       });
-      console.warn(data);
       ////////
       const resData = data.data;
       // const resData =this.resdata;
@@ -257,7 +228,6 @@ export default {
         });
         dataAll.push(obj);
       });
-      console.info(dataAll);
       this.tableData.column = column;
       this.tableData.data = dataAll;
     },

src/views/NewPages/dj1.vue

@@ -44,8 +44,8 @@
     <!-- tab1 -->
     <div v-if="tabIndex == 0" class="tab-1">
       <panel :title="'损失电量分析'" class="mg-b-16">
-        <area-bar-chart :height="'23.1481vh'" :bardata="{ legend: [] }" :lineData="lostChartData" :units="lostChartUnit"
-          :areaData="LostChartBgColorData" :showLegend="true" />
+        <area-line-chart :height="'23.1481vh'" :lineData="lostChartData" :units="lostChartUnit" :areaData="LostChartBgColorData"
+          @areaClick="areaBarChartClick" :showLegend="true" />
       </panel>
       <panel :title="'电量'" class="mg-b-16">
         <multiple-bar-line-chart :height="'16.6667vh'" :barData="powerChartData" :lineData="powerChartLineData" :units="['(kWh)']"
@@ -446,11 +446,24 @@
         </el-col>
       </el-row>
     </div>
+    <el-dialog title="区域详情查看" v-model="dialogShow" width="85%" top="10vh" custom-class="modal" :close-on-click-modal="true">
+      <el-form ref="form" label-width="100px" inline>
+        <el-form-item style="width: 32%;" label="开始时间：">{{form.ks}}</el-form-item>
+        <el-form-item style="width: 32%;" label="结束时间：">{{form.js}}</el-form-item>
+        <el-form-item style="width: 32%;" label="时长：">{{form.sc}}(小时)</el-form-item>
+        <el-form-item style="width: 32%;" label="风速：">{{form.fs}}(m/s)</el-form-item>
+        <el-form-item style="width: 32%;" label="功率：">{{form.gl}}(KW)</el-form-item>
+        <el-form-item style="width: 32%;" label="理论发电量：">{{form.llfdl}}(KWh)</el-form-item>
+        <el-form-item style="width: 32%;" label="发电量：">{{form.fdl}}(KWh)</el-form-item>
+        <el-form-item style="width: 32%;" label="损失电量：">{{form.ssdl}}(KWh)</el-form-item>
+        <el-form-item style="width: 32%;" label="风机状态：">{{form.fjzt}}</el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import AreaBarChart from "../../components/chart/combination/area-bar-chart.vue";
+import AreaLineChart from "../../components/chart/combination/area-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";
@@ -458,7 +471,7 @@ import DirectionRadarChart from "@com/chart/radar/radar-chart.vue";
 import panel from "../../components/coms/panel/panel.vue";
 import Table from "../../components/coms/table/table.vue";
 export default {
-  components: { panel, AreaBarChart, MultipleBarLineChart, Table, MarkerLineChart, DirectionRadarChart, DualPieChart },
+  components: { panel, AreaLineChart, MultipleBarLineChart, Table, MarkerLineChart, DirectionRadarChart, DualPieChart },
   setup () { },
   data () {
     return {
@@ -494,9 +507,14 @@ export default {
 
       recorddate: new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd"),
 
-      lostChartData: [],
+      lostChartData: [{
+        text: "",
+        value: []
+      }],
       lostChartUnit: [],
-      LostChartBgColorData: [],
+      LostChartBgColorData: [{
+        name: ""
+      }],
 
       powerChartData: [{
         title: "",
@@ -688,7 +706,11 @@ export default {
       yearWindPieData: [],
       dayStopPieData: [],
       monthStopPieData: [],
-      yearStopPieData: []
+      yearStopPieData: [],
+
+      dialogShow: false,
+
+      form: {}
     };
   },
   methods: {
@@ -746,13 +768,30 @@ export default {
         success (res) {
           const keyArray = ["value1", "value2", "value3", "value4"];
 
-          let lostChartData = [[], [], [], []];
+          let lostChartData = [{
+            text: "实发功率",
+            value: [{
+              text: "1",
+              value: 1,
+            }]
+          }, {
+            text: "保证功率",
+            value: []
+          }, {
+            text: "风速",
+            value: []
+          }, {
+            text: "状态",
+            value: []
+          }];
           const lostChartUnit = ["实发功率", "保证功率", "风速", "状态"];
 
-
           keyArray.forEach((key, keyIndex) => {
             res.data.forEach(ele => {
-              lostChartData[keyIndex].push(ele[key]);
+              lostChartData[keyIndex].value.push({
+                text: new Date(ele.time).formatDate("hh:mm"),
+                value: ele[key]
+              });
             });
           });
           that.lostChartData = lostChartData;
@@ -779,7 +818,10 @@ export default {
               name: pEle[0].name,
               start: (pIndex ? LostChartBgColorData[pIndex - 1].end : 0),
               end: (pIndex ? LostChartBgColorData[pIndex - 1].end : 0) + ((new Date(pEle[0].time2).getTime() / 1000) - (new Date(pEle[0].time1).getTime() / 1000)),
-              color: pEle[0].itemStyle.color
+              color: pEle[0].itemStyle.color,
+              beginDate: pEle[0].time1,
+              endDate: pEle[0].time2,
+              wtId: that.wtId
             });
           });
           that.LostChartBgColorData = LostChartBgColorData;
@@ -787,6 +829,24 @@ export default {
       });
     },
 
+    // 损失电量分析图背景颜色区域点击事件
+    areaBarChartClick (item) {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "goodness/plotBandAjax",
+        data: {
+          wtId: item.data.wtId,
+          beginDate: item.data.beginDate,
+          endDate: item.data.endDate
+        },
+        success (res) {
+          that.form = res.data || {};
+          that.dialogShow = true;
+        }
+      });
+    },
+
     // tab1 - 获取电量图表数据
     getPowerChartData () {
       let that = this;
@@ -946,13 +1006,9 @@ export default {
           recorddate: that.recorddate
         },
         success (res) {
-          const keyArray = ["value1", "value2", "value3", "value4"];
+          const keyArray = ["value2", "value3", "value4"];
 
           let powerLineChartData = [{
-            title: "风速",
-            yAxisIndex: 1,
-            value: []
-          }, {
             title: "实际拟合功率",
             yAxisIndex: 0,
             value: []
@@ -1001,10 +1057,12 @@ export default {
             }]
           };
 
-          res.data.data.forEach((ele) => {
-            windResourcesData.indicator.push(ele.name);
-            windResourcesData.data[0].value.push(ele.data1);
-          });
+          if (res.data.data) {
+            res.data.data.forEach((ele) => {
+              windResourcesData.indicator.push(ele.name);
+              windResourcesData.data[0].value.push(ele.data1);
+            });
+          }
 
           that.windResourcesData = windResourcesData;
         }

src/views/NewPages/personnel.vue

@@ -331,14 +331,12 @@ export default {
     },
     async todesc(item) {
       this.dialogVisible = true;
-      console.warn(item);
       this.perData = item;
       this.searchper()
     },
     async searchper() {
       const { data } = await axios.get(  //http://192.168.10.12:8082/   //http://10.155.32.4:8010
         `http://192.168.1.18:8087/bracelet/getInfo?userid=${this.perData.mobile}&beginDate=${new Date(this.startdate).formatDate("yyyy-MM-dd HH:mm:ss")}&endDate=${new Date(this.enddate).formatDate("yyyy-MM-dd HH:mm:ss")}`);
-      console.warn(data);
       let arr=[]
       data.data.forEach(e => {
           let obj={
@@ -359,9 +357,8 @@ export default {
     },
     async search(id) {
       const { data } = await axios.get(
-        `http://10.155.32.4:8087/shbraceletuser/selectRaceletUserinfo?stationid=${id}&pageNum=${1}&pageSize=${300}`
+        `http://192.168.1.18:8087/shbraceletuser/selectRaceletUserinfo?stationid=${id}&pageNum=${1}&pageSize=${300}`
       );
-      console.warn(data);
       const res = data.data.records;
       this.resData = res;
     },

src/views/WindSite/pages/Home/Home.vue

@@ -111,7 +111,7 @@
                     <svg-icon svgid="svg-intranet-involvement" />
                   </span>
                   <span class="text white">
-                      受累
+                    受累
                   </span>
                 </div>
               </row>
@@ -185,7 +185,8 @@
         </div>
         <div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
           <panel title="4小时功率曲线图">
-            <multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value" :units="Powertrend.units" :showLegend="true" />
+            <multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value" :units="Powertrend.units"
+              :showLegend="true" />
           </panel>
         </div>
         <div class="mg-l-16" style="flex:0 0 400px;">
@@ -196,36 +197,37 @@
       </div>
       <row>
         <Col :span="8">
-          <panel title="日度损失电量分析">
-            <dual-pie-chart :innerData="pieChartData.dayData" :outerData="pieChartData.dayData" height="21.296vh" />
-          </panel>
+        <panel title="日度损失电量分析">
+          <dual-pie-chart :innerData="pieChartData.dayData" :outerData="pieChartData.dayData" height="21.296vh" />
+        </panel>
         </Col>
         <Col :span="8">
-          <panel title="月度损失电量分析">
-            <dual-pie-chart :innerData="pieChartData.monthData" :outerData="pieChartData.monthData" height="21.296vh" />
-          </panel>
+        <panel title="月度损失电量分析">
+          <dual-pie-chart :innerData="pieChartData.monthData" :outerData="pieChartData.monthData" height="21.296vh" />
+        </panel>
         </Col>
         <Col :span="8">
-          <panel title="年度损失电量分析">
-            <dual-pie-chart :innerData="pieChartData.yearData" :outerData="pieChartData.yearData" height="21.296vh" />
-          </panel>
+        <panel title="年度损失电量分析">
+          <dual-pie-chart :innerData="pieChartData.yearData" :outerData="pieChartData.yearData" height="21.296vh" />
+        </panel>
         </Col>
       </row>
       <row>
         <Col :span="8">
-          <panel title="日度损失电量分析">
-            <hover-bar-chart :list="dayLost" height="21.296vh" />
-          </panel>
+        <panel title="日度损失电量分析">
+          <hover-bar-chart :list="dayLost" height="21.296vh" />
+        </panel>
         </Col>
         <Col :span="8">
-          <panel title="日发电量对比">
-            <multiple-bar-chart height="21.296vh" :list="CompleteElectricity.data" :units="CompleteElectricity.units" :showLegend="true" />
-          </panel>
+        <panel title="日发电量对比">
+          <multiple-bar-chart height="21.296vh" :list="CompleteElectricity.data" :units="CompleteElectricity.units"
+            :showLegend="true" />
+        </panel>
         </Col>
         <Col :span="8">
-          <panel title="月发电量对比">
-            <normal-line-chart height="21.296vh" :list="MonthCompare.value" :units="MonthCompare.units" />
-          </panel>
+        <panel title="月发电量对比">
+          <normal-line-chart height="21.296vh" :list="MonthCompare.value" :units="MonthCompare.units" />
+        </panel>
         </Col>
       </row>
     </div>
@@ -256,7 +258,7 @@ export default {
   // 使用组件
   components: { BtnGroup2, WindSiteWeather, Row, Col, Panel, DualPieChart, MultipleLineChart, Panel3, SvgIcon, HoverBarChart, MultipleBarChart, NormalLineChart, LightMatrix, BtnGroupDouble, Station },
   // 数据
-  data() {
+  data () {
     return {
       timmer: null, // 计时器
       timmer2: null,
@@ -351,12 +353,12 @@ export default {
   },
   // 函数
   methods: {
-    getWp() {
+    getWp () {
       let that = this;
       that.API.requestData({
         method: "GET",
         subUrl: "powercompare/windfarmAllAjax",
-        success(res) {
+        success (res) {
           let btnGroups = [
             {
               icon: "svg-wind-site",
@@ -388,7 +390,7 @@ export default {
       });
     },
 
-    renderBtnActiveIndex() {
+    renderBtnActiveIndex () {
       this.btnGroupsss.forEach((pEle, pIndex) => {
         pEle.btns.forEach((cEle, cIndex) => {
           if (cEle.code === this.wpId) {
@@ -399,13 +401,13 @@ export default {
       });
     },
 
-    select(res) {
+    select (res) {
       this.$router.replace({
         path: `/monitor/windsite/home/${res.code}`,
       });
     },
     // 根据风机状态码返回对应 class
-    getColor(fjzt) {
+    getColor (fjzt) {
       switch (fjzt) {
         case 0:
           return "green";
@@ -424,7 +426,7 @@ export default {
       }
     },
     // 请求服务
-    requestData(showLoading) {
+    requestData (showLoading) {
       this.requestWpInfo(showLoading);
       this.requestLoss(showLoading);
       this.requestPower(showLoading);
@@ -432,7 +434,7 @@ export default {
     },
 
     // 获取场站监视数据
-    requestWpInfo(showLoading) {
+    requestWpInfo (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
@@ -441,7 +443,7 @@ export default {
         data: {
           wpId: that.wpId,
         },
-        success(res) {
+        success (res) {
           if (res.data) {
             that.tqmap = res.data.tqmap;
             let fjmap = [];
@@ -586,7 +588,7 @@ export default {
     },
 
     // 获取日度损失电量分析
-    requestLoss(showLoading) {
+    requestLoss (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
@@ -595,7 +597,7 @@ export default {
         data: {
           wpId: that.wpId,
         },
-        success(res) {
+        success (res) {
           let dayLost = [];
           res.data.forEach((ele) => {
             dayLost.push({
@@ -609,7 +611,7 @@ export default {
     },
 
     // 获取完成电量
-    requestPower(showLoading) {
+    requestPower (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
@@ -618,7 +620,7 @@ export default {
         data: {
           wpId: that.wpId,
         },
-        success(res) {
+        success (res) {
           let data = [
             {
               title: "发电量",
@@ -649,7 +651,7 @@ export default {
     },
 
     // 获取月发电量对比
-    requestMonthPower(showLoading) {
+    requestMonthPower (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
@@ -658,7 +660,7 @@ export default {
         data: {
           wpId: that.wpId,
         },
-        success(res) {
+        success (res) {
           let data = [
             {
               title: "月发电量",
@@ -689,7 +691,7 @@ export default {
     },
   },
 
-  created() {
+  created () {
     let that = this;
     that.wpId = that.$route.params.wpId;
     that.$nextTick(() => {
@@ -704,19 +706,21 @@ export default {
     });
   },
 
-  mounted() {},
+  mounted () { },
 
-  unmounted() {
+  unmounted () {
     clearInterval(this.timmer);
     clearInterval(this.timmer2);
     this.timmer = null;
     this.timmer2 = null;
   },
   watch: {
-    $route(res) {
+    $route (res) {
       this.wpId = res.params.wpId;
-      this.requestData(false);
-      this.renderBtnActiveIndex();
+      if (res.params.wpId) {
+        this.requestData(false);
+        this.renderBtnActiveIndex();
+      }
     },
   },
 };

src/views/allLifeManage/index.vue

@@ -36,7 +36,7 @@ export default {
   data () {
     const that = this;
     return {
-      tabIndex: 1,
+      tabIndex: 0,
     };
   },
 

src/views/allLifeManage/tab3.vue

@@ -71,7 +71,7 @@ export default {
       wtArray: [],
       wtId: "",
       type: "异动",
-      typeArray:[{
+      typeArray: [{
         id: "检修",
         label: "检修",
         value: "检修"
@@ -200,21 +200,15 @@ export default {
       } else {
         that.API.requestData({
           method: "GET",
-          baseURL:"http://192.168.10.18:9988/",
+          baseURL: "http://192.168.10.18:9988/",
           subUrl: "equoperationrecord/list",
           data: {
-            // wtid: that.wtId,
-            // starttime: that.starttime,
-            // endtime: that.endtime,
-            // type: that.type,
-            // pagenum:1,
-            // pagesize:50000
             wtid: that.wtId,
             starttime: that.starttime,
             endtime: that.endtime,
             type: that.type,
-            pagenum:1,
-            pagesize:50000
+            pagenum: 1,
+            pagesize: 50000
           },
           success (res) {
             that.tableData.data = res.data.records;

src/views/layout/Menu.vue

@@ -210,6 +210,23 @@ export default {
               ],
             },
             {
+              text: "可靠性分析",
+              icon: "svg-wind-site",
+              path: "/kxkfx",
+              children: [
+                {
+                  text: "预警评判分析",
+                  icon: "svg-wind-site",
+                  path: "/warnStatistics",
+                },
+                {
+                  text: "故障评判分析",
+                  icon: "svg-wind-site",
+                  path: "/malfunctionStatistics",
+                }
+              ],
+            },
+            {
               text: "风光资源分析",
               icon: "svg-wind-site",
               path: "/fgzyfx",
@@ -576,34 +593,34 @@ export default {
 <style lang="less">
 .menu {
   padding-top: 1.481vh;
- 
+
   .menu-list {
     margin: 0;
     padding: 0;
     list-style: none;
- 
+
     .menu-item {
       padding: 1.481vh 0;
       text-align: center;
- 
+
       .menu-icon {
         display: flex;
         justify-content: center;
       }
- 
+
       &.active i {
         color: #05bb4c;
         transition: color 1s;
       }
     }
   }
- 
+
   i {
     font-size: 2.222vh;
     color: rgba(255, 255, 255, 50%);
   }
 }
- 
+
 .sub-menu {
   position: absolute;
   top: 0;
@@ -614,19 +631,19 @@ export default {
   background: fade(#192a26, 75);
   border-right: 1px solid fade(@green, 50);
   box-shadow: inset 11px 0px 20px 0px fade(#021412, 60);
- 
+
   .menu-list {
     margin: 0;
     padding: 0;
     list-style: none;
- 
+
     .menu-item {
       display: flex;
       text-align: center;
       line-height: 1.5;
       padding: 8px 0;
       background: #121d1c;
- 
+
       a {
         display: flex;
         width: 100%;
@@ -634,7 +651,7 @@ export default {
         padding: 0 1.4815vh;
         font-size: @fontsize-s;
         text-decoration: unset;
- 
+
         .menu-icon {
           display: flex;
           align-items: center;
@@ -647,10 +664,10 @@ export default {
           }
         }
       }
- 
+
       &.active {
         background: #323e70;
- 
+
         .menu-icon {
           display: flex;
           svg use {
@@ -658,18 +675,18 @@ export default {
           }
         }
       }
- 
+
       .sub-menu-text {
         margin-left: 1.1111vh;
         color: @gray-l;
       }
- 
+
       & + .menu-item {
         border-top: 1px solid fade(@darkgray, 40);
       }
     }
   }
- 
+
   i {
     font-size: 2.222vh;
     color: rgba(255, 255, 255, 50%);

src/views/warn/tjsj.vue

@@ -28,37 +28,25 @@
         </div>
         <div class="query-item">
           <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="value1"
-              @change="BeginChange(value1)"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
+            <div class="lable">开始日期：</div>
+            <div class="search-input">
+              <el-date-picker v-model="value1" @change="BeginChange(value1)" type="date" value-format="YYYY-MM-DD"
+                placeholder="选择日期" popper-class="date-select">
+              </el-date-picker>
+            </div>
           </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="value2"
-              @change="EndChange(value2)"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
-            <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="''" />
+          <div class="query-item">
+            <div class="lable">结束日期：</div>
+            <div class="search-input">
+              <el-date-picker v-model="value2" @change="EndChange(value2)" type="date" value-format="YYYY-MM-DD"
+                placeholder="选择日期" popper-class="date-select">
+              </el-date-picker>
+              <div class="unit svg-icon svg-icon-gray">
+                <svg-icon :svgid="''" />
+              </div>
             </div>
           </div>
         </div>
-        </div>
       </div>
       <div class="query-actions" style="margin-right: 1500px">
         <button class="btn green" @click="onClickSearch">查询</button>
@@ -75,7 +63,7 @@ import ComTable from "@com/coms/table/table.vue";
 
 export default {
   components: { ComTable },
-  data() {
+  data () {
     return {
       value1: "",
       value2: "",
@@ -85,14 +73,14 @@ export default {
       wtId: "",
       type: "",
       typeArray: [
-        
+
         {
           id: 4,
-          name: '维护'        
+          name: '维护'
         },
         {
           id: 2,
-          name: '故障'        
+          name: '故障'
         }],
       tableData: {
         column: [
@@ -155,30 +143,30 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     // this.requestSafeList();
     this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
-		this.value2 = this.getTime(2);
+    this.value2 = this.getTime(2);
     this.getWp();
     this.requestSafeList();
   },
   methods: {
-    getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
-				var date = new Date();
-				var year = date.getFullYear(),
-					month = date.getMonth() + 1,
-					day = date.getDate();
-				month >= 1 && month <= 9 ? (month = '0' + month) : '';
-				day >= 0 && day <= 9 ? (day = '0' + day) : '';
-				var begin = year + '-' + month + '-01';
-				var end = year + '-' + month + '-' + day;
-				if (val == 1) {
-					return begin;
-				} else if (val == 2) {
-					return end;
-				}
-			},
-// 获取风场
+    getTime (val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+      var date = new Date();
+      var year = date.getFullYear(),
+        month = date.getMonth() + 1,
+        day = date.getDate();
+      month >= 1 && month <= 9 ? (month = '0' + month) : '';
+      day >= 0 && day <= 9 ? (day = '0' + day) : '';
+      var begin = year + '-' + month + '-01';
+      var end = year + '-' + month + '-' + day;
+      if (val == 1) {
+        return begin;
+      } else if (val == 2) {
+        return end;
+      }
+    },
+    // 获取风场
     getWp (reGetWp) {
       let that = this;
       that.API.requestData({
@@ -211,21 +199,21 @@ export default {
         });
       }
     },
-    BeginChange(vl) {
+    BeginChange (vl) {
       this.value1 = vl;
     },
-    EndChange(vl) {
+    EndChange (vl) {
       this.value2 = vl;
     },
-    typeChange(vl) {
+    typeChange (vl) {
       this.type = vl;
     },
     // 搜索按钮
-    onClickSearch() {
+    onClickSearch () {
       this.requestSafeList();
     },
     // 获取停机事件
-    requestSafeList() {
+    requestSafeList () {
       let that = this;
 
       let data = {
@@ -238,24 +226,24 @@ export default {
         wpId: that.wpId,
       };
 
-      if(that.wtId!='') data.wtId=that.wtId;
-      if(that.type!='') data.type=that.type;
+      if (that.wtId != '') data.wtId = that.wtId;
+      if (that.type != '') data.type = that.type;
 
       this.API.requestData({
         method: "POST",
         subUrl: "/event/getShutdownevent",
         data,
-        success(res) {
+        success (res) {
           if (res.code == 200) {
             that.tableData.data = [];
-            if(res.data.list.length){
+            if (res.data.list.length) {
               let data = res.data.list;
               for (var i = 0; i < data.length; i++) {
                 let obj = {
                   wpName: data[i].wpName,
                   wtName: data[i].wtName,
                   stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
-                  
+
                   stopHours: data[i].stopHours,
                   statusName: data[i].statusName,
                   warnDesc: data[i].warnDesc,
@@ -263,11 +251,11 @@ export default {
                   handleWay: data[i].handleWay,
 
                 };
-                if(data[i].startTime) obj.startTime=new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss");
+                if (data[i].startTime) obj.startTime = new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss");
                 that.tableData.data.push(obj);
               }
             }
-            
+
           }
         },
       });

src/views/warn/xdgl.vue

@@ -12,37 +12,25 @@
         </div>
         <div class="query-item">
           <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="value1"
-              @change="BeginChange(value1)"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
+            <div class="lable">开始日期：</div>
+            <div class="search-input">
+              <el-date-picker v-model="value1" @change="BeginChange(value1)" type="date" value-format="YYYY-MM-DD"
+                placeholder="选择日期" popper-class="date-select">
+              </el-date-picker>
+            </div>
           </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="value2"
-              @change="EndChange(value2)"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
-            <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="''" />
+          <div class="query-item">
+            <div class="lable">结束日期：</div>
+            <div class="search-input">
+              <el-date-picker v-model="value2" @change="EndChange(value2)" type="date" value-format="YYYY-MM-DD"
+                placeholder="选择日期" popper-class="date-select">
+              </el-date-picker>
+              <div class="unit svg-icon svg-icon-gray">
+                <svg-icon :svgid="''" />
+              </div>
             </div>
           </div>
         </div>
-        </div>
       </div>
       <div class="query-actions" style="margin-right: 1500px">
         <button class="btn green" @click="onClickSearch">查询</button>
@@ -59,7 +47,7 @@ import ComTable from "@com/coms/table/table.vue";
 
 export default {
   components: { ComTable },
-  data() {
+  data () {
     return {
       value1: "",
       value2: "",
@@ -120,35 +108,35 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     // this.requestSafeList();
     this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
-		this.value2 = this.getTime(2);
+    this.value2 = this.getTime(2);
     this.getWp();
     this.requestSafeList();
   },
   methods: {
-    getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
-				var date = new Date();
-				var year = date.getFullYear(),
-					month = date.getMonth() + 1,
-					day = date.getDate();
-				month >= 1 && month <= 9 ? (month = '0' + month) : '';
-				day >= 0 && day <= 9 ? (day = '0' + day) : '';
-				var begin = year + '-' + month + '-01';
-				var end = year + '-' + month + '-' + day;
-				if (val == 1) {
-					return begin;
-				} else if (val == 2) {
-					return end;
-				}
-			},
-// 获取风场
+    getTime (val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+      var date = new Date();
+      var year = date.getFullYear(),
+        month = date.getMonth() + 1,
+        day = date.getDate();
+      month >= 1 && month <= 9 ? (month = '0' + month) : '';
+      day >= 0 && day <= 9 ? (day = '0' + day) : '';
+      var begin = year + '-' + month + '-01';
+      var end = year + '-' + month + '-' + day;
+      if (val == 1) {
+        return begin;
+      } else if (val == 2) {
+        return end;
+      }
+    },
+    // 获取风场
     getWp (reGetWp) {
       let that = this;
       that.API.requestData({
         baseURL: "http://10.155.32.4:9001",
-          subUrl: "benchmarking/wplist",
+        subUrl: "benchmarking/wplist",
         success (res) {
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
@@ -158,22 +146,22 @@ export default {
       });
     },
 
-    
-    BeginChange(vl) {
+
+    BeginChange (vl) {
       this.value1 = vl;
     },
-    EndChange(vl) {
+    EndChange (vl) {
       this.value2 = vl;
     },
-    typeChange(vl) {
+    typeChange (vl) {
       this.type = vl;
     },
     // 搜索按钮
-    onClickSearch() {
+    onClickSearch () {
       this.requestSafeList();
     },
     // 获取限电事间
-    requestSafeList() {
+    requestSafeList () {
       let that = this;
 
       let data = {
@@ -186,20 +174,20 @@ export default {
         wpId: that.wpId,
       };
 
-      
+
 
       this.API.requestData({
         method: "POST",
         subUrl: "/brownouts/getBrownoutsList",
         data,
-        success(res) {
+        success (res) {
           if (res.code == 200) {
             that.tableData.data = [];
-            if(res.data.list.length){
+            if (res.data.list.length) {
               let data = res.data.list;
               for (var i = 0; i < data.length; i++) {
                 let obj = {
-                  id: i+1,
+                  id: i + 1,
                   stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
                   startTime: new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss"),
                   stopTypeId: data[i].stopTypeId,

src/views/windAnalysis/tab1.vue

@@ -22,7 +22,7 @@
         <button class="btn green" @click="search">搜索</button>
       </div>
     </div>
-    <NormalScatterChart height="650px" :data="chartData" :showLegend="true" />
+    <NormalScatterChart height="650px" :data="chartData" xTitle="风速" yTitle="功率" :showLegend="true" />
   </div>
 </template>
 

src/views/windAnalysis/tab2.vue

@@ -31,7 +31,7 @@
         <button class="btn green" @click="search">搜索</button>
       </div>
     </div>
-    <NormalScatterChart height="650px" :data="chartData" :showLegend="true" />
+    <NormalScatterChart height="650px" :data="chartData" xTitle="风速" yTitle="功率" :showLegend="true" />
   </div>
 </template>
 
@@ -103,7 +103,7 @@ export default {
         method: "POST",
         subUrl: "scatter/scatterAjax",
         data: {
-          wpId: that.wpId,
+          wpId: "",
           pjId: that.projectId,
           lnId: "",
           year: (that.recorddate ? new Date(that.recorddate).getFullYear() : ""),

src/views/windAnalysis/tab3.vue

@@ -31,7 +31,7 @@
         <button class="btn green" @click="search">搜索</button>
       </div>
     </div>
-    <NormalScatterChart height="650px" :data="chartData" :showLegend="true" />
+    <NormalScatterChart height="650px" :data="chartData" xTitle="风速" yTitle="功率" :showLegend="true" />
   </div>
 </template>
 
@@ -103,7 +103,7 @@ export default {
         method: "POST",
         subUrl: "scatter/scatterAjax",
         data: {
-          wpId: that.wpId,
+          wpId: "",
           pjId: "",
           lnId: that.lineId,
           year: (that.recorddate ? new Date(that.recorddate).getFullYear() : ""),