From 0af507deb2a8b08a606b795d73c660d02ecb7f49 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 06 六月 2024 17:11:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/PopUp/gap-filling.vue | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/components/PopUp/gap-filling.vue b/src/components/PopUp/gap-filling.vue index 4deb149..24d349d 100644 --- a/src/components/PopUp/gap-filling.vue +++ b/src/components/PopUp/gap-filling.vue @@ -12,18 +12,17 @@ <el-form-item label="濉┖绛旀锛�" required> <el-form-item :label="item.prefix" :key="item.prefix" v-for="item in form.items" label-width="50px" class="question-item-label"> - <el-input v-model="item.content" @focus="inputClick(item, 'content')" class="question-item-content-input" - style="width: 50%" /> - <span class="question-item-span">鍒嗘暟锛�</span><el-input-number v-model="item.score" :precision="1" :step="1" - :max="100"></el-input-number> + <el-input v-model="item.content" @focus="inputClick(item, 'content')" class="question-item-content-input" /> + <!-- <span v-if="false" class="question-item-span">鍒嗘暟锛�</span><el-input-number v-model="item.score" :precision="1" :step="1" + :max="100"></el-input-number> --> </el-form-item> </el-form-item> <el-form-item label="瑙f瀽锛�" prop="analyze" required> <el-input v-model="form.analyze" @focus="inputClick(form, 'analyze')" /> </el-form-item> - <el-form-item label="鍒嗘暟锛�" prop="score" required> + <!-- <el-form-item label="鍒嗘暟锛�" prop="score" required> <el-input-number v-model="form.score" :precision="1" :step="1" :max="100"></el-input-number> - </el-form-item> + </el-form-item> --> <el-form-item label="闅惧害锛�" required> <el-rate v-model="form.difficult" class="question-item-rate"></el-rate> </el-form-item> @@ -105,17 +104,23 @@ }, } }, + props: { + id: { + type: Number, + default: 0 + } + }, created() { - let id = this.$route.query.id + this.getSubjects(); + let id = this.id let _this = this if (id && parseInt(id) !== 0) { _this.formLoading = true questionApi.select(id).then(re => { - _this.form = re.response + _this.form = re.data _this.formLoading = false }) } - this.getSubjects(); }, methods: { // 鑾峰彇绉戠洰 @@ -186,9 +191,7 @@ questionApi.edit(this.form).then(re => { if (re.code === 1) { _this.$message.success(re.message) - _this.delCurrentView(_this).then(() => { - _this.$router.push('/exam/question/list') - }) + this.$emit('callback') } else { _this.$message.error(re.message) this.formLoading = false -- Gitblit v1.8.0