Skip to content

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

111

parents 71e1bd89 1b54202b
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 @@ ...@@ -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 @ 10d2cf81
...@@ -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 {
...@@ -225,6 +225,18 @@ ...@@ -225,6 +225,18 @@
border: 3px solid #FFFFFF; border: 3px solid #FFFFFF;
box-shadow: 0px 0px 12px 0px rgba(255, 255, 255, 0.46); 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 { .examComponents-line {
width: 4rpx; width: 4rpx;
......
src/components/index/scoreDetails/analysisTest.vue
View file @ 10d2cf81
...@@ -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 @ 10d2cf81
...@@ -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 @ 10d2cf81
...@@ -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/courseCard.vue
View file @ 10d2cf81
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</view> </view>
<view class="courseCard-title" v-if="courses.AllCourseList.length>0 && Keywords==''"> <view class="courseCard-title" v-if="courses.AllCourseList.length>0 && Keywords==''">
<view class="workSituation-title-box flex"> <view class="workSituation-title-box flex">
<view class="workSituation-title flex" <view class="workSituation-title"
:class="{'active':currentIndex==index}" :class="{'active':currentIndex==index}"
v-for="(t,index) in titleList" :key="index" v-for="(t,index) in titleList" :key="index"
@click="toggleTitle(index)"> @click="toggleTitle(index)">
...@@ -215,18 +215,22 @@ ...@@ -215,18 +215,22 @@
} }
.workSituation-title.active{ .workSituation-title.active{
position: relative; position: relative;
font-weight: bold;
color:#FFF;
background-color: #282828;
} }
.workSituation-title{ .workSituation-title{
flex: 1; flex: 1;
color: #282828; color: #282828;
font-size: 26rpx; font-size: 26rpx;
font-weight: bold; border-radius: 30rpx;
align-items: center; text-align: center;
letter-spacing: 1px; line-height: 60rpx;
} }
.workSituation-title-box{ .workSituation-title-box{
margin: 0 50rpx; margin: 0 50rpx;
padding: 17rpx 0 17rpx 28rpx; height: 64rpx;
background: #F0F0F0; background: #F0F0F0;
border-radius: 30rpx; border-radius: 30rpx;
} }
......
src/components/index/workSituation/examList.vue
View file @ 10d2cf81
...@@ -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,27 +204,34 @@ ...@@ -204,27 +204,34 @@
}, },
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 = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.36:8082/api' host = 'http://192.168.10.36:8082/api'
} else { } else {
host = 'https://eduapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
} }
data.userData = uni.getStorageSync('userInfo') data.userData = uni.getStorageSync('userInfo')
data.uploadParm = { data.uploadParm = {
...@@ -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 @ 10d2cf81
...@@ -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/components/setComments/commentDetails.vue
View file @ 10d2cf81
<template> <template>
<view class="commentDetailsList-box"> <view class="commentDetailsList-box">
<view class="commentDetailsList-add" @click="goAdd"> <view class="commentDetailsList-add" @click="goAdd">
<van-icon name="plus" /> <van-icon name="plus" /><text>增加评论</text> </view>
<text>增加评论</text> <view class="index-student-information">
</view> <view class="commentDetailsList-content">
<view class="index-student-information"> <view class="commentDetailsList-list" v-for="(item,index) in CourseCommentTimesList" :key="index">
<view class="commentDetailsList-content"> <!-- <view class="commentDetailsList-cross" @click="deleteRules">
<view class="commentDetailsList-list" v-for="(item,index) in CourseCommentTimesList" :key="index">
<!-- <view class="commentDetailsList-cross" @click="deleteRules">
<van-icon name="cross" /> <van-icon name="cross" />
</view> --> </view> -->
<view class="commentDetailsList-img flex"> <view class="commentDetailsList-img flex">
<view>{{item.StuName}}</view> <view>{{item.StuName}}</view>
<view class="flex"> <view class="flex">
<text>{{item.ShowTypeStr}}</text> <text>{{item.ShowTypeStr}}</text>
<van-image @click="editRules(item)" class="img" width="31rpx" height="30rpx" fit="cover" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653980151000_180.png" /> <van-image @click="editRules(item)" class="img" width="31rpx" height="30rpx" fit="cover" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653980151000_180.png" />
</view> </view>
<view class="Wire"></view> <view class="Wire"></view>
</view> </view>
<view class="commentDetailsList-comment"> <view class="commentDetailsList-comment">
{{item.Info}} {{item.Info}}
</view> </view>
</view> </view>
</view> </view>
<view class="noData"> <view class="noData">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653902791000_806.png" mode="widthFix"></image> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653902791000_806.png" mode="widthFix"></image>
<view>暂无评论规则数据</view> <view>暂无评论规则数据</view>
</view> </view>
</view> </view>
<template v-show="show"> <template v-show="show">
<commentDetailsPopu ref="getcommentPopup" @change="changeData"></commentDetailsPopu> <commentDetailsPopu ref="getcommentPopup" @change="changeData"></commentDetailsPopu>
</template> </template>
</view> </view>
</template> </template>
<script> <script>
import commentDetailsPopu from '@/components/setComments/commentDetailsPopu' import commentDetailsPopu from '@/components/setComments/commentDetailsPopu'
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
onMounted, onMounted,
...@@ -47,66 +46,62 @@ ...@@ -47,66 +46,62 @@
} from "vue"; } from "vue";
import navbar from '../../components/navbar.vue' import navbar from '../../components/navbar.vue'
export default { export default {
props: ["CourseCommentTimesList", "qMsg"], props: ["CourseCommentTimesList"],
emits: ['refreshData'], emits: ['refreshData'],
components: { components: {
navbar, navbar,
commentDetailsPopu commentDetailsPopu
}, },
setup(props, context) { setup(props, context) {
let { let { refs } = getCurrentInstance();
refs
} = getCurrentInstance();
let { let {
proxy proxy
} = getCurrentInstance(); } = getCurrentInstance();
let data = reactive({ let data = reactive({
dataList: [], dataList: [],
show: false show:false
}); });
let methods = { let methods = {
goAdd() { goAdd(){
let url = '/pages/setComments/addComment?CourseId=' + this.qMsg.CourseId + "&CommentTimes=" + this.qMsg.CommentTimes; uni.navigateTo({
console.log("url", url); url: '/pages/setComments/addComment'
uni.navigateTo({
url: url
}) })
}, },
back() { back() {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })
}, },
addRules() { //添加规则 addRules(){//添加规则
data.show = true data.show = true
refs.getcommentPopup.$vm.showFun() refs.getcommentPopup.$vm.showFun()
}, },
editRules(item) { //编辑规则 editRules(item){//编辑规则
data.show = true data.show = true
refs.getcommentPopup.$vm.showFun(item) refs.getcommentPopup.$vm.showFun(item)
}, },
deleteRules() { //删除规则 deleteRules (){//删除规则
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '将删除该评价,是否继续', content: '将删除该评价,是否继续',
success: function(res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
console.log('---') console.log('---')
} else if (res.cancel) { } else if (res.cancel) {
uni.showToast({ uni.showToast({
title: '已取消', title:'已取消',
icon: 'none', icon:'none',
duration: 500 duration: 500
}) })
} }
} }
}); });
}, },
clickOptionsShow(item) { clickOptionsShow(item) {
item.optionsShow = !item.optionsShow; item.optionsShow = !item.optionsShow;
}, },
//实在评价可见性 //实在评价可见性
clickoptions(item, subItem) { clickoptions(item,subItem) {
let showTypeMsg = { let showTypeMsg = {
CourseId: item.CourseId, CourseId: item.CourseId,
Times: item.Times, Times: item.Times,
...@@ -114,23 +109,24 @@ ...@@ -114,23 +109,24 @@
}; };
proxy.$request("/Teacher/SetStuCommentShowTypeByTimes", showTypeMsg).then(res => { proxy.$request("/Teacher/SetStuCommentShowTypeByTimes", showTypeMsg).then(res => {
if (res) { if (res) {
} }
}) })
item.optionsShow = false; item.optionsShow = false;
//调用父组件方法 //调用父组件方法
context.emit('refreshData'); context.emit('refreshData');
}, },
//刷新数据 //刷新数据
changeData() { changeData()
{
//调用父组件方法 //调用父组件方法
context.emit('refreshData'); context.emit('refreshData');
} }
}; };
//监听属性数组 //监听属性数组
watch(() => props["CourseCommentTimesList"], (newValue, oldValue) => { watch(() => props["CourseCommentTimesList"], (newValue, oldValue) => {
if (newValue != oldValue && newValue && newValue.length > 0) { if (newValue != oldValue && newValue && newValue.length > 0) {
data.dataList = newValue; data.dataList = newValue;
} }
...@@ -143,12 +139,12 @@ ...@@ -143,12 +139,12 @@
}; };
}, },
onLoad(option) { onLoad(option) {
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.noData { .noData {
text-align: center; text-align: center;
flex: 1; flex: 1;
width: 100%; width: 100%;
...@@ -164,233 +160,204 @@ ...@@ -164,233 +160,204 @@
color: #cecece; color: #cecece;
text-align: center; text-align: center;
} }
.Wire{
.Wire { width: 4rpx;
width: 4rpx; height: 23rpx;
height: 23rpx; background: #282828;
background: #282828; position: absolute;
position: absolute; left: 0;
left: 0; top: 47rpx;
top: 47rpx; }
} .commentDetailsList-comment{
font-size: 26rpx;
.commentDetailsList-comment { font-weight: 400;
font-size: 26rpx; color: #5E5E5E;
font-weight: 400; line-height: 48rpx;
color: #5E5E5E; letter-spacing: 1rpx;
line-height: 48rpx; }
letter-spacing: 1rpx; .commentDetailsList-img .img{
} margin-top: 8rpx;
flex-shrink: 0;
.commentDetailsList-img .img { }
margin-top: 8rpx; .commentDetailsList-img view:first-child{
flex-shrink: 0; flex-grow: 1;
} margin-right: 15rpx;
}
.commentDetailsList-img view:first-child { .commentDetailsList-img text{
flex-grow: 1; background: #FCEEEF;
margin-right: 15rpx; border-radius: 25rpx;
} font-size: 24rpx;
font-weight: 500;
.commentDetailsList-img text { color: #CE8086;
background: #FCEEEF; padding: 10rpx 25rpx;
border-radius: 25rpx; margin-right: 33rpx;
font-size: 24rpx; }
font-weight: 500; .commentDetailsList-img{
color: #CE8086; justify-content: space-between;
padding: 10rpx 25rpx; align-items: center;
margin-right: 33rpx; align-items: center;
} font-size: 26rpx;
font-weight: 500;
.commentDetailsList-img { color: #282828;
justify-content: space-between; margin-bottom: 34rpx;
align-items: center; letter-spacing: 1rpx;
align-items: center; }
font-size: 26rpx; .commentDetailsList-cross{
font-weight: 500; position: absolute;
color: #282828; right: -12rpx;
margin-bottom: 34rpx; top: -12rpx;
letter-spacing: 1rpx; width: 44rpx;
} height: 44rpx;
background: #FFFFFF;
.commentDetailsList-cross { box-shadow: 0rpx 0rpx 21rpx 0rpx rgba(165, 165, 165, 0.34);
position: absolute; border-radius: 10rpx;
right: -12rpx; font-size: 26rpx;
top: -12rpx; color: #D9868D;
width: 44rpx; text-align: center;
height: 44rpx; line-height: 44rpx;
background: #FFFFFF; }
box-shadow: 0rpx 0rpx 21rpx 0rpx rgba(165, 165, 165, 0.34); .commentDetailsList-list{
border-radius: 10rpx; position: relative;
font-size: 26rpx; background: #FFFFFF;
color: #D9868D; padding: 31rpx 40rpx 37rpx 22rpx;
text-align: center; box-shadow: 0rpx 6rpx 29rpx 0rpx rgba(76, 76, 76, 0.09);
line-height: 44rpx; border-radius: 30rpx;
} margin-bottom: 40rpx;
}
.commentDetailsList-list { .commentDetailsList-title .img{
position: relative; flex-shrink: 0;
background: #FFFFFF; display: inline-block;
padding: 31rpx 40rpx 37rpx 22rpx; margin-top: 5rpx;
box-shadow: 0rpx 6rpx 29rpx 0rpx rgba(76, 76, 76, 0.09); }
border-radius: 30rpx; .commentDetailsList-title text{
} font-size: 40rpx;
font-weight: bold;
.commentDetailsList-title .img { color: #282828;
flex-shrink: 0; margin-left: 29rpx;
display: inline-block; letter-spacing: 1rpx;
margin-top: 5rpx; }
} .commentDetailsList-title{
align-items: center;
.commentDetailsList-title text { margin-bottom: 35rpx;
font-size: 40rpx; }
font-weight: bold; .commentDetailsList-Evaluation view text:first-child{
color: #282828; border-right: 1px solid #E5E5E5;
margin-left: 29rpx; padding: 0 16rpx 0 0;
letter-spacing: 1rpx; }
} .commentDetailsList-Evaluation view text:last-child{
margin-left: 16rpx;
.commentDetailsList-title { }
align-items: center; .commentDetailsList-Evaluation view text{
margin-bottom: 35rpx; display: inline-block;
} letter-spacing: 1rpx;
}
.commentDetailsList-Evaluation view text:first-child { .commentDetailsList-Evaluation view{
border-right: 1px solid #E5E5E5; float: right;
padding: 0 16rpx 0 0; margin-top: 25rpx;
} margin-bottom: 27rpx;
font-size: 24rpx;
.commentDetailsList-Evaluation view text:last-child { font-weight: 500;
margin-left: 16rpx; color: #CE8086;
} }
.commentDetailsList-Evaluation{
.commentDetailsList-Evaluation view text { height: 85rpx;
display: inline-block; border-top: 1rpx solid #E5E5E5;
letter-spacing: 1rpx; }
} .commentDetailsList-source{
font-size: 20rpx;
.commentDetailsList-Evaluation view { color: #C2BCBA;
float: right; font-weight: 500;
margin-top: 25rpx; justify-content: space-between;
margin-bottom: 27rpx; padding: 26rpx 0 25rpx 0;
font-size: 24rpx; }
font-weight: 500; .point{
color: #CE8086; width: 8rpx;
} height: 8rpx;
background: #E64150;
.commentDetailsList-Evaluation { border-radius: 50%;
height: 85rpx; }
border-top: 1rpx solid #E5E5E5; .commentDetailsList-options-title,.commentDetailsList-options-text{
} font-size: 24rpx;
font-weight: 500;
.commentDetailsList-source { color: #CE8086;
font-size: 20rpx; text-align: center;
color: #C2BCBA; font-weight: bold;
font-weight: 500; }
justify-content: space-between; .commentDetailsList-options-text text{
padding: 26rpx 0 25rpx 0; padding: 5rpx 0;
} }
.commentDetailsList-options-text{
.point { flex-direction: column;
width: 8rpx; margin-top: 10rpx;
height: 8rpx; position: absolute;
background: #E64150; left: 0;
border-radius: 50%; right: 0;
} top: 35rpx;
background: #FCEEEF;
.commentDetailsList-options-title, padding: 20rpx 0 20rpx 0;
.commentDetailsList-options-text { border-radius: 0 0 25rpx 25rpx;
font-size: 24rpx; }
font-weight: 500; .commentDetailsList-options-title text{
color: #CE8086; margin-right: 10rpx;
text-align: center; margin-left: 10rpx;
font-weight: bold; }
} .commentDetailsList-options-title{
justify-content: center;
.commentDetailsList-options-text text { align-items: center;
padding: 5rpx 0; }
} .commentDetailsList-options{
flex-grow: 1;
.commentDetailsList-options-text { border-radius: 25rpx;
flex-direction: column; background: #FCEEEF;
margin-top: 10rpx; flex-direction: column;
position: absolute; padding: 14rpx 17rpx 15rpx 17rpx;
left: 0; letter-spacing: 1rpx;
right: 0; position: relative;
top: 35rpx; }
background: #FCEEEF; .commentDetailsList-title-right{
padding: 20rpx 0 20rpx 0; width: 190rpx;
border-radius: 0 0 25rpx 25rpx; flex-shrink: 0;
} }
.commentDetailsList-title-left{
.commentDetailsList-options-title text { letter-spacing: 1rpx;
margin-right: 10rpx; flex-grow: 1;
margin-left: 10rpx; color: #282828;
} font-size: 26rpx;
font-weight: bold;
.commentDetailsList-options-title { margin-right: 20rpx;
justify-content: center; }
align-items: center; .center-line{
} position: absolute;
left: 0;
.commentDetailsList-options { top: 30rpx;
flex-grow: 1; width: 4rpx;
border-radius: 25rpx; height: 23rpx;
background: #FCEEEF; background: #282828;
flex-direction: column; }
padding: 14rpx 17rpx 15rpx 17rpx; .commentDetailsList-content{
letter-spacing: 1rpx;
position: relative; }
} .commentDetailsList-add van-icon{
font-size: 25rpx;
.commentDetailsList-title-right { margin-right: 20rpx;
width: 190rpx; }
flex-shrink: 0; .commentDetailsList-add{
} width: 190rpx;
margin: auto;
.commentDetailsList-title-left { border-radius: 27rpx;
letter-spacing: 1rpx; border: 1rpx solid #FB6087;
flex-grow: 1; color: #FB6087;
color: #282828; font-size: 24rpx;
font-size: 26rpx; letter-spacing: 1rpx;
font-weight: bold; padding: 10rpx 0;
margin-right: 20rpx; margin-bottom: 47rpx;
} text-align: center;
}
.center-line { .index-student-information{
position: absolute; min-height: 800rpx;
left: 0;
top: 30rpx;
width: 4rpx;
height: 23rpx;
background: #282828;
}
.commentDetailsList-content {}
.commentDetailsList-add van-icon {
font-size: 25rpx;
margin-right: 20rpx;
}
.commentDetailsList-add {
width: 190rpx;
margin: auto;
border-radius: 27rpx;
border: 1rpx solid #FB6087;
color: #FB6087;
font-size: 24rpx;
letter-spacing: 1rpx;
padding: 10rpx 0;
margin-bottom: 47rpx;
text-align: center;
}
.index-student-information {
min-height: 800rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 50rpx 50rpx 0 0; border-radius: 50rpx 50rpx 0 0;
padding: 71rpx 50rpx 30rpx 50rpx; padding: 71rpx 50rpx 30rpx 50rpx;
flex-direction: column; flex-direction: column;
} }
</style> </style>
src/components/setComments/commentDetailsPopu.vue
View file @ 10d2cf81
...@@ -105,6 +105,10 @@ ...@@ -105,6 +105,10 @@
text-align: center; text-align: center;
color: #FFFFFF; color: #FFFFFF;
} }
.commentPopup-save{
justify-content: center;
margin-top: 60rpx;
}
.commentPopup-title { .commentPopup-title {
width: 100%; width: 100%;
text-align: center; text-align: center;
......
src/components/setComments/setComments.vue
View file @ 10d2cf81
<template> <template>
<view class="setComments-box"> <view class="setComments-box">
<view class="setComments-add"> <view class="setComments-add" @click="addComments">
<van-icon name="plus" /><text>创建评价</text> </view> <van-icon name="plus" /><text>创建评价</text>
</view>
<view class="index-student-information"> <view class="index-student-information">
<view class="setComments-content-box" v-if="dataList.length>0"> <view class="setComments-content-box" v-if="dataList.length>0">
<template v-for="(item,index) in dataList"> <template v-for="(item,index) in dataList">
...@@ -11,7 +12,7 @@ ...@@ -11,7 +12,7 @@
<text class="setComments-title-left">第{{item.Times}}次评价</text> <text class="setComments-title-left">第{{item.Times}}次评价</text>
<view class="setComments-title-right"> <view class="setComments-title-right">
<view class="setComments-options flex"> <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> <view class="point"></view>
<text>{{item.ShowTypeStr}}</text> <text>{{item.ShowTypeStr}}</text>
<van-icon :name="item.optionsShow?'arrow-down':'arrow'" /> <van-icon :name="item.optionsShow?'arrow-down':'arrow'" />
...@@ -80,6 +81,11 @@ ...@@ -80,6 +81,11 @@
delta: 1 delta: 1
}) })
}, },
addComments(){
uni.navigateTo({
url: '/pages/setComments/commentRulesList'
})
},
goComment(item){ goComment(item){
uni.navigateTo({ uni.navigateTo({
url: '/pages/setComments/commentDetails?comment='+ encodeURIComponent(JSON.stringify(item)) url: '/pages/setComments/commentDetails?comment='+ encodeURIComponent(JSON.stringify(item))
...@@ -195,6 +201,7 @@ ...@@ -195,6 +201,7 @@
left: 0; left: 0;
right: 0; right: 0;
top: 35rpx; top: 35rpx;
z-index: 2;
background: #FCEEEF; background: #FCEEEF;
padding: 20rpx 0 20rpx 0; padding: 20rpx 0 20rpx 0;
border-radius: 0 0 25rpx 25rpx; border-radius: 0 0 25rpx 25rpx;
......
src/pages/index/examDetails.vue
View file @ 10d2cf81
<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 @ 10d2cf81
...@@ -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 @ 10d2cf81
<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 @ 10d2cf81
<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 @ 10d2cf81
...@@ -14,13 +14,18 @@ ...@@ -14,13 +14,18 @@
</view> </view>
</view> </view>
</navbar> </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="padding:0 50rpx;font-weight: 800;color: #282828;">
<view style="font-size: 36rpx;">Hi，</view> <view style="font-size: 36rpx;">Hi，</view>
<view style="font-size: 50rpx;">{{userData.AccountName}}老师</view> <view style="font-size: 50rpx;">{{userData.AccountName}}老师</view>
</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> </view>
<courseCard @change="changeCourseHandler"></courseCard> <courseCard @change="changeCourseHandler"></courseCard>
<view class="index-student-information"> <view class="index-student-information">
...@@ -43,9 +48,9 @@ ...@@ -43,9 +48,9 @@
> >
<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>
</view> </view>
</template> </template>
...@@ -100,7 +105,7 @@ ...@@ -100,7 +105,7 @@
tabNme:'作业情况', tabNme:'作业情况',
Msg:{ Msg:{
PageIndex: 1, PageIndex: 1,
PageSize: 10, PageSize: 20,
ExamName:'', ExamName:'',
CourseId:'' CourseId:''
}, },
...@@ -137,7 +142,6 @@ ...@@ -137,7 +142,6 @@
}) })
}, },
changeCourseHandler(id){ changeCourseHandler(id){
console.log(id,'........................')
data.Msg.courseId=45329247 data.Msg.courseId=45329247
data.OperationMsg.courseId=45329247 data.OperationMsg.courseId=45329247
data.currentCourseId=45329247 data.currentCourseId=45329247
...@@ -145,16 +149,11 @@ ...@@ -145,16 +149,11 @@
methods.getExamPageList() methods.getExamPageList()
methods.getCourseHomeWorkList() methods.getCourseHomeWorkList()
}, },
changeExamHandler(){
methods.getExamPageList()
},
toggleTitle(t) { toggleTitle(t) {
data.tabNme = t data.tabNme = t
// if(t=='学生列表'){
// this.getCourseStuList()
// }else if(data.tabNme=='作业情况'){
// this.getCourseHomeWorkList()
// }else{
// this.getExamPageList()
// }
}, },
//获取学生列表 //获取学生列表
getCourseStuList(){ getCourseStuList(){
...@@ -241,31 +240,13 @@ ...@@ -241,31 +240,13 @@
}; };
}, },
onLoad(option) { onLoad(option) {
// this.tabNme = option.tabNme
// this.OperationMsg.courseId = option.courseId
// this.Msg.courseId = option.courseId
}, },
onShow() { 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() { onShow() {
// this.dataList = []
// if(this.tabNme=='学生列表'){
// this.getCourseStuList()
// }else if(this.tabNme=='作业情况'){
// this.getCourseHomeWorkList()
// }else{
// this.getExamPageList()
// }
}, },
...@@ -287,6 +268,29 @@ ...@@ -287,6 +268,29 @@
</script> </script>
<style scoped> <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{ .num{
font-size: 20rpx; font-size: 20rpx;
display: inline-block; display: inline-block;
......
src/pages/setComments/commentRulesList.vue
View file @ 10d2cf81
...@@ -504,14 +504,23 @@ ...@@ -504,14 +504,23 @@
.commentRulesList-box { .commentRulesList-box {
background: #FFFFFF; background: #FFFFFF;
} }
.commentRulesList-header-box{
.commentRulesList-header-title { padding: 20rpx 42rpx;
font-size: 32rpx; flex-direction: row;
font-weight: 500; align-items: center;
color: #282828; }
flex: 1; .commentRulesList-header-title{
text-align: center; font-size: 32rpx;
padding-right: 40rpx; 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 { .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