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

fix bug

Browse Source
This commit is contained in:
zhaoxinyu
2024-07-03 14:53:24 +08:00
parent 6c65eb929c
commit e67b63616e
9 changed files with 293 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/trainEdu/album.html
+20 -4
View File
@@ -113,12 +113,16 @@ layout("/layouts/platform.html"){
<span v-if="row.createType === 1">分工会</span>
<span v-else>校工会</span>
</template>
<template v-else-if="column.prop==='disabled'" scope="{row}">
<span v-if="row.disabled" class="text-danger">否</span>
<span v-else class="text-success">是</span>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="操作" width="250">
<template scope="{row}">
<el-button size="small" @click="openView(row)">查看</el-button>
<el-button size="small" type="primary" @click="openEdit(row)">编辑</el-button>
<el-button size="small" type="danger" @click="doDelete(row.id)">删除
<el-button size="mini" @click="openView(row)">查看</el-button>
<el-button size="mini" type="primary" @click="openEdit(row)">编辑</el-button>
<el-button size="mini" type="danger" @click="doDelete(row.id)">删除
</el-button>
</template>
</el-table-column>
@@ -128,7 +132,7 @@ layout("/layouts/platform.html"){
<template #edit>
<el-form :model="formData" :rules="rules" ref="ruleForm" label-width="100px"
>
>
<el-form-item label="专辑标题" prop="title">
<el-input v-model="formData.title" maxlength="30" placeholder="请输入专辑标题"></el-input>
</el-form-item>
@@ -165,6 +169,17 @@ layout("/layouts/platform.html"){
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
<el-form-item label="是否开启" prop="disabled">
<el-switch
v-model="formData.disabled"
active-color="#13ce66"
inactive-color="#ff4949"
:active-value="false"
:inactive-value="true">
</el-switch>
</el-form-item>
<el-form-item class="text-right">
<el-button type="primary" @click="doHandle">确定</el-button>
<el-button @click="$refs.guava.index()">取消</el-button>
@@ -231,6 +246,7 @@ layout("/layouts/platform.html"){
{prop: 'videoCount', label: '视频数量'},
{prop: 'typeName', label: '专辑类型'},
{prop: 'createType', label: '创建类型'},
{prop: 'disabled', label: '是否开启'}
],
rules: {
title: [{required: true, message: '请输入标题', trigger: ['change', 'blur']}],
src/main/resources/views/platform/trainEdu/statistics/video.html
+86 -45
View File
@@ -5,6 +5,33 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<div class="btn-group tool-button mt5">
<el-select v-model="pageForm.albumId" placeholder="请选择专辑" filterable clearable @change="doSearch">
<el-option
v-for="item in albumList"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
</div>
<div class="btn-group tool-button mt5">
<el-input placeholder="请输入内容" v-model="pageForm.searchKeyword" clearable
@keyup.enter.native="doSearch">
<el-select v-model="pageForm.searchName" slot="prepend" placeholder="查询类型"
style="width: 120px;">
<el-option label="标题" value="tev.title"></el-option>
</el-select>
</el-input>
</div>
<div class="btn-group tool-button mt5">
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
</div>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="统计" :app="this"></table-tool>
@@ -23,68 +50,75 @@ layout("/layouts/platform.html"){
{{(row.sumDuration / 60 / 60).toFixed(2) + 'h'}}
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="操作" width="200">
<template scope="{row}">
<el-button size="small" 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>
<script>
<!--#include("/platform/trainEdu/include/include.js"){}#-->
const vue = new Vue({
el: '#app',
mixins: [initTableMixins],
data() {
return {
tableColumns: [
{prop: 'title', label: '专辑名称'},
{prop: 'typeName', label: '类型'},
{prop: 'studyNum', label: '已看人数', sortable: true},
{prop: 'sumDuration', label: '课程总时长', sortable: true},
{prop: 'username', label: '姓名'},
{prop: 'loginname', label: '工号'},
{prop: 'unitname', label: '单位'},
{prop: 'unionname', label: '分工会'},
// {prop: 'studyDuration', label: '观看总时长'},
{prop: 'watchCount', label: '学习总次数'}
],
viewTableColumns: [
{prop: 'username', label: '姓名'},
{prop: 'loginname', label: '工号'},
{prop: 'unitname', label: '单位'},
{prop: 'unionname', label: '分工会'},
{prop: 'studyDuration', label: '观看总时长'},
// {prop: 'studyDuration', label: '观看总时长'},
{prop: 'watchCount', label: '学习总次数'}
],
viewPageForm: {
pageNumber: 1,
@@ -92,7 +126,10 @@ layout("/layouts/platform.html"){
totalCount: 0,
albumId: null
},
viewTableData: []
viewTableData: [],
albumList: [],
}
},
methods: {
@@ -111,12 +148,16 @@ layout("/layouts/platform.html"){
viewPageNumberChange(val) {
}
},
created() {
this.pageData()
async created() {
this.albumList = await getAllAlbum()
if (this.albumList) {
this.pageForm.albumId = this.albumList[0].id
await this.pageData()
}
}
})
</script>
<!--#
}
#-->
#-->
src/main/resources/views/platform/trainEdu/video.html
+5 -1
View File
@@ -101,7 +101,7 @@ layout("/layouts/platform.html"){
</el-card>
<template #edit>
<el-form :model="formData" :rules="rules" ref="ruleForm" label-width="100px">
<el-form :model="formData" :rules="rules" ref="ruleForm" label-width="150px">
<el-form-item label="所属专辑" prop="albumId">
<el-select v-model="formData.albumId" placeholder="请选择专辑" style="width: 100%">
@@ -136,6 +136,10 @@ layout("/layouts/platform.html"){
<el-input-number :min="1" :max="128" v-model="formData.sortNo"></el-input-number>
</el-form-item>
<el-form-item label="每天最多观看次数" prop="everyDayMaxWatchNum">
<el-input-number :min="1" :max="100" v-model="formData.everyDayMaxWatchNum"></el-input-number>
</el-form-item>
<el-form-item label="是否启用" prop="disabled">
<el-switch
v-model="formData.disabled"