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

src/assets/script/BackgroundData.js

@@ -181,7 +181,8 @@ export default class BackgroundData {
         for (var v in msg.data.records) {
             var val = msg.data.records[v];
             if (this.isContains(val.alertText, ["跳闸", "开关", "刀闸", "断路器", "合位", "分位"])) {
-                this.Accidents.push(val);
+                // todo 暂时隐藏事故报警
+                //this.Accidents.push(val);
             } else {
                 if (val.rank == "5") {
                     this.Failure.push(val);
@@ -272,7 +273,8 @@ export default class BackgroundData {
         }
         return false;
     }
-
+    
+    /* 登录 */
     login(uname, psd, action) {
         axios.get(`http://${config.calcUrl}/api/user/login?userName=${uname}&psd=${psd}`)
             .then(action)

src/components/area/windturbine/WindturbineDetailPages.vue

@@ -44,7 +44,7 @@
           <td>
             <div class="chunkdiv">
               <div>所属线路&emsp;</div>
-              <div></div>
+              <div>{{line}}</div>
             </div>
           </td>
           <td>
@@ -56,13 +56,13 @@
           <td>
             <div class="chunkdiv">
               <div>告警时间：</div>
-              <div></div>
+              <div>{{alarmTime}}</div>
             </div>
           </td>
           <td>
             <div class="chunkdiv">
               <div>告警内容：</div>
-              <div></div>
+              <div>{{alarmContent}}</div>
             </div>
           </td>
         </tr>
@@ -102,6 +102,9 @@
 /* import YawDetail from "./YawDetail.vue";
  */import BasicInformationDetail from "./BasicInformationDetail.vue";
 import UniformCodes from "../../../assets/script/UniformCodes";
+import {config} from '../../../config';
+import axios from 'axios';
+import BackgroundData from "../../../assets/script/BackgroundData"
 
 export default {
   components: {
@@ -114,6 +117,9 @@ export default {
   data() {
     return {
       BasicInfo: {},
+      line:"",
+      alarmTime:"",
+      alarmContent:"",
     };
   },
   created() {
@@ -121,11 +127,16 @@ export default {
   },
   methods: {
     opened() {
+      this.line="";
+      this.alarmTime="";
+      this.alarmContent="";
       this.BasicInfo = this.UniformCodes.getStationInfos(this.windturbine);
       this.BasicInfo.windturbineId = this.windturbine.windturbineId;
       
       this.$refs.BasicInfo.start(this.BasicInfo);
 
+      this.initData();
+
       //this.refreshData();
       //this.refreshTimer = setInterval(this.refreshData, 3000);
     },
@@ -135,6 +146,20 @@ export default {
 
       //clearInterval(this.refreshTimer);
     },
+    initData(){
+      axios.get(`http://${config.calcUrl}/windturbine/line/${this.windturbine.windturbineId}`)
+      .then(msg=>this.line=msg.data);
+      axios.get(`http://${config.calcUrl}/alarm/real-time-alarm?objectId=${this.windturbine.windturbineId}&pageIndex=1&pageSize=1`)
+      .then(msg=>{
+        var vs = msg.data;
+        if(vs.length<=0)return;
+        this.alarmTime = BackgroundData.getInstance().formatDate(vs[0].lastUpdateTime);
+        this.alarmContent = vs[0].alertText;
+      })
+      .catch(err=>{
+        console.log(err);
+      });
+    }
   },
 };
 </script>

src/components/area/windturbine/control/ControlMatrixCard.vue

@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import WindturbineDetailPages from '../WindturbineDetailPages.vue'
+import WindturbineDetailPages from "../WindturbineDetailPages.vue";
 export default {
   name: "ControlMatrixCard",
   props: { title: String, datas: Object, operateStyle: Number },
@@ -56,7 +56,7 @@ export default {
     return {
       values: [],
       dialogVisible: false,
-      currentWindturbine:{},
+      currentWindturbine: {},
     };
   },
   components: {
@@ -73,7 +73,7 @@ export default {
 
     sendMsg: function (itm) {
       this.dialogVisible = true;
-      this.currentWindturbine=itm;
+      this.currentWindturbine = itm;
     },
 
     /* 获取选中的项目 */
@@ -143,7 +143,7 @@ export default {
               break;
             }
           }
-          val[item]=0;
+          val[item] = 0;
           var obj = {
             active: active,
             status: status,
@@ -156,19 +156,22 @@ export default {
             stationId: data.stationId,
             controlType: this.operateStyle,
           };
+          if (obj.modelId.indexOf("105") >= 0) {
+            obj.rollSpeed *= 9.55;
+          }
           // 替换实时刷新的值
           this.values.splice(i, 1, obj);
         });
 
         var lls = new Array();
-        for(var i1 = 0;i1<this.values.length;++i1){
+        for (var i1 = 0; i1 < this.values.length; ++i1) {
           var vvv = this.values[i1];
-          if(typeof(val[vvv.windturbineId])==='undefined'){
+          if (typeof val[vvv.windturbineId] === "undefined") {
             lls.push(i1);
           }
         }
-        for(var v2 in lls){
-          this.values.splice(v2,1);
+        for (var v2 in lls) {
+          this.values.splice(v2, 1);
         }
       },
     },

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

@@ -91,6 +91,9 @@ export default {
       if (!array[0]) {
         // 维护
         val.active = active;
+        if(val.modelId.indexOf("105")>=0){
+          val.rollSpeed*=9.55;
+        }
         this.values.push(val);
       } else {
         val.active = array[2];