Skip to content

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

调整样式信息

parent af957567
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 51 deletions
src/components/index/JobComponents.vue
View file @ 1bced2d0
...@@ -101,7 +101,10 @@ ...@@ -101,7 +101,10 @@
font-weight: 400; font-weight: 400;
letter-spacing: 1px; letter-spacing: 1px;
} }
.homework-score{
width:116rpx;
overflow: hidden;
}
.homework-score:first-child { .homework-score:first-child {
margin-right: 16rpx; margin-right: 16rpx;
} }
...@@ -114,6 +117,7 @@ ...@@ -114,6 +117,7 @@
justify-content: space-between; justify-content: space-between;
flex-shrink: 0; flex-shrink: 0;
margin-left: 11rpx; margin-left: 11rpx;
zoom: .9;
} }
.JobComponents-year { .JobComponents-year {
......
src/components/index/examComponents.vue
View file @ 1bced2d0
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
padding: 22rpx 26rpx 15rpx 26rpx; padding: 22rpx 26rpx 15rpx 26rpx;
border-radius: 30rpx; border-radius: 30rpx;
justify-content: space-between; justify-content: space-between;
margin: 0 18rpx; /* margin: 0 18rpx; */
} }
.examComponents.activeThree .operation-name { .examComponents.activeThree .operation-name {
......
src/components/index/scoreDetails/analysisTest.vue
View file @ 1bced2d0
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
width="200">{{item}}</th> width="200">{{item}}</th>
</tr> </tr>
<tr class="analysisTest-content-right flex"> <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-number">{{item.Sort}}</view>
<view class="analysisTest-difficulty"> <view class="analysisTest-difficulty">
<view v-if="item.Difficulty == '易'"><van-icon name="star" v-for="(s,i) in 1" :key="i"/></view> <view v-if="item.Difficulty == '易'"><van-icon name="star" v-for="(s,i) in 1" :key="i"/></view>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<view class="analysisTest-ScoreOne">{{item.QScore}}</view> <view class="analysisTest-ScoreOne">{{item.QScore}}</view>
<view class="analysisTest-ScoreTwo">{{item.Score}}</view> <view class="analysisTest-ScoreTwo">{{item.Score}}</view>
<view class="analysisTest-scoringRate">{{(item.ScoreRate * 100).toFixed(0)}}%</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> <view class="analysisTest-averageScoringRate">{{(item.AvgScoreRate * 100).toFixed(0)}}%</view>
</td> </td>
</tr> </tr>
......
src/components/index/scoreDetails/examDetailsComponents.vue
View file @ 1bced2d0
...@@ -179,6 +179,7 @@ ...@@ -179,6 +179,7 @@
background: rgba(200, 23, 39, 0.1); background: rgba(200, 23, 39, 0.1);
border: 2px solid #FD3869; border: 2px solid #FD3869;
position: relative; position: relative;
zoom: .9;
} }
.examDetailsComponents .examDetailsComponents-center-box{ .examDetailsComponents .examDetailsComponents-center-box{
background: #FFFFFF; background: #FFFFFF;
...@@ -242,7 +243,7 @@ ...@@ -242,7 +243,7 @@
padding: 0 50rpx; padding: 0 50rpx;
} }
.examDetailsComponents-box{ .examDetailsComponents-box{
height: 800rpx; height: 100%;
overflow-y: auto; overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
} }
......
src/components/index/scoreDetails/jobDetailsComponents.vue
View file @ 1bced2d0
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
padding: 0 50rpx; padding: 0 50rpx;
} }
.jobDetailsComponents-box{ .jobDetailsComponents-box{
height: 800rpx; height: 100%;
overflow-y: auto; overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
} }
......
src/components/index/workSituation/examList.vue
View file @ 1bced2d0
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<view class="homework-score flex"> <view class="homework-score flex">
<view class="homework-score-title">平均得分</view> <view class="homework-score-title">平均得分</view>
<view class="homework-score-num flex"> <view class="homework-score-num flex">
{{item.AvgScore}} {{item.AvgScore.toFixed(1)}}
</view> </view>
</view> </view>
</view> </view>
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
<input v-model="uploadParm.ExamName" 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
accept=".excel" accept=".excel"
preview-size="120rpx" preview-size="120rpx"
:before-read="beforeRead" :before-read="beforeRead"
...@@ -180,6 +179,7 @@ ...@@ -180,6 +179,7 @@
}) })
return return
} }
if (file.url.indexOf('xls') ==-1 ||file.url.indexOf('xlsx') ==-1) { if (file.url.indexOf('xls') ==-1 ||file.url.indexOf('xlsx') ==-1) {
uni.showToast({ uni.showToast({
title:'请上传 xls/xlsx 格式图片', title:'请上传 xls/xlsx 格式图片',
...@@ -204,20 +204,27 @@ ...@@ -204,20 +204,27 @@
}, },
uploadFileFun(file){ uploadFileFun(file){
console.log(file)
uni.showLoading({
title:'正在上传',
mask:true
})
if(!data.uploadParm.ExamName){ if(!data.uploadParm.ExamName){
uni.showToast({ uni.showToast({
title:'请输入考试名称', title:'请输入考试名称',
icon:'none', icon:'none',
duration: 500 duration: 500
}) })
uni.hideLoading()
return 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({ uni.showToast({
title:'请上传xls、xlsx格式的文件', title:'请上传xls、xlsx格式的文件',
icon:'none', icon:'none',
duration: 500 duration: 500
}) })
uni.hideLoading()
return return
} }
let host = '' let host = ''
...@@ -236,40 +243,37 @@ ...@@ -236,40 +243,37 @@
uni.uploadFile({ uni.uploadFile({
url: host + '/Upload/UploadStuExamScore', url: host + '/Upload/UploadStuExamScore',
filePath: file[0].url, filePath: file.url,
name: 'file', name: 'file',
formData: { formData: {
myfile:file[0], myfile:file,
params:JSON.stringify(data.uploadParm) params:JSON.stringify(data.uploadParm)
}, },
success(res) { success(res) {
if(res.Code ==1){ uni.hideLoading()
var result=JSON.parse(res.data)
if(result.Code ==1){
uni.showToast({ uni.showToast({
title: '导入成功', title: '导入成功',
icon:'none', icon:'none',
duration: 500 duration: 500
}) })
uni.hideLoading(); methods.closepopup()
data.uploadParm = { //data.loading = false
Uid:'',
CourseId:'',
ExamName: ''
}
data.loading = false
// ctx.emit('change') ctx.emit('change')
}else{ }else{
uni.showToast({ uni.showToast({
title: '导入失败', title: '导入失败',
icon:'none', icon:'none',
duration: 500 duration: 500
}) })
uni.hideLoading();
data.loading = false data.loading = false
} }
}, },
fail(err) { fail(err) {
console.log("uploadErr", err) console.log("uploadErr", err)
uni.hideLoading()
} }
}); });
proxy.$parent.getExamPageList(); proxy.$parent.getExamPageList();
...@@ -428,6 +432,9 @@ ...@@ -428,6 +432,9 @@
flex-shrink: 0; flex-shrink: 0;
margin-left: 11rpx; margin-left: 11rpx;
color: #CE8086; color: #CE8086;
zoom: .9;
flex: 1;
margin-left: 62rpx;
} }
.examList.activeOne .examList-state-text{ .examList.activeOne .examList-state-text{
color: #BEBEBE; color: #BEBEBE;
...@@ -462,7 +469,7 @@ ...@@ -462,7 +469,7 @@
font-weight: bold; font-weight: bold;
} }
.examList-left{ .examList-left{
flex-grow: 1; /* flex-grow: 1; */
} }
.examList-center{ .examList-center{
justify-content: space-between; justify-content: space-between;
......
src/components/index/workSituation/operation.vue
View file @ 1bced2d0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<block v-if="dataList && dataList.length>0"> <block v-if="dataList && dataList.length>0">
<view class="operation activeOne" <view class="operation activeOne"
v-for="(item,index) in dataList" :key="index"> 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-line"></view>
<view class="operation-center flex"> <view class="operation-center flex">
<view class="operation-left"> <view class="operation-left">
...@@ -69,7 +69,8 @@ ...@@ -69,7 +69,8 @@
dataList: props.dataList dataList: props.dataList
}); });
let methods = { let methods = {
JobDetails(item){ JobDetails(i){
let item = props.dataList[i]
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/jobDetails?HomeWorkId=' + item.HomeWorkId + '&obj=' + JSON.stringify(item) url: '/pages/index/jobDetails?HomeWorkId=' + item.HomeWorkId + '&obj=' + JSON.stringify(item)
}); });
......
src/pages/index/examDetails.vue
View file @ 1bced2d0
<template> <template>
<view class="jobDetails-box"> <view class="jobDetails-box flex" style="flex-direction: column;">
<view class="jobDetails-box-bj"></view> <view class="jobDetails-box-bj"></view>
<navbar class="navbarSticky" bg="#FCEEEF"> <navbar class="navbarSticky" bg="#FCEEEF">
<view class="jobDetails-header-box"> <view class="jobDetails-header-box">
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<text class="jobDetails-header-title">考试详情</text> <text class="jobDetails-header-title">考试详情</text>
</view> </view>
</navbar> </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-content-header">
<view class="jobDetails-conten-title flex"> <view class="jobDetails-conten-title flex">
<text>{{CreateTime}}</text> <text>{{CreateTime}}</text>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="index-student-information"> <view class="index-student-information" style="flex:1;height:1px">
<examDetailsComponents :ExamStu="ExamStu"></examDetailsComponents> <examDetailsComponents :ExamStu="ExamStu"></examDetailsComponents>
</view> </view>
</view> </view>
......
src/pages/index/index.vue
View file @ 1bced2d0
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
let tempArray = res.Data; let tempArray = res.Data;
data.stuCourseList = tempArray; data.stuCourseList = tempArray;
if (tempArray && tempArray.length > 0) { if (tempArray && tempArray.length > 0) {
this.getStuHomeWorkAndExam(tempArray[0].courseId) methods.getStuHomeWorkAndExam(tempArray[0].courseId)
} }
}) })
}, },
...@@ -122,34 +122,31 @@ ...@@ -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 { return {
...toRefs(data), ...toRefs(data),
...methods, ...methods,
}; };
}, },
onShow() {
this.getStuCourse();
this.userData = uni.getStorageSync('userInfo');
if(this.userData && this.userData.AccountType==1){
uni.redirectTo({
url:'/pages/index/workSituation'
})
}
},
onShareAppMessage() { onShareAppMessage() {
return { return {
title: "甲小鹤", title: "学情反馈信息",
query: "/pages/index/index", query: "/pages/index/index",
imageUrl: "", imageUrl: "",
}; };
}, },
onShareTimeline() { onShareTimeline() {
return { return {
title: "甲小鹤", title: "学情反馈信息",
query: "/pages/index/index", query: "/pages/index/index",
imageUrl: "", imageUrl: "",
}; };
......
src/pages/index/jobDetails.vue
View file @ 1bced2d0
<template> <template>
<view class="jobDetails-box"> <view class="jobDetails-box flex" style="flex-direction: column;">
<navbar class="navbarSticky" bg="#FCEEEF"> <navbar class="navbarSticky" bg="#FCEEEF">
<view class="jobDetails-header-box flex"> <view class="jobDetails-header-box flex">
<van-icon class="jobDetails-header-left" name="arrow-left" @click="back"/> <van-icon class="jobDetails-header-left" name="arrow-left" @click="back"/>
<text class="jobDetails-header-title">作业情况</text> <text class="jobDetails-header-title">作业情况</text>
</view> </view>
</navbar> </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-content-header">
<view class="jobDetails-conten-title flex"> <view class="jobDetails-conten-title flex">
<text>{{jobDetails.CourseName}}</text> <text>{{jobDetails.CourseName}}</text>
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
</view> </view>
</view> </view>
</view> </view>
<view class="index-student-information"> <view class="index-student-information" style="flex:1;">
<van-empty description="暂无数据" v-if="dataList.length === 0" /> <van-empty description="暂无数据" v-if="dataList.length === 0" />
<jobDetailsComponents v-if="dataList.length>0" :dataList="dataList"></jobDetailsComponents> <jobDetailsComponents v-if="dataList.length>0" :dataList="dataList"></jobDetailsComponents>
</view> </view>
<Loadmore :state="pageState" /> <!-- <Loadmore :state="pageState" /> -->
</view> </view>
</view> </view>
</template> </template>
......
src/pages/index/scoreDetails.vue
View file @ 1bced2d0
<template> <template>
<view class="scoreDetailspage" v-if="!Loading"> <view class="scoreDetailspage" v-if="!Loading">
<navbar class="navbarSticky" bg="#F6F6F6"> <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"/> <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> </view>
</navbar> </navbar>
<view class="scoreDetails-header flex"> <view class="scoreDetails-header flex">
...@@ -276,6 +279,11 @@ ...@@ -276,6 +279,11 @@
font-size: 50rpx; font-size: 50rpx;
font-weight: 800; font-weight: 800;
color: #282828; color: #282828;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
align-content: normal;
} }
.scoreDetails-header-name{ .scoreDetails-header-name{
font-size: 30rpx; font-size: 30rpx;
...@@ -286,6 +294,8 @@ ...@@ -286,6 +294,8 @@
} }
.scoreDetails-header-tetx{ .scoreDetails-header-tetx{
flex-grow: 1; flex-grow: 1;
flex: 1;
width: 1px;
} }
.scoreDetails-header-img .img{ .scoreDetails-header-img .img{
display: block; display: block;
...@@ -313,7 +323,7 @@ ...@@ -313,7 +323,7 @@
font-size: 40rpx; font-size: 40rpx;
} }
.scoreDetails-header-box{ .scoreDetails-header-box{
padding: 37rpx 31rpx; padding: 23rpx 31rpx;
} }
.scoreDetailspage{ .scoreDetailspage{
min-height: 100vh; min-height: 100vh;
......
src/pages/index/workSituation.vue
View file @ 1bced2d0
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
> >
<operation v-if="tabNme=='作业情况'" :dataList="homeWorks"></operation> <operation v-if="tabNme=='作业情况'" :dataList="homeWorks"></operation>
<studentList @selected="selectStuHandler" v-if="tabNme=='学生列表'" :dataList="students"></studentList> <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> </scroll-view>
<Loadmore :state="pageState" /> <Loadmore :state="pageState" />
</view> </view>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
tabNme:'作业情况', tabNme:'作业情况',
Msg:{ Msg:{
PageIndex: 1, PageIndex: 1,
PageSize: 10, PageSize: 20,
ExamName:'', ExamName:'',
CourseId:'' CourseId:''
}, },
...@@ -145,6 +145,9 @@ ...@@ -145,6 +145,9 @@
methods.getExamPageList() methods.getExamPageList()
methods.getCourseHomeWorkList() methods.getCourseHomeWorkList()
}, },
changeExamHandler(){
methods.getExamPageList()
},
toggleTitle(t) { toggleTitle(t) {
data.tabNme = t data.tabNme = t
......
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