From 30eddd057209eced9a6b6e92fd4568d274d24234 Mon Sep 17 00:00:00 2001 From: guanj Date: Thu, 5 Mar 2026 11:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device-boot/sensitiveLoadMange.ts | 75 +++ .../userLedger/components/addForm.vue | 9 +- .../terminal/userLedger/components/detail.vue | 430 +++++++++--------- .../business/terminal/userLedger/index.vue | 10 +- .../online/shishishuju/index.vue | 22 +- src/views/pqs/voltageSags/overview/right.vue | 7 +- 6 files changed, 325 insertions(+), 228 deletions(-) diff --git a/src/api/device-boot/sensitiveLoadMange.ts b/src/api/device-boot/sensitiveLoadMange.ts index fe0d04b1..24779e5d 100644 --- a/src/api/device-boot/sensitiveLoadMange.ts +++ b/src/api/device-boot/sensitiveLoadMange.ts @@ -26,3 +26,78 @@ export function deleteUser(data: any) { data: data }) } + +/** + * 干扰源接入功能删除流程 + */ +export const deleteUserReport = (data: any) => { + return request({ + url: '/device-boot/userReport/deleteUserReport', + method: 'POST', + data + }) +} +/** + * 提交表单数据 + */ +export const submitFormData = (data: any) => { + return request({ + url: '/device-boot/userReport/add', + method: 'POST', + data: data + }) +} +// 根据id获取用户档案录入的详细数据 +export const getById = (data: any) => { + return request({ + url: '/device-boot/userReport/getById', + method: 'get', + params: data + }) +} + +/** + * 提交表单数据 + */ +export const addEditor = (data: any) => { + return request({ + url: '/device-boot/userReportRenewal/addEditor', + method: 'POST', + data: data + }) +} + +// 根据id获取用户档案录入的详细数据 +export const getByDeptDevLine = (params: any) => { + return request({ + url: '/device-boot/line/getByDeptDevLine', + method: 'get', + params + }) +} +/** + * 根据id获取用户档案录入的详细数据 + */ +export const getUserReportUpdateById = (id: any) => { + return request({ + url: '/device-boot/userReportRenewal/getUserReportUpdateById?businessId='+id, + method: 'POST', + + }) +} + +// 根据id获取用户档案录入的详细数据 +export const getUserReportById = (id: any) => { + return request({ + url: '/device-boot/userReport/getUserReportById?id='+id, + method: 'get' + }) +} +// 根据id查询文件信息集合 +export const getFileById = (params: any) => { + return request({ + url: '/device-boot/fileUrl/getFileById', + method: 'get', + params + }) +} diff --git a/src/views/pqs/business/terminal/userLedger/components/addForm.vue b/src/views/pqs/business/terminal/userLedger/components/addForm.vue index 868eb81b..3b02ed4d 100644 --- a/src/views/pqs/business/terminal/userLedger/components/addForm.vue +++ b/src/views/pqs/business/terminal/userLedger/components/addForm.vue @@ -400,13 +400,12 @@ import { uploadFile } from '@/api/system-boot/file' import { submitFormData, getById, - updateFormData, addEditor, - resend, - getByDeptDevLine -} from '@/api/supervision-boot/interfere/index' + getByDeptDevLine, + getUserReportUpdateById +} from '@/api/device-boot/sensitiveLoadMange' import { getSubstationSelect } from '@/api/device-boot/line' -import { getUserReportUpdateById } from '@/api/supervision-boot/userReport/form' +// import { getUserReportUpdateById } from '@/api/supervision-boot/userReport/form' import { useRoute } from 'vue-router' const route = useRoute() diff --git a/src/views/pqs/business/terminal/userLedger/components/detail.vue b/src/views/pqs/business/terminal/userLedger/components/detail.vue index d2383b91..fdbae524 100644 --- a/src/views/pqs/business/terminal/userLedger/components/detail.vue +++ b/src/views/pqs/business/terminal/userLedger/components/detail.vue @@ -1,217 +1,225 @@ @@ -220,14 +228,13 @@ import { onMounted, ref, reactive, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' import { formatDate } from '@/utils/formatTime' import { propTypes } from '@/utils/propTypes' -import { getUserReportById, getUserReportUpdateById } from '@/api/supervision-boot/userReport/form' +import { getById, getUserReportUpdateById, getByDeptDevLine, getFileById } from '@/api/device-boot/sensitiveLoadMange' import { getDictTreeById } from '@/api/system-boot/dictTree' import { useDictData } from '@/stores/dictData' import { getFileNameAndFilePath } from '@/api/system-boot/file' import { Link, View } from '@element-plus/icons-vue' import PreviewFile from '@/components/PreviewFile/index.vue' -import { getByDeptDevLine } from '@/api/supervision-boot/interfere/index' -import { addOrUpdateFile, getFileById } from '@/api/supervision-boot/interfere/index' +// import { addOrUpdateFile, getFileById } from '@/api/supervision-boot/interfere/index' defineOptions({ name: 'BpmUserReportDetail' }) const { query } = useRoute() // 查询参数 @@ -340,9 +347,9 @@ const getInfo = async () => { getProviteData() }) } else { - await getUserReportById(props.id || queryId).then(res => { + await getById({ id: props.id || queryId }).then(res => { detailData.value = res.data - + getProviteData() }) } @@ -385,7 +392,6 @@ const preview = (val: any, url: any) => { } //预测评估报告 if (val == 'predictionEvaluationReport') { - predictionEvaluationReportRef?.value.open(url) } //预测评估评审意见报告 @@ -416,11 +422,11 @@ const preview = (val: any, url: any) => { } const queryFiles = () => { - getFileById({ id: props.id }).then(res => { - res.data.forEach((item: any) => { - if (item.url.length > 0) getFileNamePaths(item.url, item.name) - }) - }) + // getFileById({ id: props.id }).then(res => { + // res.data.forEach((item: any) => { + // if (item.url.length > 0) getFileNamePaths(item.url, item.name) + // }) + // }) } //判断userType选择取用的对象 const getProviteData = async () => { diff --git a/src/views/pqs/business/terminal/userLedger/index.vue b/src/views/pqs/business/terminal/userLedger/index.vue index d389c33a..82cc29a3 100644 --- a/src/views/pqs/business/terminal/userLedger/index.vue +++ b/src/views/pqs/business/terminal/userLedger/index.vue @@ -34,11 +34,11 @@ - + - - + @@ -57,7 +57,7 @@ import { useRouter } from 'vue-router' import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form' import DetailInfo from './components/detail.vue' import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index' -import { deleteUserReport } from '@/api/supervision-boot/delete/index' +import { deleteUserReport } from '@/api/device-boot/sensitiveLoadMange' const addForms = ref() const dictData = useDictData() const sensitiveUserPopup = ref() @@ -73,7 +73,7 @@ defineOptions({ //获取登陆用户姓名和部门 const adminInfo = useAdminInfo() const tableStore = new TableStore({ - url: '/supervision-boot/userReport/getUserLedgerPage', + url: '/device-boot/userReport/getUserLedgerPage', // publicHeight: 65, method: 'POST', column: [ diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue index 8a4075d4..e2798e8d 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue @@ -745,7 +745,7 @@ const initEcharts = (color: string, key: number, name: string) => { //渲染echarts const init = () => { loading.value = true - const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.67:10407/api/pushMessage/' + const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.68:10407/api/pushMessage/' echartsDataV1.value = initEcharts('#DAA520', 0, 'A相') echartsDataV2.value = initEcharts('#2E8B57', 0, 'B相') echartsDataV3.value = initEcharts('#A52a2a', 0, 'C相') @@ -868,6 +868,22 @@ const setRealData = () => { // webMsgSend.value[0].vRmsB == 0 ? 1 : Math.ceil(webMsgSend.value[0].vRmsB) // echartsDataV3.value.options.series[0].max = // webMsgSend.value[0].vRmsC == 0 ? 1 : Math.ceil(webMsgSend.value[0].vRmsC) + let numData = + Math.ceil( + (Math.max( + ...[ + Math.floor(webMsgSend.value[0].vRmsA * 100) / 100 || 10, + Math.floor(webMsgSend.value[0].vRmsB * 100) / 100 || 10, + Math.floor(webMsgSend.value[0].vRmsC * 100) / 100 || 10 + ] + ) * + 1.2) / + 10 + ) * 10 + + echartsDataV1.value.options.series[0].max = numData + echartsDataV2.value.options.series[0].max = numData + echartsDataV3.value.options.series[0].max = numData echartsDataV1.value.options.series[0].data = [ { name: ptName.value == 'star' ? 'A相' : 'AB相', //A相 @@ -920,14 +936,12 @@ 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/voltageSags/overview/right.vue b/src/views/pqs/voltageSags/overview/right.vue index 677abe00..0b171279 100644 --- a/src/views/pqs/voltageSags/overview/right.vue +++ b/src/views/pqs/voltageSags/overview/right.vue @@ -25,7 +25,11 @@ - + + + @@ -49,7 +53,6 @@ const props = defineProps({ const tableData = ref([]) const tableData1 = ref([]) getNoDealEvents(props.params).then(res => { - tableData.value = res.data }) getAreaOffDev(props.params).then(res => {