|
|
@@ -49,12 +49,13 @@
|
|
|
'ui-ml10' : !!index%2
|
|
|
}"> -->
|
|
|
<view @click="toClickStu(stuItem)" v-for="stuItem in column.nodes" :key="stuItem.key"
|
|
|
- class="ui-flex-column ranked-item-tr ui-flex-align-center" v-if="stuItem.id || seatMove"
|
|
|
- :class="{active : activeList.includes(stuItem.id)}">
|
|
|
- <image :src="getLevelIcon(stuItem)" style="width: 130rpx;height: 48rpx;">
|
|
|
- </image>
|
|
|
- <image style="width: 100rpx;height: 100rpx;margin-top: -20rpx;" :src="stuItem.student_cartoon_photo"
|
|
|
- mode=""></image>
|
|
|
+ class="ui-flex-column ranked-item-tr ui-flex-align-center"
|
|
|
+ :class="{
|
|
|
+ active : activeList.includes(stuItem.id),
|
|
|
+ 'ranked-item-hide' : !(stuItem.id || seatMove)
|
|
|
+ }">
|
|
|
+ <image class="stu-image" :src="getLevelIcon(stuItem)" style="width: 130rpx;height: 48rpx;"></image>
|
|
|
+ <image class="stu-image" style="width: 100rpx;height: 100rpx;margin-top: -20rpx; border-radius: 300px; " :src="cartoonHeadImg ? stuItem.student_cartoon_photo : stuItem.student_photo+'?x-image-process=style/square400'" mode=""></image>
|
|
|
<view class="stu-tag text-center ui-flex-row ui-mt10">
|
|
|
<view class="stu-tag-add ui-flex-1">{{stuItem.plus_score_total}}</view>
|
|
|
<view class="stu-tag-sub ui-flex-1">{{stuItem.minus_score_total}}</view>
|
|
|
@@ -74,16 +75,16 @@
|
|
|
|
|
|
<!-- 点评记录 -->
|
|
|
<!-- :stuList="activeList" -->
|
|
|
- <markScoreList ref="markScoreList" :chooseClassId="chooseClassId"></markScoreList>
|
|
|
+ <markScoreList ref="markScoreList" :cartoonHeadImg="cartoonHeadImg" :chooseClassId="chooseClassId"></markScoreList>
|
|
|
|
|
|
<!-- 随机点名 -->
|
|
|
- <randomRollCall ref="randomRollCall" :list="studentList" @comment="randomRollComment"></randomRollCall>
|
|
|
+ <randomRollCall ref="randomRollCall" :cartoonHeadImg="cartoonHeadImg" :list="studentList" @comment="randomRollComment"></randomRollCall>
|
|
|
|
|
|
<!-- 计时器 -->
|
|
|
<timerClock ref="timerClock"></timerClock>
|
|
|
|
|
|
<!-- 排行榜 -->
|
|
|
- <rankList ref="rankList" :chooseClassId="chooseClassId"></rankList>
|
|
|
+ <rankList ref="rankList" :cartoonHeadImg="cartoonHeadImg" :chooseClassId="chooseClassId"></rankList>
|
|
|
|
|
|
<view v-if="seatMove" class="ui-pull-bottom ui-p"
|
|
|
style="background-color: #0000006b;backdrop-filter: blur(4px);border-top: 1px solid #616161;">
|
|
|
@@ -103,7 +104,7 @@
|
|
|
|
|
|
<el-dropdown trigger="click" @command="doChooseClass">
|
|
|
<view-btn-item title="选择班级" src="../../static/jyicon/shubao.png"></view-btn-item>
|
|
|
- <el-dropdown-menu slot="dropdown">
|
|
|
+ <el-dropdown-menu slot="dropdown" :class="{'min-height': classesList.length >= 10}">
|
|
|
<el-dropdown-item v-for="(item) in classesList" :key="item.id" :command="item">
|
|
|
<text class="ui-mr10">{{item.class_name}}</text>
|
|
|
<text v-if="item.id == chooseClassId" class="el-icon-check"></text>
|
|
|
@@ -113,6 +114,8 @@
|
|
|
|
|
|
<view-btn-item title="点评记录" src="../../static/jyicon/kedan.png"
|
|
|
@click="$refs.markScoreList.open()"></view-btn-item>
|
|
|
+ <view-btn-item title="切换头像" src="../../static/jyicon/chengchang.png"
|
|
|
+ @click="cartoonHeadImg = !cartoonHeadImg"></view-btn-item>
|
|
|
<view-btn-item title="座位调整" src="../../static/jyicon/xuewei.png"
|
|
|
@click="setSeatMove(true)"></view-btn-item>
|
|
|
<view-btn-item :title="multiSelect ? '取消多选' : '学生多选'" src="../../static/jyicon/gerenzhongxin.png"
|
|
|
@@ -172,6 +175,7 @@
|
|
|
multiSelect: false,
|
|
|
lastTipBatchId: '', // 最后点评的uuid，用于撤销,
|
|
|
seatMove: false, //0不调整
|
|
|
+ cartoonHeadImg : true,
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -346,10 +350,17 @@
|
|
|
// 更新座位
|
|
|
updateStuChange() {
|
|
|
let seat_list = this.list.map(item => {
|
|
|
+ let nodesLen = item.nodes.length;
|
|
|
return {
|
|
|
id: item.id,
|
|
|
title: item.title,
|
|
|
- nodes: item.nodes.map(el => {
|
|
|
+ nodes: item.nodes.filter((el, index) => {
|
|
|
+ if(el.id){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ return index + 1 < nodesLen;
|
|
|
+ }).map(el => {
|
|
|
return {
|
|
|
id: el.id,
|
|
|
key: el.key,
|
|
|
@@ -358,7 +369,8 @@
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
- // console.log(data);
|
|
|
+ // console.log(seat_list);
|
|
|
+ // return;
|
|
|
this.$api.sendRequest({
|
|
|
url: `/mobile/saveSeat`,
|
|
|
method: "PUT",
|
|
|
@@ -458,6 +470,7 @@
|
|
|
},
|
|
|
success: res => {
|
|
|
this.lastTipBatchId = null;
|
|
|
+ this.getStudent();
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -544,10 +557,20 @@
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
}
|
|
|
-
|
|
|
+ .ranked-item-tr:hover,
|
|
|
.active {
|
|
|
background: #ffffff85;
|
|
|
}
|
|
|
+ .ranked-item-hide .stu-tag,
|
|
|
+ .ranked-item-hide .stu-image,
|
|
|
+ {
|
|
|
+ opacity: 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ .min-height {
|
|
|
+ max-height: 400px;
|
|
|
+ overflow-y: scroll;
|
|
|
+ }
|
|
|
|
|
|
.ranked-radio {
|
|
|
width: 100px;
|
