diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index a60eb79c..e0578a80 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -38,7 +38,7 @@ const tableStore = new TableStore({ echarts.value.Grade(tableStore.table.data.voltageStatistics) echarts.value.Relation(tableStore.table.data.monthlyStatistics) table.value.info(tableStore.table.data) - console.log(tableStore.table.data) + } }) provide('tableStore', tableStore) diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue index 8540fa92..e96fef03 100644 --- a/src/views/pqs/bearingCapacity/userManagement/index.vue +++ b/src/views/pqs/bearingCapacity/userManagement/index.vue @@ -259,7 +259,7 @@ const tableStore: any = new TableStore({ ], loadCallback: () => { - console.log(tableStore.table.data) + } }) diff --git a/src/views/pqs/business/terminal/FrontManagement/index.vue b/src/views/pqs/business/terminal/FrontManagement/index.vue index 0cb37758..1746dcb0 100644 --- a/src/views/pqs/business/terminal/FrontManagement/index.vue +++ b/src/views/pqs/business/terminal/FrontManagement/index.vue @@ -351,7 +351,7 @@ const tableStore = new TableStore({ }, click: row => { askRestartProcess({ - deviceRebootType: null, + deviceRebootType: 1, nodeId: row.id, processNo: 1 }).then(res => { @@ -452,9 +452,9 @@ const currentChangeEvent = () => { const restart = (data: any) => { // console.log('🚀 ~ restart ~ data:', data) askRestartProcess({ - deviceRebootType: data.processNo, + deviceRebootType: null, nodeId: nodeId.value, - processNo: 2 + processNo: data.processNo }).then(res => { ElMessage.success('重启成功') currentChangeEvent() diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue index 33708b4f..8a4075d4 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue @@ -920,11 +920,14 @@ const setRealData = () => { } defineExpose({ setRealData }) onMounted(() => { + init() + initRadioCharts() getLineDetail({ id: monitoringPoint.state.lineId }).then(res => { ptName.value = connection.filter(item => item.value == res.data.ptType)[0].code || '' }) + }) onBeforeUnmount(() => { dataSocket.socketServe?.closeWs() diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue index f519438e..ae9979b4 100644 --- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue +++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue @@ -116,7 +116,7 @@ const tableStore = new TableStore({ item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : '' }) }) - console.log(tableStore.table.data) + setTimeout(() => { luckysheet.create({ container: 'luckysheet', @@ -129,6 +129,13 @@ const tableStore = new TableStore({ data: tableStore.table.data }) }, 10) + }, + resetCallback: () => { + // 重置模板策略为第一个选项 + if (templatePolicy.value && templatePolicy.value.length > 0) { + Template.value = templatePolicy.value[0] + reportForm.value = templatePolicy.value[0]?.reportForm + } } }) const loading = ref(false) @@ -154,7 +161,7 @@ const changetype = (val: any) => { reportForm.value = val.reportForm } const selectChange = () => { - console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length) + //console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length) if (tableStore.table.data.length != 0) { setTimeout(() => { luckysheet && luckysheet?.resize() @@ -165,6 +172,13 @@ const selectChange = () => { const handleNodeClick = (data: any, node: any) => { if (data.level == 6) { dotList.value = data + + TableHeaderRef.value.setTheDate(3) + // 重置模板策略为第一个选项 + if (templatePolicy.value && templatePolicy.value.length > 0) { + Template.value = templatePolicy.value[0] + reportForm.value = templatePolicy.value[0]?.reportForm + } tableStore.index() } } diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue index 6dda6858..eb81b4b4 100644 --- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue +++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue @@ -50,9 +50,9 @@ const init = () => { getPlot(formData).then((res: any) => { const gongData = gongfunction(res.data.voltageToleranceCurveDataList) data.gs = res.data.voltageToleranceCurveDataList.length - data.krr = gongData.pointI.length - data.bkrr = gongData.pointIun.length - + data.krr = gongData.pointF.length + data.bkrr = gongData.pointFun.length + options.value = { // backgroundColor: "#f9f9f9", //地图背景色深蓝 title: { @@ -251,12 +251,14 @@ function gongfunction(arr: any) { } if (xx < 0.05) { + standF++ pointF.push({ value: point, itemStyle: { normal: { color: 'green' } } }) } else if (xx < 0.2) { + if (yy > 50) { standF++ pointF.push({ @@ -272,6 +274,7 @@ function gongfunction(arr: any) { } } else if (xx < 0.5) { if (yy > 70) { + standF++ pointF.push({ value: point, @@ -286,6 +289,7 @@ function gongfunction(arr: any) { } } else { if (yy > 80) { + standF++ pointF.push({ value: point,