diff --git a/src/api/process-boot/interference.ts b/src/api/process-boot/interference.ts index 1d0c935d..a0dffeea 100644 --- a/src/api/process-boot/interference.ts +++ b/src/api/process-boot/interference.ts @@ -6,7 +6,7 @@ export function getUndocumentednonlinearData() { method: 'get' }) } -//获取入网评估报告审核数据 +//获取系统接入方案审核数据 export function getReportreviewData() { return createAxios({ url: '/Process-supervision/Reportreview/getReportreview', diff --git a/src/views/pqs/business/terminal/userLedger/components/detail.vue b/src/views/pqs/business/terminal/userLedger/components/detail.vue index 2b98b3b5..78cf3e3d 100644 --- a/src/views/pqs/business/terminal/userLedger/components/detail.vue +++ b/src/views/pqs/business/terminal/userLedger/components/detail.vue @@ -110,10 +110,7 @@ > {{ proviteData.agreementCapacity }} - + {{ proviteData?.ratePower }} { getFileNamePath(proviteData.value.additionalAttachments, 'additionalAttachments') } - // 入网评估报告 + // 系统接入方案 if (detailData.value.netInReport.length > 0) { netInReportList.value = [] detailData.value.netInReport.forEach((item: any) => { diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue index 5e461979..30285d4c 100644 --- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue +++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue @@ -444,7 +444,7 @@ const clearQueryParams = () => { defineExpose({ refresh: (statisticalType?: string) => { - tableStore.table.params.statisticalType = options.filter(item => item.id === statisticalType)[0] || '' + tableStore.table.params.statisticalType = options.filter(item => item.id == statisticalType)[0] || options[0] clearQueryParams() tableHeaderRef.value.setTheDate(3) diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue index 9d31f266..bbf83f42 100644 --- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue +++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue @@ -92,12 +92,11 @@ const tableStore = new TableStore({ { field: 'gdName', title: '供电公司', - minWidth: 100 + width: 150 }, { field: 'subStationName', title: '变电站', minWidth: 150 }, { field: 'projectName', title: '项目名称', minWidth: 150 }, - { field: 'subStationName', title: '变电站名称', minWidth: 150 }, { field: 'subValue', title: '污染值', @@ -139,7 +138,7 @@ const tableStore = new TableStore({ tableStore.table.params.ids = [tableStore.table.params.statisticalType?.id] }, loadCallback: () => { - tableStore.table.column[5].title = tableStore.table.params.statisticalType.name + '污染值' + tableStore.table.column[4].title = tableStore.table.params.statisticalType.name + '污染值' } }) diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue index 2226a102..f0239410 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue @@ -40,8 +40,10 @@ - - + + + + @@ -148,7 +150,7 @@ watch( activeName.value = type setTimeout(() => { pointTree.value.scrollToNode(lineId) - + monitoringPoint.setValue('lineName', findNodeByTreeId(pointTree.value.tree, lineId).alias) }, 500) }, 1000) diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue index 69669f1a..c00130d2 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue @@ -6,7 +6,7 @@
- - - + + + + + + + + + +
@@ -89,6 +95,7 @@ const loading = ref(false) const tableData: any = ref([]) const subdata: any = ref([]) const picEChart = ref() +const pollutionValueList = ref([]) const tableRef = ref() const loadingTab = ref(false) const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压') @@ -120,47 +127,48 @@ const analysis = () => { loading.value = true let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01` downPollutionSensitiveUser({ ...rowList.value, ids: [PollutionList[0].id], deptId: rowList.value.id }).then(res => { - const first10Items = res.data.slice(0, 10) - picEChart.value = { - title: { - text: '污染值排名前十敏感及重要用户' - }, + pollutionValueList.value = res.data.filter((item: any) => item.subValue != null) + // const first10Items = res.data.slice(0, 10) + // picEChart.value = { + // title: { + // text: '污染值排名前十敏感及重要用户' + // }, - xAxis: { - name: '', - data: first10Items.map((item: any) => item.projectName.split('(')[0].trim()), - axisLabel: { - rotate: 20 // 核心：倾斜 45 度（推荐 30/45/60，角度太大易读性差） - } - }, - grid: { - bottom: 10 - }, - legend: { - show: false - }, - yAxis: { - name: '' - }, - options: { - dataZoom: false, - series: [ - { - // name: time[i], - name: '污染值', - type: 'bar', - data: first10Items.map((item: any) => item.subValue), - itemStyle: { - color: function (params) { - // params.value 是当前柱子的数值 - const value = params.value - return setColor(value) - } - } - } - ] - } - } + // xAxis: { + // name: '', + // data: first10Items.map((item: any) => item.projectName.split('(')[0].trim()), + // axisLabel: { + // rotate: 20 // 核心：倾斜 45 度（推荐 30/45/60，角度太大易读性差） + // } + // }, + // grid: { + // bottom: 10 + // }, + // legend: { + // show: false + // }, + // yAxis: { + // name: '' + // }, + // options: { + // dataZoom: false, + // series: [ + // { + // // name: time[i], + // name: '污染值', + // type: 'bar', + // data: first10Items.map((item: any) => item.subValue), + // itemStyle: { + // color: function (params) { + // // params.value 是当前柱子的数值 + // const value = params.value + // return setColor(value) + // } + // } + // } + // ] + // } + // } loading.value = false }) @@ -180,12 +188,12 @@ const setColor = val => { ? '#00B07D' : '' } -const echartClick = (res: any) => { +const pollutionClick = (res: any) => { router.push({ name: 'harmonic-boot/qydetailedAnalysis/pollutionReport', query: { type: '4', - name: res.name, + name: res.row.projectName, t: Date.now() } }) diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue index c0c91f43..502f169f 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue @@ -19,7 +19,7 @@
分布统计 - + {{ item.name }} @@ -84,6 +84,7 @@ const trendEChart: any = ref() const picEChart = ref() const open = async (row: any) => { + statisticalType.value = 'Load_Type' time.value = '1' rowList.value = { deviceInfoParam: { diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue index 56386e7c..eb38c13c 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue @@ -107,7 +107,8 @@ --> - + + - + diff --git a/src/views/pqs/supervise/interfere/components/network/index.vue b/src/views/pqs/supervise/interfere/components/network/index.vue index 30801528..12a20c63 100644 --- a/src/views/pqs/supervise/interfere/components/network/index.vue +++ b/src/views/pqs/supervise/interfere/components/network/index.vue @@ -73,7 +73,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Plus', render: 'basicButton', click: row => { - AuditRef.value.open('入网评估报告审核', row) + AuditRef.value.open('系统接入方案审核', row) } } ] diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue index 6c039fa8..dad17a38 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue @@ -50,25 +50,31 @@ {{ detailData.evaluationConclusion }} - + " + > {{ proviteData.nonlinearLoadType }} {{ proviteData.needGovernance == 0 ? '否' : '是' }} - + {{ proviteData.needGovernance == 0 ? '否' : '是' }} {{ proviteData.needGovernance == 0 ? '否' : '是' }} @@ -77,12 +83,14 @@ {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }} - + {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }} @@ -95,20 +103,26 @@ {{ proviteData?.pccPoint }} - + {{ proviteData.pccEquipmentCapacity }} - + {{ proviteData.baseShortCircuitCapacity }} @@ -121,20 +135,26 @@ {{ proviteData?.evaluationChekDept }} - + {{ proviteData?.minShortCircuitCapacity }} - + {{ proviteData?.userAgreementCapacity }} @@ -160,20 +180,22 @@ - + {{ proviteData.feasibilityReport.name }} - + - + {{ proviteData.feasibilityReport.name }} @@ -181,7 +203,7 @@ - + {{ proviteData.feasibilityReport.name }} @@ -190,7 +212,7 @@ - + {{ proviteData?.preliminaryDesignDescription.name }} @@ -198,7 +220,7 @@ - + {{ proviteData?.predictionEvaluationReport.name }} @@ -206,15 +228,18 @@ - + {{ proviteData?.predictionEvaluationReviewOpinions.name }} - + - + {{ proviteData?.substationMainWiringDiagram.name }} @@ -222,7 +247,7 @@ - + {{ proviteData?.sensitiveDevices.name }} @@ -230,7 +255,7 @@ - + {{ proviteData?.antiInterferenceReport.name }} @@ -238,16 +263,16 @@ - + {{ proviteData?.powerQualityReport.name }} - +
- + {{ item.name }} @@ -257,7 +282,7 @@ - + {{ proviteData?.additionalAttachments.name }} @@ -275,10 +300,12 @@ {{ detailData.orgName }} - + - + {{ proviteData?.otherReport.name }} @@ -299,7 +326,7 @@ import { userReportGoNetById } from '@/api/supervision-boot/interfere' // import el-descriptions-item from './components/detailsItem.vue' defineOptions({ name: 'BpmUserReportDetail' }) const openFile = (name: any) => { - window.open(window.location.origin + '/#/previewFile?/supervision/' + name) + window.open(window.location.origin + '/#/previewFile?' + name) } const { query } = useRoute() // 查询参数 @@ -459,7 +486,7 @@ const getProviteData = async () => { await getFileNamePath(proviteData.value.otherReport, 'otherReport') } - // 入网评估报告 + // 系统接入方案 if (detailData.value.netInReport.length > 0 && detailData.value.netInReport[0] != null) { netInReportList.value = [] detailData.value.netInReport.forEach((item: any) => { @@ -475,6 +502,7 @@ const getFileNamePath = async (val: any, pathName: any) => { if (pathName == 'feasibilityReport' && proviteData.value.feasibilityReport) { proviteData.value.feasibilityReport = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -482,6 +510,7 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'preliminaryDesignDescription' && proviteData.value.preliminaryDesignDescription) { proviteData.value.preliminaryDesignDescription = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -489,6 +518,7 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'predictionEvaluationReport' && proviteData.value.predictionEvaluationReport) { proviteData.value.predictionEvaluationReport = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -499,6 +529,7 @@ const getFileNamePath = async (val: any, pathName: any) => { ) { proviteData.value.predictionEvaluationReviewOpinions = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -506,6 +537,7 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'substationMainWiringDiagram' && proviteData.value.substationMainWiringDiagram) { proviteData.value.substationMainWiringDiagram = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -513,6 +545,7 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'sensitiveDevices' && proviteData.value.sensitiveDevices) { proviteData.value.sensitiveDevices = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -520,6 +553,7 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'antiInterferenceReport' && proviteData.value.antiInterferenceReport) { proviteData.value.antiInterferenceReport = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -527,6 +561,7 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'powerQualityReport' && proviteData.value.powerQualityReport) { proviteData.value.powerQualityReport = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -534,6 +569,7 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'additionalAttachments' && proviteData.value.additionalAttachments) { proviteData.value.additionalAttachments = { name: res.data.fileName, + key: val, url: res.data.url } } @@ -542,11 +578,13 @@ const getFileNamePath = async (val: any, pathName: any) => { else if (pathName == 'otherReport' && proviteData.value.otherReport) { proviteData.value.otherReport = { name: res.data.fileName, + key: val, url: res.data.url } } else if (pathName == 'netInReport') { netInReportList.value.push({ name: res.data.fileName, + key: val, url: res.data.url }) } diff --git a/src/views/pqs/supervise/interfere/components/undocumented/audit.vue b/src/views/pqs/supervise/interfere/components/undocumented/audit.vue index 6758a9b2..dd30d1cf 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/audit.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/audit.vue @@ -1,5 +1,4 @@