hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 19:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2022-12-14 15:31:20 +08:00
parent 474a360dc6 f0603eda14
commit 3b750a61bd
2 changed files with 672 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/views/courselibrary/CoursewareManage.vue
View File

@@ -90,10 +90,8 @@
<div class="search"></div>
<div class="btnText">重置</div>
</div>
</div>
<div class="btns">
<!-- 2022-11-30注释 后面放开 -->
<!-- <div class="btn btn3" @click="openMessage">
<div class="search"></div>
@@ -631,7 +629,7 @@
<span style="margin-right: 14px">授课教师</span>
</div>
<div class="item_inp">
<div class="select" style="width:436px; " >
<div class="select" style="width: 436px">
<ProjectManager
v-model:value="member.value"
v-model:name="member.name"
@@ -815,7 +813,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleEdit(record, String(record.courseform));
@@ -826,7 +825,8 @@
编辑
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -893,7 +893,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleDelete(record, String(record.courseform));
@@ -921,7 +922,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleRejectExit(record, String(record.courseform));
@@ -931,7 +933,8 @@
>
撤回
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1017,7 +1020,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleStart(record, String(record.courseform));
@@ -1027,7 +1031,8 @@
>
开课
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleLook(record, String(record.courseform));
@@ -1059,7 +1064,8 @@
>
管理
</div>-->
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1126,7 +1132,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleStop(record, String(record.courseform));
@@ -1138,7 +1145,6 @@
</div>
</div>
</div>
</template>
<template
v-if="
@@ -1156,7 +1162,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleStart(record, String(record.courseform));
@@ -1166,7 +1173,8 @@
>
开课
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleEdit(record, String(record.courseform));
@@ -1198,7 +1206,8 @@
>
管理
</div> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1265,7 +1274,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleOpen(record, String(record.courseform));
@@ -1275,7 +1285,8 @@
>
启用
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleDelete(record, String(record.courseform));
@@ -1304,7 +1315,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleEdit(record, String(record.courseform));
@@ -1314,7 +1326,8 @@
>
编辑
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1381,7 +1394,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleDelete(record, String(record.courseform));
@@ -1725,7 +1739,8 @@
<div class="btnText">
<span style="color: #ffffff">新建开课</span>
</div>
</div></div>
</div>
</div>
</div>
<!-- 无数据样式 -->
<div class="notable" v-if="tableData6.length === 0">
@@ -1771,7 +1786,8 @@
签到
</div>
-->
<div class="jc"
<div
class="jc"
@click="
() => {
handelEditStu(record);
@@ -1780,7 +1796,8 @@
>
编辑
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handelGuan(record);
@@ -1790,9 +1807,9 @@
管理
</div>
</div>
<a-dropdown >
<a-dropdown>
<template #overlay>
<a-menu style="margin-left: 20px;">
<a-menu style="margin-left: 20px">
<a-menu-item
@click="
() => {
@@ -1824,11 +1841,12 @@
</a-menu-item> -->
</a-menu>
</template>
<div class="fb" style="margin-left: -20px;">
<div class="jc" >
<div class="fb" style="margin-left: -20px">
<div class="jc">
更多
<down-outlined />
</div></div>
</div>
</div>
</a-dropdown>
</div>
</template>
@@ -1853,8 +1871,6 @@
</div>
</div>
</div>
</a-modal>
<!--开课页面 -->
<!--新建开课页面 -->
@@ -1950,7 +1966,7 @@
</div>
<span style="margin-right: 3px">授课教师</span>
</div>
<div class="select" style="width: 440px;">
<div class="select" style="width: 440px">
<ProjectManager
v-model:value="member.value"
v-model:name="member.name"
@@ -1987,7 +2003,6 @@
</div>
</div>
<div class="cstm_items">
<div class="signbox">
<span style="margin-right: 3px">评估设置</span>
@@ -2099,8 +2114,16 @@
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.slice(item.lastIndexOf("/") + 1) }}</span
>
{{
item.indexOf("-") !== -1
? item.slice(
item.lastIndexOf("/") + 1,
item.indexOf("-")
) + item.slice(item.lastIndexOf("."))
: item
}}
</span>
</div>
<!-- 条件渲染 s -->
<!-- <div class="file_size">
@@ -2227,7 +2250,12 @@
<a-input
v-model:value="xygl_inputV1"
placeholder="请输入姓名"
style="width: 400px; height: 40px; border-radius: 8px;margin-right:14px;"
style="
width: 400px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
/>
<div class="btn btn1" @click="handleSearchStu">
<div class="search"></div>
@@ -2241,7 +2269,7 @@
<div class="btns">
<div class="btn btn3" @click="showStuAdd(currentPlanItem)">
<div class="search"></div>
<div class="btnText"> 添加学员</div>
<div class="btnText">添加学员</div>
</div>
<!-- 2022-11-30注释 后面放开 -->
<!-- <div class="stmm_btn btn4" @click="hideShow">
@@ -2284,7 +2312,7 @@
</div> -->
</div>
</div>
<div class="tableBox" style="margin-top:20px;">
<div class="tableBox" style="margin-top: 20px">
<a-table
:columns="columns7"
:data-source="tableData7"
@@ -3205,9 +3233,9 @@ const columns6 = [
];
//开课学员管理
const columns7 = [
//// {
//// {
// title: "序号",
// width: 200,
// width: 200,
// dataIndex: "num",
// key: "num",
// align: "center",
@@ -3604,7 +3632,7 @@ export default defineComponent({
imageUrl: "",
imgList: [],
validate:false,
validate: false,
pageSize2: 10,
currentPage2: 0,
@@ -3651,7 +3679,7 @@ export default defineComponent({
codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容
codeUrl: codeUrl,
finished:false,
finished: false,
// 课程三级分类
options2222: [
{
@@ -4555,8 +4583,8 @@ export default defineComponent({
return message.warning("请输入必填项");
}
console.log("state.validate",state.validate);
if(!state.finished){
console.log("state.validate", state.validate);
if (!state.finished) {
return;
}
@@ -4569,12 +4597,11 @@ export default defineComponent({
state.bs_hs,
state.valueE1 == 2
);
if( !state.valueE1 && !state.valueE2){
if (!state.valueE1 && !state.valueE2) {
message.destroy();
return message.warning("请选择课程形式");
}
if (state.valueE1 === 2) {
state.of_hs = false;
// state.ft_hs = true;
@@ -4814,7 +4841,7 @@ export default defineComponent({
.catch();
console.log("res");
console.log(item);
console.log("获取面授课详情", item);
state.xjkkinputV2 = item.address;
state.checked1 = item.applyFlag === 1 ? true : false;
@@ -6001,7 +6028,6 @@ export default defineComponent({
}
}
.tableBox {
margin: 20px 38px 30px;
@@ -7614,7 +7640,7 @@ export default defineComponent({
.operation {
display: flex;
justify-content: right;
margin-right:20px;
margin-right: 20px;
.fb {
display: flex;
margin-right: 20px;
@@ -7910,7 +7936,6 @@ export default defineComponent({
}
.ant-table-thead > tr > th {
background-color: #eff4fc !important;
}
@@ -7954,7 +7979,6 @@ export default defineComponent({
}
}
}
}
}
}

162
src/views/courselibrary/components/seeModal.vue
View File

@@ -156,7 +156,7 @@
<div class="mbl_items12">
<div
class="i12_box1"
style="position:relative;"
style="position: relative"
v-for="(item, index) in detail.attach"
:key="index"
>
@@ -207,21 +207,43 @@
<div class="file_detail">
<div class="file_name">
<!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
<span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
{{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}
<span
style="
color: #6f6f6f;
width: 200px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
position: absolute;
top: 4px;
left: 72px;
"
>
{{
item.indexOf("-") !== -1
? item.slice(
item.lastIndexOf("/") + 1,
item.indexOf("-")
) + item.slice(item.lastIndexOf("."))
: item
}}
</span>
</div>
<div class="file_updata">
<div class="updatabox">
<div class="updatacolor"></div>
<div class="updataxq" style="right:-62px;">上传完成</div>
<div class="updataxq" style="right: -62px">
上传完成
</div>
</div>
<div class="upjd">
<span style="margin: auto 5px">100%</span>
</div>
</div>
</div>
<a :href="item" style="margin-left: 5px">下载</a>
</div>
</div>
</div>
@@ -262,134 +284,134 @@ export default defineComponent({
},
},
setup(props, { emit }) {
console.log(props);
console.log("props", props);
const state = reactive({
imgList: [],
options2222: [
{
title: '领导力',
value: '100',
selectable:false,
title: "领导力",
value: "100",
selectable: false,
children: [
{
title: '领导业务',
value: '1001',
title: "领导业务",
value: "1001",
},
{
title: '领导团队',
value: '1002',
title: "领导团队",
value: "1002",
},
{
title: '领导自我',
value: '1003',
title: "领导自我",
value: "1003",
},
],
},
{
title: '专业力',
value: '200',
selectable:false,
title: "专业力",
value: "200",
selectable: false,
children: [
{
title: '研发',
value: '2001',
title: "研发",
value: "2001",
},
{
title: '产品和解决方案',
value: '2002',
title: "产品和解决方案",
value: "2002",
},
{
title: '生产技术与制造',
value: '2003',
title: "生产技术与制造",
value: "2003",
},
{
title: '供应链',
value: '2004',
title: "供应链",
value: "2004",
},
{
title: '营销',
value: '2005',
title: "营销",
value: "2005",
},
{
title: '品质',
value: '2006',
title: "品质",
value: "2006",
},
{
title: '战略与企划',
value: '2007',
title: "战略与企划",
value: "2007",
},
{
title: '流程管理',
value: '2008',
title: "流程管理",
value: "2008",
},
{
title: '业绩管理',
value: '2009',
title: "业绩管理",
value: "2009",
},
{
title: '项目管理',
value: '20010',
title: "项目管理",
value: "20010",
},
{
title: '信息技术',
value: '20011',
title: "信息技术",
value: "20011",
},
{
title: '环境与安全',
value: '20012',
title: "环境与安全",
value: "20012",
},
{
title: '人力资源',
value: '20013',
title: "人力资源",
value: "20013",
},
{
title: '企业文化',
value: '20014',
title: "企业文化",
value: "20014",
},
{
title: '品牌',
value: '20015',
title: "品牌",
value: "20015",
},
{
title: '财务',
value: '20016',
title: "财务",
value: "20016",
},
{
title: '法务',
value: '20017',
title: "法务",
value: "20017",
},
{
title: '行政',
value: '20018',
title: "行政",
value: "20018",
},
{
title: '医工',
value: '20019',
}
title: "医工",
value: "20019",
},
],
},
{
title: '通用力',
value: '300',
selectable:false,
title: "通用力",
value: "300",
selectable: false,
children: [
{
title: '职业操守与道德',
value: '3001',
title: "职业操守与道德",
value: "3001",
},
{
title: '职业素养与技能',
value: '3002',
title: "职业素养与技能",
value: "3002",
},
{
title: '规章制度',
value: '3003',
title: "规章制度",
value: "3003",
},
],
},
],
}
]
});
console.log("detail", props.detail);
const filterTxt = (txt) => {
if (txt) {
return txt;
@@ -400,8 +422,8 @@ export default defineComponent({
const filterClassTxt = (txt) => {
let str = "-";
if (txt) {
for(let i =0; i<options2.value.length;i++){
for(let j=0;j<options2.value[i].children.length;j++){
for (let i = 0; i < options2.value.length; i++) {
for (let j = 0; j < options2.value[i].children.length; j++) {
if (String(options2.value[i].children[j].value) === String(txt)) {
str = options2.value[i].children[j].title;
}