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

!6 开发分支合并到主分支

Browse Source 
Merge pull request !6 from 派大星/xinbo
This commit is contained in:
派大星 2021-09-26 01:20:41 +00:00 committed by Gitee
commit 2e0cf47e4c
6 changed files with 92 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/assets/styles/index.scss
View File

@ -206,6 +206,10 @@ aside {
.flex {
display: flex;
&.wrap {
flex-wrap: wrap;
}
&.center {
align-items: center;
justify-content: center;

10
ruoyi-ui/src/views/benyi/checkinstatisticsclass/index.vue
View File

@ -182,11 +182,13 @@ export default {
}
listChildCheck(this.queryParams).then((response) => {
// console.log(response.rows);
this.bjmc = response.rows[0].bjmc;
this.childcount = response.rows.length - 1;
this.jsmc = response.rows[0].zbjsmc;
const {rows = []} = response;
const first = (rows && rows[0]) || {};
this.bjmc = first.bjmc || '';
this.childcount = rows.length > 0 ? rows.length - 1 : 0;
this.jsmc = first.zbjsmc || '';
// this.tableData = response.rows;
response.rows.forEach((res) => {
rows.forEach((res) => {
this.tableData.push({
name: res.name,
zj: this.avg([

8
ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
View File

@ -72,7 +72,7 @@ export default {
title: "微型课程",
title1: "概论",
//目的
note: "微 型 课 程 王东异 主编",
note: "微型课程 — 王东异 <span style='font-size: 14px'>主编</span>",
// 树状显示类型
treeOptions: [],
// 树结构
@ -158,6 +158,9 @@ export default {
};
</script>
<style lang="scss" scoped>
.app-container, .el-row {
height: 100%;
}
.text {
font-size: 14px;
}
@ -211,7 +214,8 @@ export default {
display: inline-block;
}
.tree {
overflow: auto;
overflow:auto;
height: calc(100% - 52px);
max-height: 600px;
}
</style>

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

@ -2,8 +2,18 @@
<div class="app-container" @contextmenu.prevent="">
<el-form :model="queryParams" ref="queryForm" label-width="70px">
<el-row :gutter="10">
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="视频类别" prop="type">
<el-col>
<el-form-item style="margin-bottom: 5px" label="视频类型" prop="type">
<div class="flex wrap btns">
<el-button
v-for="ele in optionTypes"
size="mini"
:key="ele.id"
:type="ele.id === type ? 'primary' : ''"
@click="changeType(ele)">{{ele.name}}</el-button>
</div>
</el-form-item>
<!-- <el-form-item label="视频类别" prop="type">
<el-cascader
placeholder="请选择视频类别"
ref="example"
@ -13,7 +23,7 @@
clearable
@change="exampleChange"
></el-cascader>
</el-form-item>
</el-form-item> -->
<!-- 博士要求注释掉，不需要该过滤条件 2020-05-30 zlp -->
<!-- <el-form-item label="讲师姓名" prop="lecturer">
<el-select v-model="queryParams.lecturer" filterable placeholder="请选择讲师">
@ -35,7 +45,7 @@
/>
</el-form-item>-->
</el-col>
<el-col :xs="24" :ms="12" :md="6">
<!-- <el-col :xs="24" :ms="12" :md="6">
<el-form-item class="no-margin">
<el-button
type="primary"
@ -48,6 +58,19 @@
>重置</el-button
>
</el-form-item>
</el-col> -->
<el-col>
<el-form-item style="margin-bottom: 5px" label="详细分类" prop="type">
<div class="flex wrap btns">
<el-button
v-for="ele in getVideoTypes"
round
size="mini"
:key="ele.id"
:type="ele.id === ancestors ? 'primary' : ''"
@click="changeTypeDetail(ele)">{{ele.name}}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -135,10 +158,24 @@ export default {
pageNum: 1,
pageSize: 8,
},
type: 1,
ancestors: '',
videoTypes: []
};
},
computed: {
getVideoTypes(){
let arr = [];
for(let ele of this.optionTypes) {
if (ele.id === this.type) {
arr = ele.children;
}
}
return arr;
}
},
created() {
this.getList();
// this.getList();
listAllLecturer().then((response) => {
//console.log(response.lecturer);
this.lecturerOptions = response.lecturer;
@ -148,12 +185,22 @@ export default {
this.optionTypes = this.handleTree(response.data, "id", "pid");
//第二步移除children为0的数组，也就是将children为0 设置为undefined
this.optionTypes = this.getTreeData(this.optionTypes);
console.log(this.optionTypes)
});
},
// mounted() {
// this.$watermark.set("测试专用");
// },
mounted() {
this.handleQuery();
},
methods: {
changeType(btn) {
this.type = btn.id;
this.ancestors = '';
this.handleQuery(btn);
},
changeTypeDetail(btn) {
this.ancestors = (this.ancestors && btn.id === this.ancestors) ? '' : btn.id;
this.handleQuery(btn);
},
exampleChange(e) {
// console.log(e);
// 目的是选择之后将下拉界面收起
@ -209,11 +256,13 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
if (this.queryParams.type == null) {
this.queryParams.type = "";
} else {
this.queryParams.type = this.queryParams.type.toString();
}
// if (this.queryParams.type == null) {
// this.queryParams.type = "";
// } else {
// // this.queryParams.type = this.queryParams.type.toString();
// this.queryParams.type = ancestors;
// }
this.queryParams.type = [this.type, this.ancestors].join(',');
//console.log(this.queryParams.type);
this.queryParams.pageNum = 1;
this.getList();
@ -227,7 +276,7 @@ export default {
};
</script>
<style>
<style lang="scss">
.time {
line-height: 12px;
font-size: 12px;
@ -265,6 +314,12 @@ export default {
margin: 0 !important;
}
.btns {
.el-button {
margin: 2px;
}
}
@media (max-width: 768.98px) {
.el-cascader-node__label {
max-width: 200px;

6
ruoyi-ui/src/views/login.vue
View File

@ -49,6 +49,7 @@
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2019 benyiedu.com All Rights Reserved.</span>
<p>技术服务：<svg-icon icon-class="wechat"/> 18633313157</p>
</div>
</div>
</template>
@ -190,7 +191,7 @@ export default {
}
.el-login-footer {
height: 40px;
line-height: 40px;
line-height: 15px;
position: fixed;
bottom: 0;
width: 100%;
@ -199,5 +200,8 @@ export default {
font-family: Arial;
font-size: 12px;
letter-spacing: 1px;
p {
opacity: .8;
}
}
</style>

4
ruoyi-ui/vue.config.js
View File

@ -33,8 +33,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8083`,
//target: `http://120.53.14.147:9990/`,
// target: `http://localhost:8083`,
target: `http://120.53.14.147:9990/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''