Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
岳佳鑫
2022-10-09 18:32:40 +08:00
6 changed files with 523 additions and 55 deletions

View File

@@ -48,6 +48,20 @@ export default {
name: "学习路径",
href: "/learningpath",
},
{
name: "关卡",
},
];
}
if (n === "/leveladddetail" || n === "/LevelAddDetail") {
state.list = [
{
name: "学习路径",
href: "/learningpath",
},
{
name: "关卡",
},
{
name: "创建关卡",
},

View File

@@ -255,6 +255,12 @@ export default {
href: "/leveladd",
openKeys: "sub1",
selectedKeys: "sub1",
pagename: "关卡",
},
{
href: "/leveladddetail",
openKeys: "sub1",
selectedKeys: "sub1",
pagename: "创建关卡",
},
{

View File

@@ -62,16 +62,16 @@
</div>
<div class="btn btn4">
<div class="search"></div>
<div class="btnText" @click="ft_hShow">新建课程</div>
<div class="btnText" @click="of_hShow">新建课程</div>
</div>
</div>
<!-- 搜索框及按钮 -->
</div>
<!-- 新建面授课弹窗 -->
<div class="faceteach" :style="{display:ft_hs ? 'block' :'none' }">
<div class="ft_header"></div>
<div class="ft_main">
<!-- 新建选择线上还是面授课弹窗 -->
<div class="selectonlineface" :style="{display:of_hs ? 'block' :'none' }">
<div class="of_header"></div>
<div class="of_main">
<div class="m_header">
<div class="add_icon"></div>
<span>请选择课程类型</span>
@@ -128,11 +128,11 @@
<div class="ol_checkbox">
<div class="checkbtn"></div>
</div>
<span style="margin:auto 31px auto 5px;">线上</span>
<span style="margin:auto 45px auto 5px;"></span>
<div class="ol_checkbox">
<div class="checkbtn"></div>
</div>
<span style="margin:auto 31px auto 5px;">面授</span>
<span style="margin:auto 0px auto 5px;"></span>
</div>
</div>
<div class="b_footer">
@@ -140,13 +140,164 @@
<div class="btnText">取消</div>
</div>
<div class="btn btn6" >
<div class="btnText">确定</div>
<div class="btnText" @click="createft">确定</div>
</div>
</div>
</div>
</div>
</div>
<!-- 新建面授课弹窗 -->
<!-- 新建选择线上还是面授课弹窗 -->
<!-- 确定新建面授课弹窗 -->
<div class="faceteach">
<div class="ft_header"></div>
<div class="ft_main">
<div class="m_header">
<div class="add_icon"></div>
<span>新建面授课</span>
<div class="add_exit">x</div>
</div>
<div class="m_title">课程信息</div>
<div class="m_body">
<div class="mb_left">
<div class="mbl_items1">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">课程名称</span>
<div class="i1_input">
<a-input v-model:value="value" style="width: 440px ;height:40px;border-radius: 8px;" placeholder="请输入课程名称" />
</div>
</div>
<div class="mbl_items2">
<div class="i2_top">
<div class="i2_left">课程命名规则</div>
<div class="i2_right" @click="hideShow" >
<div class="b_zk" :style="{display:hideshow ? 'block' :'none' }">
<span style="color: #4EA6FF;">收起</span>
</div>
<div class="b_sq" :style="{display:hideshow ? 'none' :'block' }">
<span style="color: #4EA6FF;">展开</span>
</div>
<div class="b_icon"></div>
</div>
</div>
<div class="i2_detail" :style="{display:hideshow ? 'block' :'none' }">
<span style="color: #999BA3;">
1课程名称统一不加书名号<br/>
2项目名称属地等信息如需体现在课程名称中请放在课程名称信息
之后时间管理GROW180项目时间管理B*确保首先
看到的是课程内容主题<br/>
3同一课程如先后有多个版本原则上仅开放最新版本旧版本应停用
版本如必须以年份标明请以沟通技巧2022的方式呈现
</span>
</div>
</div>
<div class="mbl_items3">
<div class="i3_top">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">封面图</span>
<div class="i3_upload">
<a-upload
v-model:file-list="fileList"
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
:before-upload="beforeUpload"
@change="handleChange"
>
<img v-if="imageUrl" :src="imageUrl" alt="avatar" />
<div v-else>
<loading-outlined v-if="loading"></loading-outlined>
<plus-outlined v-else></plus-outlined>
<div class="ant-upload-text">Upload</div>
</div>
</a-upload>
</div>
</div>
<div class="i3_bottom">
<span style="color:#999BA3;">高宽比为16:9 (:800*450) png或jpg图片</span>
</div>
</div>
<div class="mbl_items4">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">目标人群</span>
<div class="i1_input">
<a-input v-model:value="value" style="width: 440px ;height:40px;border-radius: 8px;" placeholder="请输入目标人群" />
</div>
</div>
<div class="mbl_items5">
<span style="margin-right:14px;">课程价值</span>
<div class="i1_input">
<a-input v-model:value="value" style="width: 440px ;height:40px;border-radius: 8px;" placeholder="请输入课程价值" />
</div>
</div>
<div class="mbl_items6">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">内容分类</span>
<div class="select i6_input">
<a-select
dropdownClassName="dropdown-style"
style="width: 440px"
placeholder="请选择"
:options="options2"
allowClear
showSearch
></a-select>
</div>
</div>
<div class="mbl_items7">
<span style="margin-right:14px;">场景</span>
<div class="select i7_input">
<a-select
dropdownClassName="dropdown-style"
style="width: 440px"
placeholder="请选择"
:options="options2"
allowClear
showSearch
></a-select>
</div>
</div>
<div class="mbl_items8">
<div class="i8_top">
<span style="margin-right:14px;">内容标签</span>
<div class="i1_input">
<a-input v-model:value="value" style="width: 440px ;height:40px;border-radius: 8px;" placeholder="请输入按回车键创建成功" />
</div>
</div>
<div class="i8_bottom">
<a-tag closable @close="log">Tag 2</a-tag>
<a-tag closable @close.prevent>Prevent Default</a-tag>
</div>
</div>
</div>
<div class="mb_right">
<div class="mbl_items9">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">授课教师</span>
<div class="i1_input">
<a-input v-model:value="value" style="width: 440px ;height:40px;border-radius: 8px;" placeholder="请输入" />
</div>
</div>
<div class="mbl_items10">
<span style="margin-right:14px;">课程简介</span>
<div class="i10_textarea">
<a-textarea v-model:value="value" style="width: 440px ;height:100px;border-radius: 8px; " placeholder="请输入" />
</div>
</div>
<div class="mbl_items11">
<div class="i11_top">
<span style="margin-right: 10px;">附件</span>
<div class="accessory_icon"></div>
<span style="color:#4EA6FF;">添加附件</span>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 确定新建面授课弹窗 -->
<!-- 表格 -->
<div class="tableBox">
@@ -163,6 +314,8 @@
</template>
<script>
import { reactive, toRefs, defineComponent, ref } from 'vue';
import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
import { message } from 'ant-design-vue';
const columns = [{
title: '序号',
width: 200,
@@ -280,7 +433,69 @@ const data = [{
ynuse: '启用',
kkty:true,
}];
function getBase64(img, callback) {
const reader = new FileReader();
reader.addEventListener('load', () => callback(reader.result));
reader.readAsDataURL(img);
}
export default defineComponent({
components: {
LoadingOutlined,
PlusOutlined,
},
setup() {
const fileList = ref([]);
const loading = ref(false);
const imageUrl = ref('');
const handleChange = info => {
if (info.file.status === 'uploading') {
loading.value = true;
return;
}
if (info.file.status === 'done') {
// Get this url from response in real world.
getBase64(info.file.originFileObj, base64Url => {
imageUrl.value = base64Url;
loading.value = false;
});
}
if (info.file.status === 'error') {
loading.value = false;
message.error('upload error');
}
};
const beforeUpload = file => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
if (!isJpgOrPng) {
message.error('You can only upload JPG file!');
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.error('Image must smaller than 2MB!');
}
return isJpgOrPng && isLt2M;
};
return {
fileList,
loading,
imageUrl,
handleChange,
beforeUpload,
};
},
data() {
const options1 = ref([ {
value: 'value1',
@@ -314,14 +529,14 @@ export default defineComponent({
}]);
const state = reactive({
ft_hs:false,
of_hs:false,
hideshow: false,
bs_hs:true,
});
const ft_hShow = () => {
if (state.ft_hs == false) {
state.ft_hs = true
const of_hShow = () => {
if (state.of_hs == false) {
state.of_hs = true
}
}
@@ -340,15 +555,21 @@ export default defineComponent({
state.bs_hs = true
}
}
const createft = () => {
if (state.bs_hs == false) {
state.of_hs = false
}
}
return {
...toRefs(state),
data,
columns,
options1,
options2,
ft_hShow,
of_hShow,
hideShow,
bs_hShow,
createft,
};
},
});
@@ -481,7 +702,7 @@ export default defineComponent({
}
}
.faceteach{
.selectonlineface{
z-index: 1000;
width: 679px;
height: 525px;
@@ -491,13 +712,13 @@ export default defineComponent({
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
.ft_header{
.of_header{
position: absolute;
width:calc(100%);
height: 40px;
background: linear-gradient( rgba(78,166,255,0.2) 0%, rgba(78,166,255,0) 100%);
}
.ft_main{
.of_main{
width:calc(100%);
position: relative;
.m_header{
@@ -605,6 +826,154 @@ export default defineComponent({
}
}
.faceteach{
// display: none;
z-index: 1000;
width: 1358px;
min-width: 1000px;
height: 805px;
background: #FFFFFF;
box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21);
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
.ft_header{
position: absolute;
width:calc(100%);
height: 40px;
background: linear-gradient( rgba(78,166,255,0.2) 0%, rgba(78,166,255,0) 100%);
}
.ft_main{
width:calc(100%);
position: relative;
.m_header{
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.add_icon{
width: 16px;
height: 16px;
margin-right: 10px;
background-image: url(@/assets/images/coursewareManage/add1.png);
background-size: 100% 100%;
}
.add_exit{
position: absolute;
right:42px;
cursor: pointer;
}
}
.m_title{
margin: 7px auto 25px 52px;
}
.m_body{
display: flex;
.mb_left{
.mbl_items1{
display: flex;
align-items: center;
margin-left: 87px;
margin-bottom: 10px;
}
.mbl_items2{
margin-left: 164px;
margin-bottom: 30px;
.i2_top{
display: flex;
.i2_right{
margin-left: 320px;
display: flex;
}
}
.i2_detail{
width: 400px;
}
}
.mbl_items3{
margin-left: 87px;
margin-bottom: 10px;
.i3_top{
display: flex;
align-items: start;
}
.i3_bottom{
margin-left: 60px;
}
}
.mbl_items4{
display: flex;
align-items: center;
margin-left: 87px;
margin-bottom: 10px;
}
.mbl_items5{
display: flex;
align-items: center;
margin-left: 93px;
margin-bottom: 10px;
}
.mbl_items6{
display: flex;
align-items: center;
margin-left: 87px;
margin-bottom: 10px;
}
.mbl_items7{
display: flex;
align-items: center;
margin-left: 121px;
margin-bottom: 10px;
}
.mbl_items8{
margin-left: 93px;
margin-bottom: 10px;
.i8_top{
display: flex;
align-items: center;
margin-bottom: 10px;
}
.i8_bottom{
display: flex;
align-items: center;
margin-left: 71px;
}
}
}
.mb_right{
.mbl_items9{
display: flex;
align-items: center;
margin-left: 100px;
margin-bottom: 10px;
}
.mbl_items10{
display: flex;
align-items: flex-start;
margin-left: 107px;
margin-bottom: 30px;
}
.mbl_items11{
margin-left: 105px;
margin-bottom: 10px;
.i11_top{
display: flex;
align-items: center;
.accessory_icon{
width: 15px ;
height: 15px ;
background-color: #4EA6FF;
margin-right: 6px;
}
}
}
}
}
}
}
.tableBox {
margin: 20px 38px 30px;
}

View File

@@ -73,52 +73,56 @@
expandRowByClick="true"
:scroll="{ x: 1600, y: 800 }"
@expand="expandTable"
:pagination="
tableDataTotal > 10
? false
: {
// disabled: true,
display: false,
showSizeChanger: true,
showQuickJumper: true,
hideOnSinglePage: true,
pageSizeOptions: [],
pageSize: pageSize,
current: currentPage,
total: tableDataTotal,
onChange: (page, pageSize) => {
currentPage = page;
// console.log('page', page)
// 加翻页查找代码
// this.setState({
// currentPage: page,
// }, () => {
// this.getMilitaryDeployment()
// })
},
}
"
:pagination="false"
/>
<!-- :pagination= showSizeChanger: true, showQuickJumper: true,
hideOnSinglePage: true, pageSizeOptions: [], pageSize: pageSize, current:
currentPage, total: tableDataTotal, -->
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
<!-- 表格 -->
<div :class="out ? 'out' : 'unout'">
<div class="top">
<img class="topimg" src="../../assets/images/courseManage/add1.png" />
<div class="topc">创建路径</div>
<div @click="handleOut" style="margin-left: 500px; cursor: pointer">
x
<img
style="width: 20px; height: 20px"
src="../../assets/images/basicinfo/close.png"
/>
</div>
</div>
<div class="mid clearfix">
<div class="name">
<div class="d">*</div>
<div class="d" style="margin-top: -4px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">路径图名称</div>
<div class="in">
<a-input v-model:value="valueE" />
</div>
</div>
<div class="bac">
<div class="d">*</div>
<div class="d" style="margin-top: 12px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">路径图背景</div>
<div class="in">
<!-- <img class="im" src="../../assets/px.jpg" />
@@ -385,6 +389,7 @@ export default {
height: 100%;
display: flex;
flex-direction: column;
position: relative;
// position: relative;
.filter {
margin-left: 38px;
@@ -489,6 +494,16 @@ export default {
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
.out {
display: block;
@@ -530,6 +545,11 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
.d {
// margin-top: 8px;
// color: #ff4e4e;
margin-left: -5px;
}
.name {
width: 78%;
// background-color: lightcoral;
@@ -538,10 +558,7 @@ export default {
align-items: center;
height: 40px;
// border: 1px solid black;
.d {
margin-top: 8px;
color: #ff4e4e;
}
.inname {
color: #6f6f6f;
font-size: 14px;

View File

@@ -62,10 +62,12 @@
<div class="btnText">重置</div>
</div>
<div class="btn btn3" @click="handleOut">
<div class="search"></div>
<div class="btnText">创建关卡</div>
</div>
<router-link to="/leveladddetail">
<div class="btn btn3" @click="handleOut">
<div class="search"></div>
<div class="btnText">创建关卡</div>
</div>
</router-link>
</div>
</div>
<div class="Lbom">
@@ -132,7 +134,19 @@
</div>
</a-tab-pane>
<a-tab-pane key="2" tab="学员管理" force-render
><div class="sametab">ccc</div></a-tab-pane
><div class="sametab">
<div class="Gcon">
<div class="pad"></div>
<div class="Gin">
<div class="headone">
<div class="box"></div>
<div class="onetitle">关卡内容可见可学设置</div>
<div class="oneedi">编辑</div>
</div>
<div class="onemain">fewfew</div>
</div>
</div>
</div></a-tab-pane
>
<a-tab-pane key="3" tab="设置">
<div class="sametab">eee</div></a-tab-pane
@@ -350,7 +364,7 @@ export default {
.pad {
height: 100%;
width: 40px;
background-color: red;
// background-color: red;
}
.sametab {
// margin-left: 30px;
@@ -550,6 +564,42 @@ export default {
}
}
}
.Gcon {
display: flex;
.pad {
height: 100%;
width: 40px;
}
.Gin {
background-color: #bfa;
margin-top: 30px;
.headone {
// background-color: red;
display: flex;
text-align: center;
.box {
width: 4px;
height: 20px;
background-color: #4ea6ff;
border-radius: 2px;
}
.onetitle {
margin-left: 15px;
color: #333333;
font-size: 14px;
}
.oneedi {
margin-left: 15px;
color: #4ea6ff;
}
}
.onemain {
margin-top: 30px;
margin-left: 55px;
}
}
}
}
}
</style>

View File

@@ -0,0 +1,12 @@
<template>
<div>ddd</div>
</template>
<script>
export default {
name: "LevelAddDetail",
};
</script>
<style scoped lang="scss" >
</style>