4-13

src/App.vue

@@ -89,6 +89,7 @@
           </el-submenu>
           <el-submenu index="5">
             <template slot="title">健康管理</template>
+            <el-menu-item index="/FitnessRegulate">健康管理</el-menu-item>
             <el-menu-item index="/healthAssessment">健康评价报告</el-menu-item>
           </el-submenu>
           <el-submenu index="6">

src/router/index.js

@@ -276,6 +276,13 @@ const routes = [{
 		name: 'healthAssessment',
 		component: () => import('../views/HealthManagement/HealthAssessment.vue')
 	}
+	,
+	{
+		path: '/FitnessRegulate',
+		name: 'FitnessRegulate',
+		component: () => import('../views/FitnessRegulate/FitnessRegulate.vue')
+	}
+	,
 	
 ]
 

src/views/FitnessRegulate/FitnessRegulate.vue

@@ -0,0 +1,618 @@
+<template>
+  <el-container>
+    <template>
+      <el-tabs
+        v-model="activeName"
+        type="card"
+        @tab-click="handleClick"
+        style="height: 100%; width: 99.8%"
+      >
+        <el-tab-pane label="未确认缺陷" name="serial_1">
+          <el-button class="qbhl" type="danger" @click="ignore_all_check"
+            >全部忽略</el-button
+          >
+          <el-button class="qbqr" type="danger" @click="affirm_all_check"
+            >全部确认</el-button
+          >
+          <el-row style="width: 100%">
+            <el-col :span="2">
+              <el-button
+                size="medium"
+                type="primary"
+                icon="el-icon-menu"
+                @click="weekfitness"
+                style="margin: 33px 0px 33px 13px; width: 133px"
+                >7天健康趋势</el-button
+              >
+              <el-button
+                size="medium"
+                type="primary"
+                icon="el-icon-s-grid"
+                @click="monthfitness"
+                style="margin: 33px 0px 33px 13px; width: 133px"
+                >30天健康趋势</el-button
+              >
+            </el-col>
+            <el-col :span="22">
+              <div class="box">
+                <div
+                  id="fitnessRegulate"
+                  style="width: 100%; height: 300px"
+                ></div>
+              </div>
+            </el-col>
+          </el-row>
+          <template>
+            <el-tabs
+              v-model="contraryName"
+              type="card"
+              @tab-click="contraryClick"
+              style="height: 100%; width: 100%"
+            >
+              <el-tab-pane label="当日内推荐" name="contrary_1">
+                <el-form
+                  ref="form"
+                  :model="Recommend"
+                  label-position="left"
+                  label-width="99px"
+                  style="width: 100%; margin-left: 3px"
+                >
+                  <el-row :gutter="20">
+                    <el-col
+                      :span="4"
+                      v-for="domain in Recommend"
+                      :key="domain.key"
+                      style="
+                        margin-bottom: 6px;
+                        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.55),
+                          0 0 6px rgba(0, 0, 0, 0.99);
+                      "
+                    >
+                      <el-form-item
+                        label-width="33px"
+                        style="background: #545c64"
+                      >
+                        <span style="color: #fff; font-size: 16px"
+                          >风机编号</span
+                        ><el-input
+                          v-model="domain.wtid"
+                          style="width: 99px; color: #fff"
+                        ></el-input
+                        ><span style="color: #fff; font-size: 16px"
+                          >健康报告</span
+                        >
+                      </el-form-item>
+                      <el-form-item label="推荐理由" label-width="99px">
+                        <el-input
+                          type="textarea"
+                          v-model="domain.reason"
+                        ></el-input>
+                      </el-form-item>
+                      <el-form-item label="推荐检修时间" label-width="99px">
+                        <el-date-picker
+                          v-model="domain.createdate"
+                          disabled
+                          size="mini"
+                          placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                      <el-form-item label="对应风速" label-width="99px">
+                        <el-input
+                          type="textarea"
+                          v-model="domain.speed"
+                        ></el-input>
+                      </el-form-item>
+                      <el-form-item label="判断时间" label-width="99px">
+                        <el-date-picker
+                          v-model="domain.recodedate"
+                          disabled
+                          size="mini"
+                          placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button
+                          type="primary"
+                          icon="el-icon-check"
+                          style="margin-left: -33px"
+                          >提交</el-button
+                        >
+                        <el-button
+                          type="info"
+                          icon="el-icon-close"
+                          style="margin-left: 33px"
+                          >忽略</el-button
+                        >
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-tab-pane>
+              <el-tab-pane label="三日内推荐" name="contrary_2">
+                <el-form
+                  ref="form"
+                  :model="threeday"
+                  label-position="left"
+                  label-width="99px"
+                  style="width: 100%; margin-left: 3px"
+                >
+                  <el-row :gutter="20">
+                    <el-col
+                      :span="4"
+                      v-for="domain in Exceedthreeday"
+                      :key="domain.key"
+                      style="
+                        margin-bottom: 6px;
+                        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.55),
+                          0 0 6px rgba(0, 0, 0, 0.99);
+                      "
+                    >
+                      <el-form-item
+                        label-width="33px"
+                        style="background: #545c64"
+                      >
+                        <span style="color: #fff; font-size: 16px"
+                          >风机编号</span
+                        ><el-input
+                          v-model="domain.wtid"
+                          style="width: 99px; color: #fff"
+                        ></el-input
+                        ><span style="color: #fff; font-size: 16px"
+                          >健康报告</span
+                        >
+                      </el-form-item>
+                      <el-form-item label="推荐理由" label-width="99px">
+                        <el-input
+                          type="textarea"
+                          v-model="domain.reason"
+                        ></el-input>
+                      </el-form-item>
+                      <el-form-item label="推荐检修时间" label-width="99px">
+                        <el-date-picker
+                          v-model="domain.createdate"
+                          disabled
+                          size="mini"
+                          placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                      <el-form-item label="对应风速" label-width="99px">
+                        <el-input
+                          type="textarea"
+                          v-model="domain.speed"
+                        ></el-input>
+                      </el-form-item>
+                      <el-form-item label="判断时间" label-width="99px">
+                        <el-date-picker
+                          v-model="domain.recodedate"
+                          disabled
+                          size="mini"
+                          placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button
+                          type="primary"
+                          icon="el-icon-check"
+                          style="margin-left: -33px"
+                          >提交</el-button
+                        >
+                        <el-button
+                          type="info"
+                          icon="el-icon-close"
+                          style="margin-left: 33px"
+                          >忽略</el-button
+                        >
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-tab-pane>
+              <el-tab-pane label="超三日推荐" name="contrary_3">
+                <el-form
+                  ref="form"
+                  :model="Exceedthreeday"
+                  label-position="left"
+                  label-width="99px"
+                  style="width: 100%; margin-left: 3px"
+                >
+                  <el-row :gutter="20">
+                    <el-col
+                      :span="4"
+                      v-for="(domain, i) in Exceedthreeday"
+                      :key="domain.key"
+                      style="
+                        margin-bottom: 6px;
+                        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.55),
+                          0 0 6px rgba(0, 0, 0, 0.99);
+                      "
+                    >
+                      <div v-if="domain.rid">
+                        <el-form-item
+                          label-width="33px"
+                          style="background: #545c64"
+                        >
+                          <span style="color: #fff; font-size: 16px"
+                            >风机编号</span
+                          ><el-input
+                            v-model="domain.wtid"
+                            style="width: 99px; color: #fff"
+                          ></el-input
+                          ><span style="color: #fff; font-size: 16px"
+                            >健康报告</span
+                          >
+                        </el-form-item>
+                        <el-form-item label="推荐理由" label-width="99px">
+                          <el-input
+                            type="textarea"
+                            v-model="domain.reason"
+                          ></el-input>
+                        </el-form-item>
+                        <el-form-item label="推荐检修时间" label-width="99px">
+                          <el-date-picker
+                            v-model="domain.createdate"
+                            disabled
+                            size="mini"
+                            placeholder="选择日期时间"
+                          >
+                          </el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="对应风速" label-width="99px">
+                          <el-input
+                            type="textarea"
+                            v-model="domain.speed"
+                          ></el-input>
+                        </el-form-item>
+                        <el-form-item label="判断时间" label-width="99px">
+                          <el-date-picker
+                            v-model="domain.recodedate"
+                            disabled
+                            size="mini"
+                            placeholder="选择日期时间"
+                          >
+                          </el-date-picker>
+                        </el-form-item>
+                        <el-form-item>
+                          <el-button
+                            type="primary"
+                            icon="el-icon-check"
+                            style="margin-left: -33px"
+                            @click="confirpush_check(domain.wtid, i)"
+                            >提交</el-button
+                          >
+                          <el-button
+                            type="info"
+                            icon="el-icon-close"
+                            style="margin-left: 33px"
+                            @click="ignorepush(domain.wtid, i)"
+                            >忽略</el-button
+                          >
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-tab-pane>
+            </el-tabs>
+          </template>
+        </el-tab-pane>
+        <el-tab-pane label="已确认缺陷" name="serial_2">已确认缺陷</el-tab-pane>
+        <el-tab-pane label="已分配任务" name="serial_3">已分配任务</el-tab-pane>
+        <el-tab-pane label="已完成任务" name="serial_4">已完成任务</el-tab-pane>
+      </el-tabs>
+    </template>
+  </el-container>
+</template>
+<script>
+import * as echarts from "echarts";
+import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
+export default {
+  data() {
+    return {
+      FClist: {
+        name: "",
+        id: "",
+      },
+      activeName: "serial_1",
+      contraryName: "contrary_1",
+
+      Recommend: [],
+      Exceedthreeday: [],
+      threeday: [],
+    };
+  },
+  methods: {
+    query_fc() {
+      var newData = new Date();
+      this.beginDate = formateDate1(newData.getTime() / 1000);
+      this.endDate = formateDate(newData.getTime() / 1000);
+      this.$http.get("powercompare/windfarmAjax?").then((res) => {
+        this.FClist = res.data.data;
+      });
+    },
+    handleClick() {
+      if (this.activeName == "serial_1") {
+      } else if (this.activeName == "serial_2") {
+      } else if (this.activeName == "serial_3") {
+      } else if (this.activeName == "serial_4") {
+      }
+    },
+    contraryClick() {
+      this.Recommend = [];
+      this.Exceedthreeday = [];
+      this.threeday = [];
+      if (this.contraryName == "contrary_1") {
+        this.currentRecommend();
+      } else if (this.contraryName == "contrary_2") {
+        this.threedayRecommend();
+      } else if (this.contraryName == "contrary_3") {
+        this.exceedthreedayRecommend();
+      }
+    },
+    filter_pd_date(cellValue) {
+      let date = new Date(cellValue.recodedate);
+      return formateDate(date / 1000);
+    },
+    filter_tj_date(cellValue) {
+      let date = new Date(cellValue.createdate);
+      return formateDate(date / 1000);
+    },
+    async weekfitness() {
+      var digital = new URLSearchParams();
+      digital.append("wpId", "0");
+      digital.append("type", 2);
+      const weekDateList = await this.$http.post(
+        "/recommen/findAllChartjz",
+        digital
+      );
+      this.draw_fitnessRegulate(weekDateList.data.data);
+    },
+    async monthfitness() {
+      var digital = new URLSearchParams();
+      digital.append("wpId", "0");
+      digital.append("type", 3);
+      const weekDateList = await this.$http.post(
+        "/recommen/findAllChartjz",
+        digital
+      );
+      this.draw_fitnessRegulate(weekDateList.data.data);
+    },
+    affirm_all_check() {},
+    ignore_all_check() {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.ignore_all();
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    async ignore_all() {
+      var digital = new URLSearchParams();
+      if (this.contraryName == "contrary_1") {
+        digital.append("typeid", 1);
+      } else if (this.contraryName == "contrary_2") {
+        digital.append("typeid", 2);
+      } else if (this.contraryName == "contrary_3") {
+        digital.append("typeid", 3);
+      }
+
+      const confir = await this.$http.post("/recommen/ignorepushAll", digital);
+      if (confir.data.code == 200 && this.contraryName == "contrary_1") {
+        this.Recommend.splice(0);
+        this.success_tj();
+      } else if (confir.data.code == 200 && this.contraryName == "contrary_2") {
+        this.threeday.splice(0);
+        this.success_tj();
+      } else if (confir.data.code == 200 && this.contraryName == "contrary_3") {
+        this.Exceedthreeday.splice(0);
+        this.success_tj();
+      } else {
+        this.fail_tj();
+      }
+    },
+    confirpush_check(rid, key) {
+      console.log(key);
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.confirpush(rid, key);
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    async confirpush(rid, key) {
+      let that = this;
+      var digital = new URLSearchParams();
+      digital.append("rid", rid);
+      const confir = await this.$http.post("/recommen/confirpush", digital);
+      if (confir.data.code == 200) {
+        this.Exceedthreeday.splice(key, 1);
+        this.success_tj();
+      } else {
+        this.fail_tj();
+      }
+    },
+    async ignorepush(rid, key) {
+      var digital = new URLSearchParams();
+      digital.append("rid", rid);
+      const ignore = await this.$http.post("/recommen/ignorepush", digital);
+      if (ignore.data.code == 200) {
+        this.Exceedthreeday.splice(key, 1);
+        this.success_tj();
+      } else {
+        this.fail_tj();
+      }
+    },
+    success_tj() {
+      this.$message({
+        message: "恭喜你，成功！",
+        type: "success",
+      });
+    },
+    fail_tj() {
+      this.$message.error("失败！");
+    },
+    async currentRecommend() {
+      const currentRecommend = await this.$http.post(
+        "/recommen/getRecommenmainDay1"
+      );
+      this.Recommend = currentRecommend.data.data;
+    },
+    async threedayRecommend() {
+      const currentRecommend = await this.$http.post(
+        "/recommen/getRecommenmainDay3"
+      );
+      this.threeday = currentRecommend.data.data;
+    },
+    async exceedthreedayRecommend() {
+      const currentRecommend = await this.$http.post(
+        "/recommen/getRecommenmainDay7"
+      );
+      this.Exceedthreeday = currentRecommend.data.data;
+    },
+    draw_fitnessRegulate(weekDateList) {
+      let linearBarDom = echarts.getInstanceByDom(
+        document.getElementById("fitnessRegulate")
+      );
+      if (linearBarDom == null) {
+        linearBarDom = echarts.init(document.getElementById("fitnessRegulate"));
+      }
+      var option;
+
+      option = {
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+            crossStyle: {
+              color: "#999",
+            },
+          },
+        },
+        toolbox: {},
+        legend: {
+          show: false,
+          data: ["优", "良", "差", "健康情况"],
+        },
+        xAxis: [
+          {
+            type: "category",
+            data: weekDateList.datechart,
+            axisPointer: {
+              type: "shadow",
+            },
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            name: "健康趋势",
+            min: 98.5,
+            max: 100.5,
+            axisLabel: {
+              formatter: "{value}",
+            },
+          },
+          {
+            type: "value",
+            name: "故障风机",
+            min: 0,
+            max: 1000,
+            axisLabel: {
+              formatter: "{value}",
+            },
+          },
+        ],
+        series: [
+          {
+            name: "优",
+            type: "bar",
+            stack: "total",
+            yAxisIndex: 1,
+            data: weekDateList.yslchart,
+          },
+          {
+            name: "良",
+            type: "bar",
+            stack: "total",
+            yAxisIndex: 1,
+            data: weekDateList.lslchart,
+          },
+          {
+            name: "差",
+            type: "bar",
+            stack: "total",
+            yAxisIndex: 1,
+            data: weekDateList.cslchart,
+          },
+          {
+            name: "健康情况",
+            type: "line",
+            data: weekDateList.lvchart,
+          },
+        ],
+      };
+
+      linearBarDom.setOption(option);
+    },
+  },
+  mounted() {
+    this.weekfitness();
+    this.currentRecommend();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.bg-purple-dark {
+  background: #fff;
+}
+/deep/::-webkit-scrollbar {
+  z-index: 99999999;
+  width: 6px;
+  height: 13px !important;
+  background-color: #f5f5f5;
+}
+/deep/.el-form-item {
+  margin-bottom: 0px;
+}
+/deep/.el-input__inner {
+  border: 0px solid #dcdfe6;
+  background-color: #545c64;
+  color: #fff;
+}
+/deep/.el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 188px;
+}
+.qbqr {
+  position: absolute;
+  left: 888px;
+  top: 301px;
+  z-index: 999;
+}
+.qbhl {
+  position: absolute;
+  left: 1033px;
+  top: 301px;
+  z-index: 999;
+}
+</style>

src/views/Performance/NewPerformanceList.vue

@@ -665,6 +665,7 @@ export default {
       tableid: "fc",
       celname: [],
       datelength: 0,
+      queryAll_table_lyl:[],
     };
   },
   methods: {
@@ -766,6 +767,7 @@ export default {
       Object.assign(this.$data.styleObject_pj, this.$options.data().styleObject_pj);
       Object.assign(this.$data.autoHeight_xl, this.$options.data().autoHeight_xl);
       Object.assign(this.$data.styleObject_xl, this.$options.data().styleObject_xl);
+      Object.assign(this.$data.queryAll_table_lyl, this.$options.data().queryAll_table_lyl);
     },
     query() {
       this.resetdata();
@@ -789,7 +791,8 @@ export default {
         )
         .then((res) => {
           let that = this;
-          let queryAll = res.data.data;
+          let queryAll = res.data.data.list;
+          let queryAll_table_lyl = res.data.data.lyl;
           this.datelength = queryAll.length;
           for (let i = 0; i < queryAll.length; i++) {
             this.powerAjaxDetailAll.generation[i] = queryAll[i].generation;
@@ -809,12 +812,12 @@ export default {
             this.powerAjaxDetailAll.llfdl[i] = queryAll[i].llfdl.toFixed(2);
           }
           if (this.tableid === "fc") {
-            that.drawhistogram_fc(this.powerAjaxDetailAll);
+            that.drawhistogram_fc(this.powerAjaxDetailAll,queryAll_table_lyl);
           } else if (this.tableid === "pj") {
-            that.drawhistogram_pj(this.powerAjaxDetailAll);
+            that.drawhistogram_pj(this.powerAjaxDetailAll,queryAll_table_lyl);
           } else if (this.tableid === "xl") {
             this.autoHeight = 1200;
-            that.drawhistogram_xl(this.powerAjaxDetailAll);
+            that.drawhistogram_xl(this.powerAjaxDetailAll,queryAll_table_lyl);
           }
         });
       //表格数据获取
@@ -829,7 +832,7 @@ export default {
         )
         .then((res) => {
           let that = this;
-          let queryAll_table = res.data.data;
+          let queryAll_table = res.data.data.list;
           if (this.tableid === "fc") {
             that.fc_date = queryAll_table;
           } else if (this.tableid === "pj") {
@@ -875,7 +878,8 @@ export default {
           )
           .then((res) => {
             let that = this;
-            let queryAll = res.data.data;
+            let queryAll = res.data.data.list;
+            let queryAll_table_lyl = res.data.data.lyl;
             this.datelength = queryAll.length;
             this.len = queryAll.length;
             if(this.len <= 10){that.autoHeight_fc = 580; that.styleObject_fc.height = '700px' }
@@ -906,13 +910,13 @@ export default {
               this.powerAjaxDetailAll.llfdl[i] = queryAll[i].llfdl.toFixed(2);
             }
             if (this.tableid === "fc") {
-              that.drawhistogram_fc(this.powerAjaxDetailAll);
+              that.drawhistogram_fc(this.powerAjaxDetailAll,queryAll_table_lyl);
             } else if (this.tableid === "pj") {
-              that.drawhistogram_pj(this.powerAjaxDetailAll);
+              that.drawhistogram_pj(this.powerAjaxDetailAll,queryAll_table_lyl);
             } else if (this.tableid === "xl") {
-              that.drawhistogram_xl(this.powerAjaxDetailAll);
+              that.drawhistogram_xl(this.powerAjaxDetailAll,queryAll_table_lyl);
             }
-            let queryAll_table = res.data.data;
+            let queryAll_table = res.data.data.list;
             if (this.tableid === "fc") {
               that.fc_date = queryAll_table;
             } else if (this.tableid === "pj") {
@@ -961,7 +965,7 @@ export default {
             excelHelper.exportExcel("xl_table","xl数据",".xls",true);
             }
     },
-    drawhistogram_fc(date) {
+    drawhistogram_fc(date,date2) {
       this.chartLine = echarts.init(document.getElementById("histogram_fc"));
       this.chartLine.clear();
       this.chartLine.resize({height: this.autoHeight_fc})
@@ -1011,6 +1015,7 @@ export default {
         },
         xAxis: {
           type: "value",
+          max: Math.ceil(Math.max.apply(null, date.llfdl))+ Math.ceil((Math.max.apply(null, date.llfdl))*0.08)
         },
         yAxis: {
           type: "category",
@@ -1177,6 +1182,9 @@ export default {
           {
             name: "总和",
             data: date.llfdl,
+            markPoint: {
+                data: date2,
+                        },
             type: "line",
             symbol: "circle",
             symbolSize: 20,
@@ -1195,7 +1203,7 @@ export default {
       };
       this.chartLine.setOption(option);
     },
-    drawhistogram_pj(date) {
+    drawhistogram_pj(date,date2) {
       this.chartLine = echarts.init(document.getElementById("histogram_xm"));
       this.chartLine.clear();
       this.chartLine.resize({height: this.autoHeight_pj})
@@ -1246,6 +1254,7 @@ export default {
         },
         xAxis: {
           type: "value",
+          max: Math.ceil(Math.max.apply(null, date.llfdl))+ Math.ceil((Math.max.apply(null, date.llfdl))*0.08)
         },
         yAxis: {
           type: "category",
@@ -1412,6 +1421,9 @@ export default {
           {
             name: "总和",
             data: date.llfdl,
+            markPoint: {
+                data: date2,
+                        },
             type: "line",
             symbol: "circle",
             symbolSize: 20,
@@ -1430,7 +1442,7 @@ export default {
       };
       this.chartLine.setOption(option);
     },
-    drawhistogram_xl(date) {
+    drawhistogram_xl(date,date2) {
       
       this.chartLine = echarts.init(document.getElementById("histogram_jdxl"));
       this.chartLine.clear();
@@ -1482,6 +1494,7 @@ export default {
         },
         xAxis: {
           type: "value",
+          max: Math.ceil(Math.max.apply(null, date.llfdl))+ Math.ceil((Math.max.apply(null, date.llfdl))*0.08)
         },
         yAxis: {
           type: "category",
@@ -1648,6 +1661,9 @@ export default {
           {
             name: "总和",
             data: date.llfdl,
+            markPoint: {
+                data: date2,
+                        },
             type: "line",
             symbol: "circle",
             symbolSize: 20,