diff --git a/src/components/tree/pms/pointTree.vue b/src/components/tree/pms/pointTree.vue index 362d965b..fac2f5bf 100644 --- a/src/components/tree/pms/pointTree.vue +++ b/src/components/tree/pms/pointTree.vue @@ -45,15 +45,28 @@ const formData = ref({ loadType: null, manufacturer: null, serverName: 'event-boot', - statisticalType: classificationData[0].id, + statisticalType: classificationData[2].id, scale: null }) -const loadData = () => { +const loadData = (val: string) => { + let obj = classificationData.find(function (i) { + return i.id === formData.value.statisticalType + }) let form = JSON.parse(JSON.stringify(formData.value)) form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType) let nodeKey = '' getTerminalTreeForFive(form).then(res => { console.log(res) + if (obj.code == 'Power_Network') { + res.data = [ + { + name: '电网拓扑', + level: -1, + id: 0, + children: res.data + } + ] + } res.data.forEach((item: any) => { item.icon = 'fa-solid fa-synagogue' item.color = config.getColorVal('elementUiPrimary') diff --git a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue index c3ee0d59..a48ca87e 100644 --- a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue +++ b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue @@ -1,11 +1,66 @@ - - diff --git a/src/views/pqs/voltageSags/report/regionalReports/index.vue b/src/views/pqs/voltageSags/report/regionalReports/index.vue index 98f1525e..e43f31af 100644 --- a/src/views/pqs/voltageSags/report/regionalReports/index.vue +++ b/src/views/pqs/voltageSags/report/regionalReports/index.vue @@ -142,7 +142,7 @@ import TableStore from '@/utils/tableStore' import TableHeader from '@/components/table/header/index.vue' import { useDictData } from '@/stores/dictData' import { getAreaReport, getList, selectReleation } from '@/api/event-boot/report.ts' - +import { ElMessage } from 'element-plus' defineOptions({ name: 'TransientReport/regionalreports' }) @@ -244,10 +244,13 @@ const exportEvent = () => { formInline.value.powerFlag = 2 formInline.value.waveType = tableStore.table.params.waveType formInline.value.interval = tableStore.table.params.timeFlag + ElMessage('生成报告中,请稍等!') getAreaReport(formInline.value).then(res => { let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8' }) + + const url = window.URL.createObjectURL(blob) const link = document.createElement('a') // 创建a标签 link.href = url