update

src/components/coms/collapse/collapse-list.vue

@@ -1,12 +1,26 @@
 <template>
   <el-scrollbar>
-    <div class="com-collapse" :style="{ height: allowScroll ? scrollHeight : 'auto' }">
-      <div class="collapse-box" v-for="(menu, i) in list" :key="menu" :class="{ active: menuIndex == i }">
+    <div
+      class="com-collapse"
+      :style="{ height: allowScroll ? scrollHeight : 'auto' }"
+    >
+      <div
+        class="collapse-box"
+        v-for="(menu, i) in list"
+        :key="menu"
+        :class="{ active: menuIndex == i }"
+      >
         <div class="box-text" @click="menuClick(i)">
           {{ menu.text }}
         </div>
         <div class="collapse-items">
-          <div class="item" v-for="(item, j) in menu.children" :key="item" @click.stop="itemClick(item, j)" :class="{ active: itemIndex == j }">
+          <div
+            class="item"
+            v-for="(item, j) in menu.children"
+            :key="item"
+            @click.stop="itemClick(item, j)"
+            :class="{ active: itemIndex == j }"
+          >
             <span class="dot" :class="'bg-' + item.color"></span>
             <span class="value"> {{ item.text }}</span>
           </div>
@@ -108,7 +122,7 @@ export default {
   },
   computed: {},
   // 数据
-  data () {
+  data() {
     return {
       menuIndex: 0,
       itemIndex: 0,
@@ -116,7 +130,10 @@ export default {
   },
   // 函数
   methods: {
-    menuClick (index) {
+    menuClick(index) {
+      if(index === 0){
+        this.$emit("onClick");
+      }
       if (this.menuIndex == index) {
         this.menuIndex = -1;
       } else {
@@ -124,16 +141,16 @@ export default {
       }
       this.itemIndex = -1;
     },
-    itemClick (item, index) {
+    itemClick(item, index) {
+      console.log(111111111,item);
       this.itemIndex = index;
       this.wpId = item.wpId;
       this.wtId = item.id;
       this.$emit("click", item);
     },
-    setDefaultActiveMenu (menu) {
+    setDefaultActiveMenu(menu) {
       menu.forEach((pEle, pIndex) => {
-
-        let findResult = pEle.children.find(cEle => {
+        let findResult = pEle.children.find((cEle) => {
           return cEle.wpId === this.wpId;
         });
 
@@ -141,41 +158,42 @@ export default {
 
         pEle.children.forEach((cEle, cIndex) => {
           if (cEle.id === this.wtId) {
-            this.itemIndex = cIndex
+            this.itemIndex = cIndex;
           }
         });
-
       });
-
-    }
+    },
+  
   },
   // 生命周期钩子
-  beforeCreate () {
+  beforeCreate() {
     // 创建前
   },
-  created () {
+  created() {
     // 创建后
   },
-  beforeMount () {
+  beforeMount() {
     // 渲染前
   },
-  mounted () {
+  mounted() {
     this.wpId = this.$route.params.wpId || "";
     this.wtId = this.$route.params.wtId || "";
     this.setDefaultActiveMenu(this.list);
+
+
   },
-  beforeUpdate () {
+  beforeUpdate() {
     // 数据更新前
   },
-  updated () {
+  updated() {
     // 数据更新后
   },
 
   watch: {
-    list (res) {
-      this.setDefaultActiveMenu(res)
-    }
-  }
+    list(res) {
+      this.setDefaultActiveMenu(res);
+    },
+  },
 };
 </script>
 

src/views/Decision/Decision1Mx.vue

@@ -216,6 +216,8 @@ import Panel from "../../components/coms/panel/panel.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Table from "./table.vue";
 import partten from "@/helper/partten.js";
+import api from "@api/economic/index.js";
+
 export default {
   components: {
     ToolbarPanel,
@@ -695,12 +697,12 @@ export default {
     AjaxCommon() {
       api
         .benchmarking({
-          wpids: that.value1,
-          projectids: that.value2,
-          lineids: that.value3,
-          beginDate: that.value4,
-          endDate: that.value5,
-          type: that.TypeClass,
+          wpids: this.value1,
+          projectids: this.value2,
+          lineids: this.value3,
+          beginDate: this.value4,
+          endDate: this.value5,
+          type: this.TypeClass,
           target: "",
           sort: "",
         })
@@ -777,16 +779,16 @@ export default {
               });
               arr1.push(arr2);
             }
-            that.lineData = llfdl;
-            that.bardata = {
+            this.lineData = llfdl;
+            this.bardata = {
               area: name,
               legend: legend,
               data: arr1,
             };
           }
-          that.tableDataEnd = data2[data2.length - 1];
+          this.tableDataEnd = data2[data2.length - 1];
           data2.pop();
-          that.tableData.data = data2;
+          this.tableData.data = data2;
         });
 
       //   var that = this;

src/views/Others/index.vue

@@ -185,7 +185,7 @@
               />
               <p class="imgTitle">排查、检修方案</p>
             </div>
-            <div
+            <!-- <div
               class="imgItem1"
               @click="jumpUrl('/health/gzzd/malfunctionDiagnose')"
             >
@@ -195,15 +195,15 @@
                 fit="fill"
               />
               <p class="imgTitle">评价体系</p>
-            </div>
-            <div class="imgItem1" @click="jumpUrl('/health/frist')">
+            </div> -->
+            <!-- <div class="imgItem1" @click="jumpUrl('/health/frist')">
               <el-image
                 class="img1"
                 src="./static/img/o人工智能.png"
                 fit="fill"
               />
               <p class="imgTitle">人工智能</p>
-            </div>
+            </div> -->
           </div>
         </div>
       </el-carousel-item>

src/views/Status/components/status-panel.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="status-panel">
     <div class="pause" v-if="data.breakOff">中断</div>
-    <ComPanel class="status-com-panel" :title="data.title" @click="jumpPage(data.wpId)">
+    <ComPanel class="status-com-panel" :title="data.title">
       <div class="p-body">
         <div class="category-box">
           <div class="score">
@@ -75,13 +75,13 @@ export default {
   },
   // 函数
   methods: {
-    jumpPage(wpId) {
-      this.$router.push({
-        path: `/monitor/windsite/home/${wpId}`,
-        // query: { wpId: id },
-      });
-      console.log('wpid:',wpId)
-    },
+    // jumpPage(wpId) {
+    //   this.$router.push({
+    //     path: `/monitor/windsite/home/${wpId}`,
+    //     // query: { wpId: id },
+    //   });
+    //   console.log('wpid:',wpId)
+    // },
   },
   // 生命周期钩子
   beforeCreate() {

src/views/layout/Header.vue

@@ -72,13 +72,13 @@ export default {
           path: "/decision/pb",
           isActive: false,
         },
-        {
-          id: "health",
-          text: "智慧检修",
-          // path: '/sandtable',
-          path: "/health/sandtable",
-          isActive: false,
-        },
+        // {
+        //   id: "health",
+        //   text: "智慧检修",
+        //   // path: '/sandtable',
+        //   path: "/health/sandtable",
+        //   isActive: false,
+        // },
         // {
         //   id: "decision",
         //   text: "决策支持",

src/views/layout/Menu.vue

@@ -778,115 +778,115 @@ export default {
             //     },
             //   ],
             // },
-            {
-              text: "报表管理",
-              icon: "svg-报表管理",
-              path: "/others/oafd",
-              children: [
-                {
-                  text: "OA日报",
-                  icon: "svg-matrix",
-                  path: "/others/oafd",
-                },
-                {
-                  text: "OA日报(光伏)",
-                  icon: "svg-matrix",
-                  path: "/others/oagf",
-                },
-                {
-                  text: "新能源日报",
-                  icon: "svg-matrix",
-                  path: "/others/xnyrb",
-                },
-                {
-                  text: "国电MIS日报(风电)",
-                  icon: "svg-matrix",
-                  path: "/others/missfdrb",
-                },
-                {
-                  text: "国电MIS日报(光伏)",
-                  icon: "svg-matrix",
-                  path: "/others/missgfrb",
-                },
-                {
-                  text: "新能源风电生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/xnyfdscyb",
-                },
-                {
-                  text: "麻黄山生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/mhsscyb",
-                },
-                {
-                  text: "牛首山生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/nssscyb",
-                },
-                {
-                  text: "青山生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/qsscyb",
-                },
-                {
-                  text: "石板泉生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/sbqscyb",
-                },
-                {
-                  text: "香山生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/xsscyb",
-                },
-                {
-                  text: "新能源光伏生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/xnygfscyb",
-                },
-                {
-                  text: "大武口生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/dwkscyb",
-                },
-                {
-                  text: "平罗生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/plscyb",
-                },
-                {
-                  text: "宣和生产月报",
-                  icon: "svg-matrix",
-                  path: "/others/xhscyb",
-                },
-              ],
-            },
-            {
-              text: "自定制报表管理",
-              icon: "svg-自定制报表管理",
-              path: "/others/fdczzdy",
-              children: [
-                {
-                  text: "风电场站自定义",
-                  icon: "svg-matrix",
-                  path: "/others/fdczzdy",
-                },
-                {
-                  text: "风电项目自定义",
-                  icon: "svg-matrix",
-                  path: "/others/fdxmzdy",
-                },
-                {
-                  text: "光伏场站自定义",
-                  icon: "svg-matrix",
-                  path: "/others/gfczzdy",
-                },
-                {
-                  text: "光伏项目自定义",
-                  icon: "svg-matrix",
-                  path: "/others/gfxmzdy",
-                },
-              ],
-            },
+            // {
+            //   text: "报表管理",
+            //   icon: "svg-报表管理",
+            //   path: "/others/oafd",
+            //   children: [
+            //     {
+            //       text: "OA日报",
+            //       icon: "svg-matrix",
+            //       path: "/others/oafd",
+            //     },
+            //     {
+            //       text: "OA日报(光伏)",
+            //       icon: "svg-matrix",
+            //       path: "/others/oagf",
+            //     },
+            //     {
+            //       text: "新能源日报",
+            //       icon: "svg-matrix",
+            //       path: "/others/xnyrb",
+            //     },
+            //     {
+            //       text: "国电MIS日报(风电)",
+            //       icon: "svg-matrix",
+            //       path: "/others/missfdrb",
+            //     },
+            //     {
+            //       text: "国电MIS日报(光伏)",
+            //       icon: "svg-matrix",
+            //       path: "/others/missgfrb",
+            //     },
+            //     {
+            //       text: "新能源风电生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/xnyfdscyb",
+            //     },
+            //     {
+            //       text: "麻黄山生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/mhsscyb",
+            //     },
+            //     {
+            //       text: "牛首山生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/nssscyb",
+            //     },
+            //     {
+            //       text: "青山生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/qsscyb",
+            //     },
+            //     {
+            //       text: "石板泉生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/sbqscyb",
+            //     },
+            //     {
+            //       text: "香山生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/xsscyb",
+            //     },
+            //     {
+            //       text: "新能源光伏生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/xnygfscyb",
+            //     },
+            //     {
+            //       text: "大武口生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/dwkscyb",
+            //     },
+            //     {
+            //       text: "平罗生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/plscyb",
+            //     },
+            //     {
+            //       text: "宣和生产月报",
+            //       icon: "svg-matrix",
+            //       path: "/others/xhscyb",
+            //     },
+            //   ],
+            // },
+            // {
+            //   text: "自定制报表管理",
+            //   icon: "svg-自定制报表管理",
+            //   path: "/others/fdczzdy",
+            //   children: [
+            //     {
+            //       text: "风电场站自定义",
+            //       icon: "svg-matrix",
+            //       path: "/others/fdczzdy",
+            //     },
+            //     {
+            //       text: "风电项目自定义",
+            //       icon: "svg-matrix",
+            //       path: "/others/fdxmzdy",
+            //     },
+            //     {
+            //       text: "光伏场站自定义",
+            //       icon: "svg-matrix",
+            //       path: "/others/gfczzdy",
+            //     },
+            //     {
+            //       text: "光伏项目自定义",
+            //       icon: "svg-matrix",
+            //       path: "/others/gfxmzdy",
+            //     },
+            //   ],
+            // },
             {
               text: "原始数据查询",
               icon: "svg-报表首页",
@@ -902,66 +902,66 @@ export default {
                   icon: "svg-wind-site",
                   path: "/others/historySearch",
                 },
-                {
-                  text: "气象历史数据",
-                  icon: "svg-wind-site",
-                  path: "/others/weather",
-                },
-                {
-                  text: "数据导出",
-                  icon: "svg-wind-site",
-                  path: "/others/ExportExcel",
-                },
-                {
-                  text: "设备管理",
-                  icon: "svg-wind-site",
-                  path: "/device/device",
-                },
+                // {
+                //   text: "气象历史数据",
+                //   icon: "svg-wind-site",
+                //   path: "/others/weather",
+                // },
+                // {
+                //   text: "数据导出",
+                //   icon: "svg-wind-site",
+                //   path: "/others/ExportExcel",
+                // },
+                // {
+                //   text: "设备管理",
+                //   icon: "svg-wind-site",
+                //   path: "/device/device",
+                // },
               ],
             },
-            {
-              text: "预警记录",
-              icon: "svg-预警记录",
-              path: "/others/alarmCenter/alarmcenter",
-              children: [
-                {
-                  text: "预警管理",
-                  icon: "svg-wind-site",
-                  path: "/others/alarmCenter/alarmcenter",
-                },
+            // {
+            //   text: "预警记录",
+            //   icon: "svg-预警记录",
+            //   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/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-专家知识",
@@ -1004,53 +1004,53 @@ export default {
                 },
               ],
             },
-            {
-              text: "样本库",
-              icon: "svg-报表管理",
-              path: "/others/fault",
-              children: [
-                {
-                  text: "故障训练样本库",
-                  icon: "svg-matrix",
-                  path: "/others/fault",
-                },
-                {
-                  text: "性能下降样本库",
-                  icon: "svg-matrix",
-                  path: "/others/performance",
-                },
-                {
-                  text: "预警分析样本库",
-                  icon: "svg-matrix",
-                  path: "/others/warning",
-                },
-                {
-                  text: "性能预警综合分析",
-                  icon: "svg-matrix",
-                  path: "/others/analysis",
-                },
-                // {
-                //   text: "功率曲线综合分析",
-                //   icon: "svg-matrix",
-                //   path: "/others/powerline/analysis",
-                // },
-                {
-                  text: "知识库",
-                  icon: "svg-matrix",
-                  path: "/others/knowledgeBase",
-                },
-                // {
-                //   text: "发电能力分析",
-                //   icon: "svg-matrix",
-                //   path: "/others/abilityAnalysis",
-                // },
-                // {
-                //   text: "风电营销样本库",
-                //   icon: "svg-matrix",
-                //   path: "/others/market",
-                // }
-              ],
-            },
+            // {
+            //   text: "样本库",
+            //   icon: "svg-报表管理",
+            //   path: "/others/fault",
+            //   children: [
+            //     {
+            //       text: "故障训练样本库",
+            //       icon: "svg-matrix",
+            //       path: "/others/fault",
+            //     },
+            //     {
+            //       text: "性能下降样本库",
+            //       icon: "svg-matrix",
+            //       path: "/others/performance",
+            //     },
+            //     {
+            //       text: "预警分析样本库",
+            //       icon: "svg-matrix",
+            //       path: "/others/warning",
+            //     },
+            //     {
+            //       text: "性能预警综合分析",
+            //       icon: "svg-matrix",
+            //       path: "/others/analysis",
+            //     },
+            //     // {
+            //     //   text: "功率曲线综合分析",
+            //     //   icon: "svg-matrix",
+            //     //   path: "/others/powerline/analysis",
+            //     // },
+            //     {
+            //       text: "知识库",
+            //       icon: "svg-matrix",
+            //       path: "/others/knowledgeBase",
+            //     },
+            //     // {
+            //     //   text: "发电能力分析",
+            //     //   icon: "svg-matrix",
+            //     //   path: "/others/abilityAnalysis",
+            //     // },
+            //     // {
+            //     //   text: "风电营销样本库",
+            //     //   icon: "svg-matrix",
+            //     //   path: "/others/market",
+            //     // }
+            //   ],
+            // },
           ],
         },
       ],

src/views/realSearch/index.vue

@@ -46,7 +46,7 @@
     </div>
     <div class="searchPage">
       <div style="width: 200px; height: 100vh">
-        <CollapseList :list="menus" @click="clickMenu" />
+        <CollapseList :list="menus" @click="clickMenu" @onClick="handleClick"/>
       </div>
       <div class="df-table">
         <ComTable
@@ -364,9 +364,12 @@ export default {
             JSFW = ele;
           }
         });
-        this.menus.push(JSFW, CL_FDC, KB_FDC, DX_FDC, SY_FDC);
+        this.menus.push(JSFW,CL_FDC, KB_FDC, DX_FDC, SY_FDC);
       });
     },
+    jsfw() {
+      console.log(999);
+    },
 
     // 获取表格数据
     getTableData() {
@@ -618,14 +621,32 @@ export default {
 
     // 点击左侧菜单
     clickMenu(item) {
+      console.log(item);
       this.tableid = item.tableid;
       this.getTableData();
     },
+    handleClick(){
+      this.tableid = "JSFW";
+      this.getTableData();
+    },
   },
 };
 </script>
   
 <style lang="less" scoped>
+.jsfw {
+  width: 200px;
+  height: 37px;
+  background-color: rgb(30, 37, 36);
+  padding: 7px;
+  box-sizing: border-box;
+  padding-left: 14px;
+  cursor:pointer; 
+}
+.jsfw:hover {
+  color: #fff;
+  background: rgba(75, 85, 174, 0.6);
+}
 .searchBox {
   width: 80%;
   display: flex;