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

public/static/config/modeConfig.js

@@ -7,6 +7,9 @@ let baseURL = null;
 // websocket 服务器地址
 let websocketUrl = null;
 
+// 适配器地址
+const adapterUrl = "http://10.155.32.4:8011/";
+
 if (localTest) {
     baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
         // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
@@ -18,5 +21,6 @@ websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket"
 
 window.__MODE__ = {
     baseURL,
-    websocketUrl
+    websocketUrl,
+    adapterUrl
 };

src/components/coms/table/group-table.vue

@@ -90,10 +90,9 @@ export default {
       },
     },
   },
-  // 自定义事件
   emits: {
-    // 分页事件
     onPagging: null,
+    headerClick: null,
   },
   // 数据
   data() {
@@ -143,7 +142,7 @@ export default {
       if (column.rawColumnKey.click) column.rawColumnKey.click(event, row);
     },
     onHeaderClick(column, event) {
-      if (column.rawColumnKey.headerClick) column.rawColumnKey.headerClick(event, column, this.data.data);
+      this.$emit("headerClick", { event: event, col: column.rawColumnKey, data: this.data.data });
     },
     handleCurrentChange(val) {
       this.currentPage = val;

src/views/NewPages/power-benchmarking.vue

@@ -35,7 +35,7 @@
             <div class="right-btn" :class="{ active: btnIndex == 1 }" @click="rightBtnClick(1)">光伏</div>
           </div>
         </div>
-        <group-table :customClass="'table'" :data="eltableData" :height="'420px'" :pageSize="10"></group-table>
+        <group-table :customClass="'table'" :data="eltableData" :height="'420px'" :pageSize="10" @headerClick="headerClick"></group-table>
       </div>
       <div class="top-right">
         <div class="rank-title">
@@ -69,6 +69,7 @@ import groupTable from "../../components/coms/table/group-table.vue";
 export default {
   components: { groupTable, Panel, MultipleBarChart },
   data() {
+    let that = this;
     return {
       selecttionIndex: 0,
       btnIndex: 0,
@@ -91,41 +92,21 @@ export default {
           },
           {
             name: "基础指标",
-            headerClick: function(event, col, data) {
-              console.log(event);
-              console.log(col);
-              console.log(data);
-            },
             child: [
               {
                 name: "装机容量（MW）",
                 field: "v1",
                 width: 55,
-                headerClick: function(event, col, data) {
-                  console.log(event);
-                  console.log(col);
-                  console.log(data);
-                },
               },
               {
                 name: "在运台数 (台)",
                 field: "v1",
                 width: 55,
-                headerClick: function(event, col, data) {
-                  console.log(event);
-                  console.log(col);
-                  console.log(data);
-                },
               },
               {
                 name: "理论电量 (万kwh)",
                 field: "v1",
                 width: 55,
-                headerClick: function(event, col, data) {
-                  console.log(event);
-                  console.log(col);
-                  console.log(data);
-                },
               },
               {
                 name: "发电量 (万kwh)",
@@ -161,11 +142,6 @@ export default {
           },
           {
             name: "安全指标",
-            headerClick: function(event, col, data) {
-              console.log(event);
-              console.log(col);
-              console.log(data);
-            },
             child: [
               {
                 name: "人身设备事故 (次)",
@@ -181,11 +157,6 @@ export default {
           },
           {
             name: "经济指标",
-            headerClick: function(event, col, data) {
-              console.log(event);
-              console.log(col);
-              console.log(data);
-            },
             child: [
               {
                 name: "人身设备事故 (次)",
@@ -563,6 +534,9 @@ export default {
     selectionClick(index) {
       this.selecttionIndex = index;
     },
+    headerClick(param) {
+      console.log(param);
+    },
     rightBtnClick(index) {
       this.btnIndex = index;
     },

src/views/WindSite/pages/BoosterStation.vue

@@ -8,15 +8,52 @@
         @select="select"
       ></BtnGroup2>
     </div>
-    <!-- <bsx6 class="booster-station-body"></bsx6> -->
-    <BoosterMCH class="booster-station-body"></BoosterMCH>
+    <!-- 麻黄山 -->
+    <MHS class="booster-station-body" v-if="wpId === 'MHS_FDC'" />
+
+    <!-- 牛首山 -->
+    <NSS class="booster-station-body" v-if="wpId === 'NSS_FDC'" />
+
+    <!-- 青山 -->
+    <QS class="booster-station-body" v-if="wpId === 'QS_FDC'" />
+
+    <!-- 石板泉 -->
+    <SBQ class="booster-station-body" v-if="wpId === 'SBQ_FDC'" />
+
+    <!-- 香山 -->
+    <XS class="booster-station-body" v-if="wpId === 'XS_FDC'" />
+
+    <!-- 大武口 -->
+    <DWK class="booster-station-body" v-if="wpId === 'DWK_GDC'" />
+
+    <!-- 平罗一期 -->
+    <PL1 class="booster-station-body" v-if="wpId === 'PL_GDC'" />
+
+    <!-- 平罗二期 -->
+    <PL2 class="booster-station-body" v-if="wpId === 'PL_GDC'" />
+
+    <!-- 宣和 -->
+    <XH class="booster-station-body" v-if="wpId === 'XH_GDC'" />
+
+    <!-- 马场湖 -->
+    <MCH class="booster-station-body" v-if="wpId === 'MCH_GDC'" />
   </div>
 </template>
 
 <script>
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 // import bsx6 from "../components/bsx6.vue";
-import BoosterMCH from "../components/boosterstation/mch.vue";
+import MHS from "../components/boosterstation/mhs.vue";
+import NSS from "../components/boosterstation/nss.vue";
+import QS from "../components/boosterstation/qs.vue";
+import SBQ from "../components/boosterstation/sbq.vue";
+// import SBDL from "../components/boosterstation/sbdl.vue";
+import XS from "../components/boosterstation/xs.vue";
+import DWK from "../components/boosterstation/dwk.vue";
+import PL1 from "../components/boosterstation/pl1.vue";
+import PL2 from "../components/boosterstation/pl2.vue";
+import XH from "../components/boosterstation/pl2.vue";
+import MCH from "../components/boosterstation/mch.vue";
 
 export default {
   // 名称
@@ -25,7 +62,17 @@ export default {
   components: {
     // bsx6,
     BtnGroup2,
-    BoosterMCH,
+    MHS,
+    NSS,
+    QS,
+    SBQ,
+    // SBDL,
+    XS,
+    DWK,
+    PL1,
+    PL2,
+    XH,
+    MCH,
   },
   // 数据
   data() {
@@ -55,9 +102,10 @@ export default {
   // 函数
   methods: {
     select(res) {
+      console.log(2333, res.code);
       this.$router.replace({
-      path: `/monitor/windsite/boosterstation/${res.code}`,
-    });
+        path: `/monitor/windsite/boosterstation/${res.code}`,
+      });
     },
     getWp() {
       let that = this;
@@ -147,6 +195,7 @@ export default {
 
   .booster-station-body {
     flex-grow: 1;
+    margin-top: 20px;
   }
 }
 </style>