Skip to content

T
thinkApp
Commit 1f8b4d2b authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp 

# Conflicts:
#	src/pages/index/workSituation.vue
#	src/pages/setComments/setComments.vue
parents e2d0552f fd95f545
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 31 deletions
src/components/index/workSituation/courseCard.vue
View file @ 1f8b4d2b
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
hideExchangeBoxHandler(item){ hideExchangeBoxHandler(item){
if(item){ if(item){
data.currentCourse=item data.currentCourse=item
ctx.emit('change',item.courseId) ctx.emit('change',item.courseId,item.CourseName)
} }
data.showItems=false data.showItems=false
ctx.emit('changePopStatus',0) ctx.emit('changePopStatus',0)
...@@ -178,8 +178,7 @@ ...@@ -178,8 +178,7 @@
data.titleList[1].data=r.Data.NotFinishList data.titleList[1].data=r.Data.NotFinishList
data.titleList[2].data=r.Data.FinishList data.titleList[2].data=r.Data.FinishList
data.currentCourse=r.Data.AllCourseList.length>0?r.Data.AllCourseList[0]:null data.currentCourse=r.Data.AllCourseList.length>0?r.Data.AllCourseList[0]:null
console.log(data.currentCourse) ctx.emit('change',data.currentCourse?data.currentCourse.courseId:0,data.currentCourse?data.currentCourse.CourseName:'')
ctx.emit('change',data.currentCourse?data.currentCourse.courseId:0)
}) })
}, },
......
src/components/index/workSituation/studentList.vue
View file @ 1f8b4d2b
<template> <template>
<view class="studentList-box flex"> <view class="studentList-box flex">
<block v-if="dataList && dataList.length>0" > <block v-if="dataList && dataList.length>0" >
<view class="studentList-content" @click="selectStuHandler(item)" v-for="(item,index) in dataList" :key="index"> <view class="studentList-content" v-for="(item,index) in dataList" :key="index"
@click="selectStuHandler(item)">
<view class="studentList flex"> <view class="studentList flex">
<view class="studentList-img"> <view class="studentList-img">
<van-image width="100%" height="100%" fit="cover" class="img" <van-image width="100%" height="100%" fit="cover" class="img"
...@@ -47,7 +48,6 @@ ...@@ -47,7 +48,6 @@
}); });
let methods = { let methods = {
selectStuHandler(item){ selectStuHandler(item){
console.log(item)
ctx.emit("selected",item.StuId,item.StuName) ctx.emit("selected",item.StuId,item.StuName)
} }
} }
......
src/components/setComments/rulesPopup.vue
View file @ 1f8b4d2b
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
} }
uni.showLoading() uni.showLoading()
data.loading=true data.loading=true
console.log(data.valueNum)
data.ruleObj.StartNum = data.minValue >data.maxValue?data.maxValue:data.minValue; data.ruleObj.StartNum = data.minValue >data.maxValue?data.maxValue:data.minValue;
data.ruleObj.EndNum = data.minValue>data.maxValue?data.minValue:data.maxValue; data.ruleObj.EndNum = data.minValue>data.maxValue?data.minValue:data.maxValue;
if(props.rule!=-1){ if(props.rule!=-1){
......
src/pages/index/examDetails.vue
View file @ 1f8b4d2b
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
</view> </view>
</view> </view>
<view class="index-student-information" style="flex:1;height:1px"> <view class="index-student-information" style="flex:1;height:1px">
<examDetailsComponents :ExamStu="ExamStu" :checkUnKnow='unSelectCheck'></examDetailsComponents> <van-empty description="暂无数据" v-if="ExamStu.length === 0" />
<examDetailsComponents v-if="ExamStu.length>0" :ExamStu="ExamStu" :checkUnKnow='unSelectCheck'></examDetailsComponents>
</view> </view>
</view> </view>
</view> </view>
...@@ -76,9 +77,10 @@ ...@@ -76,9 +77,10 @@
}, },
//获取考试学生列表 //获取考试学生列表
getExamStuList(){ getExamStuList(){
uni.showLoading()
proxy.$request("/Exam/GetExamStuList", data.Msg).then(res => { proxy.$request("/Exam/GetExamStuList", data.Msg).then(res => {
console.log(res.data);
data.ExamStu = res.Data; data.ExamStu = res.Data;
uni.hideLoading()
}) })
}, },
back(){ back(){
...@@ -107,6 +109,23 @@ ...@@ -107,6 +109,23 @@
}; };
</script> </script>
<style scoped> <style scoped>
.noData {
text-align: center;
flex: 1;
width: 100%;
margin-top: 171rpx;
}
.noData image {
width: 200rpx;
margin-bottom: 40rpx;
}
.noData view {
font-size: 24rpx;
color: #cecece;
text-align: center;
}
.index-student-information{ .index-student-information{
min-height: 800rpx; min-height: 800rpx;
background: #FFFFFF; background: #FFFFFF;
......
src/pages/index/workSituation.vue
View file @ 1f8b4d2b
...@@ -123,7 +123,8 @@ ...@@ -123,7 +123,8 @@
currentCourseId:0, currentCourseId:0,
userData:{}, userData:{},
loading:false, loading:false,
showPopu:false showPopu:false,
CourseName:''
}); });
data.userData=uni.getStorageSync("userInfo") data.userData=uni.getStorageSync("userInfo")
let methods = { let methods = {
...@@ -131,9 +132,9 @@ ...@@ -131,9 +132,9 @@
data.showPopu=status==1 data.showPopu=status==1
}, },
goSet(){ goSet(){
//let url='/pages/setComments/setComments?CourseId='+data.currentCourseId;
let url='/pages/setComments/teacher-commit?courseId='+data.currentCourseId; let url='/pages/setComments/teacher-commit?courseId='+data.currentCourseId;
console.log("url",url); //let url='/pages/setComments/setComments?CourseId='+data.currentCourseId+'&CourseName='+data.CourseName;
uni.navigateTo({ uni.navigateTo({
url:url url:url
}) })
...@@ -148,10 +149,11 @@ ...@@ -148,10 +149,11 @@
url:'/pages/student/student?stuId='+id+'&courseId='+data.currentCourseId+'&stuName='+encodeURIComponent(name) url:'/pages/student/student?stuId='+id+'&courseId='+data.currentCourseId+'&stuName='+encodeURIComponent(name)
}) })
}, },
changeCourseHandler(id){ changeCourseHandler(id,name){
data.Msg.courseId=id data.Msg.courseId=id
data.OperationMsg.courseId=id data.OperationMsg.courseId=id
data.currentCourseId=id data.currentCourseId=id
data.CourseName = name
methods.getCourseStuList() methods.getCourseStuList()
methods.getExamPageList() methods.getExamPageList()
methods.getCourseHomeWorkList() methods.getCourseHomeWorkList()
......
src/pages/setComments/commentRulesList.vue
View file @ 1f8b4d2b
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
<van-icon class="commentRulesList-header-left" name="arrow-left" @click="back" /> <van-icon class="commentRulesList-header-left" name="arrow-left" @click="back" />
<text class="commentRulesList-header-title">评论规则</text> <text class="commentRulesList-header-title">评论规则</text>
</view> </view>
<van-tabs v-model="activeName"
color="#D13A48" title-active-color="#D13A48"
@change="clickTabs">
<van-tab v-for="(item,indx) in LabelList" :key="index"
:title="item.name" :name="item.id"></van-tab>
</van-tabs>
</navbar> </navbar>
<view class="commentRulesList-content"> <view class="commentRulesList-content">
<!-- <view class="commentRulesList-title flex"> <!-- <view class="commentRulesList-title flex">
...@@ -55,7 +61,9 @@ ...@@ -55,7 +61,9 @@
</view> </view>
</view> </view>
<van-popup :show="show" :round="true" @close="closepopup"> <van-popup :show="show" :round="true" @close="closepopup">
<rulesPopup @cancel="closepopup" :rule="editor" :rules="courseRule" v-if="show" ref="getrulesPopup" @change="changeData"></rulesPopup> <rulesPopup @cancel="closepopup" :rule="editor" :rules="courseRule"
:Times="activeName"
v-if="show" ref="getrulesPopup" @change="changeData"></rulesPopup>
</van-popup> </van-popup>
</view> </view>
</template> </template>
...@@ -89,6 +97,8 @@ ...@@ -89,6 +97,8 @@
let data = reactive({ let data = reactive({
Msg: { Msg: {
CourseId: '', CourseId: '',
CourseName: '',
Times:''
}, },
//课程规则 //课程规则
courseRule: { courseRule: {
...@@ -96,11 +106,17 @@ ...@@ -96,11 +106,17 @@
Title: "", Title: "",
CourseId: 0, CourseId: 0,
CommentDetails: [], //规则详情 CommentDetails: [], //规则详情
Times:''
}, //课程规则 }, //课程规则
isDefaultRule: true, //是否是默认规则（ isDefaultRule: true, //是否是默认规则（
detailItem: {}, //当前编辑项 detailItem: {}, //当前编辑项
show:false, show:false,
editor:-1 editor:-1,
activeName:'1',
LabelList:[
{name:'第一次评论',id:'1'},
{name:'第二次评论',id:'2'},
{name:'第三次评论',id:'3'}]
}); });
let methods = { let methods = {
onClose(event) { onClose(event) {
...@@ -173,6 +189,11 @@ ...@@ -173,6 +189,11 @@
} }
}); });
}, },
clickTabs(name){
data.Msg.Times = name.target.name
data.courseRule.Times = name.target.name
that.getCourseRule()
},
//获取课程规则信息 //获取课程规则信息
getCourseRule() { getCourseRule() {
uni.showLoading() uni.showLoading()
...@@ -200,6 +221,7 @@ ...@@ -200,6 +221,7 @@
data.show=false data.show=false
} }
} }
let that = methods
return { return {
...toRefs(data), ...toRefs(data),
...methods ...methods
...@@ -207,18 +229,9 @@ ...@@ -207,18 +229,9 @@
}, },
onLoad(option) { onLoad(option) {
this.Msg.CourseId = option.CourseId; this.Msg.CourseId = option.CourseId;
if(option.show){ this.Msg.CourseName = option.CourseName;
//this.show = option.show this.Msg.Times = '1'
//this.addRules() this.courseRule.Times = '1'
}
// if(option.CourseId){
// this.show = true
// this.addRules()
// setTimeout(()=>{
// this.show = false
// this.closure()
// },200)
// }
this.getCourseRule(); this.getCourseRule();
}, },
}; };
...@@ -228,6 +241,7 @@ ...@@ -228,6 +241,7 @@
text-align: center; text-align: center;
flex: 1; flex: 1;
width: 100%; width: 100%;
margin-top: 171rpx;
} }
.van-swipe-cell__left, .van-swipe-cell__left,
.van-swipe-cell__right { .van-swipe-cell__right {
...@@ -379,6 +393,7 @@ ...@@ -379,6 +393,7 @@
.commentRulesList-content { .commentRulesList-content {
padding: 0 50rpx; padding: 0 50rpx;
margin-bottom: 240rpx; margin-bottom: 240rpx;
margin-top: 110rpx;
} }
.commentRulesList-box { .commentRulesList-box {
......
src/pages/setComments/setComments.vue
View file @ 1f8b4d2b
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
}, },
courseTimeList: [], //课程自动生成评论次数 courseTimeList: [], //课程自动生成评论次数
courseRule: {}, //课程评价规则 courseRule: {}, //课程评价规则
CourseName:''
}); });
let methods = { let methods = {
backFirst() { backFirst() {
...@@ -105,10 +106,8 @@ ...@@ -105,10 +106,8 @@
}) })
}, },
goRules() { goRules() {
console.log('come in 2 ....')
uni.navigateTo({ uni.navigateTo({
//url: '/pages/setComments/commentRulesList?CourseId=' + data.Msg.CourseId url: '/pages/setComments/commentRulesList?CourseId=' + data.Msg.CourseId + '&CourseName=' + data.CourseName
url: '/pages/setComments/commentRulesList?show=' + false+'&CourseId=' + data.Msg.CourseId
}) })
} }
}; };
...@@ -120,7 +119,7 @@ ...@@ -120,7 +119,7 @@
}, },
onLoad(option) { onLoad(option) {
this.Msg.CourseId = option.CourseId; this.Msg.CourseId = option.CourseId;
console.log(option) this.CourseName = option.CourseName
}, },
onShow() { onShow() {
this.getCourseRule(); this.getCourseRule();
......
src/pages/student/student.vue
View file @ 1f8b4d2b
...@@ -15,13 +15,14 @@ ...@@ -15,13 +15,14 @@
<text>学情反馈</text> <text>学情反馈</text>
<view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view> <view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view>
</view> </view>
<view class="index-student-information"> <view class="index-student-information" v-if="workList.length>0">
<template v-for="(item,index) in workList"> <template v-for="(item,index) in workList">
<JobComponents v-if="item.ResultType==1" :jobData="item"></JobComponents> <JobComponents v-if="item.ResultType==1" :jobData="item"></JobComponents>
<examComponents v-if="item.ResultType==2" :jobData="item"></examComponents> <examComponents v-if="item.ResultType==2" :jobData="item"></examComponents>
<commentsComponents v-if="item.ResultType==3" :jobData="item"></commentsComponents> <commentsComponents v-if="item.ResultType==3" :jobData="item"></commentsComponents>
</template> </template>
</view> </view>
<van-empty description="暂无数据" v-if="workList.length === 0" />
</view> </view>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment