xinyi/tearoom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

内容修改

Browse Source
This commit is contained in:
taoxu 2023-12-06 16:56:25 +08:00
commit 0bbb54807d
4 changed files with 308 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
pages.json
View File

@ -1,3 +1,4 @@
{ {
"easycom": { "easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
@ -43,69 +44,7 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path" : "pages_teacher/teacher_class/class_detail",
"style" :
{
"navigationBarTitleText": "班级详情",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path" : "pages_teacher/pages_add/add_operation",
"style" :
{
"navigationBarTitleText": "添加听力",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path":"pages_teacher/teacher_teachers/teacher_addOperation",
"style" :
{
"navigationBarTitleText": "添加作业",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path":"pages_teacher/teacher_teachers/teacher_speechadd",
"style" :
{
"navigationBarTitleText": "添加口语",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path":"pages_teacher/teacher_teachers/teacher_writeadd",
"style" :
{
"navigationBarTitleText": "添加写作",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path":"pages_teacher/teacher_teachers/operation_detail",
"style" :
{
"navigationBarTitleText": "作业详情",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{ {
@ -190,6 +129,73 @@
} }
} }
], ],
"subPackages": [
{
"root": "pages_teacher",
"pages": [
{
"path":"teacher_teachers/teacher_writeadd",
"style" :
{
"navigationBarTitleText": "添加写作",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path":"teacher_teachers/operation_detail",
"style" :
{
"navigationBarTitleText": "作业详情",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path":"teacher_teachers/teacher_addOperation",
"style" :
{
"navigationBarTitleText": "添加作业",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path" : "pages_add/add_operation",
"style" :
{
"navigationBarTitleText": "添加听力",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path" : "teacher_class/class_detail",
"style" :
{
"navigationBarTitleText": "班级详情",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}
]
}
],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
@ -197,5 +203,9 @@
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
}, },
"uniIdRouter": {} "uniIdRouter": {}
} }

206
pages/Mystudent/student.vue
View File

@ -27,8 +27,8 @@
<view class="student_page_top"> <view class="student_page_top">
<view class="search_box"> <view class="search_box">
<view class="check_search"> <view class="check_search">
学生 {{ checkindex == 1 ? '班级' : '学生' }}
<view class="iconfont icon-arow_down"></view> <!-- <view class="iconfont icon-arow_down"></view> -->
</view> </view>
<view class="serchbox"> <view class="serchbox">
<view class="serchimg"> <view class="serchimg">
@ -38,9 +38,11 @@
</image> </image>
</view> </view>
<input type="text" <input type="text"
placeholder="搜索相关内容..." v-model="searchKeyword"
class="input" placeholder="搜索相关内容..."
placeholder-style="color:#C7CDD3 "> class="input"
placeholder-style="color:#C7CDD3"
@input="search()">
</view> </view>
</view> </view>
<view class="info_box"> <view class="info_box">
@ -92,36 +94,51 @@
v-if="checkindex == 1"> v-if="checkindex == 1">
<view class="class_box_top"> <view class="class_box_top">
<view @click="toggleDropdown" <view @click="changeclass()"
class="class_box_top_cont"> class="class_box_top_cont">
班级人数 班级人数
<view class="iconfont icon-arow_down"></view> <view class="iconfont icon-arow_down"></view>
<view class="dropdown_box" <view class="dropdown_box"
v-show="false"> v-show="classnum">
<view class="dropdown_item"> <view class="dropdown_item"
:class="classnumindex == 0 ? 'act2' : ''"
@click="chengclassnumindex(0)">
降序 降序
</view> </view>
<view class="dropdown_item"> <view class="dropdown_item"
:class="classnumindex == 1 ? 'act2' : ''"
@click="chengclassnumindex(1)">
升序 升序
</view> </view>
</view> </view>
</view> </view>
<view @click="toggleDropdown" <view @click="changetext()"
class="class_box_top_cont"> class="class_box_top_cont">
标签文字 标签文字
<view class="iconfont icon-arow_down"></view> <view class="iconfont icon-arow_down"></view>
<view class="dropdown_box" <view class="dropdown_box"
v-show="false"> v-show="showtext">
<view class="dropdown_item"> <view class="dropdown_item"
标签文字 :class="textindex == 1 ? 'act2' : ''"
@click="chengetextindex(1)">
听力
</view> </view>
<view class="dropdown_item"> <view class="dropdown_item"
标签文字 :class="textindex == 2 ? 'act2' : ''"
@click="chengetextindex(2)">
阅读
</view> </view>
<view class="dropdown_item"> <view class="dropdown_item"
标签文字 :class="textindex == 3 ? 'act2' : ''"
@click="chengetextindex(3)">
写作
</view>
<view class="dropdown_item"
:class="textindex == 4 ? 'act2' : ''"
@click="chengetextindex(4)">
口语
</view> </view>
</view> </view>
</view> </view>
@ -135,8 +152,9 @@
</view> </view>
<view class="class_card" <view class="class_card"
v-for="(item, index) in classlist" v-if="isloding==false" v-for="(item, index) in classlist"
:key="index"> v-if="isloding == false"
:key="index" @click="toclassdetal(item)">
<view class="class_card_top"> <view class="class_card_top">
<view class="class_card_left"> <view class="class_card_left">
<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image> <image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
@ -145,19 +163,32 @@
<view class="class_card_right_top"> <view class="class_card_right_top">
{{ item.name }} {{ item.name }}
</view> </view>
<view class="class_card_right_bot"> <view class="class_card_right_bot"
标签文字 v-show="item.classify == 1">
听力
</view>
<view class="class_card_right_bot"
v-show="item.classify == 2">
阅读
</view>
<view class="class_card_right_bot"
v-show="item.classify == 3">
写作
</view>
<view class="class_card_right_bot"
v-show="item.classify == 4">
口语
</view> </view>
</view> </view>
</view> </view>
<view class="class_infobox"> <view class="class_infobox">
<view class="class_info" <view class="class_info"
style="width:90rpx ;"> style="width:80rpx ;">
<view class="class_info_top"> <view class="class_info_top">
班级人数 班级人数
</view> </view>
<view class="class_info_bot"> <view class="class_info_bot">
{{ item.classify }} {{ item.totalMembers }}
</view> </view>
</view> </view>
<view class="class_info"> <view class="class_info">
@ -173,14 +204,14 @@
作业完成度 作业完成度
</view> </view>
<view class="class_info_bot"> <view class="class_info_bot">
<!-- {{ calculatePercentage(item.workCompletionDegree, item.totalMembers) }} --> {{ item.workCompletionDegree }}%
{{ calculatePercentage(2, 10) }}
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view style="width: 100%;height: 50rpx;"> <view style="width: 100%;height: 50rpx;">
</view> </view>
</view> </view>
</view> </view>
@ -252,7 +283,13 @@ export default {
checkindex: 1, checkindex: 1,
isDropdownOpen: true, isDropdownOpen: true,
classlist: {}, classlist: {},
isloding:true, isloding: true,
changeclasslist: {},
classnum: false,
classnumindex: -1,
showtext: false,
textindex: 0,
searchKeyword: '',
} }
}, },
onLoad(option) { onLoad(option) {
@ -260,34 +297,111 @@ export default {
}, },
methods: { methods: {
calculatePercentage(value1, value2) { toclassdetal(item) {
if (value2 === 0) { console.log('点击了'); // 确保这一行输出
console.log("value2 is zero, cannot calculate percentage"); uni.navigateTo({
return '0%'; // 或者返回其他默认值 url: "/pages_teacher/teacher_class/class_detail?id=" + item.id
} }).then(res => {
console.log('跳转成功', res);
return ((value1 / value2) * 100).toFixed(0) + '%'; }).catch(err => {
console.error('跳转失败', err);
});
}, },
toggleDropdown() { search() {
this.isDropdownOpen = !this.isDropdownOpen; // 根据关键字过滤 this.classlist
if(this.searchKeyword!=''){
const filteredList = JSON.parse(JSON.stringify(this.changeclasslist)).filter(item => item.name.includes(this.searchKeyword));
// 更新 this.classlist 为过滤后的列表
this.classlist = filteredList;
}else{
this.fuwei()
}
},
calculatePercentage(value1, value2) {
if (value2 === 0) {
console.log("value2 is zero, cannot calculate percentage");
return '0%'; // 或者返回其他默认值
}
return ((value1 / value2) * 100).toFixed(0) + '%';
},
changeclass() {
this.classnum = !this.classnum
},
chengclassnumindex(num) {
if (num == this.classnumindex) {
this.classnumindex = -1
} else {
this.classnumindex = num
}
if (this.classnumindex == 0) {
this.classlist.sort((a, b) => b.totalMembers - a.totalMembers);
}
if (this.classnumindex == 1) {
// 升序排列 classlist 数组，根据 totalMembers 属性
this.classlist.sort((a, b) => a.totalMembers - b.totalMembers);
}
if (this.classnumindex == -1) {
this.fuwei()
}
},
fuwei() {
console.log(this.classlist, 'this.classlist');
console.log(this.changeclasslist, 'this.changeclasslist');
this.classlist = JSON.parse(JSON.stringify(this.changeclasslist));
},
changetext() {
this.showtext = !this.showtext
},
chengetextindex(num) {
if (num == this.textindex) {
this.textindex = 0
} else {
this.textindex = num
}
if (this.textindex !== 0 || this.classnumindex === 1) {
this.classlist.sort((a, b) => {
if (this.textindex !== 0 && a.classify === this.textindex) {
return -1; // 将匹配的项放在前面
}
if (this.textindex !== 0 && b.classify === this.textindex) {
return 1; // 将匹配的项放在前面
}
if (this.classnumindex === 0) {
return b.totalMembers - a.totalMembers; // 对 totalMembers 进行降序排列
}
if (this.classnumindex === 1) {
return a.totalMembers - b.totalMembers; // 对 totalMembers 进行升序排列
}
return 0; // 保持原有顺序
});
} else {
console.log('调用了');
this.fuwei();
}
}, },
getclassList() { getclassList() {
this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => { this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
console.log(res, '返回成功'); console.log(res, '返回成功');
if (res.code === 0) {
if(res.code==0){ this.classlist = res.data.list;
this.classlist = res.data.list this.changeclasslist = JSON.parse(JSON.stringify(this.classlist));
this.isloding=false this.isloding = false;
} }
}) });
}, },
getstuList() { getstuList() {
this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => { this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
console.log(res, '返回成功'); console.log(res, '返回成功');
if(res.code==0){ if (res.code == 0) {
this.classlist = res.data.list this.classlist = res.data.list
this.isloding=false this.isloding = false
} }
}) })
} }
@ -546,6 +660,10 @@ export default {
color: rgba(46, 73, 117, 0.6); color: rgba(46, 73, 117, 0.6);
border-bottom: 2rpx solid #F3F3F3; border-bottom: 2rpx solid #F3F3F3;
} }
.act2 {
color: #2D7CE6;
}
} }
} }

98
pages_teacher/teacher_teachers/components/slander.vue
View File

@ -1,37 +1,42 @@
<template> <template>
<!-- 口语下拉 --> <!-- 口语下拉 -->
<view> <view>
<view class="view_left"> <view class="view_left">
<view class="view_left_pd" @click="arrow_xl"> <view class="view_left_pd" @click="arrow_xl">
{{selectedOption}} {{selectedOption}}
<u-icon name="arrow-down" size="22" class="pd_icon"></u-icon> <u-icon name="arrow-down" size="22" class="pd_icon"></u-icon>
<view class="pull_Down" v-if="arrow"> <view class="pull_Down" v-if="arrow">
<view v-for="(item,index) in options" :key="index" @click="arrow_options(item.id)">{{item.name}}</view> <view v-for="(item,index) in options" :key="index" @click="arrow_options(item.id)">{{item.name}}</view>
</view>
</view> </view>
</view> <view class="view_left_pd" @click="arrow_xl2">
<view class="view_left_pd" @click="arrow_xl2"> {{categorize}}
{{categorize}} <u-icon name="arrow-down" size="22" class="pd_icon"></u-icon>
<u-icon name="arrow-down" size="22" class="pd_icon"></u-icon> <view class="pull_DownTow" v-if="arrowDown">
<view class="pull_DownTow" v-if="arrowDown"> <view v-for="(item,index) in options2 " :key="index" @click="Classification(item.id)">{{item.name}}</view>
<view v-for="(item,index) in options2 " :key="index" @click="Classification(item.id)">{{item.name}}</view>
</view>
</view>
</view>
<!-- 口语主体 -->
<view v-for="(item,index) in slander" :key="index">
<view class="unite">{{item.label}}</view>
<view class="slander_for">
<view class="slander_behavior" v-for="(items,indexs) in item.list" :key='indexs'>
<view class="slander_left">{{items.topicEn}}</view>
<view style="display: flex;">
<view class="slander_an">串题</view>
<view class="slander_an blue">跟读</view>
<view class="slander_an blue">模考</view>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- 口语主体 -->
</view> <view v-for="(item,index) in slander" :key="index">
<view class="view_inuygs">
<view class="header_part">
<view class="unite">{{selectedOption}}</view>
<view class="unite">{{item.label}}</view>
</view>
<view style="display: flex;">
<view class="slander_an">串题</view>
<view class="slander_an blue">跟读</view>
<view class="slander_an blue">模考</view>
</view>
</view>
<view class="slander_for">
<view class="slander_behavior" v-for="(items,indexs) in item.list" :key='indexs'>
<view class="slander_left">{{items.topicEn}}</view>
</view>
</view>
</view>
</view>
</template> </template>
<script> <script>
@ -81,7 +86,7 @@
], ],
} }
}, },
onLoad() { created() {
this.getList() this.getList()
}, },
methods:{ methods:{
@ -109,6 +114,7 @@
this.options.forEach(item=>{ this.options.forEach(item=>{
if(item.id== id){ if(item.id== id){
this.selectedOption=item.name this.selectedOption=item.name
}else if(id==2){ }else if(id==2){
this.postdata.part="part2" this.postdata.part="part2"
this.getList() this.getList()
@ -137,6 +143,11 @@
justify-content: left; justify-content: left;
margin-top: 20rpx; margin-top: 20rpx;
} }
.view_inuygs{
display: flex;
justify-content: space-between;
align-items: center;
}
.view_left_pd { .view_left_pd {
position: relative; position: relative;
@ -145,13 +156,15 @@
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;
margin-right: 15rpx; margin-right: 15rpx;
font-size: 24rpx; font-size: 24rpx;
color: #072F5A;
} }
.unite { .unite {
font-size: 28rpx; font-size: 28rpx;
font-family: 'PingFang'; font-family: 'PingFang';
font-weight: 800; font-weight: 800;
color: #2E4975; color: #2E4975;
margin: 26rpx 0rpx;
margin-right: 20rpx;
} }
.slander_for { .slander_for {
background: #FFFFFF; background: #FFFFFF;
@ -159,16 +172,12 @@
padding: 0 30rpx; padding: 0 30rpx;
} }
.slander_behavior { .slander_behavior {
display: flex;
justify-content: space-between;
padding: 20rpx 0rpx; padding: 20rpx 0rpx;
border-bottom: 2rpx solid #F2F2F2; border-bottom: 2rpx solid #F2F2F2;
} }
.slander_left { .slander_left {
width: 328rpx;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden
} }
.pull_DownTow{ .pull_DownTow{
width: 150rpx; width: 150rpx;
@ -206,5 +215,22 @@
} }
.pd_icon { .pd_icon {
margin-left: 8rpx; margin-left: 8rpx;
}
.header_part{
display: flex;
align-items: center;
margin: 26rpx 0rpx;
}
.slander_an{
padding: 6rpx 18rpx;
background: #fff;
border-radius: 12rpx 12rpx 12rpx 12rpx;
margin-left: 12rpx;
color: #65748C;
}
.blue {
background: rgba(45,124,230,0.1);
color: #2D7CE6;
} }
</style> </style>

20
pages_teacher/teacher_teachers/teacher_writeadd.vue
View File

@ -5,7 +5,7 @@
</u-navbar> </u-navbar>
<!-- 搜索 --> <!-- 搜索 -->
<view class="view_search" v-if="search"> <view class="view_search" v-if="search">
<u-search :show-action="false" :animation="true" bg-color="#fff" placeholder="搜索相关内容..."></u-search> <u-search :show-action="false" :animation="true" bg-color="#fff" placeholder="搜索相关内容..." color="#3E97FF"></u-search>
</view> </view>
<!--导航栏 --> <!--导航栏 -->
<view class="view_tabs"> <view class="view_tabs">
@ -14,7 +14,7 @@
<!-- 轮播图 --> <!-- 轮播图 -->
<swiper :interval="5000" :duration="1000" is-scroll="true" :current="current" @change="updateCurrent" class="swiper"> <swiper :interval="5000" :duration="1000" is-scroll="true" :current="current" @change="updateCurrent" class="swiper">
<!-- 口语 --> <!-- 口语 -->
<swiper-item> <swiper-item style="height: 300rpx;">
<slander></slander> <slander></slander>
</swiper-item> </swiper-item>
<!-- 写作 --> <!-- 写作 -->
@ -149,12 +149,10 @@
<swiper-item> <swiper-item>
<reading></reading> <reading></reading>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="footer"> <view :class="search== true ? 'footer2' : 'footer'">
<view class="footer_button"> <view class="footer_button">
<view :class="search==true ? 'button_andadd' :'button_show'">确定添加（4）</view> <view :class="search==true ? 'button_andadd' :'button_show'">确定添加（4）</view>
<view class="footer_button_right" v-if="search">口语模考</view> <view class="footer_button_right" v-if="search">口语模考</view>
@ -206,9 +204,6 @@
reading, reading,
slander slander
}, },
onLoad() {
// this.getCompose()
},
methods: { methods: {
upType(index, num) { upType(index, num) {
this.listType.splice(index, 1, num) this.listType.splice(index, 1, num)
@ -405,7 +400,7 @@
} }
.swiper { .swiper {
height: 62vh; height: 80%;
} }
swiper-item { swiper-item {
@ -427,6 +422,13 @@
box-shadow: 0rpx -6rpx 14rpx 0rpx rgba(177, 177, 177, 0.25); box-shadow: 0rpx -6rpx 14rpx 0rpx rgba(177, 177, 177, 0.25);
padding: 30rpx 32rpx; padding: 30rpx 32rpx;
} }
.footer2{
width: 100%;
background: #FFFFFF;
box-shadow: 0rpx -6rpx 14rpx 0rpx rgba(177, 177, 177, 0.25);
padding: 30rpx 32rpx;
margin-top: 25rpx;
}
.footer_button { .footer_button {
display: flex; display: flex;