diff --git a/package.json b/package.json index b4c7e4ab..4e0fd01a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "dev": "vite", - "build": "vite build", + "build": "vite build ", "preview": "vite preview" }, "dependencies": { diff --git a/src/api/event-boot/report.ts b/src/api/event-boot/report.ts index 0c4cd946..445ac903 100644 --- a/src/api/event-boot/report.ts +++ b/src/api/event-boot/report.ts @@ -11,32 +11,46 @@ export function getEventReport(data) { // 生成报告 export function getAreaReport(data) { return createAxios({ - url: "/event-boot/report/getAreaReport", - method: "post", + url: '/event-boot/report/getAreaReport', + method: 'post', data, - responseType: "blob", - }); + responseType: 'blob' + }) } //查询所有模板 export function getList(data) { return createAxios({ - url: "/system-boot/EventTemplate/getList", - method: "post", - data, - }); + url: '/system-boot/EventTemplate/getList', + method: 'post', + data + }) } export function selectReleation(data) { return createAxios({ - url: "/system-boot/EventTemplate/selectReleation", - method: "post", - params:data - }); + url: '/system-boot/EventTemplate/selectReleation', + method: 'post', + params: data + }) } export function getLineExport(data) { return createAxios({ - url: "/event-boot/report/getLineExport", - method: "post", + url: '/event-boot/report/getLineExport', + method: 'post', data: data, - responseType: 'blob', - }); -} \ No newline at end of file + responseType: 'blob' + }) +} +export function getVoltage(data:any) { + return createAxios({ + url: '/event-boot/report/getVoltage', + method: 'post', + data + }) +} +export function getGeneralSituation(data:any) { + return createAxios({ + url: '/event-boot/report/getGeneralSituation', + method: 'post', + data + }) +} diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 03617faa..2e4bc8d9 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -98,6 +98,7 @@ import FieldRender from '@/components/table/fieldRender/index.vue' import Column from '@/components/table/column/index.vue' import { useConfig } from '@/stores/config' import type TableStoreClass from '@/utils/tableStore' + import { defaultAttribute } from '@/components/table/defaultAttribute' const config = useConfig() @@ -114,7 +115,7 @@ const props = withDefaults(defineProps(), { onMounted(() => { tableStore.table.ref = tableRef.value as VxeTableInstance }) -console.log(props) +// console.log(props) const onTableSizeChange = (val: number) => { tableStore.onTableAction('page-size-change', { size: val }) } diff --git a/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue b/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue index 3912530d..cecb1b8c 100644 --- a/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue +++ b/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue @@ -66,7 +66,7 @@ const manufacturer = dictData.getBasicData('Dev_Manufacturers') const manufacturerForm = ref([]) const tableStore = new TableStore({ isWebPaging: true, - url: '/device-boot/runManage/getRuntimeData', + url: 'Operationmanagement/terminalmanagement', method: 'POST', column: [ { diff --git a/src/views/pqs/voltageSags/operationsManagement/point/index.vue b/src/views/pqs/voltageSags/operationsManagement/point/index.vue index 3261866a..7b721ea6 100644 --- a/src/views/pqs/voltageSags/operationsManagement/point/index.vue +++ b/src/views/pqs/voltageSags/operationsManagement/point/index.vue @@ -63,7 +63,7 @@ import { useDictData } from '@/stores/dictData' import Area from '@/components/form/area/index.vue' defineOptions({ - name: 'voltage/sags/operationsManagement/point' + name: 'Operationmanagement/accountinformation' }) const dictData = useDictData() const interferenceSource = dictData.getBasicData('Interference_Source') diff --git a/src/views/pqs/voltageSags/operationsManagement/statistics/index.vue b/src/views/pqs/voltageSags/operationsManagement/statistics/index.vue index f4292f04..76f7ee60 100644 --- a/src/views/pqs/voltageSags/operationsManagement/statistics/index.vue +++ b/src/views/pqs/voltageSags/operationsManagement/statistics/index.vue @@ -102,7 +102,7 @@ import * as echarts from 'echarts/core' import { defaultAttribute } from '@/components/table/defaultAttribute' defineOptions({ - name: 'voltage/sags/operationsManagement/statistics' + name: 'Operationmanagement/terminalstatistics' }) const dictData = useDictData() const areaStatistics = ref() diff --git a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue index 4e1e782f..cd42de2a 100644 --- a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue +++ b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue @@ -137,7 +137,7 @@ import TableStore from '@/utils/tableStore' import PointTree from '@/components/tree/pms/pointTree.vue' import TableHeader from '@/components/table/header/index.vue' import { mainHeight } from '@/utils/layout' -import { getLineExport, getList, selectReleation } from '@/api/event-boot/report.ts' +import { getLineExport, getList, selectReleation } from '@/api/event-boot/report' import { useMonitoringPoint } from '@/stores/monitoringPoint' import { ElMessage } from 'element-plus' const monitoringPoint = useMonitoringPoint() @@ -174,7 +174,7 @@ const formd: any = ref({ const templatePolicy: any = ref([]) const tableStore = new TableStore({ url: '', - method: '', + method: 'post', column: [] }) provide('tableStore', tableStore) @@ -194,7 +194,7 @@ getList({ const handleNodeClick = (data: any, node: any) => { dotList.value = data } -const changeFn = val => { +const changeFn = (val:any) => { formd.value = { xq: false, lb: false, @@ -217,7 +217,7 @@ const changeFn = val => { } selectReleation(data).then(res => { - res.data.forEach(item => { + res.data.forEach((item:any) => { for (let k in formd.value) { if (item.name == k) { formd.value[k] = true @@ -242,7 +242,7 @@ const exportEvent = () => { formd.value.searchEndTime = tableStore.table.params.searchEndTime formd.value.flag = TableHeaderRef.value.datePickerRef.interval ElMessage('生成报告中,请稍等!') - getLineExport(formd.value).then(res => { + getLineExport(formd.value).then((res:any) => { let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8' }) diff --git a/src/views/pqs/voltageSags/report/regionalReports/index.vue b/src/views/pqs/voltageSags/report/regionalReports/index.vue index e43f31af..fabd4e24 100644 --- a/src/views/pqs/voltageSags/report/regionalReports/index.vue +++ b/src/views/pqs/voltageSags/report/regionalReports/index.vue @@ -141,7 +141,7 @@ import { ref, onMounted, provide, reactive } from 'vue' 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 { getAreaReport, getList, selectReleation } from '@/api/event-boot/report' import { ElMessage } from 'element-plus' defineOptions({ name: 'TransientReport/regionalreports' @@ -161,7 +161,7 @@ const templatePolicy: any = ref([]) const value = ref('') const tableStore = new TableStore({ url: '', - method: '', + method: 'post', column: [] }) const formInline: any = ref({ @@ -195,7 +195,7 @@ getList({ templatePolicy.value = res.data.records }) // 模板策略变化 -const changeFn = val => { +const changeFn = (val:any) => { formInline.value = { monitorDistributeChart: false, eventCountTable: false, @@ -218,7 +218,7 @@ const changeFn = val => { } selectReleation(data).then(res => { - res.data.forEach(item => { + res.data.forEach((item:any) => { for (let k in formInline.value) { if (item.name == k) { formInline.value[k] = true @@ -245,7 +245,7 @@ const exportEvent = () => { formInline.value.waveType = tableStore.table.params.waveType formInline.value.interval = tableStore.table.params.timeFlag ElMessage('生成报告中,请稍等!') - getAreaReport(formInline.value).then(res => { + getAreaReport(formInline.value).then((res:any) => { let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8' }) diff --git a/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue b/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue new file mode 100644 index 00000000..10b011f5 --- /dev/null +++ b/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue @@ -0,0 +1,162 @@ + + + diff --git a/src/views/pqs/voltageSags/report/weekly/components/overviewTab.vue b/src/views/pqs/voltageSags/report/weekly/components/overviewTab.vue new file mode 100644 index 00000000..d4b5df17 --- /dev/null +++ b/src/views/pqs/voltageSags/report/weekly/components/overviewTab.vue @@ -0,0 +1,95 @@ + + diff --git a/src/views/pqs/voltageSags/report/weekly/components/overviewTabEch.vue b/src/views/pqs/voltageSags/report/weekly/components/overviewTabEch.vue new file mode 100644 index 00000000..4bf0c2b7 --- /dev/null +++ b/src/views/pqs/voltageSags/report/weekly/components/overviewTabEch.vue @@ -0,0 +1,269 @@ + + + diff --git a/src/views/pqs/voltageSags/report/weekly/components/table.vue b/src/views/pqs/voltageSags/report/weekly/components/table.vue new file mode 100644 index 00000000..5c384f61 --- /dev/null +++ b/src/views/pqs/voltageSags/report/weekly/components/table.vue @@ -0,0 +1,75 @@ + + + diff --git a/src/views/pqs/voltageSags/report/weekly/index.vue b/src/views/pqs/voltageSags/report/weekly/index.vue index b0d1d0b0..9b488864 100644 --- a/src/views/pqs/voltageSags/report/weekly/index.vue +++ b/src/views/pqs/voltageSags/report/weekly/index.vue @@ -1,11 +1,215 @@ - -