驾驶舱模块上传、中部地图逻辑修改、路由重名BUG修改

public/static/config/modeConfig.js

@@ -1,6 +1,6 @@
 
 // 本地联调开关
-const localTest = 1;
+const localTest = 0;
 
 // 服务器地址
 let baseURL = null;
@@ -9,7 +9,8 @@ let baseURL = null;
 let websocketUrl = null;
 
 if (localTest) {
-  baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
+  // baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
+  baseURL = "http://192.168.10.18:8082/" // 联机调试 - 石林
   websocketUrl = (baseURL.replace(/http:\/\//g, "")) + "gyee-websocket";
 } else {
   baseURL = "http://10.155.32.4:8082/" // 正式环境

src/router/index.js

@@ -47,13 +47,13 @@ const routes = [
       component: () => import(/* webpackChunkName: "windsitebox" */ '../views/WindSite/pages/Box.vue'),
     }, {
       path: 'info/:wpId/:wtId', // 单机状态监视
-      component: () => import(/* webpackChunkName: "windsitebox" */ '../views/WindSite/pages/Info/Info.vue'),
+      component: () => import(/* webpackChunkName: "info" */ '../views/WindSite/pages/Info/Info.vue'),
     }, {
       path: 'tower/:wpId', // 测风塔
       component: () => import(/* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Tower.vue'),
     }, {
       path: 'inverter-info/:wpId',
-      component: () => import(/* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Inverter-Info.vue'),
+      component: () => import(/* webpackChunkName: "inverter-info" */ '../views/WindSite/pages/Inverter-Info.vue'),
     }, {
       path: 'map/:wpId',
       component: () => import(/* webpackChunkName: "windsitemap" */ '../views/WindSite/pages/Map.vue'),
@@ -83,7 +83,7 @@ const routes = [
   }, {
     path: '/decision/decision1',
     name: 'decision1',
-    component: () => import(/* webpackChunkName: "lightmatrix3" */ '../views/Decision/Decision1.vue'),
+    component: () => import(/* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
   },
   {
     path: '/decision/decision2',

src/views/Home/Home.vue

@@ -116,17 +116,17 @@
               <td class="value green">{{jczbmap.zjts}}</td>
               <td class="unit gray">台</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('日发电量详情', 'genreset/findDayInfo', 'rfdl')">
               <td class="text gray">日发电量</td>
               <td class="value green">{{jczbmap.rfdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('月发电量详情', 'genreset/findMonthInfo', 'yfdl')">
               <td class="text gray">月发电量</td>
               <td class="value green">{{jczbmap.yfdl}}</td>
               <td class="unit gray gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('年发电量详情', 'genreset/findYearInfo', 'nfdl')">
               <td class="text gray">年发电量</td>
               <td class="value green">{{jczbmap.nfdl}}</td>
               <td class="unit gray">万kwh</td>
@@ -178,27 +178,27 @@
         <Col>
         <com-panel>
           <table class="table-card">
-            <tr class="">
+            <tr class="" @click="openDialog('日性能损失详情', 'genreset/findDayInfo', 'rxnssdl')">
               <td class="text gray">日性能损失</td>
               <td class="value green">{{wxssmap.rqfssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('日故障损失详情', 'genreset/findDayInfo', 'rgzssdl')">
               <td class="text gray">日故障损失</td>
               <td class="value green">{{wxssmap.rgzssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('日检修损失详情', 'genreset/findDayInfo', 'rjxssdl')">
               <td class="text gray">日检修损失</td>
               <td class="value green">{{wxssmap.rjxssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('日限电损失详情', 'genreset/findDayInfo', 'rxdssdl')">
               <td class="text gray">日限电损失</td>
               <td class="value green">{{wxssmap.rxdssdl}}</td>
               <td class="unit gray gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('日受累损失详情', 'genreset/findDayInfo', 'rslssdl')">
               <td class="text gray">日受累损失</td>
               <td class="value green">{{wxssmap.rslssdl}}</td>
               <td class="unit gray">万kwh</td>
@@ -214,27 +214,27 @@
         <Col>
         <com-panel>
           <table class="table-card">
-            <tr class="">
+            <tr class="" @click="openDialog('月性能损失详情', 'genreset/findMonthInfo', 'yxnssdl')">
               <td class="text gray">月性能损失</td>
               <td class="value green">{{wxssmap.yqfssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('月故障损失详情', 'genreset/findMonthInfo', 'ygzssdl')">
               <td class="text gray">月故障损失</td>
               <td class="value green">{{wxssmap.ygzssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('月检修损失详情', 'genreset/findMonthInfo', 'yjxssdl')">
               <td class="text gray">月检修损失</td>
               <td class="value green">{{wxssmap.yjxssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('月限电损失详情', 'genreset/findMonthInfo', 'yxdssdl')">
               <td class="text gray">月限电损失</td>
               <td class="value green">{{wxssmap.yxdssdl}}</td>
               <td class="unit gray gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('月受累损失详情', 'genreset/findMonthInfo', 'yslssdl')">
               <td class="text gray">月受累损失</td>
               <td class="value green">{{wxssmap.yslssdl}}</td>
               <td class="unit gray">万kwh</td>
@@ -250,27 +250,27 @@
         <Col>
         <com-panel>
           <table class="table-card">
-            <tr class="">
+            <tr class="" @click="openDialog('年性能损失详情', 'genreset/findYearInfo', 'nxnssdl')">
               <td class="text gray">年性能损失</td>
               <td class="value green">{{wxssmap.nqfssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('年故障损失详情', 'genreset/findYearInfo', 'ngzssdl')">
               <td class="text gray">年故障损失</td>
               <td class="value green">{{wxssmap.ngzssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('年检修损失详情', 'genreset/findYearInfo', 'njxssdl')">
               <td class="text gray">年检修损失</td>
               <td class="value green">{{wxssmap.njxssdl}}</td>
               <td class="unit gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('年限电损失详情', 'genreset/findYearInfo', 'nxdssdl')">
               <td class="text gray">年限电损失</td>
               <td class="value green">{{wxssmap.nxdssdl}}</td>
               <td class="unit gray gray">万kwh</td>
             </tr>
-            <tr class="">
+            <tr class="" @click="openDialog('年受累损失详情', 'genreset/findYearInfo', 'nslssdl')">
               <td class="text gray">年受累损失</td>
               <td class="value green">{{wxssmap.nslssdl}}</td>
               <td class="unit gray">万kwh</td>
@@ -418,6 +418,9 @@
       </panel-3>
       </Col>
     </Row>
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="70%" top="10vh" custom-class="modal" :close-on-click-modal="true">
+      <Table :data="dialogData" />
+    </el-dialog>
   </div>
 </template>
 
@@ -438,6 +441,8 @@ import PowerReview from "./components/power-review.vue";
 import PowerPlan from "./components/power-plan.vue";
 import Map from "./components/map.vue";
 
+import Table from "./dialog/table.vue";
+
 export default {
   name: "Home",
   components: {
@@ -455,6 +460,7 @@ export default {
     Panel3,
     SvgIcon,
     Map,
+    Table
   },
   data () {
     return {
@@ -467,6 +473,9 @@ export default {
       powerData: {},
       wpId: "0",
       fcmap:{},
+      dialogShow: false,
+      dialogTitle: "",
+      dialogData:{},
       // 预测电量
       ForecastPower: [],
       // 日发电量
@@ -634,8 +643,31 @@ export default {
 
     // 点击地图展示类型
     changeShowType(wpId){
+      clearInterval(this.timmer);
+      this.timmer = null;
       this.wpId = wpId;
       this.requestData(false);
+      this.timmer = setInterval(() => {
+        this.requestData(false);
+      }, this.$store.state.websocketTimeSec);
+    },
+
+    // 打开弹窗
+    openDialog(dialogTitle, subUrl, targetName){
+      this.dialogTitle = dialogTitle;
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl,
+        data: {
+          id:that.wpId,
+          targetName
+        },
+        success (res) {
+          that.dialogData = res.data;
+          that.dialogShow = true;
+        }
+      });
     }
   },
 

src/views/Home/components/map.vue

@@ -16,12 +16,12 @@
         <span>{{ tab.text }}</span>
       </div>
     </div>
-    <div class="return" @click="backMap" v-show="mapName !== 'nx'">
+    <!-- <div class="return" @click="backMap" v-show="mapName !== 'nx'">
       <span class="svg-icon svg-icon-sm">
         <svg-icon :svgid="'svg-arrow-dpwn-1'" />
       </span>
       返回
-    </div>
+    </div> -->
     <!-- 指南针 -->
     <div class="compass">
       <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="200px" height="200px" viewBox="0 0 200 200" enable-background="new 0 0 200 200" xml:space="preserve">

src/views/Home/dialog/table.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="health-day-info">
+    <!-- <div class="header">
+      <span class="herder-info">
+        风机编号：麻黄山24号风机
+      </span>
+      <span class="herder-info">
+        风机编号：麻黄山24号风机
+      </span>
+      <span class="herder-info">
+        基础指标
+      </span>
+    </div> -->
+    <div class="body">
+      <div class="left">
+        <table class="table-form">
+          <tr>
+            <td class="white"></td>
+            <td class="white" v-for="(item, index) in tableData.datels" :key="index">{{item}}</td>
+          </tr>
+          <tr v-for="(item, index) in tableData.result" :key="index">
+            <td class="white">{{item.value1}}</td>
+            <td class="white">{{item.value2}}</td>
+            <td class="white">{{item.value3}}</td>
+            <td class="white">{{item.value4}}</td>
+            <td class="white">{{item.value5}}</td>
+            <td class="white">{{item.value6}}</td>
+            <td class="white">{{item.value7}}</td>
+            <td class="white">{{item.value8}}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      value: "",
+      tableData:{}
+    };
+  },
+
+  props:{
+    data:{
+      type:Object,
+      default:() => {}
+    }
+  },
+
+  mounted(){
+    this.tableData = this.data;
+  },
+
+  watch:{
+    data(res){
+      this.tableData = res;
+    }
+  }
+};
+</script>
+
+<style lang="less">
+.health-day-info {
+  .header {
+    display: flex;
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+    background: fade(@gray, 60);
+    color: @white;
+
+    .herder-info {
+      flex: 1 0 25%;
+      text-align: center;
+      font-size: @fontsize-s;
+
+      &:last-child {
+        flex: 1 0 50%;
+      }
+    }
+  }
+
+  .body {
+    display: flex;
+    .left {
+      flex: 0 0 100%;
+
+      display: flex;
+      flex-direction: column;
+
+      .chart-body {
+        flex-grow: 1;
+        display: flex;
+        align-items: center;
+      }
+    }
+    .right {
+      flex: 0 0 50%;
+    }
+  }
+}
+</style>

src/views/LightMatrix3/LightMatrix3.vue

@@ -396,9 +396,7 @@ export default {
           }
         },
       });
-    },
-
-    FFFF
+    }
   },
 
   created() {

src/views/layout/Menu.vue

@@ -57,7 +57,7 @@ export default {
               path: "/monitor/lightmatrix1",
             },
             {
-              text: "风场明细",
+              text: "明细矩阵",
               icon: "svg-mx-matrix",
               path: "/monitor/lightmatrix3",
             },