|
|
@@ -37,7 +37,6 @@
|
|
|
<el-dropdown-item divided>退出登录</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
-
|
|
|
</view>
|
|
|
|
|
|
<view class="ui-p ui-flex ui-flex-1 ui-flex-align-center" style="justify-content: end;" v-if="multiSelect">
|
|
|
@@ -94,13 +93,7 @@
|
|
|
ref="markScore"></markScore>
|
|
|
|
|
|
<!-- 点评记录 -->
|
|
|
-<<<<<<< HEAD
|
|
|
- <markScoreList :chooseClassId="chooseClassId" ref="markScoreList"></markScoreList>
|
|
|
-=======
|
|
|
- <markScoreList @success='DelectSuccess' @add='addTab' :list='studentTab.data' ref="markScoreList">
|
|
|
- </markScoreList>
|
|
|
->>>>>>> 0d8c02ba5c71fa1c8a3b7acdb1044e14d1156fc2
|
|
|
-
|
|
|
+ <markScoreList :chooseClassId="chooseClassId" ref="markScoreList" @delSuccess="delSuccess"></markScoreList>
|
|
|
<el-drawer title="排行榜" :visible.sync="showRankList" direction="rtl">
|
|
|
<view style="text-align: center;" class="">
|
|
|
开发中....!
|
|
|
@@ -122,7 +115,7 @@
|
|
|
<text class="txt-white f24">点评记录</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="ui-flex-column text-center ui-p bottom-btn-item" @click="$pageTo('./studentRankedChange')">
|
|
|
+ <view class="ui-flex-column text-center ui-p bottom-btn-item" @click="goSeatChange">
|
|
|
<image src="../../static/uni.png" style="width: 30px;height: 30px;" mode=""></image>
|
|
|
<view style="line-height: 1;">
|
|
|
<text class="txt-white f24">座位调整</text>
|
|
|
@@ -191,15 +184,23 @@
|
|
|
type: 1,
|
|
|
stuNameList: [],
|
|
|
stuName: '',
|
|
|
-
|
|
|
+ course_id : '',
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
this.id = this.$store.state.teacherInfo.selfclass.id
|
|
|
- // this.getStudent()
|
|
|
this.getClassroomList();
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
+ goSeatChange(){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: "./studentRankedChange"
|
|
|
+ })
|
|
|
+ },
|
|
|
+ delSuccess(){
|
|
|
+ this.getStudent()
|
|
|
+ },
|
|
|
getLog(){
|
|
|
this.$refs.markScoreList.open()
|
|
|
this.$refs.markScoreList.list=[]
|
|
|
@@ -208,13 +209,14 @@
|
|
|
},
|
|
|
change(e) {
|
|
|
this.type = e == 0 ? 1 : 2
|
|
|
- this.getTabs()
|
|
|
+ this.
|
|
|
+ sdfsdfsdfsdf()
|
|
|
},
|
|
|
setMulti() {
|
|
|
this.multiSelect = !this.multiSelect;
|
|
|
this.activeList = [];
|
|
|
},
|
|
|
- loginOut() {
|
|
|
+ loginOut(){
|
|
|
uni.setStorageSync("token", '')
|
|
|
uni.navigateTo({
|
|
|
url: "/pages/login/login"
|
|
|
@@ -226,13 +228,7 @@
|
|
|
this.getStudent()
|
|
|
this.show_classes = false
|
|
|
},
|
|
|
- DelectSuccess(index) {
|
|
|
- console.log(index);
|
|
|
- this.getStudent()
|
|
|
- this.getstudentTabLog()
|
|
|
- },
|
|
|
getClassroomList() {
|
|
|
-
|
|
|
let teacher_id = this.$store.state.teacherInfo.id
|
|
|
this.$api.sendRequest({
|
|
|
url: `/mobile/teacher/teachClasses`,
|
|
|
@@ -242,9 +238,13 @@
|
|
|
},
|
|
|
success: res => {
|
|
|
this.teachList.push(res.data)
|
|
|
+ if(this.chooseClassId=="" && this.teachList[0]){
|
|
|
+ console.log(this.teachList[0][0].id,"this.teachList[0].id");
|
|
|
+ this.chooseClassId=this.teachList[0][0].id
|
|
|
+ this.getStudent()
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
},
|
|
|
// 多选学生点评
|
|
|
commentMulti() {
|
|
|
@@ -253,7 +253,6 @@
|
|
|
this.$refs.markScore.open(1);
|
|
|
},
|
|
|
Comment(item) {
|
|
|
-
|
|
|
if (this.multiSelect) {
|
|
|
let index = this.activeList.indexOf(item.id)
|
|
|
if (index >= 0) {
|
|
|
@@ -270,20 +269,6 @@
|
|
|
this.stuName = item.title
|
|
|
this.getTabs()
|
|
|
this.$refs.markScore.open(1);
|
|
|
- return;
|
|
|
- //item的id是studentClass的id,需要转换成stu_school_id传到
|
|
|
- this.$api.sendRequest({
|
|
|
- url: getStuSchoolIdByStuClassId,
|
|
|
- data: {
|
|
|
- stu_class_id: item.id
|
|
|
- },
|
|
|
- success: res => {
|
|
|
- let stu_school_id = res.data.stu_school_id
|
|
|
- uni.navigateTo({
|
|
|
- url: "/pages/studentTab/studentTab?stu_school_id=" + stu_school_id
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
},
|
|
|
getStudent() {
|
|
|
this.$api.sendRequest({
|
|
|
@@ -302,8 +287,8 @@
|
|
|
method: "post",
|
|
|
data: {
|
|
|
teacher_id: this.$store.state.teacher_id,
|
|
|
-
|
|
|
- type: this.type
|
|
|
+ type: this.type,
|
|
|
+ course_id : this.course_id,
|
|
|
},
|
|
|
success: res => {
|
|
|
this.tabList = res.data
|
|
|
@@ -324,8 +309,6 @@
|
|
|
title: `${this.info.title} ${item.tab_name} ${item.type == 1 ? '+':'-'} ${score}分`,
|
|
|
icon: 'none'
|
|
|
})
|
|
|
-
|
|
|
- this.$refs.CommentPopup.close()
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -333,44 +316,8 @@
|
|
|
this.activeList = []
|
|
|
this.multiSelect = false
|
|
|
this.getStudent()
|
|
|
- this.getstudentTabLog()
|
|
|
- },
|
|
|
- getstudentTabLog() {
|
|
|
- this.$api.sendRequest({
|
|
|
- url: `/mobile/studentTab/getstudentTabLog`,
|
|
|
- data: {
|
|
|
- class_id: this.chooseClassId
|
|
|
- },
|
|
|
- method: "post",
|
|
|
- success: res => {
|
|
|
- this.studentTab = res.data
|
|
|
- }
|
|
|
- })
|
|
|
+
|
|
|
},
|
|
|
- addTab() {
|
|
|
- if (this.studentTab.current_page == this.studentTab.last_page) {
|
|
|
- uni.showToast({
|
|
|
- title: '没有更多数据',
|
|
|
- 'icon': 'none',
|
|
|
- });
|
|
|
- return
|
|
|
- }
|
|
|
- this.$api.sendRequest({
|
|
|
- url: `/mobile/studentTab/getstudentTabLog`,
|
|
|
- method: "post",
|
|
|
- data: {
|
|
|
- page: this.studentTab.current_page + 1,
|
|
|
- class_id: this.chooseClassId
|
|
|
- },
|
|
|
- success: res => {
|
|
|
- let arr = [...this.studentTab.data, ...res.data.data]
|
|
|
- this.studentTab = res.data
|
|
|
- this.studentTab.data = arr
|
|
|
-
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
},
|
|
|
|
|
|
}
|
