Commit 77e3fb8e authored by Mac's avatar Mac

1

parents f3135500 1b0a3703
...@@ -243,12 +243,24 @@ export function saveBatchQuestionLevel(data) { ...@@ -243,12 +243,24 @@ export function saveBatchQuestionLevel(data) {
} }
/** /**
* 根据题库编号获取题库题型分类列表【试卷组卷使用】 * 根据题库编号获取题库题型列表(单选题、多选题、等)【试卷组卷使用】
* @param {*} data * @param {*} data
*/ */
export function queryQuestionCategoryList(data) { export function queryQuestionTypeStaticList(data) {
return request({ return request({
url: '/Question/GetQuestionCategoryList', url: '/Question/GetQuestionTypeStaticList',
method: 'post',
data
})
}
/**
* 根据题库编号获取题库题型分类列表(读音选择题、汉字选择题等)【试卷组卷使用】
* @param {*} data
*/
export function queryQuestionCategoryStaticList(data) {
return request({
url: '/Question/GetQuestionCategoryStaticList',
method: 'post', method: 'post',
data data
}) })
......
...@@ -314,9 +314,9 @@ ...@@ -314,9 +314,9 @@
methods: { methods: {
//是否可修改 //是否可修改
isEdit(item) { isEdit(item) {
// if (this.currentUserInfo.Id == 1) { if (this.currentUserInfo.Id == 1) {
// return true; return true;
// } }
return this.currentUserInfo.Id == item.CreateBy && return this.currentUserInfo.Id == item.CreateBy &&
(item.ExamineStatus == 0 || item.ExamineStatus == 3 || item.ExamineStatus == 4) (item.ExamineStatus == 0 || item.ExamineStatus == 3 || item.ExamineStatus == 4)
}, },
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" v-if="props.row.IsEdit==1" color="accent" style="font-weight: 400" label="修改" @click="publishExam(props.row)" /> <!--v-if="props.row.IsEdit==1"-->
<q-btn flat size="xs" color="accent" style="font-weight: 400" label="修改" @click="publishExam(props.row)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px">
<q-list> <q-list>
<q-item clickable v-close-popup @click="submitExamAudit(props.row)" <q-item clickable v-close-popup @click="submitExamAudit(props.row)"
......
...@@ -69,6 +69,12 @@ ...@@ -69,6 +69,12 @@
label: '模板名称', label: '模板名称',
field: 'TemplateName', field: 'TemplateName',
align: 'left', align: 'left',
},
{
name: 'GroupTypeName',
label: '组卷类型',
field: 'GroupTypeName',
align: 'left',
}, },
{ {
name: 'TemplateScore', name: 'TemplateScore',
......
...@@ -37,7 +37,18 @@ ...@@ -37,7 +37,18 @@
.vClozeQuestionBold { .vClozeQuestionBold {
font-weight: bold; font-weight: bold;
} }
.chooseOptionList:before{
content: "-";
display: block;
line-height: 1.5em;
color: transparent;
}
.chooseOptionList:after{
content: "-";
display: block;
line-height: 1em;
color: transparent;
}
</style> </style>
<template> <template>
<div class="vClozeQuestion"> <div class="vClozeQuestion">
...@@ -54,7 +65,7 @@ ...@@ -54,7 +65,7 @@
</thead> </thead>
<tbody class="chooseOptionList"> <tbody class="chooseOptionList">
<tr v-for="(subItem,subIndex) in item.OptionList" :key="subIndex"> <tr v-for="(subItem,subIndex) in item.OptionList" :key="subIndex">
<td style="width:40px;text-align:center;"> <td style="width:40px;text-align:center;height:50px;">
<template v-if="isOperate"> <template v-if="isOperate">
<div class="Answer_List" @click="ChangeItem(item,subItem)" :class="{'Is_Answer':subItem.IsAnswer}"> <div class="Answer_List" @click="ChangeItem(item,subItem)" :class="{'Is_Answer':subItem.IsAnswer}">
{{subItem.Name}} {{subItem.Name}}
......
...@@ -48,15 +48,15 @@ ...@@ -48,15 +48,15 @@
<td colspan="2"><span v-if="data&&data.IsMutex==1" style="font-size:13px;">答案顺序打乱也判正确</span></td> <td colspan="2"><span v-if="data&&data.IsMutex==1" style="font-size:13px;">答案顺序打乱也判正确</span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2">1. 一个空有多种答案时请用";"隔开。如:水;H2O</td> <td colspan="2" style="height:40px;">1. 一个空有多种答案时请用";"隔开。如:水;H2O</td>
</tr> </tr>
<tr> <tr>
<td colspan="2">2. 若试题答案是数字,可设置范围,两个数字之间用"-"。如:1-9,学生填写1到9之间的数字都算正确(包括1和9)</td> <td colspan="2" style="height:40px;">2. 若试题答案是数字,可设置范围,两个数字之间用"-"。如:1-9,学生填写1到9之间的数字都算正确(包括1和9)</td>
</tr> </tr>
</tbody> </tbody>
<tfoot v-if="isShowAnswer"> <tfoot v-if="isShowAnswer">
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td class="v_fillInBold"> <td class="v_fillInBold" style="height:40px;">
考生答案 考生答案
</td> </td>
<td> <td>
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
</tr> </tr>
</template> </template>
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td colspan="2"> <td colspan="2" style="height:70px;">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" filled style="width:180px;" v-model="data.StudentScore" label="得分:"
maxlength="20" @input="getQuestionScore" /> maxlength="20" @input="getQuestionScore" />
<span v-else class="v_fillInBold">考生得分:{{data.StudentScore}}</span> <span v-else class="v_fillInBold">考生得分:{{data.StudentScore}}</span>
</td> </td>
......
...@@ -7,11 +7,17 @@ ...@@ -7,11 +7,17 @@
.v_judgeQuestionBold { .v_judgeQuestionBold {
font-weight: bold font-weight: bold
} }
.v_judgeTable tfoot:before{
content: "-";
display: block;
line-height: 1em;
color: transparent;
}
</style> </style>
<template> <template>
<div class="v_judgeQuestion"> <div class="v_judgeQuestion">
<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 judgeTable">
<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:50px;text-align:center;"> <td style="width:50px;text-align:center;">
...@@ -34,15 +40,15 @@ ...@@ -34,15 +40,15 @@
</tbody> </tbody>
<tfoot v-if="isShowAnswer"> <tfoot v-if="isShowAnswer">
<tr> <tr>
<td colspan="2" class="v_judgeQuestionBold">正确答案:{{data.Answer}}</td> <td colspan="2" style="height:40px;" class="v_judgeQuestionBold">正确答案:{{data.Answer}}</td>
</tr> </tr>
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td colspan="2" class="v_judgeQuestionBold" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}"> <td colspan="2" class="v_judgeQuestionBold" style="height:40px;" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">
考生答案:{{data.StundetAnswer}}</td> 考生答案:{{data.StundetAnswer}}</td>
</tr> </tr>
<tr v-if="isShowStudentAnswer"> <tr v-if="isShowStudentAnswer">
<td colspan="2"> <td colspan="2" style="height:70px;">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" filled style="width:180px" v-model="data.StudentScore" label="得分:"
maxlength="20" @input="getQuestionScore" /> maxlength="20" @input="getQuestionScore" />
<span v-else class="v_judgeQuestionBold">考生得分:{{data.StudentScore}}</span> <span v-else class="v_judgeQuestionBold">考生得分:{{data.StudentScore}}</span>
</td> </td>
......
...@@ -23,11 +23,10 @@ ...@@ -23,11 +23,10 @@
.v_matchingQuestionBold { .v_matchingQuestionBold {
font-weight: bold; font-weight: bold;
} }
</style> </style>
<template> <template>
<div class="v_matchingQuestion"> <div class="v_matchingQuestion">
<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" style="width:360px;">
<thead> <thead>
<tr> <tr>
<th colspan="2">第一组</th> <th colspan="2">第一组</th>
...@@ -58,12 +57,14 @@ ...@@ -58,12 +57,14 @@
<span class="line_center"></span> <span class="line_center"></span>
</td> </td>
<td> <td>
<select v-model="data.QuestionContentObj[2][index].Content" class="selectBox2"> <el-select v-model="data.QuestionContentObj[2][index].Content" style="width:100px" size="small" placeholder="请选择">
<template v-for="(cItem,cIndex) in data.QuestionContentObj[1]"> <el-option
<option :key="cIndex" :label="cItem.Name" :value="cItem.Name"> v-for="(cItem,cIndex) in data.QuestionContentObj[1]"
</option> :key="cIndex"
</template> :label="cItem.Name"
</select> :value="cItem.Name">
</el-option>
</el-select>
</td> </td>
</tr> </tr>
</table> </table>
......
...@@ -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,18 +48,21 @@ ...@@ -41,18 +48,21 @@
: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:70px;">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" style="width:180px;" filled 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>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div style="display:flex;">
<span class="v_multipleQuestionBold"> <span class="v_multipleQuestionBold">
解析: 解析:
</span> </span>
<span v-html="data.AnswerParse"></span></td> <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>
......
...@@ -14,11 +14,16 @@ ...@@ -14,11 +14,16 @@
.v_sharingChooseQuestionBold { .v_sharingChooseQuestionBold {
font-weight: bold; font-weight: bold;
} }
.shareChooseTable td{
vertical-align: middle!important;
}
.shareChooseTable td p{
margin:0!important;
}
</style> </style>
<template> <template>
<div class="v_sharingChooseQuestion"> <div class="v_sharingChooseQuestion">
<table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable"> <table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable shareChooseTable">
<thead> <thead>
<tr> <tr>
<th colspan="2" style="text-align:left;"> <th colspan="2" style="text-align:left;">
...@@ -29,7 +34,7 @@ ...@@ -29,7 +34,7 @@
</tr> </tr>
</thead> </thead>
<tr v-for="(item,index) in data.QuestionContentObj[0]" :key="index"> <tr v-for="(item,index) in data.QuestionContentObj[0]" :key="index">
<td style="width:40px;text-align:center; "> <td style="width:40px;text-align:center;height:40px; ">
{{item.Name}} {{item.Name}}
</td> </td>
<td> <td>
...@@ -37,10 +42,10 @@ ...@@ -37,10 +42,10 @@
</td> </td>
</tr> </tr>
</table> </table>
<table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable"> <table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable shareChooseTable">
<tbody v-for="(item,index) in data.QuestionContentObj[1]" :key="index"> <tbody v-for="(item,index) in data.QuestionContentObj[1]" :key="index">
<tr> <tr>
<td style="width:40px;text-align:center;"> <td style="width:40px;text-align:center;height:40px;">
({{index+1}}) ({{index+1}})
</td> </td>
<td> <td>
...@@ -55,25 +60,27 @@ ...@@ -55,25 +60,27 @@
答案: {{data.QuestionContentObj[1][index].Name}} 答案: {{data.QuestionContentObj[1][index].Name}}
</template> </template>
<template v-if="isOperate"> <template v-if="isOperate">
<select v-model="item.Name" class="selectBox" style="margin:10px 0 0 0;outline:none;"> <el-select v-model="item.Name" style="width:100px" size="small" placeholder="请选择">
<template v-for="(cItem,cIndex) in data.QuestionContentObj[0]"> <el-option
<option :key="cIndex" :label="cItem.Name" :value="cItem.Name"> v-for="(cItem,cIndex) in data.QuestionContentObj[0]"
</option> :key="cIndex"
</template> :label="cItem.Name"
</select> :value="cItem.Name">
</el-option>
</el-select>
</template> </template>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tfoot v-if="isShowStudentAnswer"> <tfoot v-if="isShowStudentAnswer">
<tr> <tr>
<td colspan="2" class="v_sharingChooseQuestionBold" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}"> <td colspan="2" class="v_sharingChooseQuestionBold" style="height:70px" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">
考生答案:{{data.StundetAnswer}} 考生答案:{{data.StundetAnswer}}
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" filled style="width:180px" v-model="data.StudentScore" label="得分:"
maxlength="20" @input="getQuestionScore" /> maxlength="20" @input="getQuestionScore" />
<span v-else class="v_sharingChooseQuestionBold">考生得分:{{data.StudentScore}}</span> <span v-else class="v_sharingChooseQuestionBold">考生得分:{{data.StudentScore}}</span>
</td> </td>
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-input v-model="data.Answer" placeholder="请填写问题答案"> </el-input> <el-input v-model="data.Answer" placeholder="请填写问题答案"> </el-input>
</div> </div>
<div v-if="isShowStudentAnswer" style="display:flex;"> <div v-if="isShowStudentAnswer" style="display:flex;">
<div class="v_shortAnswerQuestionBold">考生答案:</div> <div class="v_shortAnswerQuestionBold" style="margin:20px 0">考生答案:</div>
<div v-html="data.StundetAnswer"></div> <div v-html="data.StundetAnswer"></div>
</div> </div>
<div v-if="isShowStudentAnswer" style="display:flex;"> <div v-if="isShowStudentAnswer" style="display:flex;;margin-bottom:20px;">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" filled v-model="data.StudentScore" label="得分:"
maxlength="20" @input="getQuestionScore" /> maxlength="20" @input="getQuestionScore" />
<span v-else class="v_shortAnswerQuestionBold">考生得分:{{data.StudentScore}}</span> <span v-else class="v_shortAnswerQuestionBold">考生得分:{{data.StudentScore}}</span>
</div> </div>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
.v_singleQuestionBold { .v_singleQuestionBold {
font-weight: bold; font-weight: bold;
height:40px;
} }
</style> </style>
...@@ -41,18 +42,21 @@ ...@@ -41,18 +42,21 @@
: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:70px;">
<q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分:" <q-input v-if="isEditStudentScore" filled 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>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div style="display:flex;">
<span class="v_singleQuestionBold"> <span class="v_singleQuestionBold">
解析: 解析:
</span> </span>
<span v-html="data.AnswerParse"></span></td> <span v-html="data.AnswerParse"></span>
</div>
</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
......
...@@ -56,12 +56,14 @@ ...@@ -56,12 +56,14 @@
<tr> <tr>
<td> <td>
<template v-for="(item,index) in data.QuestionContentObj[1]"> <template v-for="(item,index) in data.QuestionContentObj[1]">
<select v-model="item.Name" class="selectBox" :key="index"> <el-select v-model="item.Name" :key="index" style="width:100px;margin-right:20px;" size="small" placeholder="请选择">
<template v-for="(cItem,cIndex) in data.QuestionContentObj[0]"> <el-option
<option :key="cIndex" :label="cItem.Name" :value="cItem.Name"> v-for="(cItem,cIndex) in data.QuestionContentObj[0]"
</option> :key="cIndex"
</template> :label="cItem.Name"
</select> :value="cItem.Name">
</el-option>
</el-select>
</template> </template>
</td> </td>
</tr> </tr>
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
padding: 20px; padding: 20px;
margin-bottom: 25px; margin-bottom: 25px;
} }
.addPhase .bold{
.addPhase .bold {
font-weight: 760; font-weight: 760;
font-size: 16px; font-size: 16px;
color: #333; color: #333;
...@@ -31,51 +32,39 @@ ...@@ -31,51 +32,39 @@
<div class="bold">名称</div> <div class="bold">名称</div>
<q-input clearable debounce filled maxlength="20" counter v-model="addMsg.FlowName" style="width:600px" <q-input clearable debounce filled maxlength="20" counter v-model="addMsg.FlowName" style="width:600px"
@input="$forceUpdate()" placeholder="名称" :rules="[val => !!val || '不能为空']" /> @input="$forceUpdate()" placeholder="名称" :rules="[val => !!val || '不能为空']" />
</div> </div>
<div class="box"> <div class="box">
<div class="bold">阶段适用范围</div> <div class="bold">阶段适用范围</div>
<q-btn class="q-mr-md" label="选择部门/成员" @click="outerVisible = true" /> <q-btn class="q-mr-md" label="选择部门/成员" @click="outerVisible = true" />
</div> </div>
<div class="box"> <div class="box">
<div class="bold">选择使用阶段</div> <div class="bold">选择使用阶段</div>
<div style="display:flex;align-items: center;"> <div style="display:flex;align-items: center;">
</div> </div>
</div> </div>
<div v-if="StageList"> <div v-if="StageList">
<div class="box" v-for="(x,y) in StageList" v-if="x.Type==2"> <div class="box" v-for="(x,y) in StageList" v-if="x.Type==2">
<div class="bold" v-if="x.Name=='已输单'">选择输单原因</div> <div class="bold" v-if="x.Name=='已输单'">选择输单原因</div>
<div class="bold" v-if="x.Name=='无效'">选择无效原因</div> <div class="bold" v-if="x.Name=='无效'">选择无效原因</div>
<div style="display:flex;align-items: center;flex-wrap: wrap;"> <div style="display:flex;align-items: center;flex-wrap: wrap;">
<q-checkbox v-model="addMsg.LoseCause" v-if="x.Name=='已输单'" <q-checkbox v-model="addMsg.LoseCause" v-if="x.Name=='已输单'" v-for="(item,index) in x.OptionsList" :key='index'
v-for="(item,index) in x.OptionsList" :key='index' :val="item.Id" :val="item.Id" :label="item.Name" />
:label="item.Name" /> <q-checkbox v-model="addMsg.InvalidCause" v-if="x.Name=='无效'" v-for="(item,index) in x.OptionsList"
<q-checkbox v-model="addMsg.InvalidCause" v-if="x.Name=='无效'" :key='index' :val="item.Id" :label="item.Name" />
v-for="(item,index) in x.OptionsList" :key='index' :val="item.Id"
:label="item.Name" />
</div> </div>
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-form label-width="120px"> <el-form label-width="120px">
</el-form> </el-form>
<q-card-actions align="left" class="bg-white" > <q-card-actions align="left" class="bg-white">
<q-btn color="accent" class="q-mr-md" label="保存" @click="savemove()" style="width: 100px;" <q-btn color="accent" class="q-mr-md" label="保存" @click="savemove()" style="width: 100px;" :loading="loading" />
:loading="loading" />
<q-btn class="q-mr-md" label="返回" @click="goblck()" style="width: 60px;" /> <q-btn class="q-mr-md" label="返回" @click="goblck()" style="width: 60px;" />
</q-card-actions> </q-card-actions>
</div> </div>
<!-- 人员/部门选择 --> <!-- 人员/部门选择 -->
<choiceapprovalorbranch v-if="outerVisible" @close="outerVisible = false" @success="getsuccess2" :byval='showMember' cptype="1"></choiceapprovalorbranch> <choiceapprovalorbranch v-if="outerVisible" @close="outerVisible = false" @success="getsuccess2" :byval='showMember'
cptype="1"></choiceapprovalorbranch>
</div> </div>
</template> </template>
...@@ -97,48 +86,38 @@ ...@@ -97,48 +86,38 @@
data() { data() {
return { return {
loading: false, loading: false,
outerVisible:false, outerVisible: false,
addMsg:{ addMsg: {
FlowName:'', FlowName: '',
DeptEmpList:[], DeptEmpList: [],
UseStage:'', UseStage: '',
LoseCause:[], LoseCause: [],
InvalidCause:[], InvalidCause: [],
}, },
showMember:[], showMember: [],
StageList:[], StageList: [],
} }
}, },
created() { created() {
this.getCustomerStageList() this.getCustomerStageList()
}, },
methods: { methods: {
goblck() { //返回上一个页面
goblck() {//返回上一个页面 this.$router.go(-1); //返回上一层
this.$router.go(-1);//返回上一层
},
savemove(){
}, },
getCustomerStageList(){ savemove() {},
getCustomerStageList() {
getCustomerStageList({}).then(res => { getCustomerStageList({}).then(res => {
this.loading = false this.loading = false
if (res.Code == 1) { if (res.Code == 1) {
this.StageList = res.Data this.StageList = res.Data
} }
}) })
}, },
getsuccess2(list,type){ getsuccess2(list, type) {
console.log(list)
this.showMember = list this.showMember = list
this.outerVisible = false this.outerVisible = false
}, },
} }
} }
</script> </script>
\ No newline at end of file
...@@ -241,16 +241,19 @@ ...@@ -241,16 +241,19 @@
.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;
}
</style> </style>
<template> <template>
<div class="examPaper page-body"> <div class="examPaper page-body">
<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>题量:{{examNum}} &nbsp;&nbsp;&nbsp; 满分:{{examScore}}</div>
</div> </div>
</div> </div>
<div style="width:20%;text-align:right;"> <div style="width:20%;text-align:right;">
...@@ -264,11 +267,13 @@ ...@@ -264,11 +267,13 @@
<div class="pGNameDiv"><span class="pGroupName">{{NoToChinese(gIndex+1)}}{{gItem.GroupName}}</span> (共 <div class="pGNameDiv"><span class="pGroupName">{{NoToChinese(gIndex+1)}}{{gItem.GroupName}}</span> (共
{{gItem.DetailsList.length}} 题,{{gItem.GScore}}分)</div> {{gItem.DetailsList.length}} 题,{{gItem.GScore}}分)</div>
<div v-for="(dItem,dIndex) in gItem.DetailsList" :key="dIndex"> <div v-for="(dItem,dIndex) in gItem.DetailsList" :key="dIndex">
<div style="display:flex;margin:10px 0;">
<span>{{dIndex+1}}</span> <span>{{dIndex+1}}</span>
<span class="paper_Title" v-html="dItem.Title"></span> <span class="paper_Title" v-html="dItem.Title"></span>
<span style="margin:10px 0;display:inline-block;"> <span style="margin-left:10px;display:inline-block;">
({{dItem.Score}}分) ({{dItem.Score}}分)
</span> </span>
</div>
<!--单选题--> <!--单选题-->
<v-single v-if="dItem.QuestionTypeKey=='single'||dItem.QuestionTypeKey=='single-number'" <v-single v-if="dItem.QuestionTypeKey=='single'||dItem.QuestionTypeKey=='single-number'"
:questionObj="dItem" :isShowAnswer="isShowAnswer" :isOperate="isOperate"> :questionObj="dItem" :isShowAnswer="isShowAnswer" :isOperate="isOperate">
......
<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>
......
<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:20px;
} }
.Exam-main { .Exam-main {
...@@ -241,20 +241,25 @@ ...@@ -241,20 +241,25 @@
.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;
}
</style> </style>
<!--阅卷--> <!--阅卷-->
<template> <template>
<div class="examPaper page-body"> <div class="examPaper page-body">
<div class="examPaperInfo_Top"> <div class="examPaperInfo_Top">
<div style="width:80%;">
<div> <div>
<div> <div class="Exam_PaperNameV2">{{DataObj.PaperName}}</div>
{{DataObj.PaperName}} <br /> <div style="margin-bottom:10px;">
题量:{{examNum}} &nbsp;&nbsp;&nbsp; 满分:{{examScore}} 题量:{{examNum}} &nbsp;&nbsp;&nbsp; 满分:{{examScore}}
<br /> <span style="margin-left:30px;">学生总得分:{{studentScore}}</span>
学生总得分:{{studentScore}} </div>
<q-input filled stack-label maxlength="100" :dense="false" v-model="DataObj.StuComment" <q-input v-model="DataObj.StuComment" filled type="textarea" placeholder="评语" />
class="col-6 q-pb-lg q-pr-lg" label="评语" />
</div> </div>
</div> </div>
<div style="width:20%;text-align:right;"> <div style="width:20%;text-align:right;">
......
This diff is collapsed.
This diff is collapsed.
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