Skip to content

T
thinkApp
Commit 454432b1 authored by 罗超's avatar 罗超
Browse files
Options

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

# Conflicts:
#	src/pages/index/workSituation.vue
parents 7e949616 8dc5bb5b
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 90 deletions
src/components/index/course-card.vue
View file @ 454432b1
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
url: '/pages/index/workSituation?tabNme=' + '作业情况' +'&courseId=' + item.courseId url: '/pages/index/workSituation?tabNme=' + '作业情况' +'&courseId=' + item.courseId
}); });
},500) },500)
}, },
//计算完成百分比 //计算完成百分比
calcPercentage(item) { calcPercentage(item) {
......
src/components/index/workSituation/examList.vue
View file @ 454432b1
<template> <template>
<view class="examList-box"> <view class="examList-box">
<view class="examList-import" @click="ImportInformation"> <view class="examList-import" @click.stop="ImportInformation">
<van-icon name="plus" /> <van-icon name="plus" />
<text>导入考试信息</text> <text>导入考试信息</text>
</view> </view>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</view> </view>
</view> </view>
<view class="examList-hint-right"> <view class="examList-hint-right">
<view @click="clickReimport(item)">重新导入</view> <view @click.stop="clickReimport(item)">重新导入</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<van-icon class="examList-popup-closure" name="cross" @click="show=false"/> <van-icon class="examList-popup-closure" name="cross" @click="show=false"/>
<view class="examList-popup-title">导入考试信息</view> <view class="examList-popup-title">导入考试信息</view>
<view class="examList-popup-content"> <view class="examList-popup-content">
<input v-model="obj.name" class="examList-popup-name" placeholder="请输入考试名称"> <input v-model="uploadParm.ExamName" class="examList-popup-name" placeholder="请输入考试名称">
<van-uploader <van-uploader
class="examList-popup-fil-box flex" class="examList-popup-fil-box flex"
multiple multiple
...@@ -94,10 +94,12 @@ ...@@ -94,10 +94,12 @@
showPhone: false, showPhone: false,
showLogin: false, //多次点击 showLogin: false, //多次点击
show:false, show:false,
params:{ uploadParm: {
Uid:'', // Uid:726615,
CourseId:'', // CourseId:44977497,
ExamName:'' Uid:0,
CourseId:0,
ExamName:'考试测试530'
}, },
fileList:[], fileList:[],
Msg:{ Msg:{
...@@ -114,22 +116,19 @@ ...@@ -114,22 +116,19 @@
url: '/pages/index/examDetails?examId=' + item url: '/pages/index/examDetails?examId=' + item
}); });
}, },
//获取考试信息列表 // 重新导入
getExamPageList(){ clickReimport(item){
proxy.$request("/Exam/GetExamPageList", data.Msg).then(res => { data.uploadParm = {
data.dataList = res.Data; Uid:item.ExamId,
}) CourseId:item.CourseId,
}, ExamName: item.ExamName
}
},
ImportInformation(){ ImportInformation(){
this.show = true data.show = true
}, },
uploadFilesBefore(){ uploadFilesBefore(){
},
// 重新导入
clickReimport(item){
}, },
// 添加导入 // 添加导入
customUpload(event){ customUpload(event){
...@@ -149,26 +148,19 @@ ...@@ -149,26 +148,19 @@
}) })
return return
} }
let params = {
// Uid: data.params.Uid,
// CourseId: data.params.CourseId,
// ExamName: data.params.ExamName,
Uid: 1,
CourseId: 1,
ExamName: '',
}
uni.uploadFile({ uni.uploadFile({
url: host + '/Upload/UploadStuExamScore', url: host + '/Upload/UploadStuExamScore',
filePath: file[0].url, filePath: file[0].url,
name: 'file', name: 'file',
formData: { formData: {
'myfile': file[0], myfile:file[0],
'params': JSON.stringify(params) params:JSON.stringify(data.uploadParm)
}, },
success(res) { success(res) {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title:res.Message, title: res.Code ==1?'导入成功': '导入失败',
icon:'none', icon:'none',
duration: 500 duration: 500
}) })
......
src/pages/index/workSituation.vue
View file @ 454432b1
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
<view class="index-header-title"> <view class="index-header-title">
welcome welcome
</view> </view>
<view class="index-header-name">{{userData.AccountName}}</view> <view class="index-header-name">周一围</view>
</view> </view>
</view> </view>
</navbar> </navbar>
<view style="margin: 40rpx 0 10rpx 0;"> <view style="margin: 40rpx 0 10rpx 0;">
<view style="padding:0 50rpx;font-weight: 800;color: #282828;"> <view style="padding:0 50rpx;font-weight: 800;color: #282828;">
<view style="font-size: 36rpx;">Good afternoon，</view> <view style="font-size: 36rpx;">Good afternoon，</view>
<view style="font-size: 50rpx;">{{userData.AccountName}}老师</view> <view style="font-size: 50rpx;">李老师</view>
</view> </view>
</view> </view>
<courseCard></courseCard> <courseCard></courseCard>
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
<Loadmore :state="pageState" /> <Loadmore :state="pageState" />
</scroll-view> </scroll-view>
</view> </view>
<van-toast id="van-toast" />
</view> </view>
</template> </template>
...@@ -70,7 +69,6 @@ ...@@ -70,7 +69,6 @@
onMounted, onMounted,
provide, provide,
nextTick, nextTick,
inject
} from "vue"; } from "vue";
import { import {
...@@ -95,17 +93,11 @@ ...@@ -95,17 +93,11 @@
let { let {
proxy proxy
} = getCurrentInstance(); } = getCurrentInstance();
let Toast = inject("$toast")
Toast.loading({
message: '加载中...',
forbidClick: true,
loadingType: 'spinner',
});
let data = reactive({ let data = reactive({
titleList:[ titleList:[
{name:'学生列表',num:18}, {name:'学生列表',num:0},
{name:'作业情况',num:5}, {name:'作业情况',num:0},
{name:'考试信息',num:18}, {name:'考试信息',num:0},
], ],
tabNme:'作业情况', tabNme:'作业情况',
Msg:{ Msg:{
...@@ -121,10 +113,8 @@ ...@@ -121,10 +113,8 @@
timer: null, //防抖 timer: null, //防抖
dataList:[], dataList:[],
pageState: "more", pageState: "more",
loading:true,
userData:{}
}); });
data.userData = uni.getStorageSync('userInfo');
let methods = { let methods = {
back() { back() {
uni.navigateTo({ uni.navigateTo({
...@@ -133,9 +123,10 @@ ...@@ -133,9 +123,10 @@
}, },
toggleTitle(t) { toggleTitle(t) {
data.tabNme = t data.tabNme = t
if(this.tabNme=='学生列表'){ data.dataList = []
if(data.tabNme=='学生列表'){
that.getCourseStuList() that.getCourseStuList()
}else if(this.tabNme=='作业情况'){ }else if(data.tabNme=='作业情况'){
that.getGetCourseHomeWorkList() that.getGetCourseHomeWorkList()
}else{ }else{
that.getExamPageList() that.getExamPageList()
...@@ -143,59 +134,41 @@ ...@@ -143,59 +134,41 @@
}, },
//获取学生列表 //获取学生列表
getCourseStuList(){ getCourseStuList(){
data.loading=true
proxy.$request("/Teacher/GetCourseStu", data.OperationMsg).then(res => { proxy.$request("/Teacher/GetCourseStu", data.OperationMsg).then(res => {
if(res){ if(res){
data.titleList.forEach(item => {
if(item.name=='学生列表'){
item.num = res.Data.length
}
});
data.dataList = res.Data; data.dataList = res.Data;
data.pageState = "none"; data.pageState = "none";
data.loading=false
return
if (data.timer) data.timer = null;
if (data.Msg.PageIndex === 1) {
data.dataList = res.Data.PageData;
} else {
data.dataList = [...res.Data.PageData, ...data.dataList];
}
data.pageCount = res.Data.PageCount;
if (data.Msg.PageIndex >= res.Data.PageCount) {
data.pageState = "none";
} else {
data.pageState = "more";
}
} }
}) })
}, },
//获取作业情况列表 //获取作业情况列表
getGetCourseHomeWorkList(){ getGetCourseHomeWorkList(){
data.loading=true
proxy.$request("/Teacher/GetCourseHomeWork", data.OperationMsg).then(res => { proxy.$request("/Teacher/GetCourseHomeWork", data.OperationMsg).then(res => {
if(res){ if(res){
data.titleList.forEach(item => {
if(item.name=='作业情况'){
item.num = res.Data.length
}
});
data.dataList = res.Data; data.dataList = res.Data;
data.pageState = "none"; data.pageState = "none";
return
if (data.timer) data.timer = null;
if (data.Msg.PageIndex === 1) {
data.dataList = res.Data.PageData;
} else {
data.dataList = [...res.Data.PageData, ...data.dataList];
}
data.pageCount = res.Data.PageCount;
if (data.Msg.PageIndex >= res.Data.PageCount) {
data.pageState = "none";
} else {
data.pageState = "more";
}
data.loading=false
} }
}) })
}, },
//获取考试信息列表 //获取考试信息列表
getExamPageList(){ getExamPageList(){
data.loading=true
proxy.$request("/Exam/GetExamPageList", data.Msg).then(res => { proxy.$request("/Exam/GetExamPageList", data.Msg).then(res => {
if(res){ if(res){
data.titleList.forEach(item => {
if(item.name=='考试信息'){
item.num = res.Data.RowsCount
}
});
if (data.timer) data.timer = null; if (data.timer) data.timer = null;
if (data.Msg.PageIndex === 1) { if (data.Msg.PageIndex === 1) {
data.dataList = res.Data.PageData; data.dataList = res.Data.PageData;
...@@ -208,7 +181,6 @@ ...@@ -208,7 +181,6 @@
} else { } else {
data.pageState = "more"; data.pageState = "more";
} }
data.loading=false
} }
}) })
}, },
...@@ -218,12 +190,12 @@ ...@@ -218,12 +190,12 @@
data.Msg.PageIndex++; data.Msg.PageIndex++;
if (data.timer) clearTimeout(data.timer); if (data.timer) clearTimeout(data.timer);
data.timer = setTimeout(() => { data.timer = setTimeout(() => {
if(this.tabNme=='学生列表'){ if(data.tabNme=='学生列表'){
this.getCourseStuList() that.getCourseStuList()
}else if(this.tabNme=='作业情况'){ }else if(data.tabNme=='作业情况'){
this.getGetCourseHomeWorkList() that.getGetCourseHomeWorkList()
}else{ }else{
this.getExamPageList() that.getExamPageList()
} }
}, 1000); }, 1000);
} else { } else {
...@@ -247,7 +219,7 @@ ...@@ -247,7 +219,7 @@
this.Msg.courseId = option.courseId this.Msg.courseId = option.courseId
}, },
onShow() { onShow() {
//this.userData = uni.getStorageSync('userInfo'); this.dataList = []
if(this.tabNme=='学生列表'){ if(this.tabNme=='学生列表'){
this.getCourseStuList() this.getCourseStuList()
}else if(this.tabNme=='作业情况'){ }else if(this.tabNme=='作业情况'){
...@@ -255,6 +227,7 @@ ...@@ -255,6 +227,7 @@
}else{ }else{
this.getExamPageList() this.getExamPageList()
} }
}, },
onShareAppMessage() { onShareAppMessage() {
return { return {
......
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