From a43dd0f62fef117596d034e2cc175dd070a87779 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Wed, 3 Apr 2024 16:24:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=94=B5=E8=83=BD?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/form/datePicker/index.vue | 3 +- src/styles/element.scss | 5 + .../components/photovoltaic.vue | 26 ++-- .../electricalEnergy/components/NewlyAdd.vue | 4 +- .../electricalEnergy/components/detail.vue | 23 ++-- .../electricalEnergy/components/filling.vue | 111 ++++++++++-------- .../components/maintenance.vue | 56 +++------ .../electricalEnergy/components/process1.vue | 8 +- .../electricalEnergy/components/process2.vue | 91 +++++++++++++- .../electricalEnergy/components/process3.vue | 95 ++++++++++++++- .../electricalEnergy/components/process4.vue | 82 ++++++++++++- 11 files changed, 383 insertions(+), 121 deletions(-) diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue index 45c825bf..40b6baea 100644 --- a/src/components/form/datePicker/index.vue +++ b/src/components/form/datePicker/index.vue @@ -395,7 +395,8 @@ const setTime = (flag = 0, e = 0) => { let dd = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'dd') let data = '' - if (dd < 4 || dd == 0) { + + if ((dd < 4 || dd == 0) && interval.value != 4) { data = window.XEUtils.toDateString(new Date().getTime() - (e + dd) * 3600 * 1000 * 24, 'yyyy-MM-dd') } else { data = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'yyyy-MM-dd') diff --git a/src/styles/element.scss b/src/styles/element.scss index 4af37630..4d64d44f 100644 --- a/src/styles/element.scss +++ b/src/styles/element.scss @@ -180,3 +180,8 @@ .el-step__title { cursor: pointer; } + +.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner { + background-color: var(--el-checkbox-checked-bg-color); + opacity: 0.6; +} diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue index 3ed9219a..fd68e6a3 100644 --- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue +++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue @@ -66,7 +66,10 @@ - + + + + @@ -504,22 +507,21 @@ const choose = (e: any) => { }) } const handleNodeClick = (data: any, node: any) => { - lineList.value = {} - dotList.value = data + if (flag.value) { + lineList.value = {} + dotList.value = data - if (data.level == 6) { - getLineDetailData({ id: data.id }).then((res: any) => { - lineList.value = res.data - }) + if (data.level == 6) { + getLineDetailData({ id: data.id }).then((res: any) => { + lineList.value = res.data + }) + } } - // if (flag.value) { - // onSubmit() - // flag.value = false - // } - if (props.rowList.userId != undefined) { + if (props.rowList.userId != undefined && flag.value) { TreeRef.value.setKey(props.rowList.lineId) onSubmit() + flag.value = false } } diff --git a/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue b/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue index 8d7da250..f06a982e 100644 --- a/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue +++ b/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue @@ -311,7 +311,7 @@ const xTableRef = ref() const addData = ref({ orgName: '', problemSources: '', - problemName: dictData.state.area[0].name, + problemName: '', orgNo: dictData.state.area[0].id }) const ordinaryA = ref({ @@ -454,7 +454,7 @@ const formatter = (row: any) => { } // 运维异常问题新增 const generateAbnormal = () => { - operationAddRef.value.validate(valid => { + operationAddRef.value.validate((valid: any) => { if (valid) { addAbnormalIssues({ ...operationAdddata.value, diff --git a/src/views/pqs/supervise/electricalEnergy/components/detail.vue b/src/views/pqs/supervise/electricalEnergy/components/detail.vue index 45ac1c4f..7164bd84 100644 --- a/src/views/pqs/supervise/electricalEnergy/components/detail.vue +++ b/src/views/pqs/supervise/electricalEnergy/components/detail.vue @@ -1,11 +1,11 @@ diff --git a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue index 2f24bc53..f6a59d83 100644 --- a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue +++ b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue @@ -48,9 +48,12 @@ - + - + + + + @@ -69,6 +72,7 @@ const dictData = useDictData() const FillingRef = ref() const showNewlyAdded = ref(false) +const dialogVisible = ref(false) const TableHeaderRef = ref() const detailRef = ref() const problemData = dictData.getBasicData('Problem_Sources') @@ -133,13 +137,19 @@ const tableStore: any = new TableStore({ name: 'edit', title: '填报', disabled: row => { - return row.reportProcessStatus == 'Auditt' + return ( + row.reportProcessStatus == 'Auditt' || + (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') + ) }, type: 'primary', icon: 'el-icon-Plus', render: 'basicButton', click: row => { - filling(row) + dialogVisible.value = true + setTimeout(() => { + FillingRef.value.open(row) + }, 10) } }, { @@ -191,41 +201,13 @@ const add = () => { showNewlyAdded.value = true } -// 填报 -const filling = (row: any) => { - FillingRef.value.open(row) - if (row.reportProcess == 'Not_Reported') { - // 原因分析 - // this.showCauseAnalysisJP = true - // setTimeout(() => { - // this.$refs.CauseAnalysisJP.causeAnalysis = true - // }, 0) - } else if (row.reportProcess == 'Cause_Analysis' && row.reportProcessStatus == 'Success') { - // 计划整改措施 - // this.showPlannedRectification = true - // setTimeout(() => { - // this.$refs.PlannedRectification.rectificationMeasures = true - // }, 0) - } else if (row.reportProcess == 'Plan_Measures' && row.reportProcessStatus == 'Success') { - // 实际采取措施 - // this.showActualMeasures = true - // setTimeout(() => { - // this.$refs.ActualMeasures.rectificationMeasures = true - // }, 0) - } else if (row.reportProcess == 'Actual_Measures' && row.reportProcessStatus == 'Success') { - // 成效分析 - // this.showEffectiveness = true - // setTimeout(() => { - // this.$refs.Effectiveness.effectivenessAnalysis = true - // }, 0) - } else if (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') { - ElMessage.warning('填报已结束,无需填报!') - } else { - ElMessage.warning('审核未通过,不能进行填报!') - } -} // 关闭弹框 const handleClose = () => { showNewlyAdded.value = false } +// 关闭 填报 +const beforeClose = () => { + dialogVisible.value = false + tableStore.index() +} diff --git a/src/views/pqs/supervise/electricalEnergy/components/process1.vue b/src/views/pqs/supervise/electricalEnergy/components/process1.vue index 6e962153..866f305a 100644 --- a/src/views/pqs/supervise/electricalEnergy/components/process1.vue +++ b/src/views/pqs/supervise/electricalEnergy/components/process1.vue @@ -1,5 +1,5 @@