Ver Fonte

修改了点样式

wangguoxi há 6 meses atrás
pai
commit
37a37864c4

+ 1 - 1
src/App.vue

@@ -19,7 +19,7 @@ export default {
     methods: {
     methods: {
         SubmitLogin() {
         SubmitLogin() {
             const username = '50002100001';
             const username = '50002100001';
-            const password = '100001';
+            const password = '50002100001';
             const type = '2';
             const type = '2';
             sessionStorage.setItem('schoolType', type);
             sessionStorage.setItem('schoolType', type);
             user.loginEmailPass({
             user.loginEmailPass({

+ 2 - 2
src/views/analysisReport/wrongQuestion/KnowledgePoint.vue

@@ -13,12 +13,12 @@ export default {
 <style scoped lang="scss">
 <style scoped lang="scss">
 .knowledge_point {
 .knowledge_point {
     font-size: 14px;
     font-size: 14px;
+    line-height: 20px;
     color: #3BA272;
     color: #3BA272;
     border: 1px solid #3BA272;
     border: 1px solid #3BA272;
     background-color: rgba(#3BA272, 0.1);
     background-color: rgba(#3BA272, 0.1);
-    line-height: 20px;
     text-align: center;
     text-align: center;
-    padding: 4px 10px;
+    padding: 3px 10px;
     display: inline-block;
     display: inline-block;
     border-radius: 4px;
     border-radius: 4px;
     user-select: none;
     user-select: none;

+ 56 - 28
src/views/analysisReport/wrongQuestion/index.vue

@@ -27,7 +27,7 @@
                                     <span class="gray">试题类型:</span>
                                     <span class="gray">试题类型:</span>
                                     <span class="black">{{ question.questionType }}</span>
                                     <span class="black">{{ question.questionType }}</span>
                                     <!-- TODO: 这个地方的字段后端未确认 -->
                                     <!-- TODO: 这个地方的字段后端未确认 -->
-                                    <span class="tag">高频错题</span>
+                                    <span class="tag" v-if="question.classScoreRate < 40">高频错题</span>
                                 </div>
                                 </div>
                             </div>
                             </div>
 
 
@@ -38,7 +38,7 @@
                                 <img :src="question.questionImg" alt="" width="100%">
                                 <img :src="question.questionImg" alt="" width="100%">
                             </div>
                             </div>
 
 
-                            <div class="card_footer" style="margin-bottom: 20px;">
+                            <div class="card_footer">
                                 <div class="footer_item">
                                 <div class="footer_item">
                                     <span class="gray">满分:</span>
                                     <span class="gray">满分:</span>
                                     <span class="blue">{{ question.fullScore }}</span>
                                     <span class="blue">{{ question.fullScore }}</span>
@@ -51,22 +51,9 @@
                                 </div>
                                 </div>
                                 <div class="footer_item">
                                 <div class="footer_item">
                                     <span class="gray">难度</span>
                                     <span class="gray">难度</span>
-                                    <span class="blue">一般</span>
+                                    <span :class="countDiffcutyClass(question.difficulty)">{{ question.difficulty }} </span>
                                 </div>
                                 </div>
                             </div>
                             </div>
-
-                            <div class="card_footer">
-                                <div class="gray">知识点:</div>
-                                <template v-if="question.knowledgePoint && question.knowledgePoint.length > 0">
-                                    <KnowledgePoint v-for="(know, index) in question.knowledgePoint" :key="index"
-                                        :text="know" />
-
-                                    <!-- <el-tag type="success" size="small" v-for="(know, index) in question.knowledgePoint"
-                                        :key="index">
-                                        {{ know }}
-                                    </el-tag> -->
-                                </template>
-                            </div>
                         </div>
                         </div>
 
 
                         <div class="card_buttom">
                         <div class="card_buttom">
@@ -116,18 +103,45 @@
                             </div>
                             </div>
 
 
                             <div class="content" v-if="question.parseShow && !question.answerShow">
                             <div class="content" v-if="question.parseShow && !question.answerShow">
-                                <div class="content_inner" style="line-height: 1.5;" v-show="question.sourceType === 1"
-                                    v-html="question.questionData.analysis"></div>
-                                <div class="content_inner" v-if="question.sourceType === 2">
-                                    <img :src="question.parseImg" alt="" width="100%" />
+                                <div class="flex" style="align-items: center;">
+                                    <div class="flex_left">知识点:</div>
+                                    <div class="flex_right">
+                                        <template v-if="question.knowledgePoint && question.knowledgePoint.length > 0">
+                                            <KnowledgePoint v-for="(know, index) in question.knowledgePoint"
+                                                :key="index" :text="know" />
+                                        </template>
+                                    </div>
+                                </div>
+
+                                <div class="flex">
+                                    <div class="flex_left">答&nbsp;&nbsp;&nbsp;案:</div>
+                                    <div class="flex_right">
+                                        <div v-if="question.sourceType === 1" v-html="question.questionData.answer">
+                                        </div>
+                                        <div v-if="question.sourceType === 2">
+                                            <img :src="question.answerImg" alt="" width="100%" />
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="flex">
+                                    <div class="flex_left">解&nbsp;&nbsp;&nbsp;析:</div>
+                                    <div class="flex_right">
+                                        <div style="line-height: 1.5;" v-show="question.sourceType === 1"
+                                            v-html="question.questionData.analysis">
+                                        </div>
+                                        <div v-if="question.sourceType === 2">
+                                            <img :src="question.parseImg" alt="" width="100%" />
+                                        </div>
+                                    </div>
                                 </div>
                                 </div>
                             </div>
                             </div>
 
 
                             <div class="content" v-if="question.answerShow && !question.parseShow">
                             <div class="content" v-if="question.answerShow && !question.parseShow">
                                 <div class="content_inner" v-if="question.sourceType === 1"
                                 <div class="content_inner" v-if="question.sourceType === 1"
-                                    v-html="question.questionData.answer"></div>
+                                    v-html="question.studentAnswer"></div>
                                 <div class="content_inner" v-if="question.sourceType === 2">
                                 <div class="content_inner" v-if="question.sourceType === 2">
-                                    <img :src="question.answerImg" alt="" width="100%" />
+                                    <img :src="question.studentAnswerImg" alt="" width="100%" />
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </div>
                         </div>
@@ -150,10 +164,6 @@
                                     <span :class="countDiffcutyClass(question.variationQuestion.difficulty)">{{
                                     <span :class="countDiffcutyClass(question.variationQuestion.difficulty)">{{
                                         question.variationQuestion.difficulty }}</span>
                                         question.variationQuestion.difficulty }}</span>
                                 </div>
                                 </div>
-                                <!-- <div class="right">
-                                    <span class="gray">来源:</span>
-                                    <span class="black">这是一场考试名称</span>
-                                </div> -->
                             </div>
                             </div>
 
 
                             <div class="question_content" v-html="question.variationQuestion.questionStem">这是题目内容</div>
                             <div class="question_content" v-html="question.variationQuestion.questionStem">这是题目内容</div>
@@ -307,7 +317,7 @@ export default {
                 this.pageParam.total = res.data.total * 1;
                 this.pageParam.total = res.data.total * 1;
 
 
                 for (let i = 0; i < questionList.length; i++) {
                 for (let i = 0; i < questionList.length; i++) {
-                    const { sourceType, titleCoordinates, answerCoordinates, parseCoordinates } = questionList[i]
+                    const { sourceType, titleCoordinates, answerCoordinates, parseCoordinates, paintingPosition } = questionList[i]
                     questionList[i].answerShow = false;
                     questionList[i].answerShow = false;
                     questionList[i].parseShow = false;
                     questionList[i].parseShow = false;
                     if (sourceType === 2) {
                     if (sourceType === 2) {
@@ -319,6 +329,10 @@ export default {
 
 
                         const parseImg = await loadImg(this.answerUrls, parseCoordinates);
                         const parseImg = await loadImg(this.answerUrls, parseCoordinates);
                         questionList[i].parseImg = parseImg;
                         questionList[i].parseImg = parseImg;
+
+                        // TODO: 学生答案图片加载,由于
+                        const studentAnswerImg = await loadImg(this.answerUrls, paintingPosition);
+                        questionList[i].studentAnswerImg = studentAnswerImg;
                     }
                     }
                 }
                 }
 
 
@@ -353,6 +367,19 @@ export default {
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
+.flex {
+    display: flex;
+    margin-bottom: 10px;
+
+    .flex_left {
+        width: 60px;
+    }
+
+    .flex_right {
+        flex: 1;
+    }
+}
+
 .select_box {
 .select_box {
     background-color: #ffffff;
     background-color: #ffffff;
     border-radius: 10px;
     border-radius: 10px;
@@ -399,7 +426,8 @@ export default {
 
 
             .tag {
             .tag {
                 color: #ffffff;
                 color: #ffffff;
-                padding: 5px;
+                padding: 4px 5px;
+                font-size: 12px;
                 background-color: #F56C6C;
                 background-color: #F56C6C;
                 border-radius: 2px;
                 border-radius: 2px;
                 position: relative;
                 position: relative;