From 0ac4e192d2d2c28eb95e118eb381c04330b07953 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 20 十一月 2024 11:51:46 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/components/examinations/index.vue | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 095c41d..d65b922 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -14,7 +14,12 @@
<span v-if="nindex == 4">浜斻��</span>
<span v-html="item.catalogName"></span>
</p>
- <el-image v-if="item.catalogImage" :src="item.catalogImage"></el-image>
+ <el-image
+ v-if="item.catalogImage"
+ :src="item.catalogImage"
+ :preview-src-list="[item.catalogImage]"
+ class="catalogImage"
+ ></el-image>
<ul>
<li
v-for="(value, index) in item.infoList"
@@ -102,19 +107,18 @@
v-html="itemText"
class="input-txt"
></span>
- <el-select
+ <select
v-else
v-model="value.userAnswer"
:disabled="value.isComplete"
>
- <el-option
+ <option
v-for="(citem, cindex) in value.option"
:key="cindex + 'dropdown'"
:label="citem"
:value="citem"
- >
- </el-option>
- </el-select>
+ ></option>
+ </select>
</span>
</p>
</div>
@@ -276,7 +280,7 @@
v-model="value.isUnfold"
accordion
v-if="
- value.questionType != 'shortAnswer' ||
+ value.questionType != 'shortAnswer' &&
value.questionType != 'formula'
"
>
@@ -406,7 +410,6 @@
<div class="referBox" v-if="value.analysisCon">
<span>瑙ｆ瀽锛�</span>
<p
- v-if="value.analysisCon"
v-html="value.analysisCon"
:class="
[
@@ -416,7 +419,6 @@
].join(' ')
"
></p>
- <p v-else class="ti-2">鏆傛棤鏁版嵁</p>
</div>
</el-collapse-item>
</el-collapse>
@@ -597,7 +599,13 @@
// 鑾峰彇涓嶅彈淇濇姢鐨勫浘鐗�
getPublicImage(md5, width, height) {
if (!md5) return;
- if (md5.includes("http")) return md5;
+ if (md5.includes("http")) {
+ if(width) {
+ return md5 + `?width=${width}`
+ } else {
+ return md5
+ }
+ };
let src = null;
if (md5) {
src = process.env.VUE_APP_API_URL + `/file/GetPreViewImage?md5=${md5}`;
@@ -908,7 +916,9 @@
text-indent: 1em !important;
font-size: 16px;
}
-
+.catalogImage {
+ width: 50%;
+}
.examination {
min-height: 100px;
ul {
@@ -1067,7 +1077,10 @@
font-weight: 400;
margin-top: 6px;
}
-
+ select {
+ outline: none;
+ min-width: 100px;
+ }
input {
width: 140px;
height: 24px;
--
Gitblit v1.9.1