Skip to content

T
thinkApp
Commit 7d21f9fe authored by liudong1993's avatar liudong1993
Browse files
Options

1

parents 4f2dd5ec 34783ecf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1135 additions and 582 deletions
src/components/index/JobComponents.vue
View file @ 7d21f9fe
This diff is collapsed.
src/components/index/commentsComponents.vue
View file @ 7d21f9fe
<template>
<view class="CommentsComponents-box">
<view class="CommentsComponents activeOne flex">
<view class="CommentsComponents-time-box flex">
<view class="CommentsComponents-time">
<view>05/25 17:13</view>
</view>
<view class="CommentsComponents-line">
<view class="CommentsComponents-point"></view>
</view>
</view>
<view class="CommentsComponents-center-box">
<view class="CommentsComponents-center-line"></view>
<view class="CommentsComponents-center flex">
<view class="CommentsComponents-left flex">
<van-image width="38rpx" height="38rpx" fit="cover" class="operation-img"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png"/>
<view class="operation-name">周老师的评语</view>
</view>
<view class="CommentsComponents-right">
你是个做事小心翼翼，感情细腻丰富的女孩
，每次看你认真的样子老师都很感动。你也是幸运的，周
边有很多人都在关爱着你，所以，对他们，尤其是父母，记得不要
太莽撞，不要太任性，要学着体谅，学着换位思考
，学着懂事。另外，今后要多运动、多锻炼，有健康才能成就美好未来！
</view>
</view>
</view>
</view>
<view class="CommentsComponents-time-box flex">
<view class="CommentsComponents-time">
<view>{{jobData.CreateTime}}</view>
</view>
<view class="CommentsComponents-line">
<view class="CommentsComponents-point"></view>
</view>
</view>
<view class="CommentsComponents-center-box">
<view class="CommentsComponents-center-line"></view>
<view class="CommentsComponents-center flex">
<view class="CommentsComponents-left flex">
<van-image width="38rpx" height="38rpx" fit="cover" class="operation-img" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
<view class="operation-name">{{jobData.Title}}</view>
</view>
<view class="CommentsComponents-right">
{{jobData.DataObj.Comment}}
</view>
</view>
</view>
</view>
</view>
</template>
<script>
......@@ -40,12 +34,9 @@
} from "vue";
export default {
props: {
},
props: ["jobData"],
components: {},
setup() {
let data = reactive({
obj: {
Name: '',
......@@ -61,95 +52,111 @@
};
</script>
<style scoped>
.CommentsComponents-right{
color: #FFFFFF;
font-size: 20rpx;
line-height: 35rpx;
letter-spacing: 1rpx;
}
.CommentsComponents.activeThree .operation-name{
color: #282828;
}
.CommentsComponents.activeTwo .operation-name{
color: #282828;
}
.CommentsComponents.activeOne .operation-name{
color: #FFFFFF;
}
.operation-name{
font-size: 26rpx;
letter-spacing: 1px;
font-weight: 500;
flex-grow: 1;
}
.operation-img{
margin-right: 12rpx;
border-radius: 50%;
flex-shrink: 0;
}
.CommentsComponents-left{
flex: 1;
flex-grow: 1;
margin-top: -5rpx;
margin-bottom: 10rpx;
}
.CommentsComponents-center{
flex-direction: column;
}
.CommentsComponents-center-line{
width: 4rpx;
height: 23rpx;
background: #FEFEFE;
position: absolute;
left: 0;
top: 33rpx;
}
.CommentsComponents.activeOne .CommentsComponents-center-box{
background: #52C1CA;
}
.CommentsComponents-center-box{
flex-grow: 1;
position: relative;
border-radius: 30rpx;
padding: 31rpx 18rpx 21rpx 24rpx;
margin-bottom: 50rpx;
}
.CommentsComponents.activeOne .CommentsComponents-point{
background: #1E7BF5;
box-shadow: 0px 0px 12px 0px rgba(30, 123, 245, 0.46);
}
.CommentsComponents-point{
width: 19rpx;
height: 19rpx;
position: absolute;
top: 20rpx;
left: -13rpx;
border-radius: 50%;
border: 3px solid #FFFFFF;
box-shadow: 0px 0px 12px 0px rgba(255, 255, 255, 0.46);
}
.CommentsComponents-line{
width: 4rpx;
height: 100%;
background: #F1F1F1;
margin-left: 46rpx;
margin-right: 46rpx;
position: relative;
}
.CommentsComponents-time{
width: 61rpx;
height: 55rpx;
color: #CCC8C6;
font-size: 20rpx;
border-radius: 20rpx;
padding: 14rpx 13rpx;
background: #F6F6F6;
}
.CommentsComponents{
justify-content: space-between;
padding: 0 50rpx;
}
.CommentsComponents-box{
background: #FFFFFF;
}
.CommentsComponents-right {
color: #FFFFFF;
font-size: 20rpx;
line-height: 35rpx;
letter-spacing: 1rpx;
}
.CommentsComponents.activeThree .operation-name {
color: #282828;
}
.CommentsComponents.activeTwo .operation-name {
color: #282828;
}
.CommentsComponents.activeOne .operation-name {
color: #FFFFFF;
}
.operation-name {
font-size: 26rpx;
letter-spacing: 1px;
font-weight: 500;
flex-grow: 1;
}
.operation-img {
margin-right: 12rpx;
border-radius: 50%;
flex-shrink: 0;
}
.CommentsComponents-left {
flex: 1;
flex-grow: 1;
margin-top: -5rpx;
margin-bottom: 10rpx;
}
.CommentsComponents-center {
flex-direction: column;
}
.CommentsComponents-center-line {
width: 4rpx;
height: 23rpx;
background: #FEFEFE;
position: absolute;
left: 0;
top: 33rpx;
}
.CommentsComponents.activeOne .CommentsComponents-center-box {
background: #52C1CA;
}
.CommentsComponents-center-box {
flex-grow: 1;
position: relative;
border-radius: 30rpx;
padding: 31rpx 18rpx 21rpx 24rpx;
margin-bottom: 50rpx;
}
.CommentsComponents.activeOne .CommentsComponents-point {
background: #1E7BF5;
box-shadow: 0px 0px 12px 0px rgba(30, 123, 245, 0.46);
}
.CommentsComponents-point {
width: 19rpx;
height: 19rpx;
position: absolute;
top: 20rpx;
left: -13rpx;
border-radius: 50%;
border: 3px solid #FFFFFF;
box-shadow: 0px 0px 12px 0px rgba(255, 255, 255, 0.46);
}
.CommentsComponents-line {
width: 4rpx;
height: 100%;
background: #F1F1F1;
margin-left: 46rpx;
margin-right: 46rpx;
position: relative;
}
.CommentsComponents-time {
width: 61rpx;
height: 55rpx;
color: #CCC8C6;
font-size: 20rpx;
border-radius: 20rpx;
padding: 14rpx 13rpx;
background: #F6F6F6;
}
.CommentsComponents {
justify-content: space-between;
padding: 0 50rpx;
}
.CommentsComponents-box {
background: #FFFFFF;
}
</style>
src/components/index/course-card.vue
View file @ 7d21f9fe
......@@ -3,9 +3,10 @@
<view class="course-item">
<view style="width:287rpx;">
<view class="course-name">
{{stuCourseList[0].CourseName}}
{{ stuCourseList[0].CourseName}}
</view>
<van-progress percentage="75" :show-pivot="false" track-color="#EFEFEF" color="#282828" stroke-width="5" />
<van-progress :percentage="calcPercentage(stuCourseList[0])" :show-pivot="false" track-color="#EFEFEF" color="#282828"
stroke-width="5" />
<view class="course-progress">
上课进度 {{stuCourseList[0].CompleteNum}}/{{stuCourseList[0].TotalClassNum}}
</view>
......@@ -44,12 +45,13 @@
<view class="one_line course-name">
{{item.CourseName}}
</view>
<van-progress percentage="46" :show-pivot="false" track-color="#EFEFEF" color="#282828" stroke-width="5" />
<van-progress :percentage="calcPercentage(item)" :show-pivot="false" track-color="#EFEFEF" color="#282828"
stroke-width="5" />
<view class="course-progress">
上课进度 {{item.CompleteNum}}/{{item.TotalClassNum}}
</view>
<view style="text-align: right;">
<van-button @click="hideExchangeBoxHandler" color="#C91727" round size="mini" custom-style="color:#FFF;font-size: 24rpx;padding-left:16rpx;padding-right:10px;">
<van-button @click="hideExchangeBoxHandler(item)" color="#C91727" round size="mini" custom-style="color:#FFF;font-size: 24rpx;padding-left:16rpx;padding-right:10px;">
选择课程
</van-button>
</view>
......@@ -80,14 +82,28 @@
setup(props, context) {
let data = reactive({
statusBarHeight: 24,
showItems: false
showItems: false,
currentCourse:{}
});
let methods = {
exchangeItemHandler() {
data.showItems = true
},
hideExchangeBoxHandler() {
//点击切换课程
hideExchangeBoxHandler(item) {
//调用父页面方法
this.$parent.getStuHomeWorkAndExam(item.courseId);
data.showItems = false
},
//计算完成百分比
calcPercentage(item) {
let percent = 0;
if (item) {
if (item.TotalClassNum > 0) {
percent = Number(item.CompleteNum / item.TotalClassNum) * 100
}
}
return percent;
}
}
return {
......
src/components/index/examComponents.vue
View file @ 7d21f9fe
This diff is collapsed.
src/components/index/workSituation/courseCard.vue 0 → 100644
View file @ 7d21f9fe
This diff is collapsed.
src/components/index/workSituation/examList.vue
View file @ 7d21f9fe
<template>
<view class="examList-box">
<view class="examList-import">
<view class="examList-import" @click="ImportInformation">
<van-icon name="plus" />
<text>导入考试信息</text>
</view>
......@@ -33,6 +33,20 @@
</view>
<!-- <view class="noData">暂无数据</view> -->
</view>
<van-popup :show="show" :round="true">
<view class="examList-popup-box">
<van-icon class="examList-popup-closure" name="cross" @click="show=false"/>
<view class="examList-popup-title">导入考试信息</view>
<view class="examList-popup-content">
<input v-model="obj.name" class="examList-popup-name" placeholder="请输入考试名称">
<view class="examList-popup-fil" @click="uploadFiles">
<van-image class="img" width="32rpx" height="32rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653639041000_305.png" />
选择文件
</view>
</view>
</view>
</van-popup>
</view>
</template>
<script>
......@@ -58,12 +72,19 @@
},
showPhone: false,
showLogin: true, //多次点击
show:false,
});
let methods = {
JobDetails(){
uni.reLaunch({
url: '/pages/index/workSituation'
});
},
ImportInformation(){
this.show = true
},
uploadFiles(){
}
}
return {
......@@ -74,6 +95,52 @@
};
</script>
<style scoped>
.img {
display: inline-block;
position: relative;
top: 6rpx;
margin-right: 10rpx;
}
.examList-popup-fil{
line-height: 88rpx;
padding: 0 10rpx;
border-radius: 44rpx;
font-size: 30rpx;
color: #FFFFFF;
background: #C91727;
margin-top: 27rpx;
text-align: center;
}
.examList-popup-name{
background-color: #FFFFFF;
text-align: center;
border: 1px solid #AAAAAA;
height: 86rpx;
line-height: 86rpx;
padding: 0 10rpx;
border-radius: 44rpx;
font-size: 30rpx;
}
.examList-popup-title{
width: 100%;
text-align: center;
font-size: 30rpx;
font-weight: 500;
margin-bottom: 73rpx;
letter-spacing: 1rpx;
}
.examList-popup-closure{
position: absolute;
right: 31rpx;
top: 31rpx;
color: #282828;
font-size: 38rpx;
}
.examList-popup-box{
position: relative;
width: 548rpx;
padding: 48rpx 55rpx 98rpx 55rpx;
}
.homework-score-num view:last-child{
font-size: 23rpx;
margin-top: 25rpx;
......
src/pages/index/index.vue
View file @ 7d21f9fe
......@@ -3,12 +3,11 @@
<navbar class="navbarSticky" bg="#F6F6F6">
<view class="index-header-box">
<view class="index-header-img">
<van-image width="100%" height="100%" fit="cover" class="img"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
<van-image width="100%" height="100%" fit="cover" class="img" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
</view>
<view class="index-header-tetx">
<view class="index-header-title">
welcome
welcome
</view>
<view class="index-header-name">{{userData.AccountName}}</view>
</view>
......@@ -23,12 +22,15 @@
<course-card :stuCourseList="stuCourseList"></course-card>
<view class="index-student-title flex">
<text>考情详情</text>
<view>(共53条)</view>
<view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view>
</view>
<view class="index-student-information">
<JobComponents></JobComponents>
<examComponents></examComponents>
<commentsComponents></commentsComponents>
<template v-for="(item,index) in workList">
<JobComponents v-if="item.ResultType==1" :jobData="item"></JobComponents>
<examComponents v-if="item.ResultType==2" :jobData="item"></examComponents>
<commentsComponents v-if="item.ResultType==3" :jobData="item"></commentsComponents>
</template>
</view>
</view>
</template>
......@@ -51,9 +53,9 @@
nextTick,
} from "vue";
import {
getSweepCode
} from '../../api/index.js'
import {
getSweepCode
} from '../../api/index.js'
import {
getImageColor
} from '../../utils/index.js'
......@@ -75,8 +77,13 @@
proxy
} = getCurrentInstance();
let data = reactive({
stuCourseList: [],//学员课程列表
userData: {},//用户信息
stuCourseList: [], //学员课程列表
userData: {}, //用户信息
//学员作业和考试查询参数
workMsg: {
courseId: 0,
},
workList: [],//学员作业、考试、评语数据
});
let methods = {
......@@ -90,7 +97,7 @@
url: '/pages/timetable/timeTable',
})
},
base64_decode(data) {
var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
var o1,
......@@ -127,14 +134,24 @@
}
} while (i < data.length);
dec = tmp_arr.join("");
return dec;
},
//获取学员课程列表
//获取学员课程列表
getStuCourse() {
proxy.$request("/Stu/GetStuCourse", {}).then(res => {
data.stuCourseList = res.Data;
//console.log("data.stuCourseList",this.stuCourseList)
let tempArray = res.Data;
data.stuCourseList = tempArray;
if (tempArray && tempArray.length > 0) {
this.getStuHomeWorkAndExam(tempArray[0].courseId)
}
})
},
//获取学员作业、考试、评语
getStuHomeWorkAndExam(courseId) {
this.workMsg.courseId = courseId;
data.workList = [];
proxy.$request("/Stu/GetStuWork", this.workMsg).then(res => {
data.workList = res.Data;
})
},
async getColor(src, index, y) {
......@@ -179,35 +196,41 @@
</script>
<style scoped>
.index-student-title view{
.index-student-title view {
font-size: 25rpx;
color: #ABABAB;
margin-left: 20rpx;
padding: 13rpx 0 0 0;
}
.index-student-title text{
.index-student-title text {
font-size: 36rpx;
font-weight: 800;
color: #282828;
}
.index-student-title{
.index-student-title {
padding: 0 50rpx 45rpx;
}
.index-student-information{
.index-student-information {
min-height: 500rpx;
background: rgba(255,255,255,.7);
background: rgba(255, 255, 255, .7);
border-radius: 50rpx 50rpx 0 0;
padding: 71rpx 0 0 0;
}
.index-header-name{
.index-header-name {
font-size: 30rpx;
color: #474747;
}
.index-header-tetx{
.index-header-tetx {
color: #D0D0D0;
font-size: 24rpx;
}
.index-header-img .img{
.index-header-img .img {
display: block;
border: 2rpx solid rgba(164, 164, 164, 0.32);
border-radius: 50%;
......@@ -217,7 +240,8 @@
box-sizing: border-box;
margin: 4rpx;
}
.index-header-img{
.index-header-img {
width: 68rpx;
height: 68rpx;
border-radius: 50%;
......@@ -226,6 +250,7 @@
margin-right: 20rpx;
background: #FFFFFF;
}
.indexpage {
min-height: 100vh;
background-color: #f6f6f6;
......@@ -235,26 +260,29 @@
background-repeat: no-repeat;
background-size: 100% auto;
}
.index-header-box{
.index-header-box {
display: flex;
flex-direction: row;
align-items: center;
padding:0rpx 42rpx ;
padding: 0rpx 42rpx;
}
.index-header-box .index-header-title{
.index-header-box .index-header-title {
font-size: 24rpx;
font-weight: 400;
color: #B8B8B8;
}
.index-header-box .index-header-name{
.index-header-box .index-header-name {
font-size: 30rpx;
font-weight: 800;
color: #282828;
}
.navbarSticky {
display: sticky;
top: 0;
z-index: 9;
}
</style>
src/pages/index/workSituation.vue
View file @ 7d21f9fe
......@@ -20,7 +20,7 @@
<view style="font-size: 50rpx;">李老师</view>
</view>
</view>
<course-card></course-card>
<courseCard></courseCard>
<view class="index-student-information">
<view class="workSituation-title-box flex">
<view class="workSituation-title flex"
......@@ -43,7 +43,7 @@
</template>
<script>
import courseCard from '../../components/index/course-card'
import courseCard from '@/components/index/workSituation/courseCard'
import operation from '@/components/index/workSituation/operation'
import studentList from '@/components/index/workSituation/studentList'
import examList from '@/components/index/workSituation/examList'
......@@ -87,7 +87,7 @@
{name:'作业情况',num:5},
{name:'考试信息',num:18},
],
tabNme:'作业情况'
tabNme:'考试信息'
});
let methods = {
......@@ -166,7 +166,7 @@
border-radius: 30rpx;
}
.index-student-information{
min-height: 500rpx;
min-height: 800rpx;
background: rgba(255,255,255,.7);
border-radius: 50rpx 50rpx 0 0;
padding: 50rpx 0 30rpx 0;
......
src/pages/login/accountLogin.vue
View file @ 7d21f9fe
......@@ -63,8 +63,8 @@
} = getCurrentInstance();
let Toast = inject("$toast");
let msg = reactive({
Account: "13880093563",
Password: "093563",
Account: "13802557508",
Password: "557508",
});
let data = reactive({
phoneNum: "",
......
src/utils/wxcomponents/vant/search/index.vue
View file @ 7d21f9fe
......@@ -126,8 +126,8 @@ export default global['__wxComponents']['vant/search/index']
padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa;
background-color: var(--search-background-color,#f7f8fa);
background-color: #FFFFFF;
background-color: var(--search-background-color,#FFFFFF);
}
.van-search__content--round {
......
src/utils/wxcomponents/vant/search/index.wxss
View file @ 7d21f9fe
......@@ -21,8 +21,8 @@
padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa;
background-color: var(--search-background-color,#f7f8fa);
background-color: #FFFFFF;
background-color: var(--search-background-color,#FFFFFF);
}
.van-search__content--round {
......
src/wxcomponents/vant/search/index.vue
View file @ 7d21f9fe
......@@ -126,8 +126,8 @@ export default global['__wxComponents']['vant/search/index']
padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa;
background-color: var(--search-background-color,#f7f8fa);
background-color: #FFFFFF;
background-color: var(--search-background-color,#FFFFFF);
}
.van-search__content--round {
......
src/wxcomponents/vant/search/index.wxss
View file @ 7d21f9fe
......@@ -21,8 +21,8 @@
padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa;
background-color: var(--search-background-color,#f7f8fa);
background-color: #FFFFFF;
background-color: var(--search-background-color,#FFFFFF);
}
.van-search__content--round {
......
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