From 938f00d207cd36a6da1ed3f56e2bde9eef6b748d Mon Sep 17 00:00:00 2001 From: 2153917462 <2153917462@qq.com> Date: Fri, 25 Apr 2025 11:15:11 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/compilation/handbook/index.vue | 51 +++++++++++++++++------- src/views/evalute/supervision/index.vue | 9 ++++- src/views/manage-add/index.vue | 2 +- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/views/compilation/handbook/index.vue b/src/views/compilation/handbook/index.vue index 9936c9f..5a2a1ca 100644 --- a/src/views/compilation/handbook/index.vue +++ b/src/views/compilation/handbook/index.vue @@ -581,12 +581,6 @@ export default { }; }, nextStep() { - if (this.activeStep === 1) { - if (!this.coverForm.title) { - this.$message.warning("请输入手册名称"); - return; - } - } this.activeStep++; }, prevStep() { @@ -686,14 +680,17 @@ export default { this.$message.warning("请至少选择一个项目"); return; } - const data = { - coverImg: this.coverForm.imageUrl, - name: this.coverForm.title, - subtitle: this.coverForm.subtitle, - tailingImg: this.endForm.imageUrl, - tail: this.endForm.subtitle, - xmId: this.selectedProjects.map((project) => project.id).join(","), - }; + const data = {}; + + if (this.coverForm.imageUrl) data.coverImg = this.coverForm.imageUrl; + if (this.coverForm.title) data.name = this.coverForm.title; + if (this.coverForm.subtitle) data.subtitle = this.coverForm.subtitle; + if (this.endForm.imageUrl) data.tailingImg = this.endForm.imageUrl; + if (this.endForm.subtitle) data.tail = this.endForm.subtitle; + if (this.selectedProjects && this.selectedProjects.length > 0) { + data.xmId = this.selectedProjects.map((project) => project.id).join(","); + } + if (this.editingHandbook) { data.id = this.editingHandbook.id; updateHandbook(data) @@ -1179,6 +1176,9 @@ export default { border: 1px solid #1890ff; padding: 15px 15px 10px 15px; border-radius: 4px; + max-height: 300px; + display: flex; + flex-direction: column; } .selected-header { @@ -1192,6 +1192,29 @@ export default { display: flex; flex-direction: column; gap: 12px; + max-height: 200px; + overflow-y: auto; + padding-right: 10px; + flex: 1; + + /* 自定义滚动条样式 */ + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-track { + background: #f1f1f1; + border-radius: 4px; + } + + &::-webkit-scrollbar-thumb { + background: #c0c4cc; + border-radius: 4px; + } + + &::-webkit-scrollbar-thumb:hover { + background: #909399; + } } .selected-item { diff --git a/src/views/evalute/supervision/index.vue b/src/views/evalute/supervision/index.vue index 2fb33a6..af5191c 100644 --- a/src/views/evalute/supervision/index.vue +++ b/src/views/evalute/supervision/index.vue @@ -113,7 +113,7 @@ type="text" @click="handleEdit(scope.row)" style="color: #67c23a" - >修改编辑 import("@/components/Pagination"), }, + props: { + projectId: { + type: String, + default: "", + }, + }, data() { return { searchForm: { @@ -504,6 +510,7 @@ export default { alertTime: this.ruleForm.alertTime, alertContent: this.ruleForm.alertContent, alertType: 1, + projectId: this.xmId, }; addSmartReminder(param).then((res) => { if (res.code === 200) { diff --git a/src/views/manage-add/index.vue b/src/views/manage-add/index.vue index 7359f50..f8bfd33 100644 --- a/src/views/manage-add/index.vue +++ b/src/views/manage-add/index.vue @@ -94,7 +94,7 @@
- +