|
@@ -7,8 +7,8 @@
|
|
|
<div class="mg-b-16">
|
|
|
<btn-group-double :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select" />
|
|
|
</div>
|
|
|
- <row v-if="paramsId.includes('FDC')">
|
|
|
- <wind-site-weather :time="nowTime" :data="tqmap" />
|
|
|
+ <!-- <row v-if="paramsId.includes('FDC')">
|
|
|
+ <wind-site-weather :time="nowTime" :data="tqmap" :paramsId="resCode" />
|
|
|
<panel-3 class="wind-site-info">
|
|
|
<row align="middle">
|
|
|
<div class="info-item">
|
|
@@ -155,9 +155,9 @@
|
|
|
</div>
|
|
|
</row>
|
|
|
</panel-3>
|
|
|
- </row>
|
|
|
- <row v-if="paramsId.includes('GDC')">
|
|
|
- <wind-site-weather :time="nowTime" :data="tqmap" />
|
|
|
+ </row> -->
|
|
|
+ <row >
|
|
|
+ <wind-site-weather :time="nowTime" :data="tqmap" :paramsId="resCode" />
|
|
|
<panel-3 class="wind-site-info">
|
|
|
<row align="middle">
|
|
|
<div class="info-item">
|
|
@@ -187,7 +187,7 @@
|
|
|
<div class="info-item">
|
|
|
<div class="value">{{ jczbmap.ssfs }}</div>
|
|
|
<!-- <div class="text">实时风速</div> -->
|
|
|
- <div class="text">平均功率</div>
|
|
|
+ <div class="text">{{resCode.includes('FDC')?'实时风速':'平均功率'}} </div>
|
|
|
</div>
|
|
|
<div class="info-item">
|
|
|
<div class="value">{{ jczbmap.sjgl }}</div>
|
|
@@ -197,12 +197,25 @@
|
|
|
</panel-3>
|
|
|
<panel-3 class="wind-running-info">
|
|
|
<row align="middle">
|
|
|
- <div class="fengji">
|
|
|
+ <div class="fengji" v-if=" resCode.indexOf('GDC') == -1 ">
|
|
|
<div class="fengji-icon svg-icon svg-icon-white">
|
|
|
<svg-icon class="" svgid="svg-风机" />
|
|
|
</div>
|
|
|
<div class="info">
|
|
|
+ <div class="text green" >接入风机 </div>
|
|
|
+ <!-- <div class="text green" v-if="resCode.includes('FDC') && resCode != ''">接入风机 </div>
|
|
|
+ <div class="text green" v-else-if="resCode.includes('GDC') && resCode != ''">接入光伏 </div> -->
|
|
|
+ <div class="value">{{ jczbmap.jrts }}</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="fengji" v-else-if=" resCode.indexOf('FDC') == -1 ">
|
|
|
+ <div class="fengji-icon svg-icon svg-icon-white">
|
|
|
+ <svg-icon class="" svgid="svg-gf-matrix" />
|
|
|
+ </div>
|
|
|
+ <div class="info">
|
|
|
<div class="text green">接入光伏</div>
|
|
|
+ <!-- <div class="text green" v-if="resCode.includes('FDC') && resCode != ''">接入风机 </div>
|
|
|
+ <div class="text green" v-else-if="resCode.includes('GDC') && resCode != ''">接入光伏 </div> -->
|
|
|
<div class="value">{{ jczbmap.jrts }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -313,11 +326,11 @@
|
|
|
</panel>
|
|
|
</div>
|
|
|
<div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
|
|
|
- <panel title="4小时功率曲线图" v-if="paramsId.includes('FDC')">
|
|
|
+ <panel title="4小时功率曲线图" v-if="resCode.includes('FDC')">
|
|
|
<multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value" :units="Powertrend.units"
|
|
|
:showLegend="true" />
|
|
|
</panel>
|
|
|
- <panel title="4小时功率曲线图" v-if="paramsId.includes('GDC')">
|
|
|
+ <panel title="4小时功率曲线图" v-if="resCode.includes('GDC')">
|
|
|
<multiple-line-chart height="18.519vh" v-if="Powertrend1" :list="Powertrend1.value" :units="Powertrend1.units"
|
|
|
:showLegend="true" />
|
|
|
</panel>
|
|
@@ -550,7 +563,12 @@ export default {
|
|
|
path: `/monitor/windsite/home/${res.code}`,
|
|
|
});
|
|
|
that.resCode = res.code;
|
|
|
- console.log('resCode:',res)
|
|
|
+ // console.log('resCode:',that.resCode)
|
|
|
+ // console.log('ParamsId:',that.paramsId)
|
|
|
+ console.log('paramsId:',that.paramsId.indexOf('FDC'))
|
|
|
+ console.log('resCode:',that.resCode.indexOf('FDC'))
|
|
|
+ console.log('paramsId:',that.paramsId.indexOf('GDC'))
|
|
|
+ console.log('resCode:',that.resCode.indexOf('GDC'))
|
|
|
},
|
|
|
// 根据风机状态码返回对应 class
|
|
|
getColor (fjzt) {
|
|
@@ -589,7 +607,7 @@ export default {
|
|
|
},
|
|
|
success (res) {
|
|
|
if (res.data) {
|
|
|
- console.log('resWpinfo:',res.data)
|
|
|
+ // console.log('resWpinfo:',res.data)
|
|
|
that.tqmap = res.data.tqmap;
|
|
|
that.tqmap.name = res.data.jczbmap.name
|
|
|
that.tqmap.resCode = that.resCode
|
|
@@ -894,6 +912,11 @@ export default {
|
|
|
let that = this;
|
|
|
that.wpId = that.$route.params.wpId;
|
|
|
that.paramsId = that.$route.params.wpId;
|
|
|
+ that.resCode = that.$route.params.wpId;
|
|
|
+ console.log('paramsId:',that.paramsId.indexOf('FDC'))
|
|
|
+ console.log('resCode:',that.resCode.indexOf('FDC'))
|
|
|
+ console.log('paramsId:',that.paramsId.indexOf('GDC'))
|
|
|
+ console.log('resCode:',that.resCode.indexOf('GDC'))
|
|
|
that.$nextTick(() => {
|
|
|
that.getWp();
|
|
|
that.requestData(false);
|
|
@@ -1047,7 +1070,9 @@ export default {
|
|
|
}
|
|
|
|
|
|
.light-matrix-panel {
|
|
|
- height: 100%;
|
|
|
+ width: 673px;
|
|
|
+ overflow-y:scroll;
|
|
|
+ height: 240px;
|
|
|
|
|
|
.panel-body {
|
|
|
height: 100%;
|