This commit is contained in:
@fawn-nine
2024-08-29 16:52:01 +08:00
parent 4fc2892739
commit ddd7c2c07f
3 changed files with 114 additions and 56 deletions

View File

@@ -1,37 +1,36 @@
<template> <template>
<view> <view>
<view class=""> <view class="">
<view v-if="thisClass.state != 0" class="flex_box"> <view v-if="thisClass.state != 0" :class="['flex_box',blankNumber < 3 ? 'flex_center' : 'flex_between']">
<view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '0')"
<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '0')"
v-if="classModel.isTask == 1"> v-if="classModel.isTask == 1">
<view class="img"> <view class="img">
<image src="@/static/icon/pigai2.png" mode="widthFix"></image> <image src="@/static/icon/pigai2.png" mode="widthFix"></image>
</view> </view>
<text>作业评分</text> <text>作业评分</text>
</view> </view>
<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '1')" <view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '1')"
v-if="classModel.isMedicalcase == 1"> v-if="classModel.isMedicalcase == 1">
<view class="img"> <view class="img">
<image src="@/static/icon/pigai1.png" mode="widthFix"></image> <image src="@/static/icon/pigai1.png" mode="widthFix"></image>
</view> </view>
<text>医案评分</text> <text>医案评分</text>
</view> </view>
<view class="item" @click="goXindeList('/pages/miniClass/xindeList')" <view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @click="goXindeList('/pages/miniClass/xindeList')"
v-if="classModel.isExperience == 1"> v-if="classModel.isExperience == 1">
<view class="img "> <view class="img ">
<image src="@/static/icon/pigai3.png" mode="widthFix"></image> <image src="@/static/icon/pigai3.png" mode="widthFix"></image>
</view> </view>
<text>心得评分</text> <text>心得评分</text>
</view> </view>
<view class="item" @click="goSikaoList('/pages/miniClass/sikaoQuestionList', thisClass.id)" <view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @click="goSikaoList('/pages/miniClass/sikaoQuestionList', thisClass.id)"
v-if="classModel.isQuestion == 1"> v-if="classModel.isQuestion == 1">
<view class="img"> <view class="img">
<image src="@/static/icon/sikaoti.png" mode="widthFix"></image> <image src="@/static/icon/sikaoti.png" mode="widthFix"></image>
</view> </view>
<text>思考题评分</text> <text>思考题评分</text>
</view> </view>
<view class="item" @click="goSikaoList('/pages/miniClass/sikaoQuestionList', thisClass.id)" <view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @click="goSikaoList('/pages/miniClass/sikaoQuestionList', thisClass.id)"
v-if="classModel.isExam == 1 && thisClass.state == '2'"> v-if="classModel.isExam == 1 && thisClass.state == '2'">
<view class="img"> <view class="img">
<image src="@/static/icon/teseIcon.png" mode="widthFix"></image> <image src="@/static/icon/teseIcon.png" mode="widthFix"></image>
@@ -49,9 +48,38 @@
name: "classInfoWorkBlank", name: "classInfoWorkBlank",
data() { data() {
return { return {
blankNumber:0
}; };
}, },
onShow() {
// var _number = this.getBlankNumber
},
mounted() {
this.blankNumber = 0
console.log('进入mounted');
if(this.classModel.isTask == 1){
this.blankNumber++
}
if(this.classModel.isMedicalcase == 1){
this.blankNumber++
}
if(this.classModel.isExperience == 1){
this.blankNumber++
}
if(this.classModel.isQuestion == 1){
this.blankNumber++
}
if(this.classModel.isExam == 1){
this.blankNumber++
}
},
computed:{
getBlankNumber(){
var number = 0
},
},
methods: { methods: {
goAddHomeWork(type) { goAddHomeWork(type) {
@@ -81,10 +109,13 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.flex_box { .flex_box {
justify-content: space-between; // justify-content: space-between;
} }
.flex_center{
// justify-content: center;
}
.item{ margin: 0 30rpx;}
// .item1{border: 1px solid;}
.fabuhomework { .fabuhomework {
margin: 20rpx 0; margin: 20rpx 0;
margin-top: -10rpx; margin-top: -10rpx;
@@ -121,4 +152,7 @@
height: 100%; height: 100%;
} }
} }
.item.flex_box{align-items: center; justify-content: space-between;
text{padding-top: 0;}
}
</style> </style>

View File

@@ -41,22 +41,22 @@
<view class="titles flex_box"> <view class="titles flex_box">
<text>表现分</text><uni-icons type="help" size="18" color="#fff" @click="clickHelp"></uni-icons> <text>表现分</text><uni-icons type="help" size="18" color="#fff" @click="clickHelp"></uni-icons>
</view> </view>
</view> </view>
<view class="otherItems flex_box userScore"> <view :class="['otherItems' ,'flex_box' ,'userScore']">
<view v-if="classModel.isTask == 1">
<view v-if="classModel.isTask == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
<text class="ciyao">作业得分</text> <text class="ciyao">作业得分</text>
<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task0Score}}</i></text> <text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task0Score}}</i></text>
</view> </view>
<view v-if="classModel.isMedicalcase == 1"> <view v-if="classModel.isMedicalcase == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
<text class="ciyao">医案得分</text> <text class="ciyao">医案得分</text>
<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task1Score}}</i></text> <text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task1Score}}</i></text>
</view> </view>
<view v-if="classModel.isExperience == 1"> <view v-if="classModel.isExperience == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
<text class="ciyao">心得得分</text> <text class="ciyao">心得得分</text>
<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.experienceScore}}</i></text> <text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.experienceScore}}</i></text>
</view> </view>
<view v-if="classModel.isQuestion == 1"> <view v-if="classModel.isQuestion == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
<text class="ciyao">思考题分</text> <text class="ciyao">思考题分</text>
<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.questionScore}}</i></text> <text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.questionScore}}</i></text>
</view> </view>
@@ -156,7 +156,7 @@
<view class="" v-show="students.length == 0 && tabId == '2'"> <view class="" v-show="students.length == 0 && tabId == '2'">
<u-divider text="暂无学员加入"></u-divider> <u-divider text="暂无学员加入"></u-divider>
</view> </view>
{{getTijiaoTitleList}} <!-- {{getTijiaoTitleList}} -->
<!-- 班内提交 --> <!-- 班内提交 -->
<view class="" v-if="tabId == '3' && thisClass.state != '0'"> <view class="" v-if="tabId == '3' && thisClass.state != '0'">
<view class="flex_box tijiaoTitle"> <view class="flex_box tijiaoTitle">
@@ -422,7 +422,8 @@
questionScore: 0 questionScore: 0
}, },
roleCode:[], roleCode:[],
firstLoad:false, // 是否是第一次请求 firstLoad:true, // 是否是第一次请求
blankNumber:0
} }
}, },
onLoad(e) { onLoad(e) {
@@ -459,18 +460,6 @@
onShow() { onShow() {
this.getClassInfo() this.getClassInfo()
this.getScore() this.getScore()
// this.getTijiaoTitleList()
if (this.thisClass.state != 0) {
if(this.firstLoad){
this.firstLoad = false
}
this.pPage = 0
this.taskList = []
this.getList()
}
// this.pPage = 0
// this.taskList = []
// this.getList()
}, },
computed: { computed: {
...mapState(["userInfo"]), ...mapState(["userInfo"]),
@@ -515,6 +504,24 @@
this.tijiaoTitleId = this.tijiaoTitleList[0].id this.tijiaoTitleId = this.tijiaoTitleList[0].id
// this.tabId = // this.tabId =
}, },
getBlankNumber(){
this.blankNumber = 0
if(this.classModel.isTask == 1){
this.blankNumber++
}
if(this.classModel.isMedicalcase == 1){
this.blankNumber++
}
if(this.classModel.isExperience == 1){
this.blankNumber++
}
if(this.classModel.isQuestion == 1){
this.blankNumber++
}
// if(this.classModel.isExam == 1){
// this.blankNumber++
// }
}
}, },
methods: { methods: {
@@ -1017,10 +1024,10 @@
// console.log('this.admins.counter',this.admins.counter); // console.log('this.admins.counter',this.admins.counter);
this.admins.scorer.push(item) this.admins.scorer.push(item)
} }
if (item.role == '5') { // if (item.role == '5') {
// console.log('this.admins.counter',this.admins.counter); // // console.log('this.admins.counter',this.admins.counter);
this.admins.counter.push(item) // this.admins.counter.push(item)
} // }
}) })
} }
@@ -1029,8 +1036,19 @@
this.courses = res.result.courses this.courses = res.result.courses
this.students = res.result.students this.students = res.result.students
this.refresh = true this.refresh = true
var ss = this.getTijiaoTitleList
if (this.thisClass.state != 0) {
this.pPage = 0
this.taskList = []
if(this.firstLoad){
this.firstLoad = false
this.tijiaoTitleId = this.tijiaoTitleList[0].id
} }
this.getList()
}
var dd = this.getBlankNumber
}
uni.hideLoading() uni.hideLoading()
}).catch(e => { }).catch(e => {
uni.hideLoading() uni.hideLoading()
@@ -1315,7 +1333,9 @@
.userScore { .userScore {
text-align: center; text-align: center;
.ite.flex_box{ align-items: end;
.ciyao{margin-right: 10rpx;}
}
.mainTxt { .mainTxt {
font-size: 50rpx; font-size: 50rpx;
color: $themeColor; color: $themeColor;

View File

@@ -135,6 +135,9 @@
<!-- 学员列表 --> <!-- 学员列表 -->
<view class="" v-if="tabId == '2'"> <view class="" v-if="tabId == '2'">
<view class="classMateBox" v-show="students.length> 0 "> <view class="classMateBox" v-show="students.length> 0 ">
<view class="" style=" overflow: hidden;">
<uni-section class="mb-10 nobg xueyuanTitle" title="班内学员" type="line" sub-title=""> {{students.length}} 名学员</uni-section>
</view>
<view class="flex_box tips"> <view class="flex_box tips">
<view class="item flex_box"> <view class="item flex_box">
<span class=""></span><text>普通用户</text> <span class=""></span><text>普通用户</text>
@@ -149,7 +152,6 @@
<span class="zmVip"></span><text>国学VIP</text> <span class="zmVip"></span><text>国学VIP</text>
</view> </view>
</view> </view>
<uni-section class="mb-10 nobg xueyuanTitle" title="班内学员" type="line" sub-title=""> {{students.length}} 名学员</uni-section>
<view class="newBox" > <view class="newBox" >
<view <view
:class="['item','flexbox', :class="['item','flexbox',
@@ -411,6 +413,7 @@ import { ref, onMounted } from 'vue';
homeWorkList:[], homeWorkList:[],
thisStudent:{}, thisStudent:{},
showStudentBlank:false, showStudentBlank:false,
} }
}, },
onLoad(e) { onLoad(e) {
@@ -496,7 +499,8 @@ import { ref, onMounted } from 'vue';
break; break;
} }
return _roleName return _roleName
} },
}, },
methods: { methods: {
closePup(){ closePup(){