Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200529-zlp-3

Browse Source 
优化代码生成
新增评分评价后台代码
This commit is contained in:
paidaxing444
2020-06-01 10:03:21 +08:00
parent abf9dc0b1b
commit e31e7b6c0d
43 changed files with 2300 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ruoyi-ui/src/views/benyi_train/video/index.vue
View File

@ -71,9 +71,20 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="培训视频标题" align="center" prop="title" :show-overflow-tooltip="true" />
<el-table-column label="视频简介" align="center" prop="information" :show-overflow-tooltip="true" />
<el-table-column
label="视频简介"
align="center"
prop="information"
:show-overflow-tooltip="true"
/>
<el-table-column label="培训讲师" align="center" prop="lecturername" />
<el-table-column label="所属类别" align="center" prop="type" :formatter="typeFormat" />
<el-table-column
label="所属类别"
align="center"
prop="type"
:formatter="typeFormat"
:show-overflow-tooltip="true"
/>
<el-table-column label="创建时间" align="center" prop="createtime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span>
@ -110,6 +121,17 @@
<!-- 添加或修改培训对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属类别" prop="type">
<el-cascader
ref="typeCascader"
placeholder="请选择所属类别"
v-model="form.type"
:options="optionTypes"
:props="{ checkStrictly: true, value: 'id', label: 'name' }"
clearable
@change="getLastChildName"
></el-cascader>
</el-form-item>
<el-form-item label="视频标题" prop="title">
<el-input v-model="form.title" type="textarea" placeholder="请输入内容" />
</el-form-item>
@ -154,15 +176,6 @@
<el-progress v-if="imgFlag == true" type="circle" :percentage="percent"></el-progress>
</el-upload>
</el-form-item>
<el-form-item label="所属类别" prop="type">
<el-cascader
placeholder="请选择所属类别"
v-model="form.type"
:options="optionTypes"
:props="{ checkStrictly: true, value: 'id', label: 'name' }"
clearable
></el-cascader>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -272,6 +285,13 @@ export default {
});
},
methods: {
//获取选中节点的label用作标题
getLastChildName(val) {
//console.log(val[val.length-1]);
//console.log(this.$refs.myCascader.getCheckedNodes()[0].pathLabels[val.length-1]);
var lastLable=this.$refs.typeCascader.getCheckedNodes()[0].pathLabels[val.length-1];
this.form.title=lastLable;
},
// 字典状态字典翻译
typeFormat(row, column) {
var actions = [];

17
ruoyi-ui/src/views/benyi_train/video_study/index.vue
View File

@ -10,7 +10,8 @@
clearable
></el-cascader>
</el-form-item>
<el-form-item label="讲师姓名" prop="lecturer">
<!-- 博士要求注释掉，不需要该过滤条件 2020-05-30 zlp -->
<!-- <el-form-item label="讲师姓名" prop="lecturer">
<el-select v-model="queryParams.lecturer" filterable placeholder="请选择讲师">
<el-option
v-for="item in lecturerOptions"
@ -28,7 +29,7 @@
@keyup.enter.native="handleQuery"
placeholder="请输入培训视频标题"
/>
</el-form-item>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -43,10 +44,12 @@
:options="playerOptions[index]"
ref="videoPlayer"
></video-player>
<div class="to-detail" @click="toDetail(o)">
<div class="to-detail">
<el-tooltip effect="dark" :content="o.title" placement="bottom">
<div>
<p class="info-title">{{o.title}}</p>
<router-link :to="'/video_study/study/detail/' + o.id" class="link-type">
<p class="info-title">{{o.title}}</p>
</router-link>
</div>
</el-tooltip>
<p class="info-title info-title-name">讲师:{{o.lecturername}}</p>
@ -79,7 +82,6 @@ export default {
name: "VideoStudy",
data() {
return {
qiniuUrl: "https://files.benyiedu.com", // 个人七牛访问前缀
// 遮罩层
loading: true,
// 总条数
@ -117,9 +119,6 @@ export default {
});
},
methods: {
toDetail(arg) {
console.log(arg);
},
// 递归判断列表，把最后的children设为undefined
getTreeData(data) {
for (var i = 0; i < data.length; i++) {
@ -201,7 +200,7 @@ export default {
}
.to-detail {
cursor: pointer;
/*cursor: pointer;*/
padding: 14px;
}

2
ruoyi-ui/src/views/tool/gen/importTable.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 导入表 -->
<el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh">
<el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="表名称" prop="tableName">
<el-input

8
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -80,7 +80,11 @@
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" align="center" prop="tableId" width="60px" />
<el-table-column label="序号" type="index" width="50" align="center">
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column
label="表名称"
align="center"
@ -145,7 +149,7 @@
@pagination="getList"
/>
<!-- 预览界面 -->
<el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh">
<el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
<el-tabs v-model="preview.activeName">
<el-tab-pane
v-for="(value, key) in preview.data"