diff --git a/pages/Mystudent/Mystudent.vue b/pages/Mystudent/Mystudent.vue index 9c978af..aa028a6 100644 --- a/pages/Mystudent/Mystudent.vue +++ b/pages/Mystudent/Mystudent.vue @@ -3,7 +3,7 @@ <view class="topbox"> <u-navbar title="LILY" :border-bottom="false" :background="bgc" title-color='#FFFFFF' title-size='36' height='36'></u-navbar> - <view class="echarts"> + <view class="echarts" v-if="isloading"> <!-- <mpvue-echarts id="main" ref="pieChart" :echarts="echarts" @onInit="initChart" /> --> <l-echart ref="chart" @finished="initChart"></l-echart> </view> @@ -27,7 +27,12 @@ <view class="infobox_top_righttop"> 较昨日 </view> - <view class="infobox_top_rightbot" style="color: #2D7CE6; " v-if="isup"> + <view class="infobox_top_rightbot" v-if="workinfo.yesterdayStudyPoint==0&&workinfo.todayStudyPoint==0" style="color: #2E4975;"> + <view class="text"> + 0% + </view> + </view> + <view class="infobox_top_rightbot" style="color: #2D7CE6; " v-if="isup&&workinfo.yesterdayStudyPoint!=0&&workinfo.todayStudyPoint!=0"> <view class="iconfont icon-xiangshangjiantoucuxiao"> </view> <view class="text"> @@ -35,12 +40,12 @@ </view> </view> - <view class="infobox_top_rightbot" v-if="beforyes==0" style="color: #2E4975;"> + <view class="infobox_top_rightbot" v-if="beforyes==0&&workinfo.yesterdayStudyPoint!=0&&workinfo.todayStudyPoint!=0" style="color: #2E4975;"> <view class="text"> {{beforyes}}% </view> </view> - <view class="infobox_top_rightbot" v-if="isup==false"> + <view class="infobox_top_rightbot" v-if="isup==false&&workinfo.yesterdayStudyPoint!=0&&workinfo.todayStudyPoint!=0"> <view class="iconfont icon-xiangxiajiantoucuxiao"> </view> <view class="text"> @@ -224,28 +229,29 @@ return { // echarts, totalScore: 10, - grammaticalScore: 8, - vocabularyScore: 8, - pronounceScore: 8, - fluencyScore: 8, + write: 8, + speak: 8, + read: 8, + listen: 8, bgc: { backgroundColor: "transparent", }, sdydata: [], isalready: true, - id: 1523, + id: 0, workinfo: {}, orgworkinfo: {}, beforyes: '', isup: '', - works:{} + works:{}, + isloading:false // https://file.langsi.online/yasiimg/web/static/uBHiWpVS8LQdX241DdjX } }, onLoad(option) { - + this.id =option.id // this.changedata() this.getinfo() }, @@ -271,14 +277,19 @@ this.orgworkinfo = JSON.parse(JSON.stringify(res.data)); const percentageChange = ((this.workinfo.todayStudyPoint - this.workinfo .yesterdayStudyPoint) / Math.abs(this.workinfo.yesterdayStudyPoint)) * 100; - + this.totalScore=(this.workinfo.scoreMap.writingScore+this.workinfo.scoreMap.writingScore+this.workinfo.scoreMap.readingScore+this.workinfo.scoreMap.listeningScore)/4 + this.write=this.workinfo.scoreMap.writingScore + this.speak=this.workinfo.scoreMap.speakingScore + this.read=this.workinfo.scoreMap.readingScore + this.listen=this.workinfo.scoreMap.listeningScore + // Determine whether it's an improvement or decline this.isup = percentageChange > 0; // Assign the absolute percentage change to this.beforyes this.beforyes = Math.abs(percentageChange); this.changedata() - + this.isloading=true // this.classlist = res.data.list // this.isloding = false @@ -363,22 +374,22 @@ color: '#FFFFFF ' // 标签特定的颜色。 }, { - name: '写作' + ' ' + Number(_this.grammaticalScore).toFixed(1), + name: '写作' + ' ' + Number(_this.write).toFixed(1), max: 100, color: '#FFFFFF' // 标签特定的颜色。 }, { - name: '阅读' + ' ' + Number(_this.vocabularyScore).toFixed(1), + name: '阅读' + ' ' + Number(_this.read).toFixed(1), max: 100, color: '#FFFFFF' // 标签特定的颜色。 }, { - name: '口语' + ' ' + Number(_this.pronounceScore).toFixed(1), + name: '口语' + ' ' + Number(_this.speak).toFixed(1), max: 100, color: '#FFFFFF' // 标签特定的颜色。 }, { - name: '听力' + ' ' + Number(_this.fluencyScore).toFixed(1), + name: '听力' + ' ' + Number(_this.listen).toFixed(1), max: 100, color: '#FFFFFF' // 标签特定的颜色。 } diff --git a/pages_teacher/teacher_class/class_members.vue b/pages_teacher/teacher_class/class_members.vue index 4334764..7f4d0cf 100644 --- a/pages_teacher/teacher_class/class_members.vue +++ b/pages_teacher/teacher_class/class_members.vue @@ -19,7 +19,7 @@ </view> --> - <view class="check_card_stu" v-for="(item,index) in workinfo" :key="index"> + <view class="check_card_stu" v-for="(item,index) in workinfo" :key="index" @click="topage(item.id)"> <view class="check_card_stu_info_left"> <view class="class_card_left"> <image :src="item.avatar"></image> @@ -99,6 +99,16 @@ } }) }, + topage(id){ + // console.log(''); + uni.navigateTo({ + url: "/pages/Mystudent/Mystudent?id=" + id + }).then(res => { + + }).catch(err => { + + }); + }, }