From b87a1d397346865190f6bff7ef41db3ffd542c97 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 19 Apr 2024 14:56:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E6=B2=BB=E7=90=86=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessUser/event/eventView.vue | 10 +- .../businessUser/event/toleranceCurve.vue | 155 ++++++++++-------- .../sagGovern/businessUser/index.vue | 6 +- 3 files changed, 95 insertions(+), 76 deletions(-) diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue index b75b66b1..b0c3ea2b 100644 --- a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue +++ b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue @@ -169,8 +169,8 @@ const tableStore = new TableStore({ delete tableStore.table.params[key] } } - sags3DRef.value?.search(userId, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) - toleranceCurveRef.value?.search(userId, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) + sags3DRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) + toleranceCurveRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) } }) // 注入到子组件 @@ -185,10 +185,10 @@ const initData = async () => { Object.assign(userListData, res.data) }) userId.value = query.id - tableStore.table.params.userId = userId + tableStore.table.params.userId = userId.value tableStore.index() - sags3DRef.value?.search(userId, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) - toleranceCurveRef.value?.search(userId, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) + sags3DRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) + toleranceCurveRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime) } initData() diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/event/toleranceCurve.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/event/toleranceCurve.vue index b763a7e8..5af41fb6 100644 --- a/src/views/pqs/voltageSags/sagGovern/businessUser/event/toleranceCurve.vue +++ b/src/views/pqs/voltageSags/sagGovern/businessUser/event/toleranceCurve.vue @@ -58,11 +58,13 @@
- + p.u.
- + ms
@@ -70,11 +72,13 @@
- + p.u.
- + ms
@@ -124,6 +128,7 @@ const unKnownEvent = ref([]) const overEventColor = ref('#A52a2a') const unOverEventColor = ref('#61a0a8') const unKnownEventColor = ref('#d48265') +const eventData = ref() const search = async (id: string, beginTime: string, endTime: string) => { // 从父组件tableStore获取参数 searchBeginTime.value = beginTime @@ -159,70 +164,10 @@ const search = async (id: string, beginTime: string, endTime: string) => { } await getEventDataByProductLineId(data).then((res: any) => { - //清洗要显示的数据 - if (res.data.length > 0) { - for (let event of res.data) { - //判断落在哪个区域内 - let eventTime = Number(event.duration) / 1000 - let eventAmplitude = Number(event.featureAmplitude) - if (eventTime < Number(unit.value.vtcTimeUpper/1000) || eventAmplitude > Number(unit.value.vtcAmpUpper)) { - //未越限 - const dataTemp = { - value: [ - eventTime, - eventAmplitude, - event.startTime, - event.incomingLineName - ], - itemStyle: { - normal: { - color: unOverEventColor.value - } - } - } - unOverEvent.value.push(dataTemp) - } else if (eventTime > Number(unit.value.vtcTimeLower/1000) && eventAmplitude < Number(unit.value.vtcAmpLower)) { - //故障阶段 - const dataTemp = { - value: [ - eventTime, - eventAmplitude, - event.startTime, - event.incomingLineName - ], - itemStyle: { - normal: { - color: overEventColor.value - } - } - } - overEvent.value.push(dataTemp) - } else { - //不确定事件 - const dataTemp = { - value: [ - eventTime, - eventAmplitude, - event.startTime, - event.incomingLineName - ], - itemStyle: { - normal: { - color: unKnownEventColor.value - } - } - } - unKnownEvent.value.push(dataTemp) - } - - - } - } - - + eventData.value = res.data + reDrawPic() }) - //初始化图表 - initOptions() + } const options = ref() @@ -255,15 +200,16 @@ const initOptions = () => { yAxis: { name: '幅值/p.u.', max: 1, - min: 0 + min: 0, + splitLine: { show: false } }, grid: { - right: '70px' + right: '78px', }, - color: ['#ff0000', '#ff0000', '#A52a2a', '#61a0a8', '#d48265'], series: [ { type: 'line', + color:'#ff0000', data: [ [unit.value.vtcTimeUpper / 1000, 0], [unit.value.vtcTimeUpper / 1000, unit.value.vtcAmpUpper], @@ -276,6 +222,7 @@ const initOptions = () => { }, { type: 'line', + color:'#ff0000', data: [ [unit.value.vtcTimeLower / 1000, 0], [unit.value.vtcTimeLower / 1000, unit.value.vtcAmpLower], @@ -310,6 +257,74 @@ const initOptions = () => { } } } + +const reDrawPic = () => { + //清洗要显示的数据 + if (eventData.value.length > 0) { + unOverEvent.value=[] + overEvent.value=[] + unKnownEvent.value=[] + for (let event of eventData.value) { + //判断落在哪个区域内 + let eventTime = Number(event.duration) / 1000 + let eventAmplitude = Number(event.featureAmplitude) + if (eventTime < Number(unit.value.vtcTimeUpper / 1000) || eventAmplitude > Number(unit.value.vtcAmpUpper)) { + //未越限 + const dataTemp = { + value: [ + eventTime, + eventAmplitude, + event.startTime, + event.incomingLineName + ], + itemStyle: { + normal: { + color: unOverEventColor.value + } + } + } + unOverEvent.value.push(dataTemp) + } else if (eventTime > Number(unit.value.vtcTimeLower / 1000) && eventAmplitude < Number(unit.value.vtcAmpLower)) { + //故障阶段 + const dataTemp = { + value: [ + eventTime, + eventAmplitude, + event.startTime, + event.incomingLineName + ], + itemStyle: { + normal: { + color: overEventColor.value + } + } + } + overEvent.value.push(dataTemp) + } else { + //不确定事件 + const dataTemp = { + value: [ + eventTime, + eventAmplitude, + event.startTime, + event.incomingLineName + ], + itemStyle: { + normal: { + color: unKnownEventColor.value + } + } + } + unKnownEvent.value.push(dataTemp) + } + + + } + } + //初始化图表 + initOptions() +} + defineExpose({ search }) diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue index 431c8d98..74743d5d 100644 --- a/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue +++ b/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue @@ -78,7 +78,11 @@ const tableStore = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', click: row => { - push(`/admin/businessUserRouter/eventView?id=${row.id}`) + if (Number(row.productCount) < 1) { + ElMessage.error('请创建该用户的生产线') + } else { + push(`/admin/businessUserRouter/eventView?id=${row.id}`) + } } },