From 9e1bbe8dc34b80afe801a5a4434df0eedc6bfb25 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Thu, 15 Aug 2024 20:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=20=E8=BE=BD=E5=AE=81?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E7=BB=B4=E6=8A=A4=20=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=86=80=E5=8C=97=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device-boot/newEnergy.ts | 10 + src/api/supervision-boot/interfere/index.ts | 8 + src/api/supervision-boot/userReport/form.ts | 21 ++ src/utils/router.ts | 3 + .../components/waveform.vue | 0 .../newEnergy}/highAndLowPressure/index.vue | 2 +- .../newEnergyAnalysis/components/detail.vue | 0 .../components/timePopUpBox.vue | 0 .../newEnergy}/newEnergyAnalysis/index.vue | 2 +- .../newEnergyLedger/components/addForm.vue | 144 +++++++++++++ .../LN/newEnergy/newEnergyLedger/index.vue | 125 +++++++++++ .../embed/lntegruty/components/table.vue | 6 +- .../normalizationManager/addForm.vue | 2 +- .../normalizationManager/programReview.vue | 4 +- .../components/undocumented/addForm.vue | 68 ++++-- .../components/undocumented/addUpload.vue | 204 ++++++++++++++++++ .../components/undocumented/detail.vue | 24 +++ .../components/undocumented/index.vue | 9 +- .../components/interferenceUserTable.vue | 9 +- .../components/sensitiveUserTable.vue | 3 +- .../components/terminainal/index.vue | 40 ++-- .../terminainal/uploadATemplate.vue | 147 +++++++++++++ src/views/pqs/supervise/testRun/index.vue | 2 + 23 files changed, 794 insertions(+), 39 deletions(-) create mode 100644 src/api/device-boot/newEnergy.ts rename src/views/{pqs/supervise => LN/newEnergy}/highAndLowPressure/components/waveform.vue (100%) rename src/views/{pqs/supervise => LN/newEnergy}/highAndLowPressure/index.vue (99%) rename src/views/{pqs/supervise => LN/newEnergy}/newEnergyAnalysis/components/detail.vue (100%) rename src/views/{pqs/supervise => LN/newEnergy}/newEnergyAnalysis/components/timePopUpBox.vue (100%) rename src/views/{pqs/supervise => LN/newEnergy}/newEnergyAnalysis/index.vue (99%) create mode 100644 src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue create mode 100644 src/views/LN/newEnergy/newEnergyLedger/index.vue create mode 100644 src/views/pqs/supervise/interfere/components/undocumented/addUpload.vue create mode 100644 src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/uploadATemplate.vue diff --git a/src/api/device-boot/newEnergy.ts b/src/api/device-boot/newEnergy.ts new file mode 100644 index 00000000..9bdb61b2 --- /dev/null +++ b/src/api/device-boot/newEnergy.ts @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 新能源场站高低电压穿越信息更新 +export function editNewStation(data: any) { + return request({ url: '/device-boot/newStation/editNewStation', method: 'post', data }) +} +// 新能源场站高低电压穿越信息删除 +export function delNewStation(data: any) { + return request({ url: '/device-boot/newStation/delNewStation', method: 'delete', params: data }) +} diff --git a/src/api/supervision-boot/interfere/index.ts b/src/api/supervision-boot/interfere/index.ts index 1d93e4c6..1bfadaa3 100644 --- a/src/api/supervision-boot/interfere/index.ts +++ b/src/api/supervision-boot/interfere/index.ts @@ -86,3 +86,11 @@ export const cancel = (data: any) => { data }) } +// 根据id获取用户档案录入的详细数据 +export const getByDeptDevLine = (params: any) => { + return createAxios({ + url: '/device-boot/line/getByDeptDevLine', + method: 'get', + params + }) +} diff --git a/src/api/supervision-boot/userReport/form.ts b/src/api/supervision-boot/userReport/form.ts index b3a5d5f3..e756e1af 100644 --- a/src/api/supervision-boot/userReport/form.ts +++ b/src/api/supervision-boot/userReport/form.ts @@ -47,6 +47,16 @@ export const downloadSensitiveUserTemplate = () => { responseType: 'blob' }) } +/** + * 下载敏感及重要用户模板 + */ +export const downloadDevTemplate = () => { + return createAxios({ + url: SUPERVISION_BOOT + '/deVReport/downloadDevTemplate', + method: 'GET', + responseType: 'blob' + }) +} /** * 下载干扰源用户台账模板 */ @@ -81,6 +91,17 @@ export const importSensitiveReportData = (data: any) => { }) } +/** + * 批量导入终端台账入网 + */ +export const deVReportImportSensitive = (data: any) => { + return createAxios({ + url: SUPERVISION_BOOT + '/deVReport/importSensitiveUserData', + method: 'POST', + data: data, + responseType: 'blob' + }) +} diff --git a/src/utils/router.ts b/src/utils/router.ts index fa06484e..bf45135d 100644 --- a/src/utils/router.ts +++ b/src/utils/router.ts @@ -15,6 +15,7 @@ import { log } from 'console' * @param to — 导航位置,同 router.push */ export const routePush = async (to: RouteLocationRaw) => { + console.log("🚀 ~ routePush ~ to:", to) try { const failure = await router.push(to) if (isNavigationFailure(failure, NavigationFailureType.aborted)) { @@ -48,6 +49,8 @@ export const getFirstRoute = (routes: RouteRecordRaw[], menuType = 'tab'): false }) let find: boolean | RouteRecordRaw = false for (const key in routes) { + console.log(`11111111`,routes[key].path); + if ( routes[key].meta?.type == 'menu' && routes[key].meta?.menu_type == menuType && diff --git a/src/views/pqs/supervise/highAndLowPressure/components/waveform.vue b/src/views/LN/newEnergy/highAndLowPressure/components/waveform.vue similarity index 100% rename from src/views/pqs/supervise/highAndLowPressure/components/waveform.vue rename to src/views/LN/newEnergy/highAndLowPressure/components/waveform.vue diff --git a/src/views/pqs/supervise/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue similarity index 99% rename from src/views/pqs/supervise/highAndLowPressure/index.vue rename to src/views/LN/newEnergy/highAndLowPressure/index.vue index bad9c01e..827ca257 100644 --- a/src/views/pqs/supervise/highAndLowPressure/index.vue +++ b/src/views/LN/newEnergy/highAndLowPressure/index.vue @@ -61,7 +61,7 @@ import TableStore from '@/utils/tableStore' import { ref, onMounted, provide } from 'vue' import { mainHeight } from '@/utils/layout' defineOptions({ - name: 'highAndLowPressure' + name: 'newEnergy/highAndLowPressure' }) const EchartMap = ref() const dictData = useDictData() diff --git a/src/views/pqs/supervise/newEnergyAnalysis/components/detail.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue similarity index 100% rename from src/views/pqs/supervise/newEnergyAnalysis/components/detail.vue rename to src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue diff --git a/src/views/pqs/supervise/newEnergyAnalysis/components/timePopUpBox.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue similarity index 100% rename from src/views/pqs/supervise/newEnergyAnalysis/components/timePopUpBox.vue rename to src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue diff --git a/src/views/pqs/supervise/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue similarity index 99% rename from src/views/pqs/supervise/newEnergyAnalysis/index.vue rename to src/views/LN/newEnergy/newEnergyAnalysis/index.vue index f373a081..30b678a8 100644 --- a/src/views/pqs/supervise/newEnergyAnalysis/index.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue @@ -178,7 +178,7 @@ import MyEchart from '@/components/echarts/MyEchart.vue' import TimePopUpBox from './components/timePopUpBox.vue' import detail from './components/detail.vue' defineOptions({ - name: 'newEnergyAnalysis' + name: 'newEnergy/newEnergyAnalysis' }) const timePopUpBox = ref(null) const flag = ref('0%~10%') diff --git a/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue b/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue new file mode 100644 index 00000000..7c39c360 --- /dev/null +++ b/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue @@ -0,0 +1,144 @@ + + + diff --git a/src/views/LN/newEnergy/newEnergyLedger/index.vue b/src/views/LN/newEnergy/newEnergyLedger/index.vue new file mode 100644 index 00000000..f83917c1 --- /dev/null +++ b/src/views/LN/newEnergy/newEnergyLedger/index.vue @@ -0,0 +1,125 @@ + + + + diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue index 2f0b4c7d..bb7dd773 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue @@ -235,6 +235,7 @@ const exportEvent = () => { if (!line) { ElMessage({ type: 'warning', + message: '请选择要导出的数据' }) return @@ -246,7 +247,10 @@ const exportEvent = () => { form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1]) form.append('type', 0) form.append('name', line.name) - + ElMessage({ + message: '下载报告中,请稍等.....', + duration: 1000 + }) exportModelJB(form).then(async res => { let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue index 6b05cb6a..59b1bcd1 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue @@ -286,7 +286,7 @@ resetForm() const detailLoading = ref(false) // 表单的加载中 const getInfo = async (row?: any) => { - console.log('🚀 ~ getInfo ~ row:', row) + detailLoading.value = true try { await getUserReportById(props.id).then(res => { diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index c5fc80dc..f326864c 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -178,10 +178,10 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', showDisabled: row => { - return row.createBy != adminInfo.$state.id || !(row.status == 0) + return !(row.status == 0 || row.status == 3) }, disabled: row => { - return !(row.status == 0) + return !(row.status == 0 || row.status == 3) }, click: row => { dialogVisible.value = true diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index 655cf9c7..7263805a 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -158,6 +158,27 @@ + + + + + + + + + + + + + + diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue index 58a09da9..7d14972b 100644 --- a/src/views/pqs/supervise/testRun/index.vue +++ b/src/views/pqs/supervise/testRun/index.vue @@ -369,6 +369,8 @@ const runTestSubmit = (type: number) => { } }) } + +