双火线三相进双相出问题修改

web/三相/src/views/power/monitorall/index.vue

@@ -25,9 +25,9 @@
             <span   v-if="this.productType!='1'"   class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/pinl.png"></img>  <span    style="text-align: center;    margin-left: 10px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px;">{{productData.productPowerFreq}}</a><br>{{$t('pl')}}</span></span>
             <span     class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/hdl.png"></img>  <span     style="text-align: center;overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px">{{productData.productConsumption}}</a><br>{{$t('zhdl')}}(kWh)</span></span>
             <span    class="sensorSpamClass" style=" white-space: nowrap;">
-              <el-button type='primary'  v-if="this.productType=='4' || this.productType=='3'" size="mini" :class="{spana:isSpana}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px" @click="queryTotalOrderStatus('L1')">{{$t('sxax')}}</el-button>
-              <el-button type='primary'   v-if="this.productType=='4' || this.productType=='3'"  size="mini" :class="{spanb:isSpanb}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px;" @click="queryTotalOrderStatus('L2')">{{$t('sxbx')}}</el-button>
-              <el-button type='primary'   v-if="this.productType=='4' || this.productType=='3'"  size="mini" :class="{spanc:isSpanc}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px;" @click="queryTotalOrderStatus('L3')">{{$t('sxcx')}}</el-button>
+              <el-button type='primary'  v-if="this.productType=='4' || this.productType=='3' || this.productType=='6'" size="mini" :class="{spana:isSpana}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px" @click="queryTotalOrderStatus('L1')">{{$t('sxax')}}</el-button>
+              <el-button type='primary'   v-if="this.productType=='4' || this.productType=='3' || this.productType=='6'"  size="mini" :class="{spanb:isSpanb}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px;" @click="queryTotalOrderStatus('L2')">{{$t('sxbx')}}</el-button>
+              <el-button type='primary'   v-if="this.productType=='4' || this.productType=='3' || this.productType=='6'"  size="mini" :class="{spanc:isSpanc}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px;" @click="queryTotalOrderStatus('L3')">{{$t('sxcx')}}</el-button>
 
             </span>
           </div>

web/三相/src/views/power/monitorhistory/index.vue

@@ -108,9 +108,9 @@ s<template>
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('dy')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span3:dyisSpan3}" @click="queryEchart('3','dy','L3')" > {{$t('sxcx')}}</span>
-                  <span v-if="showLTd"  class="domainSpanCss" :class="{span2:dyisSpan2}" @click="queryEchart('2','dy','L2')" >{{$t('sxbx')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span1:dyisSpan1}" @click="queryEchart('1','dy','L1')" >{{$t('sxax')}}</span>
+                  <span v-if="showLTd && showLTd3" class="domainSpanCss" :class="{span3:dyisSpan3}" @click="queryEchart('3','dy','L3')" > {{$t('sxcx')}}</span>
+                  <span v-if="showLTd && showLTd2"  class="domainSpanCss" :class="{span2:dyisSpan2}" @click="queryEchart('2','dy','L2')" >{{$t('sxbx')}}</span>
+                  <span v-if="showLTd && showLTd1" class="domainSpanCss" :class="{span1:dyisSpan1}" @click="queryEchart('1','dy','L1')" >{{$t('sxax')}}</span>
 
 
                 </div>
@@ -124,9 +124,9 @@ s<template>
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('dl')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span3:dlisSpan3}" @click="queryEchart('3','dl','L3')" > {{$t('sxcx')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span2:dlisSpan2}" @click="queryEchart('2','dl','L2')" >{{$t('sxbx')}}</span>
-                  <span  v-if="showLTd" class="domainSpanCss" :class="{span1:dlisSpan1}" @click="queryEchart('1','dl','L1')" >{{$t('sxax')}}</span>
+                  <span v-if="showLTd && showLTd3" class="domainSpanCss" :class="{span3:dlisSpan3}" @click="queryEchart('3','dl','L3')" > {{$t('sxcx')}}</span>
+                  <span v-if="showLTd && showLTd2" class="domainSpanCss" :class="{span2:dlisSpan2}" @click="queryEchart('2','dl','L2')" >{{$t('sxbx')}}</span>
+                  <span  v-if="showLTd && showLTd1" class="domainSpanCss" :class="{span1:dlisSpan1}" @click="queryEchart('1','dl','L1')" >{{$t('sxax')}}</span>
 
 
                 </div>
@@ -140,9 +140,9 @@ s<template>
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('gl')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span3:glisSpan3}" @click="queryEchart('3','gl','L3')" > {{$t('sxcx')}}</span>
-                  <span  v-if="showLTd" class="domainSpanCss" :class="{span2:glisSpan2}" @click="queryEchart('2','gl','L2')" >{{$t('sxbx')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span1:glisSpan1}" @click="queryEchart('1','gl','L1')" >{{$t('sxax')}}</span>
+                  <span v-if="showLTd && showLTd3" class="domainSpanCss" :class="{span3:glisSpan3}" @click="queryEchart('3','gl','L3')" > {{$t('sxcx')}}</span>
+                  <span  v-if="showLTd && showLTd2" class="domainSpanCss" :class="{span2:glisSpan2}" @click="queryEchart('2','gl','L2')" >{{$t('sxbx')}}</span>
+                  <span v-if="showLTd && showLTd1" class="domainSpanCss" :class="{span1:glisSpan1}" @click="queryEchart('1','gl','L1')" >{{$t('sxax')}}</span>
 
 
                 </div>
@@ -158,9 +158,9 @@ s<template>
 
               <el-card style="border-radius: 15px;max-height: 500px">
                 <div slot="header"  ><span style=" font-size: 20px; font-weight: bold;">{{$t('hdl')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span3:hdlisSpan3}" @click="queryEchart('3','hdl','L3')" > {{$t('sxcx')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span2:hdlisSpan2}" @click="queryEchart('2','hdl','L2')" >{{$t('sxbx')}}</span>
-                  <span v-if="showLTd" class="domainSpanCss" :class="{span1:hdlisSpan1}" @click="queryEchart('1','hdl','L1')" >{{$t('sxax')}}</span>
+                  <span v-if="showLTd && showLTd3" class="domainSpanCss" :class="{span3:hdlisSpan3}" @click="queryEchart('3','hdl','L3')" > {{$t('sxcx')}}</span>
+                  <span v-if="showLTd && showLTd2" class="domainSpanCss" :class="{span2:hdlisSpan2}" @click="queryEchart('2','hdl','L2')" >{{$t('sxbx')}}</span>
+                  <span v-if="showLTd && showLTd1" class="domainSpanCss" :class="{span1:hdlisSpan1}" @click="queryEchart('1','hdl','L1')" >{{$t('sxax')}}</span>
 
 
                 </div>
@@ -256,7 +256,12 @@ s<template>
         hdlisSpan3:false,
         productType:"",
         showL:false,
-        showLTd:false
+        showLTd:false,
+
+        showLTd1:false,
+        showLTd2:false,
+        showLTd3:false,
+        productChYsList:[],
       };
     },
     created() {
@@ -280,13 +285,20 @@ s<template>
         equipmentMintenance(params).then(response => {
           this.productList = response.data;
         this.productType=  this.productList[0].productType;
-        if(this.productType=='3'){
+        if(this.productType=='3'   ){
           this.showL=true;
           this.showLTd=true;
+          this.showLTd1=true;
+          this.showLTd2=true;
+          this.showLTd3=true;
           this.queryParams.lType="L1";
         }else if(this.productType=='4' ){
           this.showL=true;
           this.queryParams.lType="L1";
+        }else if(this.productType=='6' ){
+          this.showL=true;
+          this.showLTd=true;
+          this.queryParams.lType="L1";
         }
         this.handleQuery();
       }).catch(() => {});
@@ -489,7 +501,7 @@ s<template>
       },
       // 总体状态折线图
       queryZtztEchart(){
-        if(this.productType=='3' || this.productType=='4'){
+        if(this.productType=='3' || this.productType=='4'  || this.productType=='6'){
           this.queryParams.lType="L1";
           this.isSpan1=true;
           this.isSpan2=false;
@@ -537,6 +549,83 @@ s<template>
           this.queryParams.lType="L1";
           params.lType=this.queryParams.lType;
         }
+        if(this.productType=='6'){
+// 当设备类型为三相出两相进时处理
+          // 13213
+          if( this.productChYsList!=null &&  this.productChYsList.length>0){
+            var validate=false;
+            for(var i=0;i<  this.productChYsList.length;i++){
+              var aa=this.productChYsList[i];
+              if( this.queryParams.productChId==aa.productChId){
+                var productPhOrder=aa.productPhOrder
+
+                if(productPhOrder=='L1'){
+                  if(!validate){
+                    this.dyisSpan1=true;
+                    this.dyisSpan2=false;
+                    this.dyisSpan3=false;
+                    this.dlisSpan1=true;
+                    this.dlisSpan2=false;
+                    this.dlisSpan3=false;
+                    this.glisSpan1=true;
+                    this.glisSpan2=false;
+                    this.glisSpan3=false;
+                    this.hdlisSpan1=true;
+                    this.hdlisSpan2=false;
+                    this.hdlisSpan3=false;
+                    validate=true;
+                    this.queryParams.lType="L1";
+                  }
+                  this.showLTd1=true;
+
+                }else if(productPhOrder=='L2'){
+                  if(!validate){
+                    this.dyisSpan1=false;
+                    this.dyisSpan2=true;
+                    this.dyisSpan3=false;
+                    this.dlisSpan1=false;
+                    this.dlisSpan2=true;
+                    this.dlisSpan3=false;
+                    this.glisSpan1=false;
+                    this.glisSpan2=true;
+                    this.glisSpan3=false;
+                    this.hdlisSpan1=false;
+                    this.hdlisSpan2=true;
+                    this.hdlisSpan3=false;
+                    validate=true;
+                    this.queryParams.lType="L2";
+                  }
+                  this.showLTd2=true;
+
+                }else if(productPhOrder=='L3'){
+                  if(!validate){
+                    this.dyisSpan1=false;
+                    this.dyisSpan2=false;
+                    this.dyisSpan3=true;
+                    this.dlisSpan1=false;
+                    this.dlisSpan2=false;
+                    this.dlisSpan3=true;
+                    this.glisSpan1=false;
+                    this.glisSpan2=false;
+                    this.glisSpan3=true;
+                    this.hdlisSpan1=false;
+                    this.hdlisSpan2=false;
+                    this.hdlisSpan3=true;
+                    validate=true;
+                    this.queryParams.lType="L3";
+                  }
+                  this.showLTd3=true;
+
+                }
+              }
+
+            }
+
+          }
+          params.lType=this.queryParams.lType;
+        }
+
+
         if(this.productType=='3'){
           this.queryParams.lType="L1";
           this.dyisSpan1=true;
@@ -700,18 +789,92 @@ s<template>
         this.loading = true;
         channelStatusMonitoring(params).then(response => {
           if(response.data!=null){
+            this.productChYsList=response.data;
             let list=[];
             for(var i=0;i< response.data.length;i++){
               var aa=response.data[i];
               const param2={};
               param2.productChId=aa.productChId;
               param2.productChName=aa.productChName;
+              param2.productPhOrder=aa.productPhOrder;
               const hasItem = list.some(item => item.productChId === param2.productChId);
               if(!hasItem){
                 list.push(param2);
               }
             }
             this.productChList =list;
+            // 当设备类型为三相出两相进时处理
+          if(this.productType=='6' && response.data!=null &&  response.data.length>0){
+            this.queryParams.productChId=  response.data[0].productChId;
+            var validate=false;
+            for(var i=0;i<  response.data.length;i++){
+              var aa=response.data[i];
+              if( this.queryParams.productChId==aa.productChId){
+                var productPhOrder=aa.productPhOrder
+
+                if(productPhOrder=='L1'){
+                  if(!validate){
+                    this.dyisSpan1=true;
+                    this.dyisSpan2=false;
+                    this.dyisSpan3=false;
+                    this.dlisSpan1=true;
+                    this.dlisSpan2=false;
+                    this.dlisSpan3=false;
+                    this.glisSpan1=true;
+                    this.glisSpan2=false;
+                    this.glisSpan3=false;
+                    this.hdlisSpan1=true;
+                    this.hdlisSpan2=false;
+                    this.hdlisSpan3=false;
+                    validate=true;
+                    this.queryParams.lType="L1";
+                  }
+                  this.showLTd1=true;
+
+                }else if(productPhOrder=='L2'){
+                  if(!validate){
+                    this.dyisSpan1=false;
+                    this.dyisSpan2=true;
+                    this.dyisSpan3=false;
+                    this.dlisSpan1=false;
+                    this.dlisSpan2=true;
+                    this.dlisSpan3=false;
+                    this.glisSpan1=false;
+                    this.glisSpan2=true;
+                    this.glisSpan3=false;
+                    this.hdlisSpan1=false;
+                    this.hdlisSpan2=true;
+                    this.hdlisSpan3=false;
+                    validate=true;
+                    this.queryParams.lType="L2";
+                  }
+                  this.showLTd2=true;
+
+                }else if(productPhOrder=='L3'){
+                  if(!validate){
+                    this.dyisSpan1=false;
+                    this.dyisSpan2=false;
+                    this.dyisSpan3=true;
+                    this.dlisSpan1=false;
+                    this.dlisSpan2=false;
+                    this.dlisSpan3=true;
+                    this.glisSpan1=false;
+                    this.glisSpan2=false;
+                    this.glisSpan3=true;
+                    this.hdlisSpan1=false;
+                    this.hdlisSpan2=false;
+                    this.hdlisSpan3=true;
+                    validate=true;
+                    this.queryParams.lType="L3";
+                  }
+                  this.showLTd3=true;
+
+                }
+              }
+
+            }
+
+          }
         }
 
         // this.queryParams.productChId=  this.productChList[0].productChId;
@@ -729,8 +892,42 @@ s<template>
       },
       handleClick(tab, event) {
         this.tabName=tab.name;
-        if(this.tabName=='channelTabe'){
+
+        if(this.tabName=='channelTabe'){ // 通道监控
           this.queryParams.productChId=  this.productChList[0].productChId;
+          if(this.productType=='16'){ // 三相进双相出
+
+            if( this.productChList.length!=null &&  this.productChList.length>0){
+
+              for(var i=0;i<  this.productChList.length;i++){
+                var aa=this.productChList[i];
+                if(this.queryParams.productChId==aa.productChId){
+                  var productPhOrder=aa.productPhOrder
+                  if(productPhOrder=='L1'){
+                    this.showLTd2=true;
+                    this.dyisSpan1=true;
+                    this.dyisSpan2=false;
+                    this.dyisSpan3=false;
+                    this.dlisSpan1=true;
+                    this.dlisSpan2=false;
+                    this.dlisSpan3=false;
+                    this.glisSpan1=true;
+                    this.glisSpan2=false;
+                    this.glisSpan3=false;
+                    this.hdlisSpan1=true;
+                    this.hdlisSpan2=false;
+                    this.hdlisSpan3=false;
+                  }else if(productPhOrder=='L2'){
+
+                  }else if(productPhOrder=='L3'){
+
+                  }
+                }
+
+              }
+            }
+
+          }
           if(this.productType=='3'){
             this.queryParams.lType="L1";
             this.dyisSpan1=true;
@@ -746,8 +943,8 @@ s<template>
             this.hdlisSpan2=false;
             this.hdlisSpan3=false;
           }
-        }else{
-          if(this.productType=='3' || this.productType=='4'){
+        }else{   // 总体监控
+          if(this.productType=='3' || this.productType=='4' || this.productType=='6'){
             this.queryParams.lType="L1";
             this.isSpan1=true;
             this.isSpan2=false;
@@ -763,7 +960,6 @@ s<template>
             this.zhdlisSpan3=false;
           }
         }
-
         this.handleQuery();
       },
       // 通道列表
@@ -789,6 +985,11 @@ s<template>
       },
       /** 搜索按钮操作 */
       handleQuery() {
+        if(this.productType=='6'){
+          this.showLTd1=false;
+          this.showLTd2=false;
+          this.showLTd3=false;
+        }
 
         this.queryChannelStatus();
       },