zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
@fawn-nine
2024-09-12 16:04:49 +08:00
parent 0cb8920d42
commit ac1470b6b3
3 changed files with 107 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/views/modules/miniClass/miniClass.vue
View File

@@ -111,8 +111,13 @@
>创建班级</el-button
>
<el-button type="primary" @click="saveAdd" v-else>保 存</el-button
><el-button type="success" @click="kaiban" v-if="miniClassForm.state == '0' && miniClassForm.id">开班</el-button
><el-button type="warning" @click="jieban" v-if="miniClassForm.state == '1' && miniClassForm.id">结班</el-button>
>
<template v-if="miniClassForm.id">
<el-button type="success" @click="kaiban" v-if="miniClassForm.state == '0' ">开 班</el-button
><el-button type="warning" @click="jieban" v-if="showOverbtn"
>结 班</el-button>
</template>
</div>
</div>
<div v-show="!mainSet">
@@ -341,13 +346,17 @@ export default {
}
},
placeholder: "请输入正文"
}
},
showOverbtn: false, // 是否显示结班按钮
};
},
mounted() {
// console.log('激活了')
if (this.miniClass) {
if (this.miniClass) {
console.log("编辑小班", this.miniClass);
this.getClassInfo()
if (this.miniClass.classModel.id) {
this.modelList.push(this.miniClass.classModel);
}
@@ -383,13 +392,70 @@ export default {
this.userList.push(item)
})
// console.log("处理后的",this.userList);
console.log("处理后的开班日期",this.miniClassForm.mstartseconds, this.miniClassForm.nowseconds);
}
} else {
console.log("添加小班");
}
},
methods: {
// 获取小班详情
async getClassInfo() {
console.log('班级详情')
this.$http({
url: this.$http.adornUrl("/common/class/getClassInfo"),
method: "post",
data: this.$http.adornData({
classId: this.miniClass.id
})
})
.then(async ({ data }) => {
if (data && data.code === 0) {
this.miniClassForm.startTime = data.result.class.startTime;
var strStartTime = new Date(this.miniClassForm.startTime)
var StartTime = strStartTime.getTime()
console.log(';shijia',StartTime, data.result.class.startTime)
var nowTime = await this.getServerTime() // 服务器当前时间
console.log('服务器时间',nowTime)
this.miniClassForm.mstartseconds = StartTime
this.miniClassForm.nowseconds = nowTime
// if(this.miniClass.classModel.isExam == 0){ // 没有考试模块
// var off70 = undefined // 时长过70%显示结班按钮天数
// off70 = Math.ceil(parseInt(this.miniClass.classModel.days) * 0.7)
var endminiSecond = this.miniClass.classModel.days * 1000 * 60 * 60 * 24
console.log('时间比较', (endminiSecond + StartTime), nowTime)
if (StartTime > 0 && (endminiSecond + StartTime) <= nowTime) {
console.log('显示结班按钮');
this.showOverbtn = true
} else {
this.showOverbtn = false
console.log('不显示');
}
}else{
this.showOverbtn = false
}
// }else{
// this.miniClassForm.startTime = undefined
// }
})
},
// 获取服务器时间
async getServerTime() {
var time = undefined
await this.$http({
url: this.$http.adornUrl("/common/classExam/getServerTime"),
method: "post",
data: this.$http.adornData({})
})
.then( async ({ data }) => {
if (data && data.code === 0) {
time = data.serverTime;
}}
)
return time
},
// 开班
kaiban(){
if(this.miniClass.classUsers.length == 0 || !this.miniClass.classUsers){

19
src/views/modules/miniClass/miniClassList.vue
View File

@@ -74,10 +74,10 @@
<template slot-scope="scope" v-if="scope.row.createUser">
昵称：
{{
scope.row.createUser.nickname != "" && scope.row.createUser.nickname != null && scope.row.createUser.nickname != 'null'
? scope.row.createUser.nickname
scope.row.newName!= "" && scope.row.newName != null && scope.row.newName != 'null'
? scope.row.newName
: "匿名用户"
}}<br />电话：{{ scope.row.createUser.tel }}
}}<br />电话：{{ scope.row.newTel }}
</template>
</el-table-column>
<el-table-column
@@ -87,8 +87,9 @@
label="日期"
>
<template slot-scope="scope">
创建日期:{{ scope.row.createTime }}<br />
开班日期<br />结班日期<br />
<span>创建日期：{{ scope.row.createTime }}<br /></span>
<span v-if="scope.row.state >= 1">开班日期：{{ scope.row.startTime }}<br /></span>
<span v-if="scope.row.state == 2">结班日期：{{ scope.row.endTime }}<br /></span>
<!-- <img
v-if="scope.row.avatar && scope.row.avatar != ''"
:src="scope.row.avatar"
@@ -237,6 +238,10 @@ export default {
{
value: "1",
label: "已开班"
},
{
value: "3",
label: "考试中"
},
{
value: "2",
@@ -404,6 +409,10 @@ export default {
// })
}).then(({ data }) => {
if (data && data.code === 0) {
data.page.records.forEach(element => {
element.newTel = element.createUser.tel ? element.createUser.tel : element.createUser.mobile
element.newName = element.createUser.name ? element.createUser.name : element.createUser.username
});
this.dataList = data.page.records;
this.totalPage = data.page.pages;
this.total = data.page.total;

34
src/views/modules/miniClass/miniClassType.vue
View File

@@ -44,6 +44,16 @@
v-loading="dataListLoading"
style="width: 100%;"
>
<!-- <el-table-column
prop="title"
header-align="center"
align="center"
label="创建时间"
>
<template slot-scope="scope">
<span>{{ scope.row.createTime }}<br /></span>
</template>
</el-table-column> -->
<el-table-column
prop="title"
header-align="center"
@@ -51,7 +61,7 @@
label="名称"
>
</el-table-column>
<el-table-column
<el-table-column width="300"
prop="createUser.tel"
header-align="center"
align="center"
@@ -66,7 +76,7 @@
</div>
</template>
</el-table-column>
<el-table-column
<el-table-column width="350"
prop="createTime"
header-align="center"
align="center"
@@ -75,20 +85,20 @@
<template slot-scope="scope">
<!-- <div> <span>主任</span></div> -->
<div v-if="scope.row.director">
<span v-if="scope.row.director.nickname">主任<br/></span>
<span v-if="scope.row.director.nickname">{{scope.row.director.nickname}}<br/></span>
<span v-if="scope.row.director.tel">电话：{{scope.row.director.tel}}<br/></span>
<span v-if="scope.row.director.email">邮箱：{{scope.row.director.email}}<br/></span>
<span v-if="scope.row.director.nickname">主任：</span>
<span v-if="scope.row.director.nickname">{{scope.row.director.nickname}}</span>
<span v-if="scope.row.director.tel">{{scope.row.director.tel}} / </span>
<span v-if="scope.row.director.email">{{scope.row.director.email}}<br/></span>
</div>
<div v-if="scope.row.ddirector">
<span v-if="scope.row.ddirector.nickname">副主任<br/></span>
<span v-if="scope.row.ddirector.nickname">{{scope.row.ddirector.nickname}}<br/></span>
<span v-if="scope.row.ddirector.tel">电话：{{scope.row.ddirector.tel}}<br/></span>
<span v-if="scope.row.ddirector.email">邮箱：{{scope.row.ddirector.email}}<br/></span>
<span v-if="scope.row.ddirector.nickname">副主任：</span>
<span v-if="scope.row.ddirector.nickname">{{scope.row.ddirector.nickname}}</span>
<span v-if="scope.row.ddirector.tel">{{scope.row.ddirector.tel}} / </span>
<span v-if="scope.row.ddirector.email">{{scope.row.ddirector.email}}</span>
</div>
</template>
</el-table-column>
<el-table-column
<el-table-column width="100"
prop="days"
header-align="center"
align="center"
@@ -103,7 +113,7 @@
fixed="right"
header-align="center"
align="center"
width="150"
width="100"
label="操作"
>
<template slot-scope="scope">