Merge pull request 'yangws' (#354) from yangws into main
Reviewed-on: #354
This commit is contained in:
commit
6467203c26
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<el-form ref="classWorkFormScoreRef" :model="classWorkFormScore" style="height: 100%">
|
<el-form ref="classWorkFormScoreRef" :model="classWorkFormScore" style="height: 100%">
|
||||||
<!-- <div class="teacher_content" :style="{ height: dialogProps.maxheight + 'px' }"> -->
|
<!-- <div class="teacher_content" :style="{ height: dialogProps.maxheight + 'px' }"> -->
|
||||||
<div class="teacher_content" :style="{ height: '100%' }">
|
<div class="teacher_content" :style="{ height: '100%',fontSize: '18px' }">
|
||||||
<div style="font-size: 18px; width: 100%; padding: 5px 10px; flex: 0 0 auto;">
|
<div style="font-size: 18px; width: 100%; padding: 5px 10px; flex: 0 0 auto;">
|
||||||
{{ classWorkFormScore.name }} 答题详情
|
{{ classWorkFormScore.name }} 答题详情
|
||||||
</div>
|
</div>
|
||||||
|
@ -284,59 +284,27 @@
|
||||||
|
|
||||||
<!-- 批改评价与评语 -->
|
<!-- 批改评价与评语 -->
|
||||||
<div class="tacher_conten_foot">
|
<div class="tacher_conten_foot">
|
||||||
<el-row style="padding: 1% 4%; border: 2px dotted">
|
<el-row style=" padding: 1% 4%; border: 2px dotted;">
|
||||||
<el-col :span="24" style="display: flex; flex-direction: column">
|
<el-col :span="24" style="display: flex;flex-direction: column;">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="14">
|
<el-col :span="24">
|
||||||
<div style="display: flex; margin: 10px auto">
|
<div class="greenLine" style="text-align: left;" v-if="dialogProps.studentObj.worktype == '习题训练'">
|
||||||
<span style="display: flex; align-items: center">
|
<span style="font-weight: bold;">老师点评:</span>
|
||||||
<span v-if="dialogProps.studentObj.worktype == '习题训练'">
|
<span style="margin: 0;">{{ classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)}}</span>分
|
||||||
<span>得分: </span>
|
</div>
|
||||||
<span style="margin: 0; color: red">{{
|
<div style="display: flex; margin: 10px auto;align-items: center;justify-content: space-between;">
|
||||||
classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
|
|
||||||
}}</span>
|
|
||||||
<span>分</span>
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
<span>得分: </span>
|
|
||||||
<span v-if="classWorkFormScore.teacherRating.length > 0">
|
|
||||||
<el-input-number
|
|
||||||
v-model="classWorkFormScore.teacherRating[0].score"
|
|
||||||
:controls="false"
|
|
||||||
type="number"
|
|
||||||
:min="0"
|
|
||||||
:max="classWorkFormScore.teacherRating[0].maxScore"
|
|
||||||
size="small"
|
|
||||||
style="width: 60px"
|
|
||||||
@change="handleChange"
|
|
||||||
></el-input-number>
|
|
||||||
</span>
|
|
||||||
<span>分</span>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<div class="score-container">
|
<div class="score-container">
|
||||||
<div
|
<div
|
||||||
v-for="(score, index) in teacherRatingList"
|
v-for="(score, index) in teacherRatingList"
|
||||||
:key="index"
|
:key="index"
|
||||||
style="white-space: nowrap;"
|
style="white-space: nowrap;"
|
||||||
:class="[
|
:class="['score-circle', { 'active': classWorkFormScore.rating == score.ratingKey }]"
|
||||||
'score-circle',
|
|
||||||
{ active: classWorkFormScore.rating == score.ratingKey }
|
|
||||||
]"
|
|
||||||
@click="selectScore(score)"
|
@click="selectScore(score)"
|
||||||
>
|
>
|
||||||
{{ score.ratingValue }}
|
<el-text :style="{fontWeight:'bold', color: classWorkFormScore.rating == score.ratingKey ? 'rgb(225,12,8)':'rgb(131,131,131)' }">{{ score.ratingValue }}</el-text>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<el-select v-model="value" placeholder="常用评语" style="width: 240px" @change="onSelectOption">
|
||||||
</el-col>
|
|
||||||
<el-col :span="10" style="display: flex; align-items: center">
|
|
||||||
<el-select
|
|
||||||
v-model="value"
|
|
||||||
placeholder="常用评语"
|
|
||||||
style="width: 240px"
|
|
||||||
@change="onSelectOption"
|
|
||||||
>
|
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in cities"
|
v-for="item in cities"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
|
@ -354,23 +322,21 @@
|
||||||
placeholder="输入新的常用语"
|
placeholder="输入新的常用语"
|
||||||
size="small"
|
size="small"
|
||||||
/>
|
/>
|
||||||
<el-button type="primary" size="small" @click="onConfirm"> 确定 </el-button>
|
<el-button type="primary" size="small" @click="onConfirm">
|
||||||
|
确定
|
||||||
|
</el-button>
|
||||||
<el-button size="small" @click="clear">取消</el-button>
|
<el-button size="small" @click="clear">取消</el-button>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24" style="display: flex; flex-direction: column">
|
<el-col :span="24" style="display: flex;flex-direction: column;">
|
||||||
<el-form-item label="评语说明">
|
<el-form-item>
|
||||||
<el-col :span="15" style="padding: 0px">
|
<el-col :span="24" style="padding: 0px">
|
||||||
<el-input
|
<el-input row="5" type="textarea" v-model="classWorkFormScore.teacherremark" rows="1" placeholder="输入评语" />
|
||||||
v-model="classWorkFormScore.teacherremark"
|
|
||||||
type="textarea"
|
|
||||||
rows="1"
|
|
||||||
placeholder="请输入评语说明"
|
|
||||||
/>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
@ -975,23 +941,23 @@ defineExpose({
|
||||||
}
|
}
|
||||||
|
|
||||||
.score-circle {
|
.score-circle {
|
||||||
width: 30px;
|
border: 1px solid rgb(131,131,131,.5);
|
||||||
height: 30px;
|
padding: 5px 0;
|
||||||
border-radius: 50%;
|
background-color: #fff;
|
||||||
background-color: pink;
|
|
||||||
color: red;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
font-size: 13px;
|
|
||||||
margin: 0 10px;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: background-color 0.3s;
|
margin-right: 5px;
|
||||||
|
width: 60px;
|
||||||
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.score-circle.active {
|
.score-circle.active {
|
||||||
background-color: red;
|
background-color: rgb(253, 236, 224);
|
||||||
color: white;
|
color: white;
|
||||||
|
border: 1px solid rgb(253, 236, 224);
|
||||||
|
}
|
||||||
|
.greenLine{
|
||||||
|
border-left: 5px solid rgb(14, 209, 22);
|
||||||
|
padding-left: 5px
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-header{
|
.card-header{
|
||||||
|
|
Loading…
Reference in New Issue