Skip to content

T
thinkApp
Commit 10d2cf81 authored by 黄奎's avatar 黄奎
Browse files
Options

111

parents 71e1bd89 1b54202b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 429 additions and 402 deletions
src/components/index/JobComponents.vue
View file @ 10d2cf81
......@@ -101,7 +101,10 @@
font-weight: 400;
letter-spacing: 1px;
}
.homework-score{
width:116rpx;
overflow: hidden;
}
.homework-score:first-child {
margin-right: 16rpx;
}
......@@ -114,6 +117,7 @@
justify-content: space-between;
flex-shrink: 0;
margin-left: 11rpx;
zoom: .9;
}
.JobComponents-year {
......
src/components/index/examComponents.vue
View file @ 10d2cf81
......@@ -127,7 +127,7 @@
padding: 22rpx 26rpx 15rpx 26rpx;
border-radius: 30rpx;
justify-content: space-between;
margin: 0 18rpx;
/* margin: 0 18rpx; */
}
.examComponents.activeThree .operation-name {
......@@ -225,6 +225,18 @@
border: 3px solid #FFFFFF;
box-shadow: 0px 0px 12px 0px rgba(255, 255, 255, 0.46);
}
.examComponents-center-box::after { /* div是你需要添加背景图片的盒子*/
content: "";
background-image: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654062518000_33.png);
background-position: 30rpx bottom;
background-size: 74rpx auto;
background-repeat: no-repeat;
opacity: 1;
position: absolute;
top: 0rpx;
bottom: 0;
right: 0;
}
.examComponents-line {
width: 4rpx;
......
src/components/index/scoreDetails/analysisTest.vue
View file @ 10d2cf81
......@@ -13,7 +13,7 @@
width="200">{{item}}</th>
</tr>
<tr class="analysisTest-content-right flex">
<td class="analysisTest-td" v-for="(item,index) in ScoreList" :key="index">
<td class="analysisTest-td" style="min-width: 56rpx;" :style="{'min-width':(item.KnowledgePoint.length*20+20)+'rpx'}" v-for="(item,index) in ScoreList" :key="index">
<view class="analysisTest-number">{{item.Sort}}</view>
<view class="analysisTest-difficulty">
<view v-if="item.Difficulty == '易'"><van-icon name="star" v-for="(s,i) in 1" :key="i"/></view>
......@@ -24,7 +24,7 @@
<view class="analysisTest-ScoreOne">{{item.QScore}}</view>
<view class="analysisTest-ScoreTwo">{{item.Score}}</view>
<view class="analysisTest-scoringRate">{{(item.ScoreRate * 100).toFixed(0)}}%</view>
<view class="analysisTest-TheAverageAcore">{{item.AvgScore}}</view>
<view class="analysisTest-TheAverageAcore">{{item.AvgScore.toFixed(1)}}</view>
<view class="analysisTest-averageScoringRate">{{(item.AvgScoreRate * 100).toFixed(0)}}%</view>
</td>
</tr>
......
src/components/index/scoreDetails/examDetailsComponents.vue
View file @ 10d2cf81
......@@ -179,6 +179,7 @@
background: rgba(200, 23, 39, 0.1);
border: 2px solid #FD3869;
position: relative;
zoom: .9;
}
.examDetailsComponents .examDetailsComponents-center-box{
background: #FFFFFF;
......@@ -242,7 +243,7 @@
padding: 0 50rpx;
}
.examDetailsComponents-box{
height: 800rpx;
height: 100%;
overflow-y: auto;
box-sizing: border-box;
}
......
src/components/index/scoreDetails/jobDetailsComponents.vue
View file @ 10d2cf81
......@@ -206,7 +206,7 @@
padding: 0 50rpx;
}
.jobDetailsComponents-box{
height: 800rpx;
height: 100%;
overflow-y: auto;
box-sizing: border-box;
}
......
src/components/index/workSituation/courseCard.vue
View file @ 10d2cf81
......@@ -54,7 +54,7 @@
</view>
<view class="courseCard-title" v-if="courses.AllCourseList.length>0 && Keywords==''">
<view class="workSituation-title-box flex">
<view class="workSituation-title flex"
<view class="workSituation-title"
:class="{'active':currentIndex==index}"
v-for="(t,index) in titleList" :key="index"
@click="toggleTitle(index)">
......@@ -215,18 +215,22 @@
}
.workSituation-title.active{
position: relative;
font-weight: bold;
color:#FFF;
background-color: #282828;
}
.workSituation-title{
flex: 1;
color: #282828;
font-size: 26rpx;
font-weight: bold;
align-items: center;
letter-spacing: 1px;
border-radius: 30rpx;
text-align: center;
line-height: 60rpx;
}
.workSituation-title-box{
margin: 0 50rpx;
padding: 17rpx 0 17rpx 28rpx;
height: 64rpx;
background: #F0F0F0;
border-radius: 30rpx;
}
......
src/components/index/workSituation/examList.vue
View file @ 10d2cf81
......@@ -26,7 +26,7 @@
<view class="homework-score flex">
<view class="homework-score-title">平均得分</view>
<view class="homework-score-num flex">
{{item.AvgScore}}
{{item.AvgScore.toFixed(1)}}
</view>
</view>
</view>
......@@ -58,7 +58,6 @@
<input v-model="uploadParm.ExamName" class="examList-popup-name" placeholder="请输入考试名称"/>
<van-uploader
class="examList-popup-fil-box flex"
multiple
accept=".excel"
preview-size="120rpx"
:before-read="beforeRead"
......@@ -180,6 +179,7 @@
})
return
}
if (file.url.indexOf('xls') ==-1 ||file.url.indexOf('xlsx') ==-1) {
uni.showToast({
title:'请上传 xls/xlsx 格式图片',
......@@ -204,27 +204,34 @@
},
uploadFileFun(file){
console.log(file)
uni.showLoading({
title:'正在上传',
mask:true
})
if(!data.uploadParm.ExamName){
uni.showToast({
title:'请输入考试名称',
icon:'none',
duration: 500
})
uni.hideLoading()
return
}
if(file[0].url.indexOf('xls')==-1||file[0].url.indexOf('xlsx')==-1){
if(file.url.indexOf('xls')==-1||file.url.indexOf('xlsx')==-1){
uni.showToast({
title:'请上传xls、xlsx格式的文件',
icon:'none',
duration: 500
})
uni.hideLoading()
return
}
let host = ''
if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.36:8082/api'
} else {
host = 'https://eduapi.oytour.com/api'
host = 'https://jjswapi.oytour.com/api'
}
data.userData = uni.getStorageSync('userInfo')
data.uploadParm = {
......@@ -236,40 +243,37 @@
uni.uploadFile({
url: host + '/Upload/UploadStuExamScore',
filePath: file[0].url,
filePath: file.url,
name: 'file',
formData: {
myfile:file[0],
myfile:file,
params:JSON.stringify(data.uploadParm)
},
success(res) {
if(res.Code ==1){
uni.hideLoading()
var result=JSON.parse(res.data)
if(result.Code ==1){
uni.showToast({
title: '导入成功',
icon:'none',
duration: 500
})
uni.hideLoading();
data.uploadParm = {
Uid:'',
CourseId:'',
ExamName: ''
}
data.loading = false
methods.closepopup()
//data.loading = false
// ctx.emit('change')
ctx.emit('change')
}else{
uni.showToast({
title: '导入失败',
icon:'none',
duration: 500
})
uni.hideLoading();
})
data.loading = false
}
},
fail(err) {
console.log("uploadErr", err)
uni.hideLoading()
}
});
proxy.$parent.getExamPageList();
......@@ -428,6 +432,9 @@
flex-shrink: 0;
margin-left: 11rpx;
color: #CE8086;
zoom: .9;
flex: 1;
margin-left: 62rpx;
}
.examList.activeOne .examList-state-text{
color: #BEBEBE;
......@@ -462,7 +469,7 @@
font-weight: bold;
}
.examList-left{
flex-grow: 1;
/* flex-grow: 1; */
}
.examList-center{
justify-content: space-between;
......
src/components/index/workSituation/operation.vue
View file @ 10d2cf81
......@@ -3,7 +3,7 @@
<block v-if="dataList && dataList.length>0">
<view class="operation activeOne"
v-for="(item,index) in dataList" :key="index">
<view class="operation-center-box" @click="JobDetails(item)">
<view class="operation-center-box" @click="JobDetails(index)">
<view class="operation-center-line"></view>
<view class="operation-center flex">
<view class="operation-left">
......@@ -69,7 +69,8 @@
dataList: props.dataList
});
let methods = {
JobDetails(item){
JobDetails(i){
let item = props.dataList[i]
uni.navigateTo({
url: '/pages/index/jobDetails?HomeWorkId=' + item.HomeWorkId + '&obj=' + JSON.stringify(item)
});
......
src/components/setComments/commentDetailsPopu.vue
View file @ 10d2cf81
......@@ -105,6 +105,10 @@
text-align: center;
color: #FFFFFF;
}
.commentPopup-save{
justify-content: center;
margin-top: 60rpx;
}
.commentPopup-title {
width: 100%;
text-align: center;
......
src/components/setComments/setComments.vue
View file @ 10d2cf81
<template>
<view class="setComments-box">
<view class="setComments-add">
<van-icon name="plus" /><text>创建评价</text> </view>
<view class="setComments-add" @click="addComments">
<van-icon name="plus" /><text>创建评价</text>
</view>
<view class="index-student-information">
<view class="setComments-content-box" v-if="dataList.length>0">
<template v-for="(item,index) in dataList">
......@@ -11,7 +12,7 @@
<text class="setComments-title-left">第{{item.Times}}次评价</text>
<view class="setComments-title-right">
<view class="setComments-options flex">
<view class="setComments-options-title flex" @click="clickOptionsShow(item)">
<view class="setComments-options-title flex" @click.stop="clickOptionsShow(item)">
<view class="point"></view>
<text>{{item.ShowTypeStr}}</text>
<van-icon :name="item.optionsShow?'arrow-down':'arrow'" />
......@@ -80,6 +81,11 @@
delta: 1
})
},
addComments(){
uni.navigateTo({
url: '/pages/setComments/commentRulesList'
})
},
goComment(item){
uni.navigateTo({
url: '/pages/setComments/commentDetails?comment='+ encodeURIComponent(JSON.stringify(item))
......@@ -195,6 +201,7 @@
left: 0;
right: 0;
top: 35rpx;
z-index: 2;
background: #FCEEEF;
padding: 20rpx 0 20rpx 0;
border-radius: 0 0 25rpx 25rpx;
......
src/pages/index/examDetails.vue
View file @ 10d2cf81
<template>
<view class="jobDetails-box">
<view class="jobDetails-box flex" style="flex-direction: column;">
<view class="jobDetails-box-bj"></view>
<navbar class="navbarSticky" bg="#FCEEEF">
<view class="jobDetails-header-box">
......@@ -7,7 +7,7 @@
<text class="jobDetails-header-title">考试详情</text>
</view>
</navbar>
<view class="jobDetails-content">
<view class="jobDetails-content flex" style="flex-direction: column;flex:1;height:1px">
<view class="jobDetails-content-header">
<view class="jobDetails-conten-title flex">
<text>{{CreateTime}}</text>
......@@ -24,7 +24,7 @@
</view>
</view>
</view>
<view class="index-student-information">
<view class="index-student-information" style="flex:1;height:1px">
<examDetailsComponents :ExamStu="ExamStu"></examDetailsComponents>
</view>
</view>
......
src/pages/index/index.vue
View file @ 10d2cf81
......@@ -106,7 +106,7 @@
let tempArray = res.Data;
data.stuCourseList = tempArray;
if (tempArray && tempArray.length > 0) {
this.getStuHomeWorkAndExam(tempArray[0].courseId)
methods.getStuHomeWorkAndExam(tempArray[0].courseId)
}
})
},
......@@ -122,34 +122,31 @@
})
},
};
methods.getStuCourse();
data.userData = uni.getStorageSync('userInfo');
if(data.userData && data.userData.AccountType==1){
uni.redirectTo({
url:'/pages/index/workSituation'
})
}
// onMounted(() => {
onMounted(() => {
});
// });
return {
...toRefs(data),
...methods,
};
},
onShow() {
this.getStuCourse();
this.userData = uni.getStorageSync('userInfo');
if(this.userData && this.userData.AccountType==1){
uni.redirectTo({
url:'/pages/index/workSituation'
})
}
},
onShareAppMessage() {
return {
title: "甲小鹤",
title: "学情反馈信息",
query: "/pages/index/index",
imageUrl: "",
};
},
onShareTimeline() {
return {
title: "甲小鹤",
title: "学情反馈信息",
query: "/pages/index/index",
imageUrl: "",
};
......
src/pages/index/jobDetails.vue
View file @ 10d2cf81
<template>
<view class="jobDetails-box">
<view class="jobDetails-box flex" style="flex-direction: column;">
<navbar class="navbarSticky" bg="#FCEEEF">
<view class="jobDetails-header-box flex">
<van-icon class="jobDetails-header-left" name="arrow-left" @click="back"/>
<text class="jobDetails-header-title">作业情况</text>
</view>
</navbar>
<view class="jobDetails-content">
<view class="jobDetails-content flex" style="flex:1;height: 1px;flex-direction: column;">
<view class="jobDetails-content-header">
<view class="jobDetails-conten-title flex">
<text>{{jobDetails.CourseName}}</text>
......@@ -31,11 +31,11 @@
</view>
</view>
</view>
<view class="index-student-information">
<view class="index-student-information" style="flex:1;">
<van-empty description="暂无数据" v-if="dataList.length === 0" />
<jobDetailsComponents v-if="dataList.length>0" :dataList="dataList"></jobDetailsComponents>
</view>
<Loadmore :state="pageState" />
<!-- <Loadmore :state="pageState" /> -->
</view>
</view>
</template>
......
src/pages/index/scoreDetails.vue
View file @ 10d2cf81
<template>
<view class="scoreDetailspage" v-if="!Loading">
<navbar class="navbarSticky" bg="#F6F6F6">
<view class="scoreDetails-header-box">
<view class="scoreDetails-header-box flex">
<van-icon class="scoreDetails-header-left" name="arrow-left" @click="back"/>
<view style="padding-right: 46rpx;flex: 1;text-align:center;font-size: 32rpx;color:#282828;">
分数详情
</view>
</view>
</navbar>
<view class="scoreDetails-header flex">
......@@ -276,6 +279,11 @@
font-size: 50rpx;
font-weight: 800;
color: #282828;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
align-content: normal;
}
.scoreDetails-header-name{
font-size: 30rpx;
......@@ -286,6 +294,8 @@
}
.scoreDetails-header-tetx{
flex-grow: 1;
flex: 1;
width: 1px;
}
.scoreDetails-header-img .img{
display: block;
......@@ -313,7 +323,7 @@
font-size: 40rpx;
}
.scoreDetails-header-box{
padding: 37rpx 31rpx;
padding: 23rpx 31rpx;
}
.scoreDetailspage{
min-height: 100vh;
......
src/pages/index/workSituation.vue
View file @ 10d2cf81
......@@ -14,13 +14,18 @@
</view>
</view>
</navbar>
<view style="margin: 40rpx 0 10rpx 0;">
<view style="margin: 40rpx 0 10rpx 0;" class="workSituationAccountName flex">
<view style="padding:0 50rpx;font-weight: 800;color: #282828;">
<view style="font-size: 36rpx;">Hi，</view>
<view style="font-size: 50rpx;">{{userData.AccountName}}老师</view>
</view>
<view @click="goSet">设置评语</view>
<view class="set-text">
<view class="flex" @click="goSet">
<text>设置评语</text>
<van-image class="img" width="14rpx" height="13rpx" fit="cover" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653977684000_601.png" />
</view>
</view>
</view>
<courseCard @change="changeCourseHandler"></courseCard>
<view class="index-student-information">
......@@ -43,9 +48,9 @@
>
<operation v-if="tabNme=='作业情况'" :dataList="homeWorks"></operation>
<studentList @selected="selectStuHandler" v-if="tabNme=='学生列表'" :dataList="students"></studentList>
<examList v-if="tabNme=='考试信息'" :dataList="exams" :CourseId="currentCourseId"></examList>
<examList @change="changeExamHandler" v-if="tabNme=='考试信息'" :dataList="exams" :CourseId="currentCourseId"></examList>
</scroll-view>
<Loadmore :state="pageState" />
<!-- <Loadmore :state="pageState" /> -->
</view>
</view>
</template>
......@@ -100,7 +105,7 @@
tabNme:'作业情况',
Msg:{
PageIndex: 1,
PageSize: 10,
PageSize: 20,
ExamName:'',
CourseId:''
},
......@@ -137,7 +142,6 @@
})
},
changeCourseHandler(id){
console.log(id,'........................')
data.Msg.courseId=45329247
data.OperationMsg.courseId=45329247
data.currentCourseId=45329247
......@@ -145,16 +149,11 @@
methods.getExamPageList()
methods.getCourseHomeWorkList()
},
changeExamHandler(){
methods.getExamPageList()
},
toggleTitle(t) {
data.tabNme = t
// if(t=='学生列表'){
// this.getCourseStuList()
// }else if(data.tabNme=='作业情况'){
// this.getCourseHomeWorkList()
// }else{
// this.getExamPageList()
// }
},
//获取学生列表
getCourseStuList(){
......@@ -241,31 +240,13 @@
};
},
onLoad(option) {
// this.tabNme = option.tabNme
// this.OperationMsg.courseId = option.courseId
// this.Msg.courseId = option.courseId
},
onShow() {
// if(this.tabNme=='学生列表'){
// this.getCourseStuList()
// }else if(this.tabNme=='作业情况'){
// this.getGetCourseHomeWorkList()
// }else{
// this.getExamPageList()
// }
// this.tabNme = option.tabNme?option.tabNme:'作业情况'
// this.OperationMsg.courseId = option.courseId
// this.Msg.CourseId = option.courseId
},
onShow() {
// this.dataList = []
// if(this.tabNme=='学生列表'){
// this.getCourseStuList()
// }else if(this.tabNme=='作业情况'){
// this.getCourseHomeWorkList()
// }else{
// this.getExamPageList()
// }
},
......@@ -287,6 +268,29 @@
</script>
<style scoped>
.set-text view .img{
margin-left: 10rpx;
}
.set-text view{
width: 160rpx;
line-height: 50rpx;
background: #FFFFFF;
border: 1rpx solid #E6A9AE;
border-radius: 25rpx;
justify-content: center;
font-size: 24rpx;
font-weight: bold;
color: #C91727;
letter-spacing: 1rpx;
}
.set-text{
width: 160rpx;
flex-shrink: 0;
margin-right: 50rpx;
}
.workSituationAccountName{
justify-content: space-between;
}
.num{
font-size: 20rpx;
display: inline-block;
......
src/pages/setComments/commentRulesList.vue
View file @ 10d2cf81
......@@ -504,14 +504,23 @@
.commentRulesList-box {
background: #FFFFFF;
}
.commentRulesList-header-title {
font-size: 32rpx;
font-weight: 500;
color: #282828;
flex: 1;
text-align: center;
padding-right: 40rpx;
.commentRulesList-header-box{
padding: 20rpx 42rpx;
flex-direction: row;
align-items: center;
}
.commentRulesList-header-title{
font-size: 32rpx;
font-weight: 500;
color: #282828;
flex:1;
text-align: center;
padding-right: 40rpx;
}
.commentRulesList-header-left{
font-size: 40rpx;
position: relative;
z-index: 3;
}
.navbarSticky {
......
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