合并master后

This commit is contained in:
@fawn-nine
2024-09-09 17:08:56 +08:00
parent 5232171255
commit 13c656d9b5
8 changed files with 38 additions and 27 deletions

View File

@@ -39,8 +39,9 @@
class="mainTxt">{{students.length}}/{{thisClass.number}}</text></view>
<view><text class="ciyao">管理成员</text><text class="mainTxt" @click="seeManager">点击查看</text></view>
</view>
<!-- v-if="thisClass.state == '2'" -->
<view class="pingfenBox testBox"
v-if="thisClass.state == '2'">
>
<view class="scoreTitle">
<view class="titles flex_box">
<text>总成绩</text>
@@ -48,18 +49,18 @@
@click="showTestTips = true"></uni-icons> -->
</view>
</view>
<view class="optionsBox" v-if="thisClass.state == '3'">
<!-- v-if="thisClass.state == '3'" -->
<view class="optionsBox" >
<!-- v-show="thisClass.state == '2'" -->
<view class="chengji">
<view>恭喜您获得<text class="greenScore">A证</text> <text
<view style="margin-top: 20rpx;">总成绩<text class="scoreNumber greenScore">{{performanceScore.userScore}}</text> <text
class="c999">{{performanceScore.examScore}}分考试分+{{performanceScore.usualScore}}分平时表现分</text></view>
<view>恭喜您获得<text class="greenScore">A证</text><text
class="small_btn border_radius_10 zhengshu">查看证书</text></view>
<view style="margin-top: 20rpx; text-align: center;">很遗憾您的成绩未达标</view>
<view class="" style="margin-top: 20rpx; text-align: center;">
<text class="small_btn chongxiu border_radius_10">加入新班级重修</text>
</view>
<!-- <view style="margin-top: 20rpx;">总成绩为<text class="scoreNumber greenScore">90</text> <text
class="c999">50考试分+40平时表现分</text></view> -->
</view>
</view>
</view>
@@ -385,7 +386,7 @@
<template v-if="admins.scorer.length > 0">
<view class="arryItemSub" v-for="(item,index) in admins.scorer" :key="index">
<template v-if="item.user != null">
<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname+' ' : '匿名用户 '}}</text>
<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname+'' : '匿名用户'}}</text>
<!-- <text>({{item.user.tel}}),</text> -->
</template>
</view>
@@ -932,7 +933,8 @@
url: "common/class/getUserScore",
method: "POST",
data: {
"classId": this.classId
"classId": this.classId,
"userId": this.userInfo.id
},
header: { //默认 无 说明:请求头
'Content-Type': 'application/json'
@@ -1067,10 +1069,10 @@
"page": this.pPage,
"classId": this.thisClass.id,
"type": this.tijiaoTitleId + '', //类型 0班内任务1医案2心得
"myExperience": this.myExperience, //0全部心得1我的心得
"myExperience": this.tijiaoTitleId != 2 ? "0" : "1", //0全部心得1我的心得 this.myExperience
"title": ""
}
console.log('data', data);
console.log('data任务/心得', data);
$http.request({
url: "common/class/getClassTaskListStudent",
method: "POST",
@@ -1102,9 +1104,11 @@
this.loadFlag = false;
console.log('res', res);
uni.hideLoading()
}else{
console.log('数据获取失败.......', res);
}
}).catch(e => {
console.log(e, '数据报错')
console.log( '数据报错', e)
uni.hideLoading()
this.loadFlag = false;
uni.showToast({