feat:合并

This commit is contained in:
李晓鸽
2022-10-09 16:18:41 +08:00
10 changed files with 516 additions and 155 deletions

View File

@@ -65,6 +65,7 @@ ExaminationCenter.vue:考试中心页面
```
ResearchManage.vue:调研管理页面
ResearchAdd.vue:创建调研页面
```

Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -286,6 +286,10 @@ export default {
openKeys: "sub9",
selectedKeys: "sub9",
pagename: "系统管理",
href: "/researchmanage",
openKeys: "sub5",
selectedKeys: "sub5",
pagename: "调研管理",
},
],
});

View File

@@ -16,22 +16,21 @@
</div>
<div class="select fitems">
<a-select
v-model:value="projectName"
dropdownClassName="dropdown-style"
style="width: 200px"
placeholder="请选择状态"
:options="projectNameList"
@change="selectProjectName"
:options="options1"
allowClear
showSearch
></a-select>
>
</a-select>
</div>
<div class="select fitems">
<a-select
v-model:value="projectName"
dropdownClassName="dropdown-style"
style="width: 200px"
placeholder="请选择内容分类"
:options="projectNameList"
@change="selectProjectName"
:options="options2"
allowClear
showSearch
></a-select>
@@ -63,15 +62,95 @@
</div>
<div class="btn btn4">
<div class="search"></div>
<div class="btnText">新建课程</div>
<div class="btnText" @click="ft_hShow">新建课程</div>
</div>
</div>
</div>
<!-- 搜索框及按钮 -->
</div>
<!-- 新建面授课弹窗 -->
<div class="faceteach" :style="{display:ft_hs ? 'block' :'none' }">
<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_body">
<div class="b_header">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">课程名称</span>
<div class="b_input">
<a-input v-model:value="value" style="width: 440px ;height:40px;border-radius: 8px;" placeholder="请输入课程名称" />
</div>
</div>
<div class="b_sub">
<div class="bs_header">
<div class="b_left">课程命名规则</div>
<div class="b_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="bl_detail" :style="{display:hideshow ? 'block' :'none' }">
<span style="color: #999BA3;">
1课程名称统一不加书名号<br/>
2项目名称属地等信息如需体现在课程名称中请放在课程名称信息
之后时间管理GROW180项目时间管理B*确保首先
看到的是课程内容主题<br/>
3同一课程如先后有多个版本原则上仅开放最新版本旧版本应停用
版本如必须以年份标明请以沟通技巧2022的方式呈现
</span>
</div>
</div>
<div class="b_center">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">授课形式</span>
<div class="bc_boxl">
<div class="ol_checkbox"><div class="checkbtn"></div></div>
<span style="margin:auto 31px auto 5px;">线上</span>
</div>
<div class="bc_boxr" @click="bs_hShow">
<div class="ol_checkbox"><div class="checkbtn"></div></div>
<span style="margin:auto 31px auto 5px;">面授</span>
</div>
</div>
<div class="b_sup" :style="{display:bs_hs ? 'block' :'none' }">
<div class="bs_box">
<span style="font-weight: 900; color: red;margin-right: 6px;"></span>
<span style="margin-right:14px;">是否设置目录</span>
<div class="ol_checkbox">
<div class="checkbtn"></div>
</div>
<span style="margin:auto 31px auto 5px;">线上</span>
<div class="ol_checkbox">
<div class="checkbtn"></div>
</div>
<span style="margin:auto 31px auto 5px;">面授</span>
</div>
</div>
<div class="b_footer">
<div class="btn btn5">
<div class="btnText">取消</div>
</div>
<div class="btn btn6" >
<div class="btnText">确定</div>
</div>
</div>
</div>
</div>
</div>
<!-- 新建面授课弹窗 -->
<!-- 表格 -->
<div class="tableBox">
<a-table :columns="columns" :data-source="data" :scroll="{ x: 1300, y: 1000 }">
<a-table :columns="columns" :data-source="data" :scroll="{ x: 800 }">
<template #bodyCell="{ column }">
<template v-if="column.key === 'operation'">
<a>action</a>
@@ -83,7 +162,7 @@
</div>
</template>
<script>
import { defineComponent } from 'vue';
import { reactive, toRefs, defineComponent, ref } from 'vue';
const columns = [{
title: '序号',
width: 200,
@@ -200,20 +279,93 @@ const data = [{
pubtime: '2022-07-20 9:30',
ynuse: '启用',
kkty:true,
}];
}];
export default defineComponent({
data() {
const options1 = ref([ {
value: 'value1',
label: '请选择状态',
},{
value: 'uncommitted',
label: '未提交',
}, {
value: 'tocheck',
label: '待审核',
}, {
value: 'checked',
label: '已审核',
}, {
value: 'uncheck',
label: '审核未通过',
}]);
const options2 = ref([{
value: 'value2',
label: '请选择内容分类',
}, {
value: 'leadership',
label: '领导力',
}, {
value: 'ingeneral',
label: '通用力',
}, {
value: 'profession',
label: '专业力',
}]);
const state = reactive({
ft_hs:false,
hideshow: false,
bs_hs:true,
});
const ft_hShow = () => {
if (state.ft_hs == false) {
state.ft_hs = true
}
}
const hideShow = () => {
if (state.hideshow == false) {
state.hideshow = true
} else {
state.hideshow = false
}
}
const bs_hShow = () => {
if (state.bs_hs == true) {
state.bs_hs = false
} else {
state.bs_hs = true
}
}
return {
...toRefs(state),
data,
columns,
options1,
options2,
ft_hShow,
hideShow,
bs_hShow,
};
},
});
</script>
<style lang="scss">
// .dropdown-style{
// .ant-select-dropdown-menu{
// background: #6767bd;
// }
// .ant-select-dropdown-menu-item {
// color: #4EA6FF !important;
// }
// }
.courseManage {
width: 100%;
min-width: 1000px;
height: 100%;
display: flex;
flex-direction: column;
@@ -222,8 +374,8 @@ export default defineComponent({
margin-left: 38px;
margin-top: 30px;
.filter {
width: calc(69% - 34px);
margin-right: 34px;
width: calc(70% - 40px) ;
margin-right: 30px ;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
@@ -328,6 +480,131 @@ export default defineComponent({
}
}
}
.faceteach{
z-index: 1000;
width: 679px;
height: 525px;
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_body{
width: 88%;
.checkbtn{
width: 7.8px;
height: 7.8px;
border: 1px solid #4EA6FF;
background-color: #4EA6FF;
border-radius: 50%;
}
.ol_checkbox{
width: 14px;
height: 14px;
border: 1px solid #000000;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
}
.b_header{
display: flex;
align-items: center;
margin: 21px auto 14px 80px;
}
.b_sub{
margin-left: 164px;
.bs_header{
display: flex;
justify-content: space-between;
.b_right{
display: flex;
}
}
}
.bl_detail{
top: 24px;
}
.b_center{
display: flex;
align-items: center;
margin: 21px auto 14px 80px;
.bc_boxl,.bc_boxr{
display: flex;
align-items: center;
}
}
.b_sup{
margin: 21px auto 14px 52px;
.bs_box{
display: flex;
align-items: center;
}
}
.b_footer{
width: 100%;
margin-left: 212px;
margin-top: 25px;
display: flex;
.btn {
width: 100px;
height: 40px;
background: rgba(64, 158, 255, 0);
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.btn5{
border: 1px solid rgba(64, 158, 255, 1);
color: #4EA6FF ;
}
.btn6{
background-color: #4EA6FF;
color: #ffffff;
}
}
}
}
}
.tableBox {
margin: 20px 38px 30px;
}

View File

@@ -2,100 +2,107 @@
<template>
<div class="header">
<span class="title">创建/编辑单层项目</span>
<span class="goback">返回</span>
<div class="goback"><span class="return"></span><span class="returntext">返回</span></div>
</div>
<div class="content">
<div class="main">
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left: 140px">*</span>项目名称
<a-input
style="width: 500px; height: 40px; border-radius: 8px;margin-left: 13px"
placeholder="请输入项目名称"
allowClear
showSearch
></a-input>
<div class="main">
<div class="name">
<div class="d">*</div>
<div class="inname">项目名称</div>
<div class="in">
<a-input v-model:value="valueE" placeholder="请输入项目名称"/>
</div>
</div>
<div class="name">
<div class="d" style="margin-left: 26px">*</div>
<div class="inname" style="width: 50px">分类</div>
<div class="in" style="margin-left: 2px">
<a-select
v-model:value="value1"
placeholder="四个养成"
:size="size"
style="width: 100%"
:options="options"
></a-select>
</div>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left:166px">*</span>分类
<a-select
style="width: 505px; height: 40px; margin-left: 13px"
placeholder="四个养成"
allowClear
showSearch
></a-select>
<div class="name">
<div class="d" style="margin-left: 9px">*</div>
<div class="inname">封面图</div>
<div class="box" style="width: 100px;height: 100px;border: 1px solid rgba(78, 166, 255, 1);border-radius: 5px">
<div class="box1"></div>
<div class="box2"></div>
</div>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left:152px">*</span>封面图
<span class="photo"></span>
<div class="name">
<div class="d">*</div>
<div class="inname">项目时间</div>
<div class="in">
<a-range-picker separator="至" style="width: 100%;height: 40px;border-radius: 5px" show-time />
</div>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left:140px">*</span>项目时间
<a-range-picker v-model:value="value2" show-time style="margin-left:10px;width: 505px"/>
<div class="name">
<div class="d">*</div>
<div class="inname">项目经理</div>
<div class="in">
<a-input v-model:value="valueE" placeholder="请选择项目经理"/>
</div>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left: 140px">*</span>项目经理
<a-input
style="width: 500px; height: 40px; border-radius: 8px;margin-left: 13px"
placeholder="请选择项目经理"
allowClear
showSearch
></a-input>
<div class="name">
<div class="d">*</div>
<div class="inname">资源归属</div>
<div class="in">
<a-input v-model:value="valueE" placeholder="自动带出 可修改"/>
</div>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left: 140px">*</span>资源归属
<a-input
style="width: 500px; height: 40px; border-radius: 8px;margin-left: 13px"
placeholder="自动带出 可修改"
allowClear
showSearch
></a-input>
<div class="name" style="height: 80px">
<div class="d">&nbsp;</div>
<div class="inname">项目说明</div>
<div class="in">
<a-input v-model:value="valueE" placeholder="请输入项目说明" style="height: 80px"/>
</div>
</div>
<div class="select" style="margin-top: 20px;algin-items: center;margin-left: 150px">
项目说明
<a-input
style="width: 500px; height: 80px; border-radius: 8px;margin-left: 13px"
placeholder="请输入说明"
type="textarea"
allowClear
showSearch
></a-input>
<div class="name">
<div class="inname" style="width: 107px;margin-left: -15px">同步学习记录</div>
<div class="in">
<a-radio v-model:checked="checked"><span style="width: 100%;color: rgba(109, 117, 132, 1); font-size: 14px">同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span></a-radio>
</div>
</div>
<div class="select" style="margin-top: 20px;algin-items: center;margin-left: 130px">
同步学习记录
<a-radio v-model:checked="checked" style="margin-left: 3px">同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</a-radio>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left: 140px">*</span>项目级别
<a-input
style="width: 500px; height: 40px; border-radius: 8px;margin-left: 13px"
placeholder="集团级/组织级/现地级/部门级"
allowClear
showSearch
></a-input>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left: 140px">*</span>培训体系
<a-input
style="width: 500px; height: 40px; border-radius: 8px;margin-left: 13px"
placeholder="集团级/组织级/现地级/部门级"
allowClear
showSearch
></a-input>
</div>
<div class="select" style="margin-top: 20px;algin-items: center">
<span class="star" style="margin-left: 110px">*</span>是否BOEU实施
<a-radio v-model:checked="checked">BOEU实施</a-radio>
</div>
<div class="name">
<div class="d">*</div>
<div class="inname">项目级别</div>
<div class="in">
<a-input v-model:value="valueE" placeholder="集团级/组织级/现地级/部门级"/>
</div>
</div>
<div class="name">
<div class="d">*</div>
<div class="inname">培训体系</div>
<div class="in">
<a-input v-model:value="valueE" placeholder="集团级/组织级/现地级/部门级"/>
</div>
</div>
<div class="name">
<div class="d" style="margin-left: -30px">*</div>
<div class="inname" style="width: 107px;margin-left: 9px">是否BOEU实施</div>
<div class="in">
<a-radio v-model:checked="checked"><span style="width: 100%;color: rgba(109, 117, 132, 1); font-size: 14px">BOEU实施</span></a-radio>
</div>
</div>
</div>
<div class="template">
<div class="select" style="margin-top: 20px;margin-left: 43px;algin-items: center">
模板<a-select
style="width: 505px; height: 40px; margin-left: 13px"
placeholder="请选择模板"
allowClear
showSearch
></a-select>
</div>
<div class="name">
<div class="inname" style="width: 50px">模板</div>
<div class="in" style="margin-left: 2px">
<a-select
v-model:value="value1"
placeholder="请选择模板"
:size="size"
style="width: 100%"
:options="options"
></a-select>
</div>
</div>
</div>
</div>
<div class="footer">
@@ -127,37 +134,141 @@
//font-weight: 500;
}
.goback {
color: #4EA6FF;
font-size: 14px;
padding-right: 39px;
padding-top: 37px;
padding-right: 70px;
//padding-top: 37px;
position: relative;
.return {
display: inline-block;
width: 42px;
height: 42px;
margin-top: 17px;
margin-right: 10px;
background-image: url("../../assets/images/projectadd/return.png");
}
.returntext {
display: inline-block;
position: absolute;
top: 27px;
color: #4EA6FF;
font-size: 14px;
}
}
}
.content {
display: flex;
.template {
float: right;
}
.main {
width: 50%;
display: flex;
flex-direction: column;
align-items: center;
//justify-content: center;
float: left;
border-right: 1px solid rgba(153, 155, 163, 0.3);
.star {
color: #FF4E4E;
margin-right: 4px;
font-size: 20px;
}
.photo {
display: inline-block;
width: 100px;
height: 100px;
margin-left: 13px;
border: 1px solid #4EA6FF;
border-radius: 8px;
//text-align: center;
//line-height: 100px;
//color: #4EA6FF;
}
.name {
width: 78%;
// background-color: lightcoral;
display: flex;
margin-top: 20px;
align-items: center;
//height: 40px;
// border: 1px solid black;
.d {
margin-top: 8px;
font-size: 25px;
color: #ff4e4e;
}
.box {
position: relative;
.box1 {
position: absolute;
left: 50%;
top: 50%;
width: 50px;
margin-left: -25px;
margin-top: -5px;
border-top: 2px solid rgba(78, 166, 255, 1);
}
.box2 {
position: absolute;
left: 50%;
top: 50%;
height: 50px;
//margin-left: -5px;
margin-top: -25px;
border-left: 2px solid rgba(78, 166, 255, 1);
}
}
.inname {
color: #6f6f6f;
font-size: 14px;
margin-left: 7px;
width: 65px;
}
.in {
margin-left: 14px;
width: 81%;
.ant-radio-wrapper {
}
.ant-input {
border-radius: 5px;
// height: 120%;
width: 100%;
height: 40px;
}
.ant-select-selector {
border-radius: 5px;
// height: 120%;
width: 100%;
height: 40px;
}
}
}
}
.template {
width: 50%;
display: flex;
flex-direction: column;
align-items: center;
//justify-content: center;
float: right;
.name {
width: 78%;
// background-color: lightcoral;
display: flex;
margin-top: 20px;
align-items: center;
height: 40px;
// border: 1px solid black;
.d {
margin-top: 8px;
font-size: 25px;
color: #ff4e4e;
}
.inname {
color: #6f6f6f;
font-size: 14px;
margin-left: 7px;
width: 65px;
}
.in {
margin-left: 14px;
width: 81%;
.ant-input {
border-radius: 5px;
// height: 120%;
width: 100%;
height: 40px;
}
.ant-select-selector {
border-radius: 5px;
// height: 120%;
width: 100%;
height: 40px;
}
}
}
}
}
.footer {

View File

@@ -155,6 +155,7 @@ const columns = [
return (
<div class="opacation">
<span>编辑</span>
<span style={{ "margin-left": "21px" }}>授权</span>
<span style={{ "margin-left": "21px" }}>创建子项目</span>
<span style={{ "margin-left": "21px" }} class="more">
<span>更多</span>
@@ -223,25 +224,9 @@ export default {
state: "草稿",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
{
key: 8,
projectName: "管理者进阶8",
manager: "黄华 刘俊",
state: "草稿",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
},
],
},
{
key: 6,
projectName: "管理者进阶6",
manager: "黄华 刘俊",
state: "草稿",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
],
},
{
@@ -251,6 +236,7 @@ export default {
state: "草稿",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
hasChildren: true,
},
{
key: 3,
@@ -268,24 +254,6 @@ export default {
state: "草稿",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
children: [
{
key: 37,
projectName: "管理者进阶37",
manager: "黄华 刘俊",
state: "草稿",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
{
key: 38,
projectName: "管理者进阶38",
manager: "黄华 刘俊",
state: "草稿",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
],
},
{
key: 36,

View File