修改测试问题
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -21,6 +21,7 @@
|
||||
import html2canvas from 'html2canvas'
|
||||
import $ from 'jquery'
|
||||
import * as echarts from 'echarts'
|
||||
|
||||
import { mainHeight } from '@/utils/layout'
|
||||
import url from '@/assets/img/point.png'
|
||||
export default {
|
||||
@@ -96,7 +97,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
console.log(`123123`,this.boxoList,this.wp);
|
||||
// console.log(`123123`,this.boxoList,this.wp);
|
||||
this.zoom = 1 / document.body.style.zoom
|
||||
window.addEventListener('resize', () => {
|
||||
this.zoom = 1 / document.body.style.zoom
|
||||
@@ -142,7 +143,6 @@ export default {
|
||||
},
|
||||
//根据后台查询的数据，清洗数据
|
||||
initWaves() {
|
||||
console.log(this.boxoList.systemType,"this.boxoList.systemType");
|
||||
if (null != this.wp) {
|
||||
if (this.boxoList.systemType == 'pms') {
|
||||
this.titles =
|
||||
@@ -170,26 +170,32 @@ export default {
|
||||
' 持续时间：' +
|
||||
this.boxoList.evtParamTm +
|
||||
's'
|
||||
}
|
||||
else if (this.boxoList.systemType == 'WX') {
|
||||
this.titles =
|
||||
// "变电站名称：" +
|
||||
// this.boxoList.equipmentName +
|
||||
' 监测点名称：' +
|
||||
this.boxoList.equipmentName +
|
||||
' 发生时刻：' +
|
||||
this.boxoList.startTime +
|
||||
' 暂降(骤升)幅值：' +
|
||||
this.boxoList.featureAmplitude==null?'/':this.boxoList.featureAmplitude.toFixed(2) +
|
||||
' 持续时间：' +
|
||||
this.boxoList.persistTime==null? '/':this.boxoList.persistTime+
|
||||
's'
|
||||
} else {
|
||||
if((this.boxoList.featureAmplitude * 100).toFixed(0)){
|
||||
this.boxoList.featureAmplitude= (this.boxoList.featureAmplitude * 100).toFixed(0)
|
||||
}
|
||||
for(var key in this.boxoList) {
|
||||
if(this.boxoList[key]==null||!this.boxoList[key]){
|
||||
this.boxoList[key]='/'
|
||||
}
|
||||
}
|
||||
this.titles =
|
||||
'变电站名称：' +
|
||||
this.boxoList.subName +
|
||||
this.boxoList.subName +
|
||||
' 监测点名称：' +
|
||||
this.boxoList.lineName +
|
||||
' 发生时刻：' +
|
||||
this.boxoList.startTime +
|
||||
' 暂降(骤升)幅值：' +
|
||||
this.boxoList.featureAmplitude +
|
||||
(this.boxoList.featureAmplitude * 100).toFixed(0) +
|
||||
'% 持续时间：' +
|
||||
this.boxoList.duration +
|
||||
this.boxoList.duration +
|
||||
's'
|
||||
}
|
||||
|
||||
@@ -511,9 +517,7 @@ export default {
|
||||
for (var step = 1; step < waveDatas.length; step++) {
|
||||
var waveId = 'wave' + step
|
||||
var newDivShunshi = $(` <div style="height:${this.vh};overflow: hidden;">
|
||||
<div class='bx1' id='${waveId}' style="zoom:${this.zoom};transform:scale(${
|
||||
1 / this.zoom
|
||||
});transform-origin:0 0;">
|
||||
<div class='bx1' id='${waveId}'>
|
||||
</div>
|
||||
</div>`)
|
||||
newDivShunshi.insertAfter($('#shushi'))
|
||||
@@ -589,7 +593,7 @@ export default {
|
||||
},
|
||||
title: {
|
||||
left: 'center',
|
||||
text: '电网侧-电压 ' + title,
|
||||
text: title,
|
||||
textStyle: {
|
||||
fontSize: '0.8rem',
|
||||
color: _this.DColor ? '#fff' : echartsColor.WordColor
|
||||
|
||||
@@ -4,19 +4,9 @@
|
||||
<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
|
||||
<el-date-picker
|
||||
v-model="timeValue"
|
||||
type="daterange"
|
||||
:disabled="disabledPicker"
|
||||
style="width: 220px; margin-right: 10px"
|
||||
unlink-panels
|
||||
:clearable="false"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
:shortcuts="shortcuts"
|
||||
/>
|
||||
<el-date-picker v-model="timeValue" type="daterange" :disabled="disabledPicker"
|
||||
style="width: 220px; margin-right: 10px" unlink-panels :clearable="false" range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" :shortcuts="shortcuts" />
|
||||
<el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
|
||||
<el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button>
|
||||
<el-button :disabled="preDisabled" type="primary" :icon="DArrowRight" @click="next"></el-button>
|
||||
@@ -43,7 +33,7 @@ const count = ref(0)
|
||||
const disabledPicker = ref(true)
|
||||
const timeValue = ref()
|
||||
const backDisabled = ref(false)
|
||||
const preDisabled = ref(false)
|
||||
const preDisabled = ref(true)
|
||||
const timeOptions: any = ref([
|
||||
{ label: '年份', value: 1 },
|
||||
{ label: '季度', value: 2 },
|
||||
@@ -86,7 +76,7 @@ onMounted(() => {
|
||||
// 选择时间范围
|
||||
const timeChange = (e: number) => {
|
||||
backDisabled.value = false
|
||||
preDisabled.value = false
|
||||
preDisabled.value = true
|
||||
count.value = 0
|
||||
if (e == 1) {
|
||||
disabledPicker.value = true
|
||||
@@ -128,6 +118,7 @@ const nowTime = () => {
|
||||
}
|
||||
// 上一个
|
||||
const preClick = () => {
|
||||
preDisabled.value = false
|
||||
let startTime = timeValue.value[0]
|
||||
let endTime = timeValue.value[1]
|
||||
let year = parseInt(startTime.substring(0, 4))
|
||||
@@ -410,6 +401,12 @@ const next = () => {
|
||||
}
|
||||
|
||||
}
|
||||
if (!props.nextFlag) {
|
||||
if (new Date(endTime + ' 00:00:00').getTime() >= new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()) {
|
||||
preDisabled.value = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
timeValue.value = [startTime, endTime]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user