From 3d6addd2c0817b30bd328605cb048ca9698742a6 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 28 二月 2025 16:50:17 +0800 Subject: [PATCH] 修复新建子任务时,未提前建立日任务的bug --- src/views/fysp/check/components/CompProblemCard.vue | 137 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 104 insertions(+), 33 deletions(-) diff --git a/src/views/fysp/check/components/CompProblemCard.vue b/src/views/fysp/check/components/CompProblemCard.vue index 13e41cc..afbeb8c 100644 --- a/src/views/fysp/check/components/CompProblemCard.vue +++ b/src/views/fysp/check/components/CompProblemCard.vue @@ -1,13 +1,17 @@ <template> - <el-card class="layout" shadow="hover"> - <el-steps - :active="proStatus.index" - finish-status="success" - style="" - align-center - > - <el-step v-for="(s, i) in getSteps" :key="i" :title="s" /> - </el-steps> + <el-card class="layout" shadow="never"> + <!-- <el-row justify="space-between"> --> + <div > + <el-steps + :active="proStatus.index" + finish-status="success" + style="" + align-center + > + <el-step v-for="(s, i) in getSteps" :key="i" :title="s" /> + </el-steps> + </div> + <!-- </el-row> --> <el-descriptions :column="3" size="small"> <template #title> @@ -34,7 +38,7 @@ > </el-descriptions> - <el-scrollbar> + <el-scrollbar style="width: 70%;"> <el-descriptions title=" " :column="2" @@ -85,15 +89,22 @@ </el-col> <el-col :span="12"> <el-row justify="end" class="btn-group"> - <el-button + <el-button type="danger" size="small" @click="deletePro" :disabled="true" + >鍒犻櫎</el-button + > + <!-- <el-button type="danger" size="small" @click="deletePro" :disabled="!proStatus.deletable" >鍒犻櫎</el-button - > + > --> + <!-- 瀹℃牳椹冲洖鎿嶄綔 --> <el-button - v-if="proStatus.name.indexOf('涓嶉�氳繃') != -1" + v-if=" + this.problem.extension3 == 'fail' || + this.problem.extension3 == 'change_fail' + " type="danger" size="small" @click="revokePro" @@ -106,12 +117,12 @@ size="small" @click="rejectPro" :disabled="!proStatus.checkable" - >椹冲洖</el-button + >瀹℃牳椹冲洖</el-button > <el-button v-if=" - proStatus.name.indexOf('涓嶉�氳繃') == -1 && - proStatus.name.indexOf('閫氳繃') != -1 + this.problem.extension3 == 'pass' || + this.problem.extension3 == 'change_pass' " type="danger" size="small" @@ -125,7 +136,7 @@ size="small" @click="passPro" :disabled="!proStatus.checkable" - >閫氳繃</el-button + >瀹℃牳閫氳繃</el-button > </el-row> </el-col> @@ -175,7 +186,7 @@ import CompProRecent from './CompProRecent.vue'; import { useCloned } from '@vueuse/core'; export default { - emits: ['submmit', 'cancel'], + emits: ['check', 'submit', 'cancel'], components: { CompProblemAddOrUpd, ComChangeEdit, @@ -233,11 +244,11 @@ }, { bef: '闂寰呮暣鏀�', - aft: '闂宸叉暣鏀�' + aft: '鏁存敼宸蹭笂浼�' }, { bef: '鏁存敼寰呭鏍�', - aft: '鏁存敼宸插鏍�' + aft: '闂宸叉暣鏀�' } ] }; @@ -290,8 +301,7 @@ this.$emit('submit', isOk); this.proAddOrUpdDialogVisible = false; }, - onChangeCanceled() { - }, + onChangeCanceled() {}, onChangeSubmited(isOk) { this.$emit('submit', isOk); this.changeDialogVisible = false; @@ -339,7 +349,8 @@ .checkProblem({ pId: pro.guid, action: action }) .then((res) => { if (res.success) { - this.$emit('submit', false); + pro.extension3 = status; + this.$emit('check'); } }); } @@ -360,7 +371,8 @@ .checkProblem({ pId: pro.guid, action: action }) .then((res) => { if (res.success) { - this.$emit('submit', false); + pro.extension3 = status; + this.$emit('check'); } }); } @@ -402,15 +414,16 @@ <style scoped> .layout { background-color: transparent; - margin-top: 20px; + margin-bottom: 20px; /* border: none; */ - border-color: rgba(0, 0, 0, 0.308); + /* border-color: rgba(0, 0, 0, 0.308); */ } .image { - width: 200px; - height: 210px; + width: 240px; + height: 250px; border-radius: 4px; + margin-bottom: 6px; } .d-index { @@ -434,13 +447,71 @@ .d-extra { } -.descriptions-label-1 { - color: whitesmoke; - background: var(--el-color-danger-light-3); +:deep(.descriptions-label-1) { + /* color: whitesmoke; */ + /* background: var(--el-color-danger-light-3); */ } .descriptions-label-2 { - color: whitesmoke; - background-color: var(--el-color-success-light-3); + /* color: whitesmoke; */ + /* background-color: var(--el-color-success-light-3); */ +} +</style> + +<!-- 姝ラ鏉¤嚜瀹氫箟鏍峰紡 --> +<style scoped> +:deep(.el-steps--simple){ + background: #fffbf731; +} + +:deep(.is-wait .el-step__icon){ + height: 17px; + width: 17px; + margin-top: 3px; +} + +:deep(.is-wait .is-text .el-step__icon-inner) { + font-size: var(--el-font-size-small); +} + +:deep(.is-success .el-step__icon){ + height: 17px; + width: 17px; + margin-top: 3px; +} + +:deep(.is-success .is-text .el-step__icon-inner) { + font-size: var(--el-font-size-small); +} + +:deep(.el-step__head.is-process) { + border-color: var(--el-color-danger); + color: var(--el-color-danger) +} + +:deep(.el-step__head.is-wait) { + border-color: var(--el-text-color-placeholder); + color: var(--el-text-color-placeholder) +} + +:deep(.el-step__head.is-success) { + border-color: var(--el-color-success-light-3); + color: var(--el-color-success-light-3) +} + +:deep(.el-step__title.is-process) { + color: var(--el-color-danger); + font-weight: bolder; + font-size: var(--el-font-size-large); +} + +:deep(.el-step__title.is-wait) { + color: var(--el-text-color-placeholder); + font-size: var(--el-font-size-small); +} + +:deep(.el-step__title.is-success) { + color: var(--el-color-success-light-3); + font-size: var(--el-font-size-small); } </style> -- Gitblit v1.9.3