解决文件冲突
This commit is contained in:
libowei
commit
165e313e4e
|
|
@ -41,7 +41,9 @@ const install = (Vue, vm) => {
|
|||
// 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的
|
||||
// 所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
|
||||
// const token = uni.getStorageSync('token');
|
||||
const token = " Bearer ce1a0c1ec5344cefbc7a185e29353c7c"
|
||||
|
||||
const token = " Bearer d61c0fee9e404290b8e4ad7bd0167656"
|
||||
|
||||
// console.log("我是token", token)
|
||||
config.header.Authorization = token;
|
||||
// config.header.Tenant-Id=1
|
||||
|
|
|
|||
31
pages.json
31
pages.json
|
|
@ -68,16 +68,7 @@
|
|||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/Mystudent/search",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "",
|
||||
"navigationBarBackgroundColor": "#4473f6",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"path" : "pages/Mystudent/classmate",
|
||||
"style" :
|
||||
|
|
@ -127,6 +118,26 @@
|
|||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/Mystudent/addstu",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "",
|
||||
"navigationBarBackgroundColor": "#4473f6",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/Mystudent/formstu",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "",
|
||||
"navigationBarBackgroundColor": "#4473f6",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
],
|
||||
"subPackages": [
|
||||
|
|
|
|||
|
|
@ -18,39 +18,14 @@
|
|||
placeholder-style="color:#C7CDD3 ">
|
||||
</view>
|
||||
<view class="teacher_card_box" >
|
||||
<view class="teacher_card" >
|
||||
|
||||
<view class="teacher_card" v-for="(item,index) in teacherlist" :key="index" >
|
||||
<view class="class_card_left">
|
||||
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
|
||||
</view>
|
||||
<view class="class_card_right">
|
||||
<view class="class_card_right_top">
|
||||
张三三老师
|
||||
</view>
|
||||
<view class="class_card_right_bot">
|
||||
听力
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="teacher_card" >
|
||||
<view class="class_card_left">
|
||||
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
|
||||
</view>
|
||||
<view class="class_card_right">
|
||||
<view class="class_card_right_top">
|
||||
张三三老师
|
||||
</view>
|
||||
<view class="class_card_right_bot">
|
||||
听力
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="teacher_card" >
|
||||
<view class="class_card_left">
|
||||
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
|
||||
</view>
|
||||
<view class="class_card_right">
|
||||
<view class="class_card_right_top">
|
||||
张三三老师
|
||||
{{item.name}}
|
||||
</view>
|
||||
<view class="class_card_right_bot">
|
||||
听力
|
||||
|
|
@ -68,10 +43,28 @@ export default {
|
|||
bgc: {
|
||||
backgroundColor: "#transparent",
|
||||
},
|
||||
classid:0,
|
||||
teacherlist:[]
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
// this.classid=option.id
|
||||
this.classid=15
|
||||
this.getclassteacher()
|
||||
},
|
||||
methods: {
|
||||
|
||||
getclassteacher(){
|
||||
this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/teacher/list?classId=${this.classid}`).then(res => {
|
||||
|
||||
|
||||
if (res.code == 0) {
|
||||
this.teacherlist=res.data.list
|
||||
// this.classlist = res.data.list
|
||||
// this.isloding = false
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
207
pages/Mystudent/addstu.vue
Normal file
207
pages/Mystudent/addstu.vue
Normal file
|
|
@ -0,0 +1,207 @@
|
|||
<template>
|
||||
<view class="searchpage">
|
||||
<u-navbar title="搜索" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
<view class="serchbox">
|
||||
<view class="serchimg">
|
||||
<image src="https://file.langsi.online/yasiimg/web/static/uVMACkynkipOxuTYDqm0">
|
||||
|
||||
</image>
|
||||
</view>
|
||||
<input type="text" placeholder="搜索相关内容..." class="input" placeholder-style="color:#C7CDD3 ">
|
||||
</view>
|
||||
<view class="check_card">
|
||||
<view class="check_card_stu" v-for="(item,index ) in stulist" :key="index">
|
||||
<view class="check_card_stu_info_left">
|
||||
<view class="class_card_left">
|
||||
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
|
||||
</view>
|
||||
<view class="class_card_right">
|
||||
<view class="class_card_right_top">
|
||||
李斯丹妮
|
||||
</view>
|
||||
<view class="class_card_right_bot">
|
||||
ID：3324
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="zhanwei" style="width: 100%; height: 50rpx;">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
bgc: {
|
||||
backgroundColor: "#transparent",
|
||||
},
|
||||
checkindex: 1,
|
||||
stulist:[]
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
// this.classid=option.id
|
||||
this.classid=15
|
||||
this.getallstu()
|
||||
},
|
||||
methods: {
|
||||
getallstu(){
|
||||
this.$u.get(`https://api.admin-v2.langsi.online/admin-api/v2/ybs-user/page`).then(res => {
|
||||
|
||||
|
||||
if (res.code == 0) {
|
||||
this.stulist=res.data.list
|
||||
// this.classlist = res.data.list
|
||||
// this.isloding = false
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
page {
|
||||
background: linear-gradient(183deg, #F0F6FF 0%, #FAFAFA 100%);
|
||||
}
|
||||
|
||||
.searchpage {
|
||||
width: 750rpx;
|
||||
padding: 0 32rpx;
|
||||
|
||||
.serchbox {
|
||||
padding: 0 32rpx;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
margin-top: 30rpx;
|
||||
align-items: center;
|
||||
width: 686rpx;
|
||||
height: 88rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
|
||||
.serchimg {
|
||||
width: 30.51rpx;
|
||||
height: 32rpx;
|
||||
margin-right: 24rpx;
|
||||
}
|
||||
|
||||
.input {
|
||||
margin: 0 auto;
|
||||
width: 568rpx;
|
||||
height: 88rpx;
|
||||
border-radius: 30rpx;
|
||||
// background-color: #f5f8fc;
|
||||
// display: flex;
|
||||
// justify-content: center;
|
||||
// align-items: center;
|
||||
// text-align: center;
|
||||
font-size: 28rpx;
|
||||
font-family: Source Han Sans CN, Source Han Sans CN-Light;
|
||||
font-weight: 300;
|
||||
text-align: left;
|
||||
color: #a7b9cd;
|
||||
letter-spacing: 1.2rpx;
|
||||
line-height: 36rpx;
|
||||
// padding: 0 100rpx;
|
||||
// padding-right: 135rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.check_card {
|
||||
margin-top: 20rpx;
|
||||
|
||||
.check_card_stu {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 32rpx;
|
||||
width: 686rpx;
|
||||
height: 148rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
border: 2rpx solid #FFFFFF;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.check_card_stu_info_left {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
|
||||
.class_card_left {
|
||||
width: 76rpx;
|
||||
height: 76rpx;
|
||||
}
|
||||
|
||||
.class_card_right {
|
||||
margin-left: 12rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.class_card_right_top {
|
||||
width: 100%;
|
||||
font-size: 28rpx;
|
||||
font-family: 'PingFang', 'PingFang';
|
||||
font-weight: bold;
|
||||
color: #072F5A;
|
||||
}
|
||||
|
||||
.class_card_right_bot {
|
||||
margin-top: 4rpx;
|
||||
font-size: 20rpx;
|
||||
font-family: 'PingFang', 'PingFang';
|
||||
font-weight: 500;
|
||||
color: rgba(7, 47, 90, 0.6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.check_card_stu_info_right {
|
||||
width: 50%;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.class_info {
|
||||
width: 110rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
|
||||
.class_info_top {
|
||||
font-size: 20rpx;
|
||||
font-family: 'PingFang', 'PingFang';
|
||||
font-weight: 500;
|
||||
color: rgba(7, 47, 90, 0.5);
|
||||
}
|
||||
|
||||
.class_info_bot {
|
||||
margin-top: 12rpx;
|
||||
font-size: 28rpx;
|
||||
font-family: 'PingFang', 'PingFang';
|
||||
font-weight: 800;
|
||||
color: #2D7CE6;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.act1 {
|
||||
border: 2rpx solid #2D7CE6;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
<template>
|
||||
<view class="searchpage">
|
||||
<u-navbar title="搜索"
|
||||
<view class="addpage">
|
||||
<u-navbar :title="title"
|
||||
:border-bottom="false"
|
||||
:background="bgc"
|
||||
title-color='#2E4975'
|
||||
title-size='36'
|
||||
height='36'></u-navbar>
|
||||
<view class="search_box">
|
||||
<view class="check_search">
|
||||
<view class="topbox">
|
||||
<view class="search_box">
|
||||
<!-- <view class="check_search">
|
||||
{{ checkindex == "0" ? "班级" : '学生' }}
|
||||
<view class="iconfont icon-arow_down"></view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="serchbox">
|
||||
<view class="serchimg">
|
||||
<image src="https://file.langsi.online/yasiimg/web/static/uVMACkynkipOxuTYDqm0"
|
||||
|
|
@ -23,94 +24,89 @@
|
|||
class="input"
|
||||
placeholder-style="color:#C7CDD3 ">
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="addclass" @click="addstu()">
|
||||
+ 添加学生
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_box"
|
||||
v-if="checkindex == 1">
|
||||
|
||||
<view class="class_card">
|
||||
<view class="class_card_top">
|
||||
<view class="check_card" v-show="checkindex==1">
|
||||
<view class="check_card_stu">
|
||||
<view class="check_card_stu_info_left">
|
||||
<view class="class_card_left">
|
||||
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
|
||||
</view>
|
||||
<view class="class_card_right">
|
||||
<view class="class_card_right_top">
|
||||
雅思1班
|
||||
李斯丹妮
|
||||
</view>
|
||||
<view class="class_card_right_bot">
|
||||
标签文字
|
||||
ID：3324
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_infobox">
|
||||
<view class="class_info">
|
||||
<view class="class_info_top">
|
||||
班级人数
|
||||
<view class="check_card_stu_info_right">
|
||||
<view class="class_info" >
|
||||
<view class="class_info_top" >
|
||||
平均成绩/分
|
||||
</view>
|
||||
<view class="class_info_bot" >
|
||||
6
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_info_bot">
|
||||
21
|
||||
<view class="class_info" >
|
||||
<view class="class_info_top" >
|
||||
作业完成度
|
||||
</view>
|
||||
<view class="class_info_bot" >
|
||||
80%
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_info">
|
||||
<view class="class_info_top">
|
||||
平均成绩/分
|
||||
</view>
|
||||
<view class="class_info_bot">
|
||||
21
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_info">
|
||||
<view class="class_info_top">
|
||||
作业完成度
|
||||
</view>
|
||||
<view class="class_info_bot">
|
||||
80%
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_card">
|
||||
<view class="class_card_top">
|
||||
<view class="check_card_stu ">
|
||||
<view class="check_card_stu_info_left">
|
||||
<view class="class_card_left">
|
||||
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
|
||||
</view>
|
||||
<view class="class_card_right">
|
||||
<view class="class_card_right_top">
|
||||
雅思1班
|
||||
李斯丹妮
|
||||
</view>
|
||||
<view class="class_card_right_bot">
|
||||
标签文字
|
||||
ID：3324
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_infobox">
|
||||
<view class="class_info">
|
||||
<view class="class_info_top">
|
||||
班级人数
|
||||
<view class="check_card_stu_info_right">
|
||||
<view class="class_info" >
|
||||
<view class="class_info_top" >
|
||||
平均成绩/分
|
||||
</view>
|
||||
<view class="class_info_bot" >
|
||||
6
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_info_bot">
|
||||
21
|
||||
<view class="class_info" >
|
||||
<view class="class_info_top" >
|
||||
作业完成度
|
||||
</view>
|
||||
<view class="class_info_bot" >
|
||||
80%
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_info">
|
||||
<view class="class_info_top">
|
||||
平均成绩/分
|
||||
</view>
|
||||
<view class="class_info_bot">
|
||||
21
|
||||
</view>
|
||||
</view>
|
||||
<view class="class_info">
|
||||
<view class="class_info_top">
|
||||
作业完成度
|
||||
</view>
|
||||
<view class="class_info_bot">
|
||||
80%
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<!-- <view class="botbtn">
|
||||
<view class="btn">
|
||||
确定添加（1）
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -118,30 +114,65 @@
|
|||
export default {
|
||||
data() {
|
||||
return {
|
||||
title: '班级成员',
|
||||
bgc: {
|
||||
backgroundColor: "#transparent",
|
||||
backgroundColor: "#F6F9FC",
|
||||
},
|
||||
checkindex: 1,
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
// this.classid=option.id
|
||||
this.classid=15
|
||||
this.getclassteacher()
|
||||
},
|
||||
methods: {
|
||||
|
||||
getclassteacher(){
|
||||
this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/members/list?classId=${this.classid}`).then(res => {
|
||||
|
||||
|
||||
if (res.code == 0) {
|
||||
this.teacherlist=res.data.list
|
||||
// this.classlist = res.data.list
|
||||
// this.isloding = false
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
addstu(){
|
||||
uni.navigateTo({
|
||||
url: "/pages/Mystudent/addstu?id=" + this.classid
|
||||
}).then(res => {
|
||||
|
||||
}).catch(err => {
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
page {
|
||||
background: linear-gradient(183deg, #F0F6FF 0%, #FAFAFA 100%);
|
||||
background: #F6F9FC;
|
||||
}
|
||||
|
||||
.searchpage {
|
||||
.addpage {
|
||||
width: 750rpx;
|
||||
padding: 0 32rpx;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.search_box {
|
||||
// display: flex;
|
||||
// flex-wrap: wrap;
|
||||
.topbox{
|
||||
margin-top: 46rpx;
|
||||
width: 686rpx;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
justify-content:space-between;
|
||||
align-items: center;
|
||||
.search_box {
|
||||
|
||||
width: 480rpx;
|
||||
height: 88rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
|
|
@ -174,7 +205,7 @@ page {
|
|||
flex-wrap: nowrap;
|
||||
// margin-top: 30rpx;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
// justify-content: space-between;
|
||||
width: 538rpx;
|
||||
height: 88rpx;
|
||||
background: #FFFFFF;
|
||||
|
|
@ -189,8 +220,8 @@ page {
|
|||
}
|
||||
|
||||
.input {
|
||||
// margin-left: 24rpx;
|
||||
width: 452rpx;
|
||||
margin-left: 24rpx;
|
||||
width: 394rpx;
|
||||
height: 88rpx;
|
||||
// border-radius: 30rpx;
|
||||
// background-color: #f5f8fc;
|
||||
|
|
@ -211,29 +242,47 @@ page {
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
.addclass{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 194rpx;
|
||||
height: 88rpx;
|
||||
background: #FFF2E4;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
|
||||
.class_box {
|
||||
font-size: 28rpx;
|
||||
font-family:'PingFang','PingFang';
|
||||
font-weight: 500;
|
||||
color: #F39852;
|
||||
}
|
||||
}
|
||||
|
||||
.check_card {
|
||||
margin-top: 20rpx;
|
||||
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.class_card {
|
||||
margin-top: 20rpx;
|
||||
.check_card_stu {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 32rpx;
|
||||
width: 686rpx;
|
||||
height: 296rpx;
|
||||
height: 148rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
padding: 32rpx;
|
||||
border: 2rpx solid #FFFFFF;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.class_card_top {
|
||||
.check_card_stu_info_left {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
|
||||
.class_card_left {
|
||||
width: 84rpx;
|
||||
height: 84rpx;
|
||||
width: 76rpx;
|
||||
height: 76rpx;
|
||||
}
|
||||
|
||||
.class_card_right {
|
||||
|
|
@ -243,35 +292,28 @@ page {
|
|||
|
||||
.class_card_right_top {
|
||||
width: 100%;
|
||||
font-size: 32rpx;
|
||||
font-size: 28rpx;
|
||||
font-family:'PingFang','PingFang';
|
||||
font-weight: bold;
|
||||
color: #072F5A;
|
||||
}
|
||||
|
||||
.class_card_right_bot {
|
||||
margin-top: 8rpx;
|
||||
background: #EBF3FF;
|
||||
border-radius: 4rpx 4rpx 4rpx 4rpx;
|
||||
padding: 10rpx 20rpx;
|
||||
margin-top: 4rpx;
|
||||
font-size: 20rpx;
|
||||
font-family:'PingFang','PingFang';
|
||||
font-weight: 500;
|
||||
color: #2D7CE6;
|
||||
color: rgba(7,47,90,0.6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.class_infobox {
|
||||
margin-top: 20rpx;
|
||||
.check_card_stu_info_right {
|
||||
width: 50%;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
justify-content: space-around;
|
||||
width: 622rpx;
|
||||
height: 128rpx;
|
||||
background: #F9F9F9;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
justify-content: space-between;
|
||||
|
||||
.class_info {
|
||||
width: 110rpx;
|
||||
|
|
@ -296,5 +338,34 @@ page {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.act1{
|
||||
border: 2rpx solid #2D7CE6;
|
||||
}
|
||||
}
|
||||
.botbtn{
|
||||
padding: 32rpx 32rpx 0 32rpx;
|
||||
margin-left: -32rpx;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
width: 750rpx;
|
||||
height: 200rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx -10rpx 16rpx 0rpx rgba(202,202,202,0.25);
|
||||
border-radius: 40rpx 40rpx 0rpx 0rpx;
|
||||
.btn{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 28rpx;
|
||||
font-family:'PingFang','PingFang';
|
||||
font-weight: 800;
|
||||
color: #FFFFFF;
|
||||
width: 686rpx;
|
||||
height: 80rpx;
|
||||
background: linear-gradient(180deg, #74AFFF 0%, #2D7CE6 100%);
|
||||
border-radius: 104rpx 104rpx 104rpx 104rpx;
|
||||
}
|
||||
}
|
||||
}</style>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
学生人数
|
||||
</view>
|
||||
<view class="info_cont_bot">
|
||||
21
|
||||
{{totalLastNum}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="info_cont">
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
平均成绩/分
|
||||
</view>
|
||||
<view class="info_cont_bot">
|
||||
21
|
||||
{{totalAvgScore }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="info_cont">
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
作业完成度
|
||||
</view>
|
||||
<view class="info_cont_bot">
|
||||
80%
|
||||
{{totalWorkCompletionDegre}}%
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -160,8 +160,8 @@
|
|||
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
|
||||
</view>
|
||||
<view class="class_card_right">
|
||||
<view class="class_card_right_top">
|
||||
{{ item.name }}
|
||||
<view class="class_card_right_top" v-html="highlightSearch(item.name)">
|
||||
<!-- {{ item.name }} -->
|
||||
</view>
|
||||
<view class="class_card_right_bot"
|
||||
v-show="item.classify == 1">
|
||||
|
|
@ -290,6 +290,9 @@ export default {
|
|||
showtext: false,
|
||||
textindex: 0,
|
||||
searchKeyword: '',
|
||||
totalLastNum:'',
|
||||
totalAvgScore:'',
|
||||
totalWorkCompletionDegre:0,
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
|
|
@ -297,14 +300,22 @@ export default {
|
|||
},
|
||||
|
||||
methods: {
|
||||
highlightSearch(name) {
|
||||
// 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字
|
||||
if (this.searchKeyword) {
|
||||
const regex = new RegExp(this.searchKeyword, 'gi');
|
||||
return name.replace(regex, match => `<span style="color: #2D7CE6 ;">${match}</span>`);
|
||||
}
|
||||
return name;
|
||||
},
|
||||
toclassdetal(item) {
|
||||
console.log('点击了'); // 确保这一行输出
|
||||
|
||||
uni.navigateTo({
|
||||
url: "/pages_teacher/teacher_class/class_detail?id=" + item.id
|
||||
}).then(res => {
|
||||
console.log('跳转成功', res);
|
||||
}).catch(err => {
|
||||
console.error('跳转失败', err);
|
||||
|
||||
}).catch(err => {
|
||||
|
||||
});
|
||||
},
|
||||
search() {
|
||||
|
|
@ -320,7 +331,7 @@ export default {
|
|||
},
|
||||
calculatePercentage(value1, value2) {
|
||||
if (value2 === 0) {
|
||||
console.log("value2 is zero, cannot calculate percentage");
|
||||
|
||||
return '0%'; // 或者返回其他默认值
|
||||
}
|
||||
|
||||
|
|
@ -348,8 +359,7 @@ export default {
|
|||
|
||||
},
|
||||
fuwei() {
|
||||
console.log(this.classlist, 'this.classlist');
|
||||
console.log(this.changeclasslist, 'this.changeclasslist');
|
||||
|
||||
this.classlist = JSON.parse(JSON.stringify(this.changeclasslist));
|
||||
},
|
||||
changetext() {
|
||||
|
|
@ -378,7 +388,7 @@ export default {
|
|||
return 0; // 保持原有顺序
|
||||
});
|
||||
} else {
|
||||
console.log('调用了');
|
||||
|
||||
this.fuwei();
|
||||
}
|
||||
|
||||
|
|
@ -386,17 +396,40 @@ export default {
|
|||
},
|
||||
getclassList() {
|
||||
this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
|
||||
console.log(res, '返回成功');
|
||||
|
||||
if (res.code === 0) {
|
||||
this.classlist = res.data.list;
|
||||
this.changeclasslist = JSON.parse(JSON.stringify(this.classlist));
|
||||
this.isloding = false;
|
||||
const list = res.data.list;
|
||||
|
||||
if (list.length > 0) {
|
||||
// 计算 totalMembers 总和
|
||||
const totalMembersSum = list.reduce((sum, item) => sum + item.totalMembers, 0);
|
||||
|
||||
// 计算 workCompletionDegree 平均值
|
||||
const workCompletionDegreeAvg = list.reduce((sum, item) => sum + item.workCompletionDegree, 0) / list.length;
|
||||
|
||||
// 计算 avgScore 平均值
|
||||
const avgScoreAvg = list.reduce((sum, item) => sum + item.avgScore, 0) / list.length;
|
||||
console.log(workCompletionDegreeAvg,'workCompletionDegreeworkCompletionDegree');
|
||||
// 将计算结果赋值给对应的变量
|
||||
this.totalLastNum = totalMembersSum;
|
||||
this.totalWorkCompletionDegre = workCompletionDegreeAvg;
|
||||
this.totalAvgScore = avgScoreAvg;
|
||||
// console.log(this.totalworkCompletionDegree,'totalworkCompletionDegreetotalworkCompletionDegree');
|
||||
} else {
|
||||
// 处理空数组的情况，例如设置默认值或者给出提示
|
||||
this.totalLastNum = 0;
|
||||
this.totalWorkCompletionDegre = 0;
|
||||
this.totalAvgScore = 0;
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
getstuList() {
|
||||
this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
|
||||
console.log(res, '返回成功');
|
||||
|
||||
|
||||
if (res.code == 0) {
|
||||
this.classlist = res.data.list
|
||||
|
|
|
|||
|
|
@ -8,8 +8,20 @@
|
|||
<image src="https://file.langsi.online/yasiimg/web/static/uXJ24nLEqmCb0FkFpmfy" mode=""></image>
|
||||
</view>
|
||||
<view class="view_span">
|
||||
<text>雅思1班</text>
|
||||
<view>基础班</view>
|
||||
<text>{{classinfo.name}}</text>
|
||||
<!-- <view>基础班</view> -->
|
||||
<view v-show="classinfo.classify == 1">
|
||||
听力
|
||||
</view>
|
||||
<view v-show="classinfo.classify == 2">
|
||||
阅读
|
||||
</view>
|
||||
<view v-show="classinfo.classify == 3">
|
||||
写作
|
||||
</view>
|
||||
<view v-show="classinfo.classify == 4">
|
||||
口语
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_yellowBotton">
|
||||
|
|
@ -19,10 +31,21 @@
|
|||
<view class="view_zy">
|
||||
|
||||
|
||||
<view class="view_left" v-for="(item,index) in clas" :key="index">
|
||||
<view class="view_left" @click="tostu()">
|
||||
<view class="veiw_left2">
|
||||
<view class="view_class">
|
||||
<text>{{item.title}}</text>
|
||||
<text>班级成员</text>
|
||||
<u-icon name="arrow-right" color="#646D7B" size="16"></u-icon>
|
||||
</view>
|
||||
<view class="view_images">
|
||||
<image :src="item1.url" mode="" v-for="(item1,index) in item.image"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_left" @click="toteacher()" >
|
||||
<view class="veiw_left2">
|
||||
<view class="view_class">
|
||||
<text>带班老师</text>
|
||||
<u-icon name="arrow-right" color="#646D7B" size="16"></u-icon>
|
||||
</view>
|
||||
<view class="view_images">
|
||||
|
|
@ -69,52 +92,7 @@
|
|||
|
||||
return {
|
||||
isShow: false,
|
||||
clas:[
|
||||
{
|
||||
title:'班级成员',
|
||||
image:[
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uXJ24nLEqmCb0FkFpmfy',
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/ufg5N01CbfezyG5wt48Q'
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uXJ24nLEqmCb0FkFpmfy'
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uy3xEPgyYPnRqPbpamya'
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uY8idjLvCQSuYCzvus9A'
|
||||
},{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/ucf2g8fGLqNtW7OpGNT6'
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
title:'带班老师',
|
||||
image:[
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uXJ24nLEqmCb0FkFpmfy',
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/ufg5N01CbfezyG5wt48Q'
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uXJ24nLEqmCb0FkFpmfy'
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uy3xEPgyYPnRqPbpamya'
|
||||
},
|
||||
{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/uY8idjLvCQSuYCzvus9A'
|
||||
},{
|
||||
url:'https://file.langsi.online/yasiimg/web/static/ucf2g8fGLqNtW7OpGNT6'
|
||||
},
|
||||
]
|
||||
}
|
||||
],
|
||||
|
||||
operation:[
|
||||
{
|
||||
image:'https://file.langsi.online/yasiimg/web/static/ukPnTLkhCKU5zhbM7SMu',
|
||||
|
|
@ -137,9 +115,55 @@
|
|||
title:'更多'
|
||||
}
|
||||
|
||||
]
|
||||
],
|
||||
classid:0,
|
||||
classinfo:{}
|
||||
}
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
// this.classid=option.id
|
||||
this.classid=15
|
||||
this.getclassinfo()
|
||||
},
|
||||
onShow(){
|
||||
|
||||
},
|
||||
methods:{
|
||||
getclassinfo() {
|
||||
this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/detail?id=${this.classid}`).then(res => {
|
||||
|
||||
|
||||
if (res.code == 0) {
|
||||
this.classinfo=res.data
|
||||
// this.classlist = res.data.list
|
||||
// this.isloding = false
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
toteacher(){
|
||||
|
||||
uni.navigateTo({
|
||||
url: "/pages/Mystudent/Formteacher?id=" + this.classinfo.id
|
||||
}).then(res => {
|
||||
|
||||
}).catch(err => {
|
||||
|
||||
});
|
||||
|
||||
},
|
||||
tostu(){
|
||||
|
||||
uni.navigateTo({
|
||||
url: "/pages/Mystudent/formstu?id=" + this.classinfo.id
|
||||
}).then(res => {
|
||||
|
||||
}).catch(err => {
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,127 @@
|
|||
</swiper-item>
|
||||
<!-- 写作 -->
|
||||
<swiper-item>
|
||||
<compose></compose>
|
||||
<view v-for="(item,index) in Compose" :key="item.id">
|
||||
<view class="view_bages">
|
||||
<view class="lelts">{{item.examName}}</view>
|
||||
<text class="Bags active" @click="upType(index,1)">test1</text>
|
||||
<text class="Bags" @click="upType(index,2)">test2</text>
|
||||
<text class="Bags" @click="upType(index,3)">test3</text>
|
||||
<text class="Bags" @click="upType(index,4)">test4</text>
|
||||
</view>
|
||||
<view class="view_fff" v-if="listType[index]===1">
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 1
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 1
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton" @click="addIdList()">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_fff" v-else-if="listType[index]===2">
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 2
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 2
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_fff" v-else-if="listType[index]===3">
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 3
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 3
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_fff" v-else-if="listType[index]===4">
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 4
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="view_Do">
|
||||
<view class="view_English">
|
||||
<view class="Task">
|
||||
Test 4
|
||||
</view>
|
||||
<view class="grizzly">曲线图</view>
|
||||
<view class="yellow">政府</view>
|
||||
</view>
|
||||
|
||||
<view class="view_pushbutton">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</swiper-item>
|
||||
<!--听力 -->
|
||||
<swiper-item>
|
||||
|
|
@ -46,7 +166,6 @@
|
|||
import audiology from './components/audiology.vue'
|
||||
import reading from './components/reading.vue'
|
||||
import slander from './components/slander.vue'
|
||||
import compose from './components/compose.vue'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -68,25 +187,40 @@
|
|||
name: '1',
|
||||
disabled: false
|
||||
}],
|
||||
// 写作
|
||||
Compose: [],
|
||||
num:0,
|
||||
// 下拉框的v-if布尔值
|
||||
radioValue: '',
|
||||
part1: true,
|
||||
current: 0,
|
||||
search: true,
|
||||
listType: [],
|
||||
idList: [],
|
||||
}
|
||||
},
|
||||
components:{
|
||||
audiology,
|
||||
reading,
|
||||
slander,
|
||||
compose
|
||||
slander
|
||||
},
|
||||
methods: {
|
||||
upType(index, num) {
|
||||
this.listType.splice(index, 1, num)
|
||||
},
|
||||
change(index) {
|
||||
this.current = index;
|
||||
},
|
||||
//写作接口
|
||||
// getCompose() {
|
||||
// this.$u.post('https://api.admin-v2.langsi.online/admin-api/speaking/topic/home/list').then(res => {
|
||||
// this.Compose = res.data
|
||||
// console.log(this.Compose)
|
||||
// for (let i = 0; i < res.data.length; i++) {
|
||||
// this.listType.push(1)
|
||||
// }
|
||||
// })
|
||||
// },
|
||||
// 选中某个单选框时，由radio时触发
|
||||
radioCheck(index) {
|
||||
if (this.radioValue == this.list2[index].id) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user