升级播放器版本、增加监控回放、总氮磷COD弹窗
This commit is contained in:
wgx
parent
98b2652041
commit
91d754e050
|
|
@ -371,6 +371,7 @@
|
|||
text-align: left;
|
||||
font-size: 0.7vw;
|
||||
margin-top: 0.4vw;
|
||||
margin-left: 0.2vw;
|
||||
color: #fff;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
|
|
@ -383,7 +384,7 @@
|
|||
color: #27ddfe;
|
||||
}
|
||||
.jczbtm_lf_rtnum span{
|
||||
font-size: 0.7vw;
|
||||
font-size: 1vw;
|
||||
}
|
||||
.mywrcov{
|
||||
width: 94%;
|
||||
|
|
@ -894,6 +895,10 @@
|
|||
background-color: #000a21 !important;
|
||||
color: #fff !important;
|
||||
}
|
||||
.el-table {
|
||||
background-color: rgb(34, 28, 28, 0.1) !important;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar {
|
||||
width: 0 !important; /* 隐藏滚动条 */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,8 @@
|
|||
@close="closeDialog"
|
||||
>
|
||||
<div class="xintc">
|
||||
<div class="tz_cov_chanye" style="height: 770px">
|
||||
<img
|
||||
src="@/assets/image/zhwl/guanbi.png"
|
||||
class="guanbiann"
|
||||
@click="closeDialog"
|
||||
alt=""
|
||||
/>
|
||||
<div class="tz_cov_chanye" style="height: 770px" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.5)" >
|
||||
<img src="@/assets/image/zhwl/guanbi.png" class="guanbiann" @click="closeDialog" alt=""/>
|
||||
<div class="tz_cov_topchanye">
|
||||
<span class="tz_cov_top_tit">长期定位监测</span>
|
||||
</div>
|
||||
|
|
@ -75,15 +70,16 @@
|
|||
<!-- <div class="xiaoshiHover" @click="formParamChange">查询</div>-->
|
||||
<div class="zsfsList">
|
||||
<span>展示方式：</span>
|
||||
<el-radio-group v-model="echartOrTable" size="small" fill="#1783C6">
|
||||
<el-radio-group v-model="echartOrTable" size="small" fill="#1783C6" @change="formParamChange">
|
||||
<el-radio-button label="1">折线</el-radio-button>
|
||||
<el-radio-button label="0">表格</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
<div id="columnTrEchart" v-show="(echartOrTable=='1')" style="width: 100%; height: 480px;"></div>
|
||||
<div id="columnTrEchart" v-show="(echartOrTable=='1')" style="min-width: 700px;width: 100%; height: 480px;"></div>
|
||||
<el-table v-if="allData" v-show="!(echartOrTable=='1')" :data="allData.tableData" :default-sort="{ prop: 'dates', order: 'descending' }"
|
||||
row-class-name="tableRowClassName" cell-class-name="tableRowClassName" header-row-class-name="tableRowClassName" header-cell-class-name="tableRowClassName"
|
||||
row-class-name="tableRowClassName" cell-class-name="tableRowClassName"
|
||||
header-row-class-name="tableRowClassName" header-cell-class-name="tableRowClassName"
|
||||
height="580" border size="mini">
|
||||
<el-table-column :prop="`dates`" label="日期" width="92" ></el-table-column>
|
||||
<el-table-column :prop="item2.survItem" :label="item2.name+'('+item2.unit+')'" v-for="(item2, index2) in allData.realTimeData"
|
||||
|
|
@ -144,7 +140,8 @@ export default {
|
|||
endTime: null,
|
||||
summrayMode: 'monthDays',
|
||||
},
|
||||
myChartObj: null
|
||||
myChartObj: null,
|
||||
loading: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -154,6 +151,7 @@ export default {
|
|||
methods: {
|
||||
// 历史数据曲线
|
||||
deviceSummaryApi() {
|
||||
this.loading = true
|
||||
let that = this
|
||||
this.tableHead = [];
|
||||
getSoilSummry(that.postParam).then(res => {
|
||||
|
|
@ -163,6 +161,7 @@ export default {
|
|||
this.tableHead = res.result.realTimeData
|
||||
this.tableIndex = res.result.tableIndex
|
||||
}
|
||||
this.loading = false
|
||||
this.initEchartDom();
|
||||
}
|
||||
})
|
||||
|
|
@ -179,6 +178,9 @@ export default {
|
|||
// })
|
||||
},
|
||||
initEchartDom() {
|
||||
if(!(this.echartOrTable == '1')){
|
||||
return;
|
||||
}
|
||||
console.log('initEchart')
|
||||
if(!this.allData) {
|
||||
console.error('数据未获取到')
|
||||
|
|
@ -899,7 +901,11 @@ export default {
|
|||
}
|
||||
}
|
||||
.tableRowClassName{
|
||||
background-color: rgb(216, 19, 19);
|
||||
background-color: rgb(34, 28, 28);
|
||||
color: #fff;
|
||||
}
|
||||
:deep(.el-table) :deep(.el-table__body-wrapper){
|
||||
background-color: rgb(34, 28, 28);
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
@ -262,9 +262,9 @@
|
|||
<div class="jczbtm_lf_rt">
|
||||
<span class="jczbtm_lf_rttit">{{ valist.name }}</span>
|
||||
<span class="jczbtm_lf_rtnum">
|
||||
<animate-number class="in1con_lf_imglf_num_jix" ref="reNum" from="0" :to="valist.code"
|
||||
:key="valist.code" duration="3000"></animate-number>
|
||||
<!-- <span class="in1con_lf_imglf_num_jix">{{valist.code}}</span> -->
|
||||
<!-- <animate-number class="in1con_lf_imglf_num_jix" ref="reNum" from="0" :to="valist.code"-->
|
||||
<!-- :key="valist.tylename+'_key'" duration="3000"></animate-number>-->
|
||||
<span class="in1con_lf_imglf_num_jix">{{valist.code?parseFloat((valist.code-0).toFixed(2)):'--'}}</span>
|
||||
{{ valist.unit }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -669,24 +669,17 @@ export default {
|
|||
if (this.stationInfoList) {
|
||||
for (var i = 0; i < this.stationInfoList.length; i++) {
|
||||
let objlist = this.stationInfoList[i].newestData
|
||||
let arryobjlist = Object.keys(objlist).map(key => objlist[key])
|
||||
let newobjList = Object.keys(objlist)
|
||||
this.stationInfoList[i].wrwcode = []
|
||||
for (var j = 0; j < this.getPollutionDictCover.length; j++) {
|
||||
// Object.keys 获取字段名
|
||||
for (var k = 0; k < newobjList.length; k++) {
|
||||
if (this.getPollutionDictCover[j].code == newobjList[k]) {
|
||||
this.stationInfoList[i].wrwcode.push({
|
||||
name: this.getPollutionDictCover[j].description,
|
||||
icon: this.getPollutionDictCover[j].icon,
|
||||
unit: this.getPollutionDictCover[j].unit,
|
||||
color: this.getPollutionDictCover[j].color,
|
||||
code: arryobjlist[k],
|
||||
tylename: newobjList[k]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
objlist.map(item => {
|
||||
this.stationInfoList[i].wrwcode.push({
|
||||
name: item.name,
|
||||
icon: item.icon,
|
||||
unit: item.unit,
|
||||
color: item.color,
|
||||
code: item.value,
|
||||
tylename: item.survItem
|
||||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -930,7 +923,9 @@ export default {
|
|||
});
|
||||
var optionLine = {
|
||||
tooltip: {
|
||||
trigger: 'axis'
|
||||
trigger: 'axis',
|
||||
enterable: true,
|
||||
confine: true,
|
||||
},
|
||||
grid: {
|
||||
top: '14%',
|
||||
|
|
|
|||
|
|
@ -520,7 +520,8 @@ export default {
|
|||
});
|
||||
var optionLine = {
|
||||
tooltip: {
|
||||
trigger: 'axis'
|
||||
trigger: 'axis',
|
||||
confine: true,
|
||||
},
|
||||
grid: {
|
||||
top: '14%',
|
||||
|
|
@ -647,13 +648,21 @@ export default {
|
|||
this.stationDetail = res.result
|
||||
this.DetailListAirData = res.result.latestAirData[0]
|
||||
//空气数据
|
||||
if (this.DetailListAirData) {}
|
||||
if (this.DetailListAirData) { }
|
||||
if (this.stationDetail.latestWaterData[0]) { //水数据
|
||||
this.waterData.dataWaterTemp = this.stationDetail.latestWaterData[0].dataWaterTemp
|
||||
this.waterData.dataWaterPh = this.stationDetail.latestWaterData[0].dataWaterPh
|
||||
this.waterData.dataWaterDo = this.stationDetail.latestWaterData[0].dataWaterDo
|
||||
this.waterData.dataWaterDdl = this.stationDetail.latestWaterData[0].dataWaterDdl
|
||||
this.waterData.dataWaterNtu = this.stationDetail.latestWaterData[0].dataWaterNtu
|
||||
this.stationDetail.latestWaterData.map(item => {
|
||||
if(item.survItem == 'dataWaterTemp'){
|
||||
that.waterData.dataWaterTemp = item.value
|
||||
} else if(item.survItem == 'dataWaterPh'){
|
||||
that.waterData.dataWaterPh = item.value
|
||||
} else if(item.survItem == 'dataWaterDo'){
|
||||
that.waterData.dataWaterDo = item.value
|
||||
} else if(item.survItem == 'dataWaterDdl'){
|
||||
that.waterData.dataWaterDdl = item.value
|
||||
} else if(item.survItem == 'dataWaterNtu'){
|
||||
that.waterData.dataWaterNtu = item.value
|
||||
}
|
||||
});
|
||||
this.animateObj = [];
|
||||
this.hhlistxunh();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue