Skip to content

Commit 109abbb

Browse files
fengsam6fengsam6
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # interactive-class/class-system/src/main/resources/mapper/CourseMapper.xml
2 parents 713bc7a + 8e392fc commit 109abbb

File tree

8 files changed

+50
-32
lines changed

8 files changed

+50
-32
lines changed

‎interactive-class/class-system/src/main/resources/mapper/UserSignMapper.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
</sql>
2121

2222
<select id="querySignInfo" resultType="com.code.classsystem.vo.SignVo">
23-
select class_user.member_id userId,course.class_id,course.id course_id,sign_place, MAX(case sign_in when 1 then sign_time else null end )signPreTime,
24-
MAX(case sign_in when 0 then sign_time else null end )signNextTime ,course.begin_time,course.end_time
25-
from course left join user_sign ON course.id = user_sign.course_id AND course.class_id = user_sign.class_id
26-
left join class_user on class_user.class_id=course.class_id
27-
where class_user.member_id=#{userId} and course.class_id=#{classId} and course.id=#{courseId} group by user_id,class_id,course_id,sign_place
23+
select c4.member_id userId,c3.id,c2.id course_id,sign_place, MAX(case sign_in when 1 then sign_time else null end )signPreTime,
24+
MAX(case sign_in when 0 then sign_time else null end )signNextTime ,c2.begin_time,c2.end_time
25+
from class_course c1 LEFT JOIN course c2 on c1.course_id=c2.id
26+
left join class c3 on c1.class_id=c3.id
27+
left join user_sign u ON c2.id = u.course_id
28+
left join class_user c4 on c4.class_id=c3.id
29+
where c4.member_id=#{userId} and c3.id=#{classId} and c2.id=#{courseId}
2830
</select>
2931

3032
</mapper>

‎interactiveClassUI/src/pages/class/index.vue‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,17 @@
146146
this.queryNotice();
147147
},
148148
onLoad(option) {
149-
this.teacher=option.roleId=='2';
150-
const item = JSON.parse(decodeURIComponent(option.item));
151-
this.className=item.className;
152-
this.notice.classId=item.classId;
153-
this.notice.courseId=item.courseId;
154-
this.course=item;
149+
const dataItem = JSON.parse(decodeURIComponent(option.item));
150+
this.teacher=dataItem.roleId=='2';
151+
this.className=dataItem.item.className;
152+
this.notice.classId=dataItem.item.id;
153+
this.notice.courseId=dataItem.courseId;
154+
this.course=dataItem;
155155
},
156156
methods:{
157157
codeImg(){
158158
uni.navigateTo({
159-
url: '/pages/class/codeImg/index?item='+this.course.classId
159+
url: '/pages/class/codeImg/index?item='+this.course.item.id
160160
});
161161
},
162162
studentManager(){
@@ -167,7 +167,7 @@
167167
},
168168
userTalk(){
169169
uni.navigateTo({
170-
url: '/pages/class/talk/index?classId='+ this.course.classId
170+
url: '/pages/class/talk/index?classId='+ this.course.item.id
171171
});
172172
},
173173
checkAnalysis(){

‎interactiveClassUI/src/pages/class/notice/form.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
this.showfbgg = true
6767
},
6868
publishGg(){
69-
this.notice.classId=this.course.classId;
69+
this.notice.classId=this.course.item.id;
7070
this.notice.courseId=this.course.courseId;
7171
addNotice(this.notice).then(resp => {
7272
this.successAlert("添加通知成功");

‎interactiveClassUI/src/pages/class/paper/addPaperForm.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
this.addPaperBtn = true
6565
},
6666
addPaper(){
67-
this.paper.classId=this.course.classId;
67+
this.paper.classId=this.course.item.id;
6868
this.paper.courseId=this.course.courseId;
6969
createPaper(this.paper).then(resp => {
7070
this.successAlert("添加试卷成功");

‎interactiveClassUI/src/pages/class/sign/index.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
}
103103
},
104104
mounted(){
105-
this.signComData.classId=this.signData.classId;
105+
this.signComData.classId=this.signData.item.id;
106106
this.signComData.courseId=this.signData.courseId;
107107
this.querySignInfo();
108108
},
@@ -113,7 +113,7 @@
113113
querySignInfo(){
114114
var data={
115115
courseId:this.signData.courseId,
116-
classId:this.signData.classId
116+
classId:this.signData.item.id
117117
}
118118
queryMySignInfo(data).then(resp => {
119119
this.signQuery=resp;
@@ -151,6 +151,7 @@
151151
}
152152
this.signComData.signPlace=this.signQuery.signPlace;
153153
this.signComData.signTime=this.signQuery.signPreTime;
154+
debugger
154155
signIn(this.signComData).then(resp => {
155156
this.successAlert("上课签到成功");
156157
// this.$emit("refreshNotice")

‎interactiveClassUI/src/pages/class/student/index.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
this.queryStuList();
4545
},
4646
onLoad(option) {
47-
const item = JSON.parse(decodeURIComponent(option.item));
48-
this.studentCom.classId=item.classId;
49-
this.studentCom.courseId=item.courseId;
47+
const dataItem = JSON.parse(decodeURIComponent(option.item));
48+
this.studentCom.classId=dataItem.item.id;
49+
this.studentCom.courseId=dataItem.courseId;
5050
},
5151
methods:{
5252
queryStuList(){

‎interactiveClassUI/src/pages/index/encourse/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
for(var i=0;i<this.classNum.length;i++){
134134
array.push(this.classNum[i].value);
135135
}
136-
this.courseInfo.className=array.toString();
136+
this.courseInfo.classNameList=array.toString();
137137
var resultJson=this.courseInfo;
138138
createCourse(this.courseInfo).then(resp => {
139139
this.successAlert("创建课程成功")

‎interactiveClassUI/src/pages/index/index.vue‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,13 @@
136136
<van-icon name="bars" />
137137
</view>
138138
</view>
139-
<view @click="managerCls(item)">
139+
<view @click="managerCls(item)" v-if="!roleId">
140140
<view class="cls_list_2">
141141
<view>
142-
<view style="height: 50%;line-height: 30px;" v-if="roleId">
143-
{{item.classList[0].className}}
144-
</view>
145-
<view style="height: 50%;line-height: 30px;" v-if="!roleId">
142+
<view style="height: 50%;line-height: 30px;">
146143
{{item.className}}
147144
</view>
148-
<view style="color: #FF5722;height: 50%;line-height: 30px;" v-if="roleId">
149-
{{item.classList[0].classNum}}人
150-
</view>
151-
<view style="color: #FF5722;height: 50%;line-height: 30px;" v-if="!roleId">
145+
<view style="color: #FF5722;height: 50%;line-height: 30px;">
152146
{{item.classNum}}人
153147
</view>
154148
</view>
@@ -158,6 +152,22 @@
158152
</view>
159153
<view class="line"></view>
160154
</view>
155+
<view v-for="item2 in item.classList" :key="item2.id" v-if="roleId">
156+
<view class="cls_list_2" @click="managerCls(item.courseId,item2)" >
157+
<view>
158+
<view style="height: 50%;line-height: 30px;">
159+
{{item2.className}}
160+
</view>
161+
<view style="color: #FF5722;height: 50%;line-height: 30px;">
162+
{{item2.classNum}}人
163+
</view>
164+
</view>
165+
<view class="cls_list2_icon" style="margin: auto 4px;font-size:20px;">
166+
<van-icon name="arrow" />
167+
</view>
168+
</view>
169+
<view class="line"></view>
170+
</view>
161171
</view>
162172
</view>
163173
</scroll-view>
@@ -308,9 +318,14 @@
308318
})
309319
console.log(this.classInfo);
310320
},
311-
managerCls(item){
321+
managerCls(courseId,item){
322+
var data={
323+
item:item,
324+
courseId:courseId,
325+
roleId:this.userInfo.roleId
326+
}
312327
uni.navigateTo({
313-
url: '/pages/class/index?roleId='+this.userInfo.roleId+'&item='+encodeURIComponent(JSON.stringify(item))
328+
url: '/pages/class/index?item='+encodeURIComponent(JSON.stringify(data))
314329
});
315330
},
316331
async doGetStoreUserInfo() {

0 commit comments

Comments
 (0)