Commit 7bf1e583 authored by zhengke's avatar zhengke

修改

parent 024b61da
...@@ -6,12 +6,19 @@ ...@@ -6,12 +6,19 @@
.v_multipleQuestionBold { .v_multipleQuestionBold {
font-weight: bold; font-weight: bold;
height:40px;
}
.mutiTable tfoot:before{
content: "-";
display: block;
line-height: 1em;
color: transparent;
} }
</style> </style>
<template> <template>
<div class="v_multipleQuestion"> <div class="v_multipleQuestion">
<table v-if="data&&data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable"> <table v-if="data&&data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable mutiTable">
<tbody v-for="(item,index) in data.QuestionContentObj" :key="index"> <tbody v-for="(item,index) in data.QuestionContentObj" :key="index">
<tr> <tr>
<td style="width:40px;text-align:center;"> <td style="width:40px;text-align:center;">
...@@ -27,7 +34,7 @@ ...@@ -27,7 +34,7 @@
</div> </div>
</template> </template>
</td> </td>
<td> <td style="height:40px;">
<div class="InpDIV" style="border:0;" v-html="item.Content"></div> <div class="InpDIV" style="border:0;" v-html="item.Content"></div>
</td> </td>
</tr> </tr>
...@@ -41,7 +48,7 @@ ...@@ -41,7 +48,7 @@
:style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">考生答案:{{data.StundetAnswer}}</td> :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">考生答案:{{data.StundetAnswer}}</td>
</tr> </tr>
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td colspan="2"> <td colspan="2" style="height:40px;">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:"
maxlength="20" @input="getQuestionScore" /> maxlength="20" @input="getQuestionScore" />
<span v-else class="v_multipleQuestionBold">考生得分:{{data.StudentScore}}</span> <span v-else class="v_multipleQuestionBold">考生得分:{{data.StudentScore}}</span>
...@@ -49,10 +56,13 @@ ...@@ -49,10 +56,13 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<span class="v_multipleQuestionBold"> <div style="display:flex;">
解析: <span class="v_multipleQuestionBold">
</span> 解析:
<span v-html="data.AnswerParse"></span></td> </span>
<span v-html="data.AnswerParse"></span>
</div>
</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
.v_readingComprehensioQuestionBold { .v_readingComprehensioQuestionBold {
font-weight: bold; font-weight: bold;
height:40px;
} }
</style> </style>
...@@ -164,17 +165,17 @@ ...@@ -164,17 +165,17 @@
</tr> </tr>
</template> </template>
<tr v-if="isShowAnswer"> <tr v-if="isShowAnswer">
<td colspan="2" class="v_readingComprehensioQuestionBold"> <td colspan="2" style="height:40px" class="v_readingComprehensioQuestionBold">
答案: {{data.QuestionAnswerList[index].SubAnswer}} 答案: {{data.QuestionAnswerList[index].SubAnswer}}
</td> </td>
</tr> </tr>
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td colspan="2" class="v_readingComprehensioQuestionBold" :style="{color:data.QuestionAnswerList[index].SubAnswer ==data.AnswerList[index].SubAnswer?'#67c23a':'red'}"> <td colspan="2" style="height:40px" class="v_readingComprehensioQuestionBold" :style="{color:data.QuestionAnswerList[index].SubAnswer ==data.AnswerList[index].SubAnswer?'#67c23a':'red'}">
学生答案: {{data.AnswerList[index].SubAnswer}} 学生答案: {{data.AnswerList[index].SubAnswer}}
</td> </td>
</tr> </tr>
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td colspan="2"> <td colspan="2" style="height:40px">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" <q-input v-if="isEditStudentScore" standout="bg-primary text-white"
v-model="data.AnswerList[index].StudentScore" label="得分:" maxlength="20" @input="getQuestionScore" /> v-model="data.AnswerList[index].StudentScore" label="得分:" maxlength="20" @input="getQuestionScore" />
<span v-else class="v_readingComprehensioQuestionBold">考生得分:{{data.AnswerList[index].StudentScore}}</span> <span v-else class="v_readingComprehensioQuestionBold">考生得分:{{data.AnswerList[index].StudentScore}}</span>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
.v_singleQuestionBold { .v_singleQuestionBold {
font-weight: bold; font-weight: bold;
height:40px;
} }
</style> </style>
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
:style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">考生答案:{{data.StundetAnswer}}</td> :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">考生答案:{{data.StundetAnswer}}</td>
</tr> </tr>
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td colspan="2"> <td colspan="2" style="height:40px;">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:"
maxlength="20" @input="getQuestionScore" /> maxlength="20" @input="getQuestionScore" />
<span v-else class="v_singleQuestionBold">考生得分:{{data.StudentScore}}</span> <span v-else class="v_singleQuestionBold">考生得分:{{data.StudentScore}}</span>
...@@ -49,10 +50,13 @@ ...@@ -49,10 +50,13 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<span class="v_singleQuestionBold"> <div style="display:flex;">
解析: <span class="v_singleQuestionBold">
</span> 解析:
<span v-html="data.AnswerParse"></span></td> </span>
<span v-html="data.AnswerParse"></span>
</div>
</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
......
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
.examPaperInfo_Top .vClozeQuestion .clozeTest_question_tit { .examPaperInfo_Top .vClozeQuestion .clozeTest_question_tit {
margin: 15px 0; margin: 15px 0;
} }
.Exam_PaperName{ .Exam_PaperNameV2{
font-size:20px; font-size:20px;
font-weight: bold; font-weight: bold;
margin-bottom:5px; margin-bottom:5px;
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<div class="examPaperInfo_Top"> <div class="examPaperInfo_Top">
<div> <div>
<div> <div>
<div class="Exam_PaperName">{{DataObj.PaperName}}</div> <div class="Exam_PaperNameV2">{{DataObj.PaperName}}</div>
<div>题量:{{examNum}} &nbsp;&nbsp;&nbsp; 满分:{{examScore}}</div> <div>题量:{{examNum}} &nbsp;&nbsp;&nbsp; 满分:{{examScore}}</div>
</div> </div>
</div> </div>
......
<style> <style>
.examPaperInfo_Top { .examPaperInfo_Top {
height: 83px; min-height: 83px;
border-bottom: 1px solid #d9d9d9; border-bottom: 1px solid #d9d9d9;
display: flex; display: flex;
align-items: center;
justify-content: space-between; justify-content: space-between;
margin: 0 100px; margin: 0 100px;
padding-bottom:15px;
} }
.Exam-main { .Exam-main {
...@@ -241,7 +241,14 @@ ...@@ -241,7 +241,14 @@
.examPaperInfo_Top .vClozeQuestion .clozeTest_question_tit { .examPaperInfo_Top .vClozeQuestion .clozeTest_question_tit {
margin: 15px 0; margin: 15px 0;
} }
.Exam_PaperNameV2{
font-size:20px;
font-weight: bold;
margin-bottom:5px;
}
.pGNameDiv:first-child{
margin-top:0;
}
</style> </style>
<!--阅卷--> <!--阅卷-->
<template> <template>
...@@ -249,14 +256,15 @@ ...@@ -249,14 +256,15 @@
<div class="examPaperInfo_Top"> <div class="examPaperInfo_Top">
<div> <div>
<div> <div>
{{DataObj.PaperName}} <br /> <div class="Exam_PaperNameV2">{{DataObj.PaperName}}</div>
题量:{{examNum}} &nbsp;&nbsp;&nbsp; 满分:{{examScore}} <div>
<br /> <span>题量:{{examNum}} &nbsp;&nbsp;&nbsp; 满分:{{examScore}} </span>
学生总得分:{{studentScore}}<br /> <span style="margin-left:30px;">学生总得分:{{studentScore}}</span>
</div>
评语:{{DataObj.StuComment}} <br/> 评语:{{DataObj.StuComment}} <br/>
</div> </div>
</div> </div>
<div style="width:20%;text-align:right;"> <div style="width:20%;text-align:right;flex-shrink:0;">
<q-btn color="accent" size="sm" class="q-mr-md" @click="goBack()" label="返回" /> <q-btn color="accent" size="sm" class="q-mr-md" @click="goBack()" label="返回" />
</div> </div>
</div> </div>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
border-radius: 3px; border-radius: 3px;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
background: #f0f0f0; background: #f0f0f0;
padding-top: 20px; padding-top: 10px;
padding-bottom: 0px; padding-bottom: 0px;
} }
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
.Left-ptitel { .Left-ptitel {
font-size: 14px; font-size: 14px;
color: #777; color: #777;
padding-left: 18px; padding-left: 5px;
} }
.Left-ptitel span { .Left-ptitel span {
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
background: #fdfdfd; background: #fdfdfd;
font-size: 14px; font-size: 14px;
line-height: 40px; line-height: 40px;
padding-left: 10px; /* padding-left: 10px; */
} }
.List-bt i { .List-bt i {
...@@ -251,6 +251,7 @@ ...@@ -251,6 +251,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin-right: 5px; margin-right: 5px;
cursor: pointer;
} }
.paperEdit_Top { .paperEdit_Top {
...@@ -263,7 +264,9 @@ ...@@ -263,7 +264,9 @@
color: #555; color: #555;
font-weight: normal; font-weight: normal;
} }
.checkedExam{
background: #9cf!important;
}
</style> </style>
<template> <template>
<div class="examPaper page-body"> <div class="examPaper page-body">
...@@ -294,27 +297,31 @@ ...@@ -294,27 +297,31 @@
</div> </div>
<div class="Exam-main"> <div class="Exam-main">
<div class="Exam-left f1"> <div class="Exam-left f1">
<p class="Left-ptitel"> <div style="display:flex;justify-content:space-between;align-items:center;padding:0 10px 10px 5px">
<span>题量:<i>{{examNum}}</i></span> <div class="Left-ptitel">
<span>  总分:<i>{{examScore.toFixed(2)}}</i></span> <span>题量:<i>{{examNum}}</i></span>
<q-btn-dropdown color="primary" label="添加分类"> <span>总分:<i>{{examScore.toFixed(2)}}</i></span>
<q-list> </div>
<q-item clickable v-close-popup @click="onCategoryItemClick(item)" <div>
v-for="(item,index) in newQuestionCategoryList" :key="index"> <q-btn-dropdown color="primary" label="添加分类" size="sm">
<q-item-section> <q-list>
<q-item-label>{{item.Name}}</q-item-label> <q-item clickable v-close-popup @click="onCategoryItemClick(item)"
</q-item-section> v-for="(item,index) in newQuestionCategoryList" :key="index">
</q-item> <q-item-section>
</q-list> <q-item-label>{{item.Name}}</q-item-label>
</q-btn-dropdown> </q-item-section>
</p> </q-item>
</q-list>
</q-btn-dropdown>
</div>
</div>
<div class="Left-list"> <div class="Left-list">
<template v-if="DataObj&&DataObj.GroupList&&DataObj.GroupList.length>0"> <template v-if="DataObj&&DataObj.GroupList&&DataObj.GroupList.length>0">
<div class="List-con1" v-for="(gItem,gIndex) in DataObj.GroupList" :key="gIndex"> <div class="List-con1" v-for="(gItem,gIndex) in DataObj.GroupList" :key="gIndex">
<div class="List-bt"> <div class="List-bt">
<div class="paperEdit_Top"> <div class="paperEdit_Top" :class="{'checkedExam':clickIndex==gIndex}">
<template v-if="!gItem.isShowEdit"> <template v-if="!gItem.isShowEdit">
<div @click="GetGroupItem(gItem)"> <div @click="GetGroupItem(gItem,gIndex)" style="display:flex;padding-left:5px;">
<div>{{gIndex+1}}</div>&nbsp; <div>{{gIndex+1}}</div>&nbsp;
<div class="paper_GroupName" :title="gItem.GroupName">{{gItem.GroupName}}</div> <div class="paper_GroupName" :title="gItem.GroupName">{{gItem.GroupName}}</div>
<div>(共{{ gItem.DetailsList?gItem.DetailsList.length:0 }}题,{{gItem.GScore}}分)</div> <div>(共{{ gItem.DetailsList?gItem.DetailsList.length:0 }}题,{{gItem.GScore}}分)</div>
...@@ -614,6 +621,7 @@ ...@@ -614,6 +621,7 @@
savePaperLoading: false, savePaperLoading: false,
isShowPoint: false, //选择知识点 isShowPoint: false, //选择知识点
clickGroupItem: null, //选择的分组 clickGroupItem: null, //选择的分组
clickIndex:-1
} }
}, },
computed: { computed: {
...@@ -657,7 +665,8 @@ ...@@ -657,7 +665,8 @@
} }
}, },
methods: { methods: {
GetGroupItem(gItem) { GetGroupItem(gItem,gIndex) {
this.clickIndex = gIndex;
this.clickGroupItem = gItem; this.clickGroupItem = gItem;
}, },
//添加分类 //添加分类
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment