Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into sl

# Conflicts:
#	src/views/layout/Menu.vue

src/views/HealthControl/assess/assessconfig.vue

@@ -11,61 +11,76 @@
           </div>
         </div>
         <div class="query-actions">
-          <button class="btn green mg-l-30" @click="onClickAdd">新增</button>
+          <button class="btn green mg-l-30" @click="onClickSearch">搜索</button>
+          <button class="btn green mg-l-30" @click="onClickCreate">新增</button>
         </div>
       </div>
     </div>
-
     <div class="assess-bottom">
       <ComTable :data="tableData" height="85vh"></ComTable>
     </div>
+    <div>
+      <el-dialog
+        title="新增模型"
+        v-model="isvisiable"
+        width="45%"
+        top="15vh"
+        custom-class="modal"
+        :close-on-click-modal="false"
+      >
+        <popup-create :data="editform" :station="stations"/>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
 import ComTable from "@/components/coms/table/table-unpage.vue";
+import PopupCreate from "./compoenets/popupcreate.vue";
 
 export default {
-  components: { ComTable },
+  components: { ComTable, PopupCreate },
   data() {
     const that = this;
     return {
       content: "",
+      stations: [],
+      editform: {},
+      isvisiable: false,
       tableData: {
         column: [
           {
             name: "名称",
-            field: "targetname",
+            field: "name",
             is_light: false,
           },
           {
             name: "时间",
-            field: "safecontent",
+            field: "createdate",
             is_light: false,
           },
           {
             name: "场站",
-            field: "describe",
+            field: "wpids",
             is_num: false,
             is_light: false,
           },
           {
             name: "是否启用",
-            field: "principal",
+            field: "isenable",
             is_num: false,
             is_light: false,
           },
           {
             name: "操作",
-            field: "addtime",
             is_num: false,
             is_light: false,
-            width: 10,
+            width: 100,
             template: () => {
               return (
-                "<el-button type='text' style='cursor: pointer;' value='xq'>编辑</el-button>&nbsp" +
-                "<el-button type='text' style='cursor: pointer;' value='ls'>删除</el-button>&nbsp" +
-                "<el-button type='text' style='cursor: pointer;' value='ls'>配置</el-button>&nbsp"
+                "<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
+                "<el-button type='text' style='cursor: pointer;' value='delete'>删除</el-button>&nbsp" +
+                "<el-button type='text' style='cursor: pointer;' value='config'>配置</el-button>&nbsp"
               );
             },
             click(e, row) {
@@ -79,21 +94,82 @@ export default {
   },
   created() {
     this.requestList();
+    this.requestStations();
   },
   methods: {
     // 新增按钮
-    onClickAdd() {},
-    // 获取按错内容
+    onClickCreate() {
+      this.isvisiable = true;
+    },
+    // 搜索按钮
+    onClickSearch() {
+      this.requestList();
+    },
+    // 操作按钮
+    onClickOption(e, row) {
+      console.log(row)
+      let that = this;
+      if ("delete" == e.target.getAttribute("value")) {
+        that
+          .$confirm("确认删除？")
+          .then((_) => {
+            that.requestDelete(row);
+          })
+          .catch((_) => {});
+      }
+      if ("edit" == e.target.getAttribute("value")) {
+        that.isvisiable = true
+        that.editform = row;
+      }
+    },
+    // 获取模型数据列表
     requestList() {
       let that = this;
-      this.API.requestData({
+      that.API.requestData({
         method: "GET",
         baseURL: "http://10.155.32.4:8034/",
         subUrl: "/evaluation/modelMainList",
         data: {
-          name: "sdf",
+          name: that.content,
+        },
+        success(res) {
+          if (res.code == 200) that.tableData.data = res.data;
+          for (var i in that.tableData.data) {
+            that.tableData.data[i].createdate = new Date(
+              res.data[i].createdate
+            ).formatDate("yyyy-MM-dd");
+            that.tableData.data[i].isenable =
+              res.data[i].isenable == 1 ? "是" : "否";
+          }
+        },
+      });
+    },
+    requestStations(){
+      let that = this;
+      that.API.requestData({
+        method: "GET",
+        subUrl: "powercompare/windfarmAllAjax",
+        success(res) {
+          let array = [];
+          res.data.forEach((item) => {
+            if (item.id.indexOf("FDC") !== -1) {
+              array.push(item)
+            } 
+          });
+          that.stations = array;
+        },
+      });
+    },
+    // 删除
+    requestDelete(row) {
+      let that = this;
+      that.API.requestData({
+        method: "DELETE",
+        baseURL: "http://10.155.32.4:8034/",
+        subUrl: "/evaluation/delModelMain/" + row.id,
+        success(res) {
+          if (res.code == 200) that.requestList();
         },
-        success(res) {},
       });
     },
   },

src/views/HealthControl/assess/compoenets/popupcreate.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="assess-create">
+    <div class="top">
+      <div class="query mg-b-8">
+        <div class="query-items flex-column">
+          <div class="query-item flex-row">
+            <div class="lable item-name">模块：</div>
+            <div class="search-input item-content">
+              <el-input v-model="form.name" placeholder="请填写"></el-input>
+            </div>
+          </div>
+          <div class="query-item flex-row">
+            <div class="lable item-name">场站：</div>
+            <div class="search-input item-content">
+              <el-select
+                v-model="form.wpids"
+                @change="onChangeStation(form.wpids)"
+                multiple
+                collapse-tags
+                popper-class="select"
+              >
+                <el-option
+                  v-for="item in stations"
+                  :key="item.label"
+                  :value="item.id"
+                  :label="item.name"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+          <div class="query-item flex-row">
+            <div class="lable item-name">日期：</div>
+            <div class="search-input item-content">
+              <el-select
+                v-model="form.timetypes"
+                @change="onChangeStation(form.timetypes)"
+                multiple
+                popper-class="select"
+              >
+                <el-option
+                  v-for="item in dates"
+                  :key="item.label"
+                  :value="item.label"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+          <div class="query-item flex-row">
+            <div class="lable item-name">是否启用：</div>
+            <div class="search-input item-content">
+              <el-select
+                v-model="form.isenable"
+                @change="onChangeStation(form.isenable)"
+                popper-class="select"
+              >
+                <el-option
+                  v-for="item in enables"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bottom">
+      <button class="btn green mg-l-30" @click="onClickClear">清空</button>
+      <button class="btn green mg-l-30" @click="onClickSave">保存</button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "popup-create",
+  props: {
+    data: Object,
+    station: Array,
+  },
+  data() {
+    return {
+      form: {},
+      dates: [{ label: "日" }, { label: "月" }, { label: "年" }],
+      stations: [],
+      enables: [
+        { value: "0", label: "否" },
+        { value: "1", label: "是" },
+      ],
+    };
+  },
+  created() {
+    this.stations = this.station;
+    this.form = this.convertArray(this.data);
+  },
+  methods: {
+    onClickClear() {
+      this.form = {};
+    },
+    onClickSave() {
+      this.requestSave();
+    },
+    requestSave() {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        baseURL: "http://10.155.32.4:8034/",
+        subUrl: "/evaluation/saveModelMain",
+        data: {
+          name: that.form.name,
+          wpids: that.form.wpids,
+          timetypes: that.form.timetypes,
+          createdate: new Date(),
+          isenable: that.form.isenable,
+        },
+        success(res) {
+          console.log(res);
+        },
+      });
+    },
+    convertArray(form) {
+      if (form.wpids != undefined && form.timetypes != undefined) {
+        form.wpids = form.wpids.split(",");
+        form.timetypes = form.timetypes.split(",");
+      }
+      return form;
+    },
+  },
+  watch: {
+    data(value) {
+      this.form = this.convertArray(value);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.assess-create {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .top {
+    width: 60%;
+    margin-top: 50px;
+    display: flex;
+    flex-direction: column;
+    align-self: center;
+
+    .flex-row {
+      margin-bottom: 20px;
+      display: flex;
+      flex-direction: row;
+    }
+
+    .flex-column {
+      display: flex;
+      flex-direction: column;
+    }
+
+    .item-name {
+      width: 100px;
+      text-align: end;
+    }
+    .item-content {
+      width: 300px;
+    }
+  }
+
+  .bottom {
+    margin: 50px 0;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+
+    .mg-l-30 {
+      margin-left: 30px;
+    }
+  }
+}
+</style>

src/views/layout/Header.vue

@@ -34,9 +34,9 @@ export default {
           isActive: true
         },
         {
-          id: 'ztfx',
+          id: 'decision1',
           text: '经济运行',
-          path: '/new/ztfx',
+          path: '/decision1',
           isActive: false
         },
         {

src/views/layout/Menu.vue

@@ -103,126 +103,114 @@ export default {
               path: '/monitor/windsite/home/MHS_FDC'
             }
           ]
-        },
+        }
+        ,
         {
-          id: 'performanceAnalysis',
-          text: '增发分析',
+          id: 'decision1',
+          text: '经济运行',
           data: [
+            ,
             {
-              text: '能效分析',
-              icon: 'svg-wind-site',
-              path: '/powerCurve',
+              text: '对标管理',
+              icon: 'svg-matrix',
+              path: '/decision1',
               children: [
                 {
-                  text: '功率曲线拟合',
+                  text: '风机绩效榜',
                   icon: 'svg-wind-site',
-                  path: '/powerCurve'
+                  path: '/decision1'
                 },
                 {
-                  text: '偏航对风分析',
+                  text: '五项损失率',
                   icon: 'svg-wind-site',
-                  path: '/nxfx2'
+                  path: '/decision2'
                 },
                 {
-                  text: '切入切出分析',
+                  text: '场内对标',
                   icon: 'svg-wind-site',
-                  path: '/cutAnalyse'
+                  path: '/decision2Cndb'
                 },
                 {
-                  text: '曲线偏差率分析',
+                  text: '场际对标',
                   icon: 'svg-wind-site',
-                  path: '/qxpclfx'
+                  path: '/decision2Cjdb'
                 },
                 {
-                  text: '单机性能分析',
+                  text: '项目对标',
                   icon: 'svg-wind-site',
-                  path: '/performanceAnalysis'
+                  path: '/decision2Xmdb'
                 },
                 {
-                  text: '单机月度分析',
+                  text: '线路对标',
                   icon: 'svg-wind-site',
-                  path: '/singleAnalysis'
+                  path: '/decision2Xldb'
                 },
                 {
-                  text: '单机饱和度',
+                  text: '性能对标',
                   icon: 'svg-wind-site',
-                  path: '/wtSaturability'
+                  path: '/decision3'
+                },
+                {
+                  text: '值际对标',
+                  icon: 'svg-wind-site',
+                  path: '/decision4'
+                },
+                {
+                  text: '单机横向对比',
+                  icon: 'svg-matrix',
+                  path: '/decision3db'
+                },
+                {
+                  text: '操作指令统计',
+                  icon: 'svg-matrix',
+                  path: '/decision4czzl'
                 }
               ]
-            },
+            }, // 三率管理
             {
-              text: '可靠性分析',
-              icon: 'svg-wind-site',
-              path: '/new/alarmcenter1',
+              text: '三率管理',
+              icon: 'svg-matrix',
+              path: '/fwjsl',
               children: [
                 {
-                  text: '预警分析',
-                  icon: 'svg-wind-site',
-                  path: '/new/alarmcenter1'
-                },
-                {
-                  text: '故障分析',
+                  text: '复位及时率',
                   icon: 'svg-wind-site',
-                  path: '/new/alarmcenter2'
+                  path: '/fwjsl'
                 },
                 {
-                  text: '预警评判分析',
+                  text: '状态转换率',
                   icon: 'svg-wind-site',
-                  path: '/warnStatistics'
+                  path: '/ztzhl'
                 },
                 {
-                  text: '故障评判分析',
+                  text: '消缺及时率',
                   icon: 'svg-wind-site',
-                  path: '/malfunctionStatistics'
+                  path: '/xqjsl'
                 }
               ]
-            },
+            } ,
             {
-              text: '风光资源分析',
-              icon: 'svg-wind-site',
-              path: '/windAnalysis',
+              text: "排行榜",
+              icon: "svg-matrix",
+              path: "/phb",
               children: [
                 {
-                  text: '风资源散点',
-                  icon: 'svg-wind-site',
-                  path: '/windAnalysis'
+                  text: "发电效率排行",
+                  icon: "svg-wind-site",
+                  path: "/powerRank",
                 },
                 {
-                  text: '风资源风向',
-                  icon: 'svg-wind-site',
-                  path: '/windAnalysis/fx'
-                }
-              ]
-            }
-            // {
-            //   text: "单机分析",
-            //   icon: "svg-wind-site",
-            //   path: "/fgzyfx",
-            //   children: [
-            //     {
-            //       text: "单机分析详细",
-            //       icon: "svg-wind-site",
-            //       path: "/new/dj1",
-            //     },
-            //     {
-            //       text: "电量预测",
-            //       icon: "svg-wind-site",
-            //       path: "/new/pf1",
-            //     },
-            //     {
-            //       text: "气象预测",
-            //       icon: "svg-wind-site",
-            //       path: "/new/fs",
-            //     }
-            //   ]
-            // }
-          ]
-        },
-        ,
-        {
-          id: 'ztfx',
-          text: '降损分析',
-          data: [
+                  text: "总发电效率排行",
+                  icon: "svg-wind-site",
+                  path: "/totalPowerRank",
+                },
+                {
+                  text: "报警排行",
+                  icon: "svg-wind-site",
+                  path: "/warningRank",
+                },
+              ],
+            },
             {
               text: '专题分析',
               icon: 'svg-wind-site',
@@ -299,85 +287,23 @@ export default {
                   path: '/new/zzhcydl'
                 }
               ]
-            },
+            } ,
             {
-              text: '对标管理',
-              icon: 'svg-matrix',
-              path: '/decision1',
+              text: "风机分析",
+              icon: "svg-matrix",
+              path: "/fjfx",
               children: [
                 {
-                  text: '风机绩效榜',
-                  icon: 'svg-wind-site',
-                  path: '/decision1'
-                },
-                {
-                  text: '五项损失率',
-                  icon: 'svg-wind-site',
-                  path: '/decision2'
-                },
-                {
-                  text: '场内对标',
-                  icon: 'svg-wind-site',
-                  path: '/decision2Cndb'
-                },
-                {
-                  text: '场际对标',
-                  icon: 'svg-wind-site',
-                  path: '/decision2Cjdb'
-                },
-                {
-                  text: '项目对标',
-                  icon: 'svg-wind-site',
-                  path: '/decision2Xmdb'
-                },
-                {
-                  text: '线路对标',
-                  icon: 'svg-wind-site',
-                  path: '/decision2Xldb'
-                },
-                {
-                  text: '性能对标',
-                  icon: 'svg-wind-site',
-                  path: '/decision3'
-                },
-                {
-                  text: '值际对标',
-                  icon: 'svg-wind-site',
-                  path: '/decision4'
-                },
-                {
-                  text: '单机横向对比',
-                  icon: 'svg-matrix',
-                  path: '/decision3db'
-                },
-                {
-                  text: '操作指令统计',
-                  icon: 'svg-matrix',
-                  path: '/decision4czzl'
-                }
-              ]
-            }, // 三率管理
-            {
-              text: '三率管理',
-              icon: 'svg-matrix',
-              path: '/fwjsl',
-              children: [
-                {
-                  text: '复位及时率',
+                  text: '单机性能分析',
                   icon: 'svg-wind-site',
-                  path: '/fwjsl'
+                  path: '/performanceAnalysis'
                 },
                 {
-                  text: '状态转换率',
+                  text: '单机月度分析',
                   icon: 'svg-wind-site',
-                  path: '/ztzhl'
+                  path: '/singleAnalysis'
                 },
-                {
-                  text: '消缺及时率',
-                  icon: 'svg-wind-site',
-                  path: '/xqjsl'
-                }
-              ]
+              ],
             }
             // {
             //   text: "单机分析",
@@ -404,205 +330,178 @@ export default {
           ]
         },
         {
-          id: 'realSearch',
-          text: '数据管理',
+          id: 'health',
+          text: '智慧检修',
           data: [
             {
-              text: '原始数据查询',
+              text: '沙盘',
               icon: 'svg-wind-site',
-              path: '/realSearch',
-              children: [
-                {
-                  text: '测点数据查询',
-                  icon: 'svg-wind-site',
-                  path: '/realSearch'
-                },
-                {
-                  text: '测点历史数据查询',
-                  icon: 'svg-wind-site',
-                  path: '/historySearch'
-                }
-              ]
+              path: '/spt'
             },
             {
-              text: '预警记录',
+              text: '等级评估',
               icon: 'svg-wind-site',
-              path: '/new/alarmcenter',
+              path: '/djpg'
+            },
+            {
+              text: '健康管理',
+              icon: 'svg-wind-site',
+              path: '/health',
               children: [
                 {
-                  text: '预警管理',
-                  icon: 'svg-wind-site',
-                  path: '/new/alarmcenter'
-                },
-
-                {
-                  text: '停机事件管理',
-                  icon: 'svg-wind-site',
-                  path: '/new/tjsj'
-                },
-                {
-                  text: '限电管理',
+                  text: '健康推荐',
                   icon: 'svg-wind-site',
-                  path: '/new/xdgl'
+                  path: '/health'
                 },
                 {
-                  text: '升压站报警',
+                  text: '健康首页',
                   icon: 'svg-wind-site',
-                  path: '/alarmCenter/boosterAlarm'
+                  path: '/health/health2'
                 },
                 {
-                  text: 'SCADA报警',
+                  text: '健康总览',
                   icon: 'svg-wind-site',
-                  path: '/alarmCenter/scadaAlarm'
+                  path: '/health/health6'
                 },
                 {
-                  text: '自定义报警',
+                  text: '健康矩阵',
                   icon: 'svg-wind-site',
-                  path: '/alarmCenter/customAlarm'
+                  path: '/health/health5'
                 },
+                // {
+                //   text: "健康列表",
+                //   icon: "svg-wind-site",
+                //   path: "/health/health6",
+                // },
                 {
-                  text: '自定义报警统计',
+                  text: '健康列表',
                   icon: 'svg-wind-site',
-                  path: '/alarmCenter/customStatistics'
+                  path: '/health/health8'
                 }
               ]
             },
             {
-              text: '专家知识',
+              text: '全生命周期',
               icon: 'svg-wind-site',
-              path: '/knowledge',
+              path: '/allLifeManage'
+            }, {
+              text: '能效分析',
+              icon: 'svg-wind-site',
+              path: '/powerCurve',
               children: [
                 {
-                  text: '故障知识列表',
-                  icon: 'svg-matrix',
-                  path: '/knowledge'
-                },
-                {
-                  text: '安全措施知识',
-                  icon: 'svg-matrix',
-                  path: '/knowledge2'
-                },
-                {
-                  text: '排查检修方案',
-                  icon: 'svg-matrix',
-                  path: '/knowledge6'
+                  text: '功率曲线拟合',
+                  icon: 'svg-wind-site',
+                  path: '/powerCurve'
                 },
                 {
-                  text: '预警知识',
-                  icon: 'svg-matrix',
-                  path: '/knowledge7'
+                  text: '偏航对风分析',
+                  icon: 'svg-wind-site',
+                  path: '/nxfx2'
                 },
                 {
-                  text: '特征参数',
-                  icon: 'svg-matrix',
-                  path: '/knowledge5'
+                  text: '切入切出分析',
+                  icon: 'svg-wind-site',
+                  path: '/cutAnalyse'
                 },
                 {
-                  text: '风险辨识知识',
-                  icon: 'svg-matrix',
-                  path: '/knowledge3'
+                  text: '曲线偏差率分析',
+                  icon: 'svg-wind-site',
+                  path: '/qxpclfx'
                 },
+               
                 {
-                  text: '作业指导知识',
-                  icon: 'svg-matrix',
-                  path: '/knowledge4'
+                  text: '单机饱和度',
+                  icon: 'svg-wind-site',
+                  path: '/wtSaturability'
                 }
               ]
-            }
-          ]
-        },
-        {
-          id: 'health',
-          text: '健康管理',
-          data: [
-            {
-              text: '等级评估',
-              icon: 'svg-wind-site',
-              path: '/djpg'
             },
             {
-              text: '健康管理',
+              text: '可靠性分析',
               icon: 'svg-wind-site',
-              path: '/health',
+              path: '/new/alarmcenter1',
               children: [
                 {
-                  text: '健康推荐',
-                  icon: 'svg-wind-site',
-                  path: '/health'
-                },
-                {
-                  text: '健康首页',
+                  text: '预警分析',
                   icon: 'svg-wind-site',
-                  path: '/health/health2'
+                  path: '/new/alarmcenter1'
                 },
                 {
-                  text: '健康总览',
+                  text: '故障分析',
                   icon: 'svg-wind-site',
-                  path: '/health/health6'
+                  path: '/new/alarmcenter2'
                 },
                 {
-                  text: '健康矩阵',
+                  text: '预警评判分析',
                   icon: 'svg-wind-site',
-                  path: '/health/health5'
+                  path: '/warnStatistics'
                 },
-                // {
-                //   text: "健康列表",
-                //   icon: "svg-wind-site",
-                //   path: "/health/health6",
-                // },
                 {
-                  text: '健康列表',
+                  text: '故障评判分析',
                   icon: 'svg-wind-site',
-                  path: '/health/health8'
+                  path: '/malfunctionStatistics'
                 }
               ]
             },
             {
-              text: '全生命周期',
+              text: '风光资源分析',
               icon: 'svg-wind-site',
-              path: '/allLifeManage'
+              path: '/windAnalysis',
+              children: [
+                {
+                  text: '风资源散点',
+                  icon: 'svg-wind-site',
+                  path: '/windAnalysis'
+                },
+                {
+                  text: '风资源风向',
+                  icon: 'svg-wind-site',
+                  path: '/windAnalysis/fx'
+                }
+              ]
             }
           ]
         },
         {
           id: 'personnel',
-          text: '安措管控',
+          text: '安全管控',
           data: [
             // ,
             // {
             //   text: "五项损失率",
             //   icon: "svg-matrix",
-            //   path: "/decision2",
+            //   path: "/decision/decision2",
             // },
             // {
             //   text: "场内对标",
             //   icon: "svg-matrix",
-            //   path: "/decision2Cndb",
+            //   path: "/decision/decision2Cndb",
             // },
             // {
             //   text: "场际对标",
             //   icon: "svg-matrix",
-            //   path: "/decision2Cjdb",
+            //   path: "/decision/decision2Cjdb",
             // },
             // {
             //   text: "项目对标",
             //   icon: "svg-matrix",
-            //   path: "/decision2Xmdb",
+            //   path: "/decision/decision2Xmdb",
             // },
             // {
             //   text: "线路对标",
             //   icon: "svg-matrix",
-            //   path: "/decision2Xldb",
+            //   path: "/decision/decision2Xldb",
             // },
             // {
             //   text: "性能对标",
             //   icon: "svg-matrix",
-            //   path: "/decision3",
+            //   path: "/decision/decision3",
             // },
             // {
             //   text: "值际对标",
             //   icon: "svg-matrix",
-            //   path: "/decision4",
+            //   path: "/decision/decision4",
             // }
 
             {
@@ -624,47 +523,6 @@ export default {
             }
           ]
         },
-        // {
-        //   id: "knowledge",
-        //   text: "知识管理",
-        //   data: [
-        //     {
-        //       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",
-        //     },
-        //   ],
-        // },
         {
           id: 'bdzcx',
           text: '智能报表',
@@ -799,6 +657,114 @@ export default {
               ]
             }
           ]
+        },
+        {
+          id: 'realSearch',
+          text: '数据管理',
+          data: [
+            {
+              text: '原始数据查询',
+              icon: 'svg-wind-site',
+              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'
+                }
+              ]
+            }
+          ]
         }
       ],
       activeIndex: 0,