c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server_commit

Browse Source
This commit is contained in:
zhaoxinyu
2024-09-18 15:05:17 +08:00
parent 541ee6193a
commit ca104cd831
12 changed files with 251 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/mobile/wakeshome/review/appraisal.html
+9 -1
View File
@@ -146,7 +146,15 @@ layout("/mobile/platform.html"){
const now = new Date();
// 检查当前时间是否在 startTime 和 endTime 之间
return now >= start && now <= end;
if (now < start && now > end){
vant.Dialog.alert({
title: '温馨提示',
message: '不在测评时间内，暂无法测评',
confirmButtonColor: '#1867b0'
})
return
}
//自评模式
if (o.reviewMode == 1 && !o.canJoin) {
src/main/resources/views/mobile/wakeshome/review/commentator.html
+28 -7
View File
@@ -249,7 +249,7 @@ layout("/mobile/platform.html"){
let resultScore = 0; // 评议分
this.bzList.forEach(v => {
source += Number(v.source)
source += Number(v.score)
resultScore += Number(v.resultScore)
})
const result = (resultScore / source) * 100
@@ -290,16 +290,36 @@ layout("/mobile/platform.html"){
const resp = await $.post('/mobile/wakeshome/review/appraisal/doSubmit', formData)
if (resp.code === 0) {
await this.getCommentById();
window.location.href = '/mobile/wakeshome/review/appraisal/mine'
vant.Toast.success('操作成功')
setTimeout(()=>{
window.location.href = '/mobile/wakeshome/review/appraisal/mine'
},500)
}
})
},
async showAssess() {
this.$refs['addForm'].validate().then(async () => {
let score = 0;
await this.assignment();
// let score = 0;
if (this.commentatorData.assessmentMode === 1) {
await this.assignment();
let source = 0; // 标准分
let resultScore = 0; // 评议分
this.bzList.forEach(v => {
source += Number(v.score)
resultScore += Number(v.resultScore)
})
const result = (resultScore / source) * 100
if (result >= 80) {
this.reviewResult = '满意'
} else if (result >= 60 && result <= 79) {
this.reviewResult = '基本满意'
} else {
this.reviewResult = '不满意'
}
/*this.bzList.forEach(v => {
score += Number(v.resultScore)
})
if (score >= Number(80)) {
@@ -308,12 +328,13 @@ layout("/mobile/platform.html"){
this.reviewResult = '基本满意'
} else {
this.reviewResult = '不满意'
}
console.log(score)
}*/
console.log(source)
console.log(resultScore)
console.log(this.reviewResult)
vant.Dialog.alert({
title: '测评结果',
message: '您的测评分数为【' + score + "】分，测评结果为【" + this.reviewResult + "】",
message: '您的测评分数为【' + resultScore + "】分，测评结果为【" + this.reviewResult + "】",
confirmButtonColor: '#1867b0'
})
} else if (this.commentatorData.assessmentMode === 2) {
src/main/resources/views/platform/trainEdu/statistics/video.html
+47 -40
View File
@@ -34,7 +34,11 @@ layout("/layouts/platform.html"){
<el-card shadow="never" class="mt10">
<table-tool label="统计" :app="this"></table-tool>
<table-tool label="统计" :app="this">
<template #func>
<el-button type="primary" size="small" @click="exportXlsx">导出</el-button>
</template>
</table-tool>
<el-table :data="tableData" :size="tableSize" style="width: 100%">
<el-table-column type="index" label="序号" width="80px"></el-table-column>
<el-table-column
@@ -46,9 +50,9 @@ layout("/layouts/platform.html"){
:prop="column.prop"
:sortable="column.sortable"
>
<!-- <template v-if="column.prop==='sumDuration'" scope="{row}">-->
<!-- {{(row.sumDuration / 60 / 60).toFixed(2) + 'h'}}-->
<!-- </template>-->
<!-- <template v-if="column.prop==='sumDuration'" scope="{row}">-->
<!-- {{(row.sumDuration / 60 / 60).toFixed(2) + 'h'}}-->
<!-- </template>-->
<template v-if="column.prop==='isQualified'" scope="{row}">
<span v-if="row.watchCount>=row.qualifiedNum" class="text-success">
是
@@ -58,48 +62,48 @@ layout("/layouts/platform.html"){
</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" header-align="center" label="操作" width="200">-->
<!-- <template scope="{row}">-->
<!-- <el-button size="mini" type="primary" @click="openView(row)">查看具体学习情况</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" header-align="center" label="操作" width="200">-->
<!-- <template scope="{row}">-->
<!-- <el-button size="mini" type="primary" @click="openView(row)">查看具体学习情况</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<!-- <template #view>-->
<!-- <el-table :data="viewTableData" stripe border style="width: 100%">-->
<!-- <el-table-column type="index" label="序号" width="80px">-->
<!-- <template scope="scope">-->
<!-- <span>{{ scope.$index + (viewPageForm.pageNumber - 1) * viewPageForm.pageSize + 1 }} </span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- header-align="center"-->
<!-- v-for="column in viewTableColumns"-->
<!-- show-overflow-tooltip-->
<!-- :label="column.label"-->
<!-- :prop="column.prop"-->
<!-- :sortable="column.sortable"-->
<!-- >-->
<!-- <template v-if="column.prop==='studyDuration'" scope="{row}">-->
<!-- {{(row.studyDuration / 60 / 60).toFixed(2) + 'h'}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <template #view>-->
<!-- <el-table :data="viewTableData" stripe border style="width: 100%">-->
<!-- <el-table-column type="index" label="序号" width="80px">-->
<!-- <template scope="scope">-->
<!-- <span>{{ scope.$index + (viewPageForm.pageNumber - 1) * viewPageForm.pageSize + 1 }} </span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- header-align="center"-->
<!-- v-for="column in viewTableColumns"-->
<!-- show-overflow-tooltip-->
<!-- :label="column.label"-->
<!-- :prop="column.prop"-->
<!-- :sortable="column.sortable"-->
<!-- >-->
<!-- <template v-if="column.prop==='studyDuration'" scope="{row}">-->
<!-- {{(row.studyDuration / 60 / 60).toFixed(2) + 'h'}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <el-row class="el-pagination-container" style="margin-bottom: 0px">-->
<!-- <el-pagination-->
<!-- @current-change="(val)=>{viewPageForm.pageNumber=val;viewPageData()}"-->
<!-- :current-page="viewPageForm.pageNumber"-->
<!-- :page-size="viewPageForm.pageSize"-->
<!-- layout="total, sizes, prev, pager, next"-->
<!-- :total="viewPageForm.totalCount">-->
<!-- </el-pagination>-->
<!-- </el-row>-->
<!-- <el-row class="el-pagination-container" style="margin-bottom: 0px">-->
<!-- <el-pagination-->
<!-- @current-change="(val)=>{viewPageForm.pageNumber=val;viewPageData()}"-->
<!-- :current-page="viewPageForm.pageNumber"-->
<!-- :page-size="viewPageForm.pageSize"-->
<!-- layout="total, sizes, prev, pager, next"-->
<!-- :total="viewPageForm.totalCount">-->
<!-- </el-pagination>-->
<!-- </el-row>-->
<!-- </template>-->
<!-- </template>-->
</guava>
</div>
@@ -155,6 +159,9 @@ layout("/layouts/platform.html"){
}
},
viewPageNumberChange(val) {
},
exportXlsx() {
window.open(loc() + '/exportXlsx?albumId=' + this.pageForm.albumId)
}
},
async created() {
src/main/resources/views/platform/trainSingUp/manage/activity.html
+37 -1
View File
@@ -105,13 +105,40 @@ layout("/layouts/platform.html"){
</el-switch>
</template>
</el-table-column>
<el-table-column label="操作" width="350px">
<!-- <el-table-column label="操作" width="350px">
<template scope="{row}">
<el-button @click="makeCode(row)" size="mini" type="primary">生成二维码</el-button>
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button @click="openEdit(row)" size="mini" type="primary">编辑</el-button>
<el-button @click="deleteDo(row)" size="mini" type="primary">删除</el-button>
</template>
</el-table-column>-->
<el-table-column label="操作" width="150px">
<template scope="{row}">
<el-dropdown>
<el-button plain size="mini">
<i class="ti-settings"></i>
<span class="ti-angle-down"></span>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="openCode(row.id)">
活动二维码
</el-dropdown-item>
<el-dropdown-item @click.native="makeCode(row)">
签到二维码
</el-dropdown-item>
<el-dropdown-item @click.native="openView(row)">
查看
</el-dropdown-item>
<el-dropdown-item @click.native="openEdit(row)">
编辑
</el-dropdown-item>
<el-dropdown-item @click.native="deleteDo(row)">
删除
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
@@ -164,6 +191,8 @@ layout("/layouts/platform.html"){
</el-table>
</el-dialog>
<open-qr-code ref="openQRCode" :url="url"></open-qr-code>
</div>
<script>
@@ -197,9 +226,16 @@ layout("/layouts/platform.html"){
courseTimeList: [],
viewMapDialog: false,
clickRow: {},
url: '',
}
},
components: {
'open-qr-code': httpVueLoader('/components/plugins/OpenQRCode.vue'),
},
methods: {
openCode(id) {
this.$refs.openQRCode.openCode("/platform/mobile/trainSignUpActivity/trainList")
},
makeCode(row) {
this.clickRow = row
const type = this.trainTypeList.find(o => o.code === row.trainType)
src/main/resources/views/platform/wakeshome/review/doReview.html
+1 -1
View File
@@ -414,7 +414,7 @@ layout("/layouts/platform.html"){
let source = 0; // 标准分
let resultScore = 0; // 评议分
this.formData.bzList.forEach(v => {
source += Number(v.source)
source += Number(v.score)
resultScore += Number(v.resultScore)
})
const result = (resultScore / source) * 100