Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/neic

src/assets/script/BackgroundData.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { config } from '../../config';
+import UniformCodes from './UniformCodes';
 
 export default class BackgroundData {
     /* 当前登录用户 */
@@ -108,6 +109,7 @@ export default class BackgroundData {
         this.windturbineControl = this.windturbineControl.bind(this);
         this.marking = this.marking.bind(this);
         this.removeMarked = this.removeMarked.bind(this);
+        this.getWinturbineBaseData=this.getWinturbineBaseData.bind(this);
         
 
         this.refreshTPData();
@@ -368,6 +370,20 @@ export default class BackgroundData {
         this.Marks.splice(indx, 1);
     }
 
+    /* 获取风机详情页面数据 */
+    getWinturbineBaseData(windturbineId,stationId){
+        var info = UniformCodes.getStationInfos(stationId);
+        axios.get(``)
+        .then(msg=>{
+            console.log(msg);
+        })
+        .catch(err=>{
+            console.log(err);
+        });
+        console.log(info);
+        console.log(windturbineId);
+    }
+
     /* 单例 */
     static getInstance() {
         if (!BackgroundData.instance) {

src/components/area/windturbine/WindturbineDetailPages.vue

@@ -1,11 +1,13 @@
 <template>
-    <el-dialog
-  title="风机详情"
-  width="80%"
-  top="11vh"
+  <el-dialog
+    title="风机详情"
+    width="80%"
+    top="11vh"
+    @opened="opened()"
+    @closed="closed()"
   >
-  <div style="background-color:black;">
-    <!-- <div class="titeldiv">
+    <div style="background-color: black">
+      <!-- <div class="titeldiv">
       <div class="chunkdiv" width="15%">
         <img src="../../../assets/img/WindturbineDetailPages/pic_01.png"/>
         <div>MA B401</div>
@@ -29,103 +31,121 @@
       <table width="99.8%">
         <tr>
           <td>
-        <div class="chunkdiv">
-        <img src="../../../assets/img/WindturbineDetailPages/pic_01.png"/>
-        <div>{{windturbineId}}</div>
-      </div>
-      </td>
-      <td>
-      <div class="chunkdiv">
-        <div>所属线路&emsp;</div>
-        <div>某某某1线</div>
-      </div>
-      </td>
-      <td>
-      <div class="chunkdiv">
-        <div>机型&emsp;</div>
-        <div>GW1000</div>
-      </div>
-      </td>
-      <td>
-      <div class="chunkdiv">
-        <div>告警时间：</div>
-        <div>2021年5月10日&ensp;12:23:31</div>
-      </div>
-      </td>
-      <td>
-      <div class="chunkdiv">
-        <div>告警内容：</div>
-        <div>通讯中断</div>
-      </div>
-      </td>
-      </tr>
+            <div class="chunkdiv">
+              <img
+                src="../../../assets/img/WindturbineDetailPages/pic_01.png"
+              />
+              <div>{{ windturbineId }}</div>
+            </div>
+          </td>
+          <td>
+            <div class="chunkdiv">
+              <div>所属线路&emsp;</div>
+              <div>某某某1线</div>
+            </div>
+          </td>
+          <td>
+            <div class="chunkdiv">
+              <div>机型&emsp;</div>
+              <div>GW1000</div>
+            </div>
+          </td>
+          <td>
+            <div class="chunkdiv">
+              <div>告警时间：</div>
+              <div>2021年5月10日&ensp;12:23:31</div>
+            </div>
+          </td>
+          <td>
+            <div class="chunkdiv">
+              <div>告警内容：</div>
+              <div>通讯中断</div>
+            </div>
+          </td>
+        </tr>
       </table>
-    
-    <el-tabs type="border-card" tab-position="bottom" stretch=true>
-    <el-tab-pane label="基本信息">
-      <BasicInformationDetail></BasicInformationDetail>
-    </el-tab-pane>
-    <el-tab-pane label="机舱信息">
-      <BasicInformationDetail></BasicInformationDetail>
-    </el-tab-pane>
-    <el-tab-pane label="故障信息">
-      <BasicInformationDetail></BasicInformationDetail>
-    </el-tab-pane>
-    <el-tab-pane label="齿轮箱">
-      <BasicInformationDetail></BasicInformationDetail>
-    </el-tab-pane>
-    <el-tab-pane label="变桨">
-      <BasicInformationDetail></BasicInformationDetail>
-    </el-tab-pane>
-    <el-tab-pane label="偏航">
-      <YawDetail></YawDetail>
-    </el-tab-pane>
-    <el-tab-pane label="液压">
-      <BasicInformationDetail></BasicInformationDetail>
-    </el-tab-pane>
-    <el-tab-pane label="发电机">
-      <BasicInformationDetail></BasicInformationDetail>
-    </el-tab-pane>
-  </el-tabs>
-  </div>
-</el-dialog>
+
+      <el-tabs type="border-card" tab-position="bottom" stretch="true">
+        <el-tab-pane label="基本信息">
+          <BasicInformationDetail></BasicInformationDetail>
+        </el-tab-pane>
+        <el-tab-pane label="机舱信息">
+          <BasicInformationDetail></BasicInformationDetail>
+        </el-tab-pane>
+        <el-tab-pane label="故障信息">
+          <BasicInformationDetail></BasicInformationDetail>
+        </el-tab-pane>
+        <el-tab-pane label="齿轮箱">
+          <BasicInformationDetail></BasicInformationDetail>
+        </el-tab-pane>
+        <el-tab-pane label="变桨">
+          <BasicInformationDetail></BasicInformationDetail>
+        </el-tab-pane>
+        <el-tab-pane label="偏航">
+          <YawDetail></YawDetail>
+        </el-tab-pane>
+        <el-tab-pane label="液压">
+          <BasicInformationDetail></BasicInformationDetail>
+        </el-tab-pane>
+        <el-tab-pane label="发电机">
+          <BasicInformationDetail></BasicInformationDetail>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-import YawDetail from './YawDetail.vue'
-import BasicInformationDetail from './BasicInformationDetail.vue'
+import YawDetail from "./YawDetail.vue";
+import BasicInformationDetail from "./BasicInformationDetail.vue";
+import BackgroundData from "../../../assets/script/BackgroundData";
 
-export default{
-  components: { 
+export default {
+  components: {
     YawDetail,
-    BasicInformationDetail
+    BasicInformationDetail,
+  },
+  props: {
+    windturbineId: String,
+    stationId: String,
+  },
+  methods: {
+    opened() {
+      this.refreshData();
+      this.refreshTimer=setInterval(this.refreshData,3000);
+    },
+    closed() {
+      clearInterval(this.refreshTimer);
     },
-    props:{
-      windturbineId:String,
+    refreshData(){
+      var bg = BackgroundData.getInstance();
+      var data = bg.getWinturbineBaseData(this.windturbineId,this.stationId);
+      console.log(data);
     }
-}
+  },
+};
 </script>
 <style scoped>
 /*   .titeldiv{
     display: flex;
     justify-content: space-around;
   } */
-  .chunkdiv{
-    display: flex;
-    justify-content: center;
-    background-color:#363636;
-    margin: 1px;
-    padding: 2px;
-    color:rgb(220,220,220);
-  }
-  table{
-    margin-left: 2px;
-    margin-right: 2px;
-  }
-  td{
-    width:20%;
-  }
-  el-tabs{
-    background-color: black;
-  }
+.chunkdiv {
+  display: flex;
+  justify-content: center;
+  background-color: #363636;
+  margin: 1px;
+  padding: 2px;
+  color: rgb(220, 220, 220);
+}
+table {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+td {
+  width: 20%;
+}
+el-tabs {
+  background-color: black;
+}
 </style>

src/components/area/windturbine/problem/ProblemMatrixCard.vue

@@ -41,38 +41,39 @@
     </div>
     <div class="bottom"></div>
   </div>
-  <WindturbineDetailPages v-model="dialogVisible" :windturbineId="currentWindturbineId"></WindturbineDetailPages>
+  <WindturbineDetailPages
+    v-model="dialogVisible"
+    :windturbineId="currentWindturbineId"
+    :stationId="currentStationId"
+  ></WindturbineDetailPages>
 </template>
 
 <script>
-/* import wtbdp from "../../wtbDetailPages" */
-import WindturbineDetailPages from "../WindturbineDetailPages.vue"
+import WindturbineDetailPages from "../WindturbineDetailPages.vue";
 export default {
   name: "ControlMatrixCard",
   props: { title: String, type: Number, datas: Object },
   data() {
     return {
       values: [],
-      dialogVisible:false,
-      currentWindturbineId:"",
+      dialogVisible: false,
+      currentWindturbineId: "",
+      currentStationId: "",
     };
   },
-  created() {},
-  components:{
-    WindturbineDetailPages
+  components: {
+    WindturbineDetailPages,
   },
   methods: {
     // 点击卡片事件
     onSelectHandler(item) {
       item.active = !item.active;
     },
-    sendMsg:function(itm){
-      this.dialogVisible=true;
+    sendMsg: function (itm) {
+      this.dialogVisible = true;
       this.currentWindturbineId = itm.windturbineId;
+      this.currentStationId = itm.stationId;
     },
-    /* sendMsg:function(){
-      wtbdp.$emit("event","first");
-    }, */
     filter(value, windturbineId) {
       var array = [];
       var flag = false;
@@ -112,7 +113,7 @@ export default {
     /* 将选中的项目填充到数组中 */
     outputSelectedItems(ls) {
       this.values.forEach((item) => {
-        if (item.active&&!this.isHas(item,ls)) {
+        if (item.active && !this.isHas(item, ls)) {
           ls.push(item);
         }
       });
@@ -123,29 +124,29 @@ export default {
       this.values.forEach((item) => (item.active = false));
     },
 
-    isHas(item,ls){
-      for(var id in ls){
-        if(ls[id].windturbineId==item.windturbineId){
+    isHas(item, ls) {
+      for (var id in ls) {
+        if (ls[id].windturbineId == item.windturbineId) {
           return true;
         }
       }
       return false;
     },
 
-    clear(vs){
+    clear(vs) {
       var ll = new Array();
-      this.values.forEach((item)=>{
+      this.values.forEach((item) => {
         var it = vs[item.windturbineId];
-        if(typeof(it)==="undefined"){
+        if (typeof it === "undefined") {
           ll.push(item);
         }
       });
-      for(var v1 in ll){
+      for (var v1 in ll) {
         var ind = this.values.indexOf(ll[v1]);
-        if(ind<0)continue;
-        this.values.splice(ind,1);
+        if (ind < 0) continue;
+        this.values.splice(ind, 1);
       }
-    }
+    },
   },
   watch: {
     "$store.getters.windturbinelist": {
@@ -156,11 +157,11 @@ export default {
           var val = json[id];
           if (val.status == this.type) {
             this.addCard(val);
-            vs[val.windturbineId]=0;
+            vs[val.windturbineId] = 0;
           }
           if (this.type < 0 && val.lockValue) {
             this.addCard(val);
-            vs[val.windturbineId]=0;
+            vs[val.windturbineId] = 0;
           }
         }
         this.clear(vs);