Merge remote-tracking branch 'remotes/origin/sl' into yx

# Conflicts:
#	package.json

package.json

@@ -4,6 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
+    "servebig": "node --max-old-space-size=6000  ./node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint"

src/components/coms/wt-chooser/wt-chooser.vue

@@ -0,0 +1,70 @@
+<template>
+  <div class="query mg-b-8">
+    <div class="query-items">
+      <div class="query-item">
+        <div class="lable">风场：</div>
+        <div class="search-input">
+          <el-select v-model="wpId" clearable placeholder="请选择风场" popper-class="select" @change="getWtList">
+            <el-option v-for="item in wpList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+      <div class="query-item">
+        <div class="lable">风机：</div>
+        <div class="search-input">
+          <el-select v-model="wtId" clearable placeholder="请选择风机" popper-class="select" @change="wtChange">
+            <el-option v-for="item in wtList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 传参
+  props: {
+    wpId: { type: String, default: "MHS_FDC" },
+    wtId: { type: String, default: "MG01_01" },
+  },
+  // 事件
+  emits: {
+  },
+  data() {
+    return {
+      wpList: [],
+      wtList: [],
+    };
+  },
+  created() {
+    this.getWpList();
+    this.getWtList();
+  },
+  methods: {
+    async getWpList() {
+      const { data } = await this.API.requestData({
+        subUrl: "powercompare/windfarmAjax",
+      });
+      this.wpList = data.data;
+    },
+    async getWtList() {
+      const { data } = await this.API.requestData({
+        subUrl: "powercompare/windturbineAjax",
+        data: {
+          wpId: this.wpId,
+        },
+      });
+      this.wtList = data.data;
+    },
+    wtChange() {
+      this.$emit("change", { wtId: this.wtId, wpId: this.wpId });
+    },
+  },
+};
+</script>
+
+<style lang="less">
+</style>

src/views/HealthControl/healthLineChart.vue

@@ -1,73 +1,80 @@
-<template>
-  <div class="pageBox">
-    <simple-line-chart :height="'100px'" v-for="(item, index) in chartData" :key="index" :title="item.title" :data="item.data" :color="item.color" :lineTitle="item.lineTitle" />
-  </div>
-</template>
-
-<script>
-import SimpleLineChart from "../../components/chart/line/simple-line-chart.vue";
-export default {
-  setup() {},
-  components: { SimpleLineChart },
-  data() {
-    return {
-      chartData:[]
-    };
-  },
-
-  created() {
-    this.wtId = this.$route.params.wtId;
-    this.wpId = this.$route.params.wpId;
-    this.requestData();
-  },
-  
-  methods:{
-    requestData(){
-      let that=this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "healthsub/hsFjValueIndex",
-        data:{
-          wtId: that.wtId
-        },
-        success(res) {
-
-          const color=["green","yellow","purple","blue","orange"];
-          let chartData=[];
-          let lineTitle=[];
-
-          res.data.xData.forEach(ele=>{
-            lineTitle.push(new Date(ele).formatDate("hh:mm"));
-          });
-
-          res.data.datasets.forEach((ele,index)=>{
-            chartData.push({
-              title:ele.name,
-              data:ele.data,
-              color:color[index],
-              lineTitle
-            });
-          });
-          that.chartData=chartData;
-        },
-      });
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.pageBox {
-  width: 100%;
-  height:calc(100% - 1.481vh * 2);
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin:1.481vh 0;
-
-  .chart{
-    width: 100%;
-    height:25%;
-  }
-}
+<template>
+  <div class="pageBox">
+    <wt-chooser @change="switchWt" :wpId="wpId" :wtId="wtId"></wt-chooser>
+    <simple-line-chart :height="'100px'" v-for="(item, index) in chartData" :key="index" :title="item.title" :data="item.data" :color="item.color" :lineTitle="item.lineTitle" />
+  </div>
+</template>
+
+<script>
+import SimpleLineChart from "../../components/chart/line/simple-line-chart.vue";
+import WtChooser from "@com/coms/wt-chooser/wt-chooser.vue"
+export default {
+  setup() {},
+  components: { SimpleLineChart ,WtChooser},
+  data() {
+    return {
+      chartData:[]
+    };
+  },
+
+  created() {
+    this.wtId = this.$route.params.wtId;
+    this.wpId = this.$route.params.wpId;
+    this.requestData();
+  },
+  
+  methods:{
+    switchWt(data){
+      this.$router.push(`/health/health4/healthLineChart/${data.wpId}/${data.wtId}`);
+      this.wtId = this.$route.params.wtId;
+      this.wpId = this.$route.params.wpId;
+      this.requestData();
+    },
+    requestData(){
+      let that=this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthsub/hsFjValueIndex",
+        data:{
+          wtId: that.wtId
+        },
+        success(res) {
+
+          const color=["green","yellow","purple","blue","orange"];
+          let chartData=[];
+          let lineTitle=[];
+
+          res.data.xData.forEach(ele=>{
+            lineTitle.push(new Date(ele).formatDate("hh:mm"));
+          });
+
+          res.data.datasets.forEach((ele,index)=>{
+            chartData.push({
+              title:ele.name,
+              data:ele.data,
+              color:color[index],
+              lineTitle
+            });
+          });
+          that.chartData=chartData;
+        },
+      });
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.pageBox {
+  width: 100%;
+  height:calc(100% - 1.481vh * 2);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+  .chart{
+    width: 100%;
+    height:25%;
+  }
+}
 </style>

src/views/HealthControl/healthLineChart2.vue

@@ -1,289 +1,298 @@
-<template>
-  <div class="health-7">
-    <div class="power-info mg-b-16">
-      <div class="info-tab">
-        <div
-          class="tab"
-          v-for="(item, index) in infoList"
-          :key="index"
-          :class="item.active ? 'active' : ''"
-          @click="onClickInfo(item)"
-        >
-          <i class="svg-icon svg-icon svg-icon-sm">
-            <svg-icon :svgid="item.svgid" />
-          </i>
-          <span> {{ item.title }} </span>
-        </div>
-        <div class="empty"></div>
-      </div>
-      <div class="info-chart">
-        <panel class="info-chart-panel" :title="'健康趋势'">
-          <vertival-bar-line-chart :height="'310px'" :bardata="bardata" :lineData="lineData"/>
-        </panel>
-      </div>
-    </div>
-    <div class="fc-info mg-b-16">
-      <panel :title="'健康走势图'" :showLine="false">
-        <normal-line-chart :height="'150px'" />
-      </panel>
-    </div>
-    <div class="data-list">
-      <Table :data="tableData" :canScroll="true" />
-    </div>
-  </div>
-</template>
-
-<script>
-import VertivalBarLineChart from "../../components/chart/combination/vertival-bar-line-chart.vue";
-import NormalLineChart from "../../components/chart/line/normal-line-chart.vue";
-import SvgIcon from "../../components/coms/icon/svg-icon.vue";
-import Panel from "../../components/coms/panel/panel.vue";
-import Table from "../../components/coms/table/table.vue";
-export default {
-  setup() {},
-  components: { SvgIcon, Panel, VertivalBarLineChart, NormalLineChart, Table },
-  data() {
-    return {
-      infoList: [
-        // {title: '24小时健康趋势', svgid: 'svg-24-houre', active: false, type: 'houre'},
-        { title: "7日健康趋势", svgid: "svg-h-day", active: true, type: "day" },
-        { title: "30日健康趋势", svgid: "svg-h-month", active: false, type: "month"},
-      ],
-      tableData: {
-        column: [
-          { name: "部件名称",field: "name" },
-          { name: "MTBF（h）",field: "v1", is_num: true },
-          { name: "MTTR（h）",field: "v2", is_num: true },
-          { name: "损失电量（kw/h）",field: "v3",is_num: true },
-          { name: "当前状态",field: "v4",
-            template: function(data) {
-              if (data == 1) return "<div class='dot green'></div>";
-              else if (data == 2) return "<div class='dot purple'></div>";
-              else if (data == 3) return "<div class='dot yellow'></div>";
-              else if (data == 4) return "<div class='dot orange'></div>";
-            },
-          },
-        ],
-        data: [],
-      },
-      bardata: { area: [], legend: [], data: [] }, // 损失电量分析echart数值
-      lineData: [],
-      wtId: undefined,
-      wpId: undefined,
-      hisValue: {},  //健康走势图
-    };
-  },
-  created() {
-    this.wtId = this.$route.params.wtId;
-    this.wpId = this.$route.params.wpId;
-    this.requestCoulometry(2)
-    this.requestHisValue()
-    this.requestMttrrand()
-  },
-  methods:{
-     // 未确认缺陷按钮下的健康趋势选项
-    onClickInfo(item) {
-      this.infoList.forEach((element) => {
-        if (item.type == element.type) {
-          item.active = true;
-          switch (item.type) {
-            case "day":
-              this.requestCoulometry(2);
-              break;
-            case "month":
-              this.requestCoulometry(3);
-          }
-        } else {
-          element.active = false;
-        }
-      });
-    },
-    // 损失电量分析  type：1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势
-    requestCoulometry(type) {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        timeout: 8000,
-        subUrl: "recommen/findAllChartjz",
-        data: { wpId: 0, type: type },
-        success(res) {
-          if (res.code == 200) {
-            that.bardata.legend = ["优数量", "良数量", "差数量"];
-            that.lineData = res.data.lvchart;
-            that.bardata.area = res.data.datechart;
-            that.bardata.data[2] = res.data.cslchart;
-            that.bardata.data[1] = res.data.lslchart;
-            that.bardata.data[0] = res.data.yslchart;
-          }
-        },
-      });
-    },
-    //风机健康走势图
-    requestHisValue(){
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "healthsub/findWtHisValueForBj",
-        data: { wtId: that.wtId },
-        success(res) {
-          if(res.code == 200){
-            let data = res.data;
-            data.time = data.time.slice(0, 65)
-            that.hisValue = data
-          }
-        },
-      });
-    },
-    //部件健康情况
-    requestMttrrand(){
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "healthsub/getWtMttrandMtbfByBj",
-        data: { wtId: that.wtId },
-        success(res) {
-          if(res.code == 200){
-            let data = res.data;
-            that.tableData.data = [
-              {name:data.clx[1], v1:data.clx[4], v2:data.clx[5], v3:data.clx[6], v4:data.clx[0]},
-              {name:data.fdj[1], v1:data.fdj[4], v2:data.fdj[5], v3:data.fdj[6], v4:data.fdj[0]},
-              {name:data.bj[1], v1:data.bj[4], v2:data.bj[5], v3:data.bj[6], v4:data.bj[0]},
-              {name:data.zk[1], v1:data.zk[4], v2:data.zk[5], v3:data.zk[6], v4:data.zk[0]},
-              {name:data.zz[1], v1:data.zz[4], v2:data.zz[5], v3:data.zz[6], v4:data.zz[0]},
-              {name:data.ph[1], v1:data.ph[4], v2:data.ph[5], v3:data.ph[6], v4:data.ph[0]},
-              {name:data.jc[1], v1:data.jc[4], v2:data.jc[5], v3:data.jc[6], v4:data.jc[0]},
-              {name:data.bpq[1], v1:data.bpq[4], v2:data.bpq[5], v3:data.bpq[6], v4:data.bpq[0]},
-            ]
-          }
-        },
-      });
-    }
-  }
-};
-</script>
-
-<style lang="less">
-.health-7 {
-  // 电量健康情况
-  .power-info {
-    display: flex;
-    .info-tab {
-      flex: 0 0 156px;
-      display: flex;
-      flex-direction: column;
-      height: 350px;
-      margin-right: 1.4815vh;
-
-      .tab {
-        position: relative;
-        flex: 0 0 auto;
-        text-align: center;
-        line-height: 33px;
-        margin-right: 8px;
-        color: @gray-l;
-        font-size: 12px;
-        background: fade(@gray, 20);
-        border: 1px solid fade(@gray, 20);
-
-        display: flex;
-        align-items: center;
-
-        i {
-          margin: 0 1.4815vh;
-          svg use {
-            fill: @gray-l;
-          }
-        }
-
-        &:hover,
-        &.active {
-          background: fade(@green, 20);
-          border: 1px solid @green;
-          color: @green;
-          cursor: pointer;
-          i {
-            svg use {
-              fill: @green;
-            }
-          }
-        }
-
-        &.active::after {
-          box-sizing: content-box;
-          width: 0px;
-          height: 0px;
-          position: absolute;
-          right: -19px;
-          padding: 0;
-          border-bottom: 9px solid @green;
-          border-top: 9px solid transparent;
-          border-left: 9px solid transparent;
-          border-right: 9px solid transparent;
-          display: block;
-          content: "";
-          z-index: 10;
-          transform: rotate(90deg);
-        }
-
-        &.active::before {
-          box-sizing: content-box;
-          width: 0px;
-          height: 0px;
-          position: absolute;
-          right: -17px;
-          padding: 0;
-          border-bottom: 9px solid #063319;
-          border-top: 9px solid transparent;
-          border-left: 9px solid transparent;
-          border-right: 9px solid transparent;
-          display: block;
-          content: "";
-          z-index: 12;
-          transform: rotate(90deg);
-        }
-
-        & + .tab {
-          margin-top: 0.7407vh;
-        }
-
-        &:last-child {
-          text-align: center;
-          justify-content: center;
-        }
-      }
-
-      .empty {
-        flex: 1 0 auto;
-      }
-    }
-
-    .info-chart {
-      flex: 1 0 auto;
-    }
-  }
-
-  .data-list {
-    .dot {
-      width: 12px;
-      height: 12px;
-      margin: auto;
-
-      &.green {
-        background: @green;
-      }
-
-      &.purple {
-        background: @purple;
-      }
-
-      &.yellow {
-        background: @yellow;
-      }
-
-      &.orange {
-        background: @orange;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="health-7">
+    <wt-chooser @change="switchWt" :wpId="wpId" :wtId="wtId"></wt-chooser>
+    <div class="power-info mg-b-16">
+      <div class="info-tab">
+        <div
+          class="tab"
+          v-for="(item, index) in infoList"
+          :key="index"
+          :class="item.active ? 'active' : ''"
+          @click="onClickInfo(item)"
+        >
+          <i class="svg-icon svg-icon svg-icon-sm">
+            <svg-icon :svgid="item.svgid" />
+          </i>
+          <span> {{ item.title }} </span>
+        </div>
+        <div class="empty"></div>
+      </div>
+      <div class="info-chart">
+        <panel class="info-chart-panel" :title="'健康趋势'">
+          <vertival-bar-line-chart :height="'310px'" :bardata="bardata" :lineData="lineData"/>
+        </panel>
+      </div>
+    </div>
+    <div class="fc-info mg-b-16">
+      <panel :title="'健康走势图'" :showLine="false">
+        <normal-line-chart :height="'150px'" />
+      </panel>
+    </div>
+    <div class="data-list">
+      <Table :data="tableData" :canScroll="true" />
+    </div>
+  </div>
+</template>
+
+<script>
+import VertivalBarLineChart from "../../components/chart/combination/vertival-bar-line-chart.vue";
+import NormalLineChart from "../../components/chart/line/normal-line-chart.vue";
+import SvgIcon from "../../components/coms/icon/svg-icon.vue";
+import Panel from "../../components/coms/panel/panel.vue";
+import Table from "../../components/coms/table/table.vue";
+import WtChooser from "@com/coms/wt-chooser/wt-chooser.vue"
+export default {
+  setup() {},
+  components: { SvgIcon, Panel, VertivalBarLineChart, NormalLineChart, Table, WtChooser },
+  data() {
+    return {
+      infoList: [
+        // {title: '24小时健康趋势', svgid: 'svg-24-houre', active: false, type: 'houre'},
+        { title: "7日健康趋势", svgid: "svg-h-day", active: true, type: "day" },
+        { title: "30日健康趋势", svgid: "svg-h-month", active: false, type: "month"},
+      ],
+      tableData: {
+        column: [
+          { name: "部件名称",field: "name" },
+          { name: "MTBF（h）",field: "v1", is_num: true },
+          { name: "MTTR（h）",field: "v2", is_num: true },
+          { name: "损失电量（kw/h）",field: "v3",is_num: true },
+          { name: "当前状态",field: "v4",
+            template: function(data) {
+              if (data == 1) return "<div class='dot green'></div>";
+              else if (data == 2) return "<div class='dot purple'></div>";
+              else if (data == 3) return "<div class='dot yellow'></div>";
+              else if (data == 4) return "<div class='dot orange'></div>";
+            },
+          },
+        ],
+        data: [],
+      },
+      bardata: { area: [], legend: [], data: [] }, // 损失电量分析echart数值
+      lineData: [],
+      wtId: undefined,
+      wpId: undefined,
+      hisValue: {},  //健康走势图
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods:{
+    init(){
+      this.wtId = this.$route.params.wtId;
+      this.wpId = this.$route.params.wpId;
+      this.requestCoulometry(2);
+      this.requestHisValue();
+      this.requestMttrrand();
+    },
+    switchWt(data){
+      this.$router.push(`/health/health4/healthLineChart2/${data.wpId}/${data.wtId}`);
+      this.init();
+    },
+     // 未确认缺陷按钮下的健康趋势选项
+    onClickInfo(item) {
+      this.infoList.forEach((element) => {
+        if (item.type == element.type) {
+          item.active = true;
+          switch (item.type) {
+            case "day":
+              this.requestCoulometry(2);
+              break;
+            case "month":
+              this.requestCoulometry(3);
+          }
+        } else {
+          element.active = false;
+        }
+      });
+    },
+    // 损失电量分析  type：1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势
+    requestCoulometry(type) {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        timeout: 8000,
+        subUrl: "recommen/findAllChartjz",
+        data: { wpId: 0, type: type },
+        success(res) {
+          if (res.code == 200) {
+            that.bardata.legend = ["优数量", "良数量", "差数量"];
+            that.lineData = res.data.lvchart;
+            that.bardata.area = res.data.datechart;
+            that.bardata.data[2] = res.data.cslchart;
+            that.bardata.data[1] = res.data.lslchart;
+            that.bardata.data[0] = res.data.yslchart;
+          }
+        },
+      });
+    },
+    //风机健康走势图
+    requestHisValue(){
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthsub/findWtHisValueForBj",
+        data: { wtId: that.wtId },
+        success(res) {
+          if(res.code == 200){
+            let data = res.data;
+            data.time = data.time.slice(0, 65)
+            that.hisValue = data
+          }
+        },
+      });
+    },
+    //部件健康情况
+    requestMttrrand(){
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "healthsub/getWtMttrandMtbfByBj",
+        data: { wtId: that.wtId },
+        success(res) {
+          if(res.code == 200){
+            let data = res.data;
+            that.tableData.data = [
+              {name:data.clx[1], v1:data.clx[4], v2:data.clx[5], v3:data.clx[6], v4:data.clx[0]},
+              {name:data.fdj[1], v1:data.fdj[4], v2:data.fdj[5], v3:data.fdj[6], v4:data.fdj[0]},
+              {name:data.bj[1], v1:data.bj[4], v2:data.bj[5], v3:data.bj[6], v4:data.bj[0]},
+              {name:data.zk[1], v1:data.zk[4], v2:data.zk[5], v3:data.zk[6], v4:data.zk[0]},
+              {name:data.zz[1], v1:data.zz[4], v2:data.zz[5], v3:data.zz[6], v4:data.zz[0]},
+              {name:data.ph[1], v1:data.ph[4], v2:data.ph[5], v3:data.ph[6], v4:data.ph[0]},
+              {name:data.jc[1], v1:data.jc[4], v2:data.jc[5], v3:data.jc[6], v4:data.jc[0]},
+              {name:data.bpq[1], v1:data.bpq[4], v2:data.bpq[5], v3:data.bpq[6], v4:data.bpq[0]},
+            ]
+          }
+        },
+      });
+    }
+  }
+};
+</script>
+
+<style lang="less">
+.health-7 {
+  // 电量健康情况
+  .power-info {
+    display: flex;
+    .info-tab {
+      flex: 0 0 156px;
+      display: flex;
+      flex-direction: column;
+      height: 350px;
+      margin-right: 1.4815vh;
+
+      .tab {
+        position: relative;
+        flex: 0 0 auto;
+        text-align: center;
+        line-height: 33px;
+        margin-right: 8px;
+        color: @gray-l;
+        font-size: 12px;
+        background: fade(@gray, 20);
+        border: 1px solid fade(@gray, 20);
+
+        display: flex;
+        align-items: center;
+
+        i {
+          margin: 0 1.4815vh;
+          svg use {
+            fill: @gray-l;
+          }
+        }
+
+        &:hover,
+        &.active {
+          background: fade(@green, 20);
+          border: 1px solid @green;
+          color: @green;
+          cursor: pointer;
+          i {
+            svg use {
+              fill: @green;
+            }
+          }
+        }
+
+        &.active::after {
+          box-sizing: content-box;
+          width: 0px;
+          height: 0px;
+          position: absolute;
+          right: -19px;
+          padding: 0;
+          border-bottom: 9px solid @green;
+          border-top: 9px solid transparent;
+          border-left: 9px solid transparent;
+          border-right: 9px solid transparent;
+          display: block;
+          content: "";
+          z-index: 10;
+          transform: rotate(90deg);
+        }
+
+        &.active::before {
+          box-sizing: content-box;
+          width: 0px;
+          height: 0px;
+          position: absolute;
+          right: -17px;
+          padding: 0;
+          border-bottom: 9px solid #063319;
+          border-top: 9px solid transparent;
+          border-left: 9px solid transparent;
+          border-right: 9px solid transparent;
+          display: block;
+          content: "";
+          z-index: 12;
+          transform: rotate(90deg);
+        }
+
+        & + .tab {
+          margin-top: 0.7407vh;
+        }
+
+        &:last-child {
+          text-align: center;
+          justify-content: center;
+        }
+      }
+
+      .empty {
+        flex: 1 0 auto;
+      }
+    }
+
+    .info-chart {
+      flex: 1 0 auto;
+    }
+  }
+
+  .data-list {
+    .dot {
+      width: 12px;
+      height: 12px;
+      margin: auto;
+
+      &.green {
+        background: @green;
+      }
+
+      &.purple {
+        background: @purple;
+      }
+
+      &.yellow {
+        background: @yellow;
+      }
+
+      &.orange {
+        background: @orange;
+      }
+    }
+  }
+}
+</style>

src/views/layout/Header.vue

@@ -53,9 +53,9 @@ export default {
         //   isActive: false,
         // },
         {
-          id: 'personnel',
+          id: 'save',
           text: '安全管控',
-          path: '/new/personnel',
+          path: '/save/personnel',
           isActive: false
         },
         // {
@@ -65,9 +65,9 @@ export default {
         //   isActive: false,
         // },
         {
-          id: 'realSearch',
+          id: 'others',
           text: '其他',
-          path: '/realSearch',
+          path: '/others/reportPandect',
           isActive: false
         }
       ],

src/views/layout/Menu.vue

@@ -157,160 +157,160 @@ export default {
             {
               text: "三率管理",
               icon: "svg-slgl",
-              path: "/fwjsl",
+              path: "/decision/fwjsl",
               children: [
                 {
                   text: "复位及时率",
                   icon: "svg-wind-site",
-                  path: "/fwjsl",
+                  path: "/decision/fwjsl",
                 },
                 {
                   text: "状态转换率",
                   icon: "svg-wind-site",
-                  path: "/ztzhl",
+                  path: "/decision/ztzhl",
                 },
                 {
                   text: "消缺及时率",
                   icon: "svg-wind-site",
-                  path: "/xqjsl",
+                  path: "/decision/xqjsl",
                 },
               ],
             },
             {
               text: "排行榜",
               icon: "svg-phb",
-              path: "/powerRank",
+              path: "/decision/powerRank",
               children: [
                 {
                   text: "发电效率排行",
                   icon: "svg-wind-site",
-                  path: "/powerRank",
+                  path: "/decision/powerRank",
                 },
                 {
                   text: "总发电效率排行",
                   icon: "svg-wind-site",
-                  path: "/totalPowerRank",
+                  path: "/decision/totalPowerRank",
                 },
                 {
                   text: "报警排行",
                   icon: "svg-wind-site",
-                  path: "/warningRank",
+                  path: "/decision/warningRank",
                 },
               ],
             },
             {
               text: "专题分析",
               icon: "svg-ztfx",
-              path: "/new/ztfx",
+              path: "/decision/ztfx",
               children: [
                 {
                   text: "综合分析",
                   icon: "svg-wind-site",
-                  path: "/new/ztfx",
+                  path: "/decision/ztfx",
                 },
                 {
                   text: "风能利用率",
                   icon: "svg-wind-site",
-                  path: "/new/fnlyl",
+                  path: "/decision/fnlyl",
                 },
                 {
                   text: "维护损失率",
                   icon: "svg-wind-site",
-                  path: "/new/whssl",
+                  path: "/decision/whssl",
                 },
                 {
                   text: "故障损失率",
                   icon: "svg-wind-site",
-                  path: "/new/gzssl",
+                  path: "/decision/gzssl",
                 },
                 {
                   text: "限电损失率",
                   icon: "svg-wind-site",
-                  path: "/new/xdssl",
+                  path: "/decision/xdssl",
                 },
                 {
                   text: "性能损失率",
                   icon: "svg-wind-site",
-                  path: "/new/xnssl",
+                  path: "/decision/xnssl",
                 },
                 {
                   text: "受累损失率",
                   icon: "svg-wind-site",
-                  path: "/new/slssl",
+                  path: "/decision/slssl",
                 },
                 {
                   text: "MTBF分析",
                   icon: "svg-wind-site",
-                  path: "/new/mtbf",
+                  path: "/decision/mtbf",
                 },
                 {
                   text: "MTTR分析",
                   icon: "svg-wind-site",
-                  path: "/new/mttr",
+                  path: "/decision/mttr",
                 },
                 {
                   text: "复位分析",
                   icon: "svg-wind-site",
-                  path: "/new/zfwjsl",
+                  path: "/decision/zfwjsl",
                 },
                 {
                   text: "状态分析",
                   icon: "svg-wind-site",
-                  path: "/new/zztzhl",
+                  path: "/decision/zztzhl",
                 },
                 {
                   text: "消缺分析",
                   icon: "svg-wind-site",
-                  path: "/new/zxqjsl",
+                  path: "/decision/zxqjsl",
                 },
                 {
                   text: "发电量分析",
                   icon: "svg-wind-site",
-                  path: "/new/zfdl",
+                  path: "/decision/zfdl",
                 },
                 {
                   text: "综合场用电量",
                   icon: "svg-wind-site",
-                  path: "/new/zzhcydl",
+                  path: "/decision/zzhcydl",
                 },
               ],
             },
             {
               text: "风机分析",
               icon: "svg-fjfx",
-              path: "/fjfx",
+              path: "/decision/performanceAnalysis",
               children: [
                 {
                   text: "单机性能分析",
                   icon: "svg-wind-site",
-                  path: "/performanceAnalysis",
+                  path: "/decision/performanceAnalysis",
                 },
                 {
                   text: "单机月度分析",
                   icon: "svg-wind-site",
-                  path: "/singleAnalysis",
+                  path: "/decision/singleAnalysis",
                 },
               ],
             },
             {
               text: "气象分析",
               icon: "svg-qxfx",
-              path: "/new/fs",
+              path: "/decision/fs",
             },
             {
               text: "电量预测",
               icon: "svg-dlyc",
-              path: "/nhycfsdl",
+              path: "/decision/nhycfsdl",
               children: [
                 {
                   text: "预测拟合风速电量",
-                  icon: "svg-wind-site",
-                  path: "/nhycfsdl",
+                  icon: "svg-wind-sitenhycfsdl",
+                  path: "/decision/nhycfsdl",
                 },
                 {
                   text: "修正预测风速电量",
                   icon: "svg-wind-site",
-                  path: "/xzycfsdl",
+                  path: "/decision/xzycfsdl",
                 },
               ],
             },
@@ -351,34 +351,34 @@ export default {
             {
               text: "等级评估",
               icon: "svg-等级评估",
-              path: "/assess/index",
+              path: "/health/assess/index",
             },
             {
               text: "故障诊断",
               icon: "svg-故障诊断",
-              path: "/malfunctionDiagnose",
+              path: "/health/malfunctionDiagnose",
               children: [
                 {
                   text: "故障诊断",
                   icon: "svg-wind-site",
-                  path: "/malfunctionDiagnose",
+                  path: "/health/malfunctionDiagnose",
                 },
                 {
                   text: "故障回溯",
                   icon: "svg-wind-site",
-                  path: "/malfunctionRecall",
+                  path: "/health/malfunctionRecall",
                 },
               ],
             },
             {
               text: "健康管理",
               icon: "svg-健康管理",
-              path: "/health",
+              path: "/health/frist",
               children: [
                 {
                   text: "健康推荐",
                   icon: "svg-wind-site",
-                  path: "/health",
+                  path: "/health/frist",
                 },
                 {
                   text: "健康首页",
@@ -410,32 +410,32 @@ export default {
             {
               text: "全生命周期",
               icon: "svg-全生命周期",
-              path: "/allLifeManage",
+              path: "/health/allLifeManage",
             },
             {
               text: "能效分析",
               icon: "svg-能效分析",
-              path: "/powerCurve",
+              path: "/health/powerCurve",
               children: [
                 {
                   text: "功率曲线拟合",
                   icon: "svg-wind-site",
-                  path: "/powerCurve",
+                  path: "/health/powerCurve",
                 },
                 {
                   text: "偏航对风分析",
                   icon: "svg-wind-site",
-                  path: "/phdffx",
+                  path: "/health/phdffx",
                 },
                 {
                   text: "切入切出分析",
                   icon: "svg-wind-site",
-                  path: "/cutAnalyse",
+                  path: "/health/cutAnalyse",
                 },
                 {
                   text: "曲线偏差率分析",
                   icon: "svg-wind-site",
-                  path: "/qxpclfx",
+                  path: "/health/qxpclfx",
                 },
 
                 {
@@ -448,72 +448,72 @@ export default {
             {
               text: "可靠性分析",
               icon: "svg-可靠性分析",
-              path: "/new/alarmcenter1",
+              path: "/health/alarmcenter1",
               children: [
                 {
                   text: "预警分析",
                   icon: "svg-wind-site",
-                  path: "/new/alarmcenter1",
+                  path: "/health/alarmcenter1",
                 },
                 {
                   text: "故障分析",
                   icon: "svg-wind-site",
-                  path: "/new/alarmcenter2",
+                  path: "/health/alarmcenter2",
                 },
                 {
                   text: "预警评判分析",
                   icon: "svg-wind-site",
-                  path: "/warnStatistics",
+                  path: "/health/warnStatistics",
                 },
                 {
                   text: "故障评判分析",
                   icon: "svg-wind-site",
-                  path: "/malfunctionStatistics",
+                  path: "/health/malfunctionStatistics",
                 },
                 {
                   text: "部件评判分析",
                   icon: "svg-wind-site",
-                  path: "/bjgltjb",
+                  path: "/health/bjgltjb",
                 },
               ],
             },
             {
               text: "风光资源分析",
               icon: "svg-风光资源分析",
-              path: "/windAnalysis",
+              path: "/health/windAnalysis",
               children: [
                 {
                   text: "风资源散点",
                   icon: "svg-wind-site",
-                  path: "/windAnalysis",
+                  path: "/health/windAnalysis",
                 },
                 {
                   text: "风资源风向",
                   icon: "svg-wind-site",
-                  path: "/windAnalysis/fx",
+                  path: "/health/windAnalysis/fx",
                 },
               ],
             },
           ],
         },
         {
-          id: "personnel",
+          id: "save",
           text: "安全管控",
           data: [
             {
               text: "安全管控",
               icon: "svg-安全管控",
-              path: "/new/personnel",
+              path: "/save/personnel",
               children: [
                 {
                   text: "人员矩阵",
                   icon: "svg-wind-site",
-                  path: "/new/personnel",
+                  path: "/save/personnel",
                 },
                 {
                   text: "全局监视",
                   icon: "svg-wind-site",
-                  path: "/globalMonitor",
+                  path: "/save/globalMonitor",
                 },
               ],
             },
@@ -657,238 +657,239 @@ export default {
         //   ],
         // },
         {
-          id: "realSearch",
+          id: "others",
           text: "其他",
           data: [
             {
-              text: "原始数据查询",
-              icon: "svg-报表首页",
-              path: "/realSearch",
-              children: [
-                {
-                  text: "测点数据查询",
-                  icon: "svg-wind-site",
-                  path: "/realSearch",
-                },
-                {
-                  text: "测点历史数据查询",
-                  icon: "svg-wind-site",
-                  path: "/historySearch",
-                },
-              ],
-            },
-            {
-              text: "预警记录",
-              icon: "svg-wind-site",
-              path: "/new/alarmcenter",
-              children: [
-                {
-                  text: "预警管理",
-                  icon: "svg-wind-site",
-                  path: "/new/alarmcenter",
-                },
-
-                {
-                  text: "停机事件管理",
-                  icon: "svg-wind-site",
-                  path: "/new/tjsj",
-                },
-                {
-                  text: "限电管理",
-                  icon: "svg-wind-site",
-                  path: "/new/xdgl",
-                },
-                {
-                  text: "升压站报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/boosterAlarm",
-                },
-                {
-                  text: "SCADA报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/scadaAlarm",
-                },
-                {
-                  text: "自定义报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/customAlarm",
-                },
-                {
-                  text: "自定义报警统计",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/customStatistics",
-                },
-              ],
-            },
-            {
-              text: "专家知识",
-              icon: "svg-wind-site",
-              path: "/knowledge",
-              children: [
-                {
-                  text: "故障知识列表",
-                  icon: "svg-matrix",
-                  path: "/knowledge",
-                },
-                {
-                  text: "安全措施知识",
-                  icon: "svg-matrix",
-                  path: "/knowledge2",
-                },
-                {
-                  text: "排查检修方案",
-                  icon: "svg-matrix",
-                  path: "/knowledge6",
-                },
-                {
-                  text: "预警知识",
-                  icon: "svg-matrix",
-                  path: "/knowledge7",
-                },
-                {
-                  text: "特征参数",
-                  icon: "svg-matrix",
-                  path: "/knowledge5",
-                },
-                {
-                  text: "风险辨识知识",
-                  icon: "svg-matrix",
-                  path: "/knowledge3",
-                },
-                {
-                  text: "作业指导知识",
-                  icon: "svg-matrix",
-                  path: "/knowledge4",
-                },
-              ],
-            },{
               text: "统计分析",
               icon: "svg-统计分析",
-              path: "/tjfx",
+              path: "/others/tjfx",
               children: [
                 {
                   text: "统计分析",
                   icon: "svg-matrix",
-                  path: "/tjfx",
+                  path: "/others/tjfx",
                 },
                 {
                   text: "表底值查询",
                   icon: "svg-matrix",
-                  path: "/bdzcx",
+                  path: "/others/bdzcx",
                 },
               ],
             },
             {
               text: "报表管理",
               icon: "svg-报表管理",
-              path: "/bdzcx",
+              path: "/others/oafd",
               children: [
                 {
                   text: "OA日报",
                   icon: "svg-matrix",
-                  path: "/oafd",
+                  path: "/others/oafd",
                 },
                 {
                   text: "OA日报(光伏)",
                   icon: "svg-matrix",
-                  path: "/oagf",
+                  path: "/others/oagf",
                 },
                 {
                   text: "新能源日报",
                   icon: "svg-matrix",
-                  path: "/xnyrb",
+                  path: "/others/xnyrb",
                 },
                 {
                   text: "国电MIS日报(风电)",
                   icon: "svg-matrix",
-                  path: "/missfdrb",
+                  path: "/others/missfdrb",
                 },
                 {
                   text: "国电MIS日报(光伏)",
                   icon: "svg-matrix",
-                  path: "/missgfrb",
+                  path: "/others/missgfrb",
                 },
                 {
                   text: "新能源风电生产月报",
                   icon: "svg-matrix",
-                  path: "/xnyfdscyb",
+                  path: "/others/xnyfdscyb",
                 },
                 {
                   text: "麻黄山生产月报",
                   icon: "svg-matrix",
-                  path: "/mhsscyb",
+                  path: "/others/mhsscyb",
                 },
                 {
                   text: "牛首山生产月报",
                   icon: "svg-matrix",
-                  path: "/nssscyb",
+                  path: "/others/nssscyb",
                 },
                 {
                   text: "青山生产月报",
                   icon: "svg-matrix",
-                  path: "/qsscyb",
+                  path: "/others/qsscyb",
                 },
                 {
                   text: "石板泉生产月报",
                   icon: "svg-matrix",
-                  path: "/sbqscyb",
+                  path: "/others/sbqscyb",
                 },
                 {
                   text: "香山生产月报",
                   icon: "svg-matrix",
-                  path: "/xsscyb",
+                  path: "/others/xsscyb",
                 },
                 {
                   text: "新能源光伏生产月报",
                   icon: "svg-matrix",
-                  path: "/xnygfscyb",
+                  path: "/others/xnygfscyb",
                 },
                 {
                   text: "大武口生产月报",
                   icon: "svg-matrix",
-                  path: "/dwkscyb",
+                  path: "/others/dwkscyb",
                 },
                 {
                   text: "平罗生产月报",
                   icon: "svg-matrix",
-                  path: "/plscyb",
+                  path: "/others/plscyb",
                 },
                 {
                   text: "宣和生产月报",
                   icon: "svg-matrix",
-                  path: "/xhscyb",
+                  path: "/others/xhscyb",
                 },
               ],
             },
             {
               text: "自定制报表管理",
               icon: "svg-自定制报表管理",
-              path: "/fdczzdy",
+              path: "/others/fdczzdy",
               children: [
                 {
                   text: "风电场站自定义",
                   icon: "svg-matrix",
-                  path: "/fdczzdy",
+                  path: "/others/fdczzdy",
                 },
                 {
                   text: "风电项目自定义",
                   icon: "svg-matrix",
-                  path: "/fdxmzdy",
+                  path: "/others/fdxmzdy",
                 },
                 {
                   text: "光伏场站自定义",
                   icon: "svg-matrix",
-                  path: "/gfczzdy",
+                  path: "/others/gfczzdy",
                 },
                 {
                   text: "光伏项目自定义",
                   icon: "svg-matrix",
-                  path: "/gfxmzdy",
+                  path: "/others/gfxmzdy",
                 },
               ],
             },
           ],
         },
+            {
+              text: "原始数据查询",
+              icon: "svg-报表首页",
+              path: "/other/realSearch",
+              children: [
+                {
+                  text: "测点数据查询",
+                  icon: "svg-wind-site",
+                  path: "/others/realSearch",
+                },
+                {
+                  text: "测点历史数据查询",
+                  icon: "svg-wind-site",
+                  path: "/others/historySearch",
+                },
+              ],
+            },
+            {
+              text: "预警记录",
+              icon: "svg-wind-site",
+              path: "/others/alarmCenter/alarmcenter",
+              children: [
+                {
+                  text: "预警管理",
+                  icon: "svg-wind-site",
+                  path: "/others/alarmCenter/alarmcenter",
+                },
+
+                {
+                  text: "停机事件管理",
+                  icon: "svg-wind-site",
+                  path: "/others/alarmCenter/tjsj",
+                },
+                {
+                  text: "限电管理",
+                  icon: "svg-wind-site",
+                  path: "/others/alarmCenter/xdgl",
+                },
+                {
+                  text: "升压站报警",
+                  icon: "svg-wind-site",
+                  path: "/others/alarmCenter/boosterAlarm",
+                },
+                {
+                  text: "SCADA报警",
+                  icon: "svg-wind-site",
+                  path: "/others/alarmCenter/scadaAlarm",
+                },
+                {
+                  text: "自定义报警",
+                  icon: "svg-wind-site",
+                  path: "/others/alarmCenter/customAlarm",
+                },
+                {
+                  text: "自定义报警统计",
+                  icon: "svg-wind-site",
+                  path: "/others/alarmCenter/customStatistics",
+                },
+              ],
+            },
+            {
+              text: "专家知识",
+              icon: "svg-wind-site",
+              path: "/others/knowledge/knowledge",
+              children: [
+                {
+                  text: "故障知识列表",
+                  icon: "svg-matrix",
+                  path: "/others/knowledge/knowledge",
+                },
+                {
+                  text: "安全措施知识",
+                  icon: "svg-matrix",
+                  path: "/others/knowledge/knowledge2",
+                },
+                {
+                  text: "排查检修方案",
+                  icon: "svg-matrix",
+                  path: "/others/knowledge/knowledge6",
+                },
+                {
+                  text: "预警知识",
+                  icon: "svg-matrix",
+                  path: "/others/knowledge/knowledge7",
+                },
+                {
+                  text: "特征参数",
+                  icon: "svg-matrix",
+                  path: "/others/knowledge/knowledge5",
+                },
+                {
+                  text: "风险辨识知识",
+                  icon: "svg-matrix",
+                  path: "/others/knowledge/knowledge3",
+                },
+                {
+                  text: "作业指导知识",
+                  icon: "svg-matrix",
+                  path: "/others/knowledge/knowledge4",
+                },
+              ],
+            },
       ],
       activeIndex: 0,
       isShowSubMenu: false,

src/views/performanceAnalysis/index.vue

@@ -542,7 +542,7 @@ export default {
 
     // 页面跳转
     jumpUrl (item) {
-      this.$router.push(`/performanceAnalysis/detail/${item.windtpowerstationid}/${item.windturbineid}`);
+      this.$router.push(`/decision/performanceAnalysis/detail/${item.windtpowerstationid}/${item.windturbineid}`);
     }
   },
 

src/views/singleAnalysis/index.vue

@@ -212,7 +212,7 @@ export default {
   methods: {
     goznzhfx(row){
       console.warn(row);
-      this.$router.push({path:`/new/znzhfx/${row.windturbineid}/${new Date(this.recorddate).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`})
+      this.$router.push({path:`/decision/znzhfx/${row.windturbineid}/${new Date(this.recorddate).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`})
     },
     // 请求服务
     requestData() {