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/weekly/components/causeStatistics.vue b/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue index e295a960..10b011f5 100644 --- a/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue +++ b/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue @@ -1,11 +1,162 @@ - - + diff --git a/src/views/pqs/voltageSags/report/weekly/components/overview.vue b/src/views/pqs/voltageSags/report/weekly/components/overview.vue deleted file mode 100644 index d1613c50..00000000 --- a/src/views/pqs/voltageSags/report/weekly/components/overview.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - 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 index 46ee7605..5c384f61 100644 --- a/src/views/pqs/voltageSags/report/weekly/components/table.vue +++ b/src/views/pqs/voltageSags/report/weekly/components/table.vue @@ -13,16 +13,19 @@ import TableHeader from '@/components/table/header/index.vue' import TableStore from '@/utils/tableStore' import Table from '@/components/table/index.vue' -import { ref, onMounted, provide ,nextTick} from 'vue' +import { ref, onMounted, provide, nextTick } from 'vue' import { useDictData } from '@/stores/dictData' +import createAxios from '@/utils/request' +import { requestPayload } from '@/utils/request' interface Props { info: any } const props = withDefaults(defineProps(), {}) const dictData = useDictData() +const tableRef = ref() const tableStore = new TableStore({ url: props.info.url, - publicHeight: 60, + publicHeight: 62, method: 'POST', column: props.info.column, @@ -44,5 +47,29 @@ nextTick(() => { tableStore.index() }) // 导出 -const exportEvent = () => {} +const exportEvent = () => { + let form = JSON.parse(JSON.stringify(tableStore.table.params)) + form.pageNum = 1 + form.pageSize = tableStore.table.total + createAxios( + Object.assign( + { + url: props.info.url, + method: 'post' + }, + requestPayload('POST', form) + ) + ).then(res => { + tableRef.value.getRef().exportData({ + filename: props.info.name, // 文件名字 + sheetName: 'Sheet1', + type: 'xlsx', //导出文件类型 xlsx 和 csv + useStyle: true, + data: res.data.records, // 数据源 // 过滤那个字段导出 + columnFilterMethod: function (column: any) { + return !(column.$columnIndex === 0) + } + }) + }) +} diff --git a/src/views/pqs/voltageSags/report/weekly/index.vue b/src/views/pqs/voltageSags/report/weekly/index.vue index 3fd577c1..9b488864 100644 --- a/src/views/pqs/voltageSags/report/weekly/index.vue +++ b/src/views/pqs/voltageSags/report/weekly/index.vue @@ -1,7 +1,16 @@