Commit a1adf9e81ccad600889ef18dd0f14d53c7bed7f1
1 parent
03105460
wip: bug修复
Showing
2 changed files
with
27 additions
and
14 deletions
src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
src/views/basic/askTestQuestion/wrongQuestion.vue
@@ -256,9 +256,10 @@ | @@ -256,9 +256,10 @@ | ||
256 | </template> | 256 | </template> |
257 | 257 | ||
258 | <script> | 258 | <script> |
259 | -import { setDateRules } from "@/utils"; | 259 | +import { setDateRules, getKnowledge } from "@/utils"; |
260 | import wrongQuestionDialog from "./components/wrongQuestionDialog.vue"; | 260 | import wrongQuestionDialog from "./components/wrongQuestionDialog.vue"; |
261 | import analysisDialog from "./components/analysisDialog.vue"; | 261 | import analysisDialog from "./components/analysisDialog.vue"; |
262 | + | ||
262 | export default { | 263 | export default { |
263 | components: { | 264 | components: { |
264 | wrongQuestionDialog, | 265 | wrongQuestionDialog, |
@@ -373,12 +374,16 @@ export default { | @@ -373,12 +374,16 @@ export default { | ||
373 | let param = { | 374 | let param = { |
374 | ...this.listPage, | 375 | ...this.listPage, |
375 | ...this.formData, | 376 | ...this.formData, |
377 | + startScoreRate: this.formData.startScoreRate.toString(), | ||
378 | + endScoreRate: this.formData.endScoreRate.toString(), | ||
376 | startDate: this.formData.dateRange[0], | 379 | startDate: this.formData.dateRange[0], |
377 | endDate: this.formData.dateRange[1], | 380 | endDate: this.formData.dateRange[1], |
378 | }; | 381 | }; |
379 | let data = await this.$request.getWrongQuestionList(param); | 382 | let data = await this.$request.getWrongQuestionList(param); |
380 | this.queryLoading = false; | 383 | this.queryLoading = false; |
381 | - this.topicList = data.data.records; | 384 | + this.topicList = data.data.records.map((item) => { |
385 | + return { ...item, knowledge: getKnowledge(item.knowledge) }; | ||
386 | + }); | ||
382 | this.listPage.total = data.data.total; | 387 | this.listPage.total = data.data.total; |
383 | // this.topicList = await this.loadAndModifyHTML(data.data.records); | 388 | // this.topicList = await this.loadAndModifyHTML(data.data.records); |
384 | }, | 389 | }, |
@@ -420,6 +425,9 @@ export default { | @@ -420,6 +425,9 @@ export default { | ||
420 | if (value > this.formData.endScoreRate) { | 425 | if (value > this.formData.endScoreRate) { |
421 | this.formData.startScoreRate = this.formData.endScoreRate; | 426 | this.formData.startScoreRate = this.formData.endScoreRate; |
422 | } | 427 | } |
428 | + if (!value) { | ||
429 | + this.formData.startScoreRate = 0; | ||
430 | + } | ||
423 | }, | 431 | }, |
424 | // 输入不超过100 | 432 | // 输入不超过100 |
425 | endValidateInput(value) { | 433 | endValidateInput(value) { |
@@ -432,6 +440,9 @@ export default { | @@ -432,6 +440,9 @@ export default { | ||
432 | if (value < this.formData.startScoreRate) { | 440 | if (value < this.formData.startScoreRate) { |
433 | this.formData.endScoreRate = this.formData.startScoreRate; | 441 | this.formData.endScoreRate = this.formData.startScoreRate; |
434 | } | 442 | } |
443 | + if (!value) { | ||
444 | + this.formData.endScoreRate = 0; | ||
445 | + } | ||
435 | }, | 446 | }, |
436 | 447 | ||
437 | // 搜索按钮 | 448 | // 搜索按钮 |
@@ -596,18 +607,18 @@ export default { | @@ -596,18 +607,18 @@ export default { | ||
596 | // 获取ref | 607 | // 获取ref |
597 | onIFrameLoad(index) { | 608 | onIFrameLoad(index) { |
598 | const iframeRef = this.$refs["iframe" + index][0]; // 获取对应的 iframe | 609 | const iframeRef = this.$refs["iframe" + index][0]; // 获取对应的 iframe |
599 | - // const doc = iframeRef.contentDocument || iframeRef.contentWindow.document; | ||
600 | - // const body = iframeRef.contentWindow.document.body; | ||
601 | - // body.style.overflowX = "hidden"; // 不允许出现横向滚动条 | ||
602 | - // const height = body.scrollHeight; // 获取内容的高度 | ||
603 | - // iframeRef.style.height = `${height}px`; // 设置 iframe 的高度 | ||
604 | - // // 获取第一个P标签 | ||
605 | - // const firstP = doc.getElementsByTagName("p")[0]; | ||
606 | - // // 或者修改第一个 < p > 标签的内容; | ||
607 | - // if (firstP) { | ||
608 | - // let a = this.processString(firstP.innerHTML); | ||
609 | - // firstP.innerHTML = a; | ||
610 | - // } | 610 | + const doc = iframeRef.contentDocument || iframeRef.contentWindow.document; |
611 | + const body = iframeRef.contentWindow.document.body; | ||
612 | + body.style.overflowX = "hidden"; // 不允许出现横向滚动条 | ||
613 | + const height = body.scrollHeight; // 获取内容的高度 | ||
614 | + iframeRef.style.height = `${height}px`; // 设置 iframe 的高度 | ||
615 | + // 获取第一个P标签 | ||
616 | + const firstP = doc.getElementsByTagName("p")[0]; | ||
617 | + // 或者修改第一个 < p > 标签的内容; | ||
618 | + if (firstP) { | ||
619 | + let a = this.processString(firstP.innerHTML); | ||
620 | + firstP.innerHTML = a; | ||
621 | + } | ||
611 | }, | 622 | }, |
612 | 623 | ||
613 | // 子集删除后 父级需要更新 | 624 | // 子集删除后 父级需要更新 |