diff --git a/src/api/supervision-boot/interfere/index.ts b/src/api/supervision-boot/interfere/index.ts index c7f1144c..916c1fd1 100644 --- a/src/api/supervision-boot/interfere/index.ts +++ b/src/api/supervision-boot/interfere/index.ts @@ -23,7 +23,6 @@ export const submitGoNet = (data: any) => { }) } - export const userReportGoNetById = (data: any) => { return createAxios({ url: '/supervision-boot/userReportNormal/userReportGoNetById', @@ -31,4 +30,11 @@ export const userReportGoNetById = (data: any) => { params: data }) } - +// 根据id获取用户档案录入的详细数据 +export const getById = (data: any) => { + return createAxios({ + url: '/supervision-boot/userReport/getById', + method: 'get', + params: data + }) +} diff --git a/src/styles/app.scss b/src/styles/app.scss index 40f294b4..c346638e 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -109,14 +109,14 @@ body, } //修改上传文件filelist位置 .uploadFile { - .el-form-item__content { + .el-form-item__content { line-height: 20px !important; div { display: flex !important; align-items: center !important; } .el-upload-list__item-name { - width: 120px !important; + width: 150px !important; } .el-upload-list--text { margin: 0px 20px 0 !important; @@ -384,7 +384,7 @@ body, background: #fff; z-index: 2; } -.bjs-powered-by{ +.bjs-powered-by { display: none; } diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue index 475e219b..8631a86e 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue @@ -124,7 +124,7 @@ const tableStore = new TableStore({ 3: 'info' }, replaceValue: { - 0: '禁用', + 0: '中断', 1: '正常', 3: '/' } diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue index 3585043a..e7f52129 100644 --- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue +++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue @@ -124,7 +124,7 @@ const tableStore = new TableStore({ 3: 'info' }, replaceValue: { - 0: '禁用', + 0: '中断', 1: '正常', 3: '/' } diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue index 73229a3b..679d061e 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue @@ -4,32 +4,143 @@
- - + + + + - - + + + + - - + + + + - - - + + + + + - - + + + + - - + + + +
-
+
+ + + +
@@ -40,7 +151,9 @@ import MyEChart from '@/components/echarts/MyEchart.vue' import { defaultAttribute } from '@/components/table/defaultAttribute' import { getAssessDetail, getAssessTrend } from '@/api/device-boot/panorama' const dialogVisible: any = ref(false) - +const rowList: any = ref({}) +const time = ref('1') +const loading = ref(false) const tableData: any = ref([]) const picEChart = ref() @@ -48,7 +161,14 @@ const open = async (row: any) => { getAssessDetail(row).then(res => { tableData.value = res.data }) - getAssessTrend(row).then(res => { + rowList.value = row + analysis(1) + dialogVisible.value = true +} +const analysis = (e: any) => { + loading.value = true + let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01` + getAssessTrend({ ...rowList.value, searchBeginTime: time, type: e }).then(res => { picEChart.value = { title: { text: '各地市综合评估趋势对比' @@ -57,9 +177,11 @@ const open = async (row: any) => { name: '时间', data: res.data[0].children.map((item: any) => item.dataTime) }, + grid: { bottom: '10px' }, + yAxis: { name: '' }, @@ -85,16 +207,8 @@ const open = async (row: any) => { data: item }) }) + loading.value = false }) - - dialogVisible.value = true -} -const formatter = (row: any) => { - if (row.cellValue == 3.14159) { - return '/' - } else { - return row.cellValue - } } defineExpose({ open }) @@ -103,4 +217,27 @@ defineExpose({ open }) :deep(.el-dialog__body) { max-height: none !important; } +.conclusion { + display: inline-block; + padding: 0 10px; + height: 24px; + line-height: 24px; + + border-radius: 4px; +} +.background1 { + background-color: #339966; + color: #fff; +} +.background2 { + background-color: #97017e; + color: #fff; +} +.background3 { + background-color: #cc0000; + color: #fff; +} +:deep(.el-select) { + min-width: 80px !important; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue index 1bd746f5..803ed84b 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue @@ -96,21 +96,45 @@
综合评估得分: - - {{ dropList.assessData == 3.14159 ? '--' : dropList.assessData }} + + {{ dropList.assessData }}
- + - {{ item.targetName }} + {{ item.targetName }}
评估得分： - {{ item.avg == 3.14159 ? '--' : item.avg }} + + {{ item.avg }} +
@@ -207,7 +231,7 @@ const open = async (id: string) => { // 完整性 getTotalIntegrityByLineIds(form).then((res: any) => { let num = (res.data || 0) / 100 - IntegrityNum.value = num + IntegrityNum.value = res.data ComCharts.value = { title: { text: '完整性', @@ -256,7 +280,7 @@ const open = async (id: string) => { label: { normal: { formatter: () => { - return num * 100 + '%' + return (num * 100).toFixed(2) + '%' }, textStyle: { fontSize: 20, @@ -328,7 +352,7 @@ const open = async (id: string) => { label: { normal: { formatter: () => { - return num * 100 + '%' + return (num * 100).toFixed(2) + '%' }, textStyle: { fontSize: 20, @@ -356,31 +380,31 @@ const open = async (id: string) => { startTime: datePickerRef.value.timeValue[0], endTime: datePickerRef.value.timeValue[1] }).then((res: any) => { - dropList.value.assessData = res.data.assessData + dropList.value.assessData = res.data.assessLevel evaluationData.value = [ { targetName: '频率偏差', - avg: res.data.freqAssessData, + avg: res.data.freqAssessLevel, sd: res.data.freqQualifyData }, { targetName: '电压偏差', - avg: res.data.vdevAssessData, + avg: res.data.vdevAssessLevel, sd: res.data.vdevQualifyData }, { targetName: '电压总谐波畸变率', - avg: res.data.harmAssessData, + avg: res.data.harmAssessLevel, sd: res.data.harmQualifyData }, { targetName: '三相电压不平衡度', - avg: res.data.unbalanceAssessData, + avg: res.data.unbalanceAssessLevel, sd: res.data.unbalanceQualifyData }, { targetName: '闪变', - avg: res.data.flickerAssessData, + avg: res.data.flickerAssessLevel, sd: res.data.flickerQualifyData } ] @@ -645,7 +669,7 @@ defineExpose({ open }) display: grid; grid-template-rows: repeat(5, auto); .row { - margin: 4px 2%; + margin: 4px 2% 0; width: 100%; box-shadow: 1px 1px 1px 1px #e8e3e3; } @@ -665,4 +689,23 @@ defineExpose({ open }) margin-left: 3px; } } +.conclusion { + display: inline-block; + padding: 0 5px; + height: 20px; + line-height: 20px; + border-radius: 4px; +} +.background1 { + background-color: #339966; + color: #fff; +} +.background2 { + background-color: #97017e; + color: #fff; +} +.background3 { + background-color: #cc0000; + color: #fff; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue index c144be38..bf851df8 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue @@ -329,6 +329,7 @@ const info = async (row: any) => { numOneList: [] }) }) + // 监测点告警 getGridDiagramAreaData(form).then((res: any) => { let numOne = 0 let numOneList: any = [] diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue index 88c9892e..7c94f552 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue @@ -52,7 +52,7 @@ : '' }" > - {{ assessList.score }} + {{ assessList.level }}
@@ -80,7 +80,7 @@ : '' }" > - {{ item.score == 3.14159 ? '/' : item.score }} + {{ item.level }}
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index 1c1ae198..897683b0 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -1,7 +1,7 @@ - + { reportDate: new Date(), //填报日期 1 orgId: '', //填报部门 1 expectedProductionDate: '', //工程预期投产日期 1 - userType: '0', //用户性质 1 + userType: 0, //用户性质 1 city: areaOptionList[0].name, //所属地市 1 responsibleDepartment: '', //归口管理部门 1 userStatus: userStateList[0].value, //用户状态 1 @@ -684,7 +691,7 @@ const subForm: any = ref({ responsibleDepartment: '', //归口管理部门 substation: '', ////变电站 userStatus: '0', //用户状态 - userType: '0', //用户性质 + userType: 0, //用户性质 voltageLevel: '', //userType=='0' '1' userReportProjectPO: { @@ -749,286 +756,46 @@ const subForm: any = ref({ //定义校验规则 const rules = ref({ - reporter: [ - { - required: true, - message: '请输入填报人', - trigger: 'blur' - } - ], - reportDate: [ - { - required: true, - message: '请选择填报日期', - trigger: 'change' - } - ], - orgId: [ - { - required: true, - message: '请选择填报部门', - trigger: 'change' - } - ], - expectedProductionDate: [ - { - required: true, - message: '请选择工程预期投产日期', - trigger: 'change' - } - ], - userType: [ - { - required: true, - message: '清选择用户性质', - trigger: 'change' - } - ], - city: [ - { - required: true, - message: '请选择所属地市', - trigger: 'change' - } - ], - responsibleDepartment: [ - { - required: true, - message: '请输入归口管理部门', - trigger: 'blur' - } - ], - userStatus: [ - { - required: true, - message: '请选择用户状态', - trigger: 'change' - } - ], - projectName: [ - { - required: true, - message: '请输入工程名称', - trigger: 'blur' - } - ], - substation: [ - { - required: true, - message: '请输入变电站', - trigger: 'blur' - } - ], - voltageLevel: [ - { - required: true, - message: '请选择电压等级', - trigger: 'change' - } - ], - evaluationDept: [ - { - required: true, - message: '请选择预测评估单位', - trigger: 'change' - } - ], - evaluationConclusion: [ - { - required: true, - message: '请输入预测评估结论', - trigger: 'blur' - } - ], - agreementCapacity: [ - { - required: true, - message: '请选择用户协议容量', - trigger: 'blur' - } - ], - nonlinearDeviceType: [ - { - required: true, - message: '请选择非线性设备类型', - trigger: 'change' - } - ], - needGovernance: [ - { - required: true, - message: '请选择是否需要治理', - trigger: 'change' - } - ], - backgroundTestPerformed: [ - { - required: true, - message: '请选择是否开展背景测试', - trigger: 'change' - } - ], - state: [ - { - required: true, - message: '请选择数据状态', - trigger: 'change' - } - ], - pccPoint: [ - { - required: true, - message: '请输入PCC点', - trigger: 'blur' - } - ], - industry: [ - { - required: true, - message: '请选择行业', - trigger: 'change' - } - ], - deviceName: [ - { - required: true, - message: '请输入敏感装置名称', - trigger: 'blur' - } - ], - powerSupplyCount: [ - { - required: true, - message: '请输入供电电源数量', - trigger: 'blur' - } - ], - energyQualityIndex: [ - { - required: true, - message: '请输入敏感电能质量指标', - trigger: 'blur' - } - ], - evaluationType: [ - { - required: true, - message: '请选择评估类型', - trigger: 'change' - } - ], - antiInterferenceTest: [ - { - required: true, - message: '请选择是否开展抗扰度测试', - trigger: 'change' - } - ], - evaluationChekDept: [ - { - required: true, - message: '请输入预测评估审单位', - trigger: 'blur' - } - ], - baseShortCircuitCapacity: [ - { - required: true, - message: '请输入基准短路容量', - trigger: 'blur' - } - ], - minShortCircuitCapacity: [ - { - required: true, - message: '请输入系统最小短路容量', - trigger: 'blur' - } - ], - pccEquipmentCapacity: [ - { - required: true, - message: '请输入PCC供电设备容量', - trigger: 'blur' - } - ], - userAgreementCapacity: [ - { - required: true, - message: '请输入用户用电协议容量', - trigger: 'blur' - } - ], - nonlinearLoadType: [ - { - required: true, - message: '请输入非线性负荷类型', - trigger: 'blur' - } - ], - substationMainWiringDiagram: [ - { - required: true, - message: '请上传用户接入变电站主接线示意图', - trigger: 'change' - } - ], - sensitiveDevices: [ - { - required: true, - message: '请上传主要敏感设备清单', - trigger: 'change' - } - ], - antiInterferenceReport: [ - { - required: true, - message: '请上传抗扰度测试报告', - trigger: 'change' - } - ], - powerQualityReport: [ - { - required: true, - message: '请上传背景电能质量测试报告', - trigger: 'change' - } - ], - feasibilityReport: [ - { - required: true, - message: '请上传可研报告', - trigger: 'blur' - } - ], - preliminaryDesignDescription: [ - { - required: true, - message: '请上传项目初步设计说明书', - trigger: 'blur' - } - ], - predictionEvaluationReport: [ - { - required: true, - message: '请上传预测评估报告', - trigger: 'blur' - } - ], - predictionEvaluationReviewOpinions: [ - { - required: true, - message: '请上传预测评估评审意见报告', - trigger: 'blur' - } - ], - additionalAttachments: [ - { - required: false, - message: '请上传其他附件', - trigger: 'blur' - } - ] + reporter: [{ required: true, message: '请输入填报人', trigger: 'blur' }], + reportDate: [{ required: true, message: '请选择填报日期', trigger: 'change' }], + orgId: [{ required: true, message: '请选择填报部门', trigger: 'change' }], + expectedProductionDate: [{ required: true, message: '请选择工程预期投产日期', trigger: 'change' }], + userType: [{ required: true, message: '清选择用户性质', trigger: 'change' }], + city: [{ required: true, message: '请选择所属地市', trigger: 'change' }], + responsibleDepartment: [{ required: true, message: '请输入归口管理部门', trigger: 'blur' }], + userStatus: [{ required: true, message: '请选择用户状态', trigger: 'change' }], + projectName: [{ required: true, message: '请输入工程名称', trigger: 'blur' }], + substation: [{ required: true, message: '请输入变电站', trigger: 'blur' }], + voltageLevel: [{ required: true, message: '请选择电压等级', trigger: 'change' }], + evaluationDept: [{ required: true, message: '请选择预测评估单位', trigger: 'change' }], + evaluationConclusion: [{ required: true, message: '请输入预测评估结论', trigger: 'blur' }], + agreementCapacity: [{ required: true, message: '请选择用户协议容量', trigger: 'blur' }], + nonlinearDeviceType: [{ required: true, message: '请选择非线性设备类型', trigger: 'change' }], + needGovernance: [{ required: true, message: '请选择是否需要治理', trigger: 'change' }], + backgroundTestPerformed: [{ required: true, message: '请选择是否开展背景测试', trigger: 'change' }], + state: [{ required: true, message: '请选择数据状态', trigger: 'change' }], + pccPoint: [{ required: true, message: '请输入PCC点', trigger: 'blur' }], + industry: [{ required: true, message: '请选择行业', trigger: 'change' }], + deviceName: [{ required: true, message: '请输入敏感装置名称', trigger: 'blur' }], + powerSupplyCount: [{ required: true, message: '请输入供电电源数量', trigger: 'blur' }], + energyQualityIndex: [{ required: true, message: '请输入敏感电能质量指标', trigger: 'blur' }], + evaluationType: [{ required: true, message: '请选择评估类型', trigger: 'change' }], + antiInterferenceTest: [{ required: true, message: '请选择是否开展抗扰度测试', trigger: 'change' }], + evaluationChekDept: [{ required: true, message: '请输入预测评估审单位', trigger: 'blur' }], + baseShortCircuitCapacity: [{ required: true, message: '请输入基准短路容量', trigger: 'blur' }], + minShortCircuitCapacity: [{ required: true, message: '请输入系统最小短路容量', trigger: 'blur' }], + pccEquipmentCapacity: [{ required: true, message: '请输入PCC供电设备容量', trigger: 'blur' }], + userAgreementCapacity: [{ required: true, message: '请输入用户用电协议容量', trigger: 'blur' }], + nonlinearLoadType: [{ required: true, message: '请输入非线性负荷类型', trigger: 'blur' }], + substationMainWiringDiagram: [{ required: true, message: '请上传用户接入变电站主接线示意图', trigger: 'change' }], + sensitiveDevices: [{ required: true, message: '请上传主要敏感设备清单', trigger: 'change' }], + antiInterferenceReport: [{ required: true, message: '请上传抗扰度测试报告', trigger: 'change' }], + powerQualityReport: [{ required: true, message: '请上传背景电能质量测试报告', trigger: 'change' }], + feasibilityReport: [{ required: true, message: '请上传可研报告', trigger: 'blur' }], + preliminaryDesignDescription: [{ required: true, message: '请上传项目初步设计说明书', trigger: 'blur' }], + predictionEvaluationReport: [{ required: true, message: '请上传预测评估报告', trigger: 'blur' }], + predictionEvaluationReviewOpinions: [{ required: true, message: '请上传预测评估评审意见报告', trigger: 'blur' }], + additionalAttachments: [{ required: false, message: '请上传其他附件', trigger: 'blur' }] }) watch( () => form.value, @@ -1137,8 +904,63 @@ watch( deep: true } ) -const open = () => { +const open = async (row: any) => { + title.value = row.title dialogFormVisible.value = true + + if (row.row) { + await getById({ id: row.row.id }).then(res => { + // form.value.userType = res.data.userType + + if (res.data.userReportProjectPO != null) { + // userType 0 1 + form.value = { ...res.data, ...res.data.userReportProjectPO } + fileRaw(res.data, 'userReportProjectPO') + } else if (res.data.userReportSubstationPO != null) { + // userType 2 3 4 5 + form.value = { ...res.data, ...res.data.userReportSubstationPO } + fileRaw(res.data, 'userReportSubstationPO') + } else if (res.data.userReportSensitivePO != null) { + // userType6 + form.value = { ...res.data, ...res.data.userReportSensitivePO } + fileRaw(res.data, 'userReportSensitivePO') + } + form.value.orgId = adminInfo.$state.deptName + }) + } +} +// 处理上传文件回显 +const fileRaw = (row: any, key: string) => { + let list = [ + 'feasibilityReport', + 'preliminaryDesignDescription', + 'predictionEvaluationReport', + 'predictionEvaluationReviewOpinions', + 'additionalAttachments', + 'substationMainWiringDiagram', + 'sensitiveDevices', + 'antiInterferenceReport', + 'powerQualityReport' + ] + for (let k of list) { + if (row[key][k]) { + form.value[k] = [ + { + name: row[key][k].split('/')[2] + } + ] + } + } + + feasibilityReport.value = row[key].feasibilityReport + preliminaryDesignDescription.value = row[key].preliminaryDesignDescription + predictionEvaluationReport.value = row[key].predictionEvaluationReport + predictionEvaluationReviewOpinions.value = row[key].predictionEvaluationReviewOpinions + additionalAttachments.value = row[key].additionalAttachments + substationMainWiringDiagram.value = row[key].substationMainWiringDiagram + sensitiveDevices.value = row[key].sensitiveDevices + antiInterferenceReport.value = row[key].antiInterferenceReport + powerQualityReport.value = row.powerQualityReport } const close = () => { //重置表单内容 @@ -1167,7 +989,7 @@ const uploadFileName = val => { uploadName.value = val } //移除文件上传 -const removeFile = (file: any,uploadFiles:any) => { +const removeFile = (file: any, uploadFiles: any) => { console.log(file, uploadFiles) } // 可研报告数组 @@ -1189,6 +1011,7 @@ const antiInterferenceReport = ref('') //背景电能质量测试报告： const powerQualityReport = ref('') const choose = (e: any) => { + // console.log('🚀 ~ choose ~ e:', e) uploadFile(e.raw, '/supervision/').then(res => { //可研报告 if (uploadName.value == 'feasibilityReport') { @@ -1235,7 +1058,7 @@ const disabledDate = time => { } //提交 const confirmForm = () => { - ruleFormRef.value.validate(valid => { + ruleFormRef.value.validate((valid: any) => { if (valid) { //整理上传文件的数据 // userType==0,1 @@ -1395,17 +1218,21 @@ const confirmForm = () => { } } } - submitFormData(confirmFormData).then(res => { - if (res.code == 'A0000') { - ElMessage({ - message: '新增成功', - type: 'success' - }) - ruleFormRef.value.resetFields() - resetForm() - close() - } - }) + if (title.value == '用户档案录入') { + submitFormData(confirmFormData).then(res => { + if (res.code == 'A0000') { + ElMessage({ + message: '新增成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + } + }) + } else { + console.log(confirmFormData) + } } else { console.log('表单验证失败') return false diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index a02a09a4..0adfd57e 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue @@ -122,7 +122,35 @@ const tableStore = new TableStore({ click: row => { handleAudit(row.processInstanceId) } - } + }, + // { + // name: 'edit', + // title: '重新发起', + // type: 'warning', + // icon: 'el-icon-Open', + // render: 'basicButton', + // disabled: row => { + // return row.status == 1 || row.status == 2 + // }, + // click: row => { + // addForms.value.open({ + // title: '重新发起', + // row: row + // }) + // } + // }, + // { + // name: 'cancel', + // title: '取消', + // type: 'danger', + // icon: 'el-icon-Open', + // render: 'basicButton', + // disabled: row => { + // return row.status == 3 || row.status == 2 || row.status == 4 + // }, + // click: row => { + // } + // } ] } ], @@ -132,8 +160,8 @@ const tableStore = new TableStore({ tableStore.table.params.relationUserName = tableStore.table.params.userName } }) -tableStore.table.params.city='' -tableStore.table.params.projectName='' +tableStore.table.params.city = '' +tableStore.table.params.projectName = '' tableStore.table.params.loadType = '' tableStore.table.params.userName = '' tableStore.table.params.fileUploadflag = '' @@ -146,11 +174,12 @@ const addList = () => { const addForms = ref() const addFormModel = () => { - show.value=true + show.value = true setTimeout(() => { - addForms.value.open() - }, 0); - + addForms.value.open({ + title: '用户档案录入' + }) + }, 0) } // 导出 diff --git a/src/views/pqs/supervise/plan/components/addForm.vue b/src/views/pqs/supervise/plan/components/addForm.vue index 73bfa8f8..081a688f 100644 --- a/src/views/pqs/supervise/plan/components/addForm.vue +++ b/src/views/pqs/supervise/plan/components/addForm.vue @@ -1,7 +1,7 @@