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

This commit is contained in:
zhangyc
2022-12-25 16:36:10 +08:00
6 changed files with 1054 additions and 991 deletions

View File

@@ -1,20 +1,11 @@
<template>
<a-drawer
:visible="selfacetVisible"
class="drawerStyle selfacetDrawer"
width="80%"
title="添加在线"
placement="right"
@after-visible-change="afterVisibleChange"
>
<a-drawer :visible="selfacetVisible" class="drawerStyle selfacetDrawer" width="80%" title="添加在线" placement="right"
@after-visible-change="afterVisibleChange">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">选择面授</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
</div>
<div class="contentMain">
<div class="main_items">
@@ -22,11 +13,8 @@
<div class="mii_ipt">
<div class="ipt_name">课程信息</div>
<div class="fi_input">
<a-input
v-model:value="name"
style="width: 424px; height: 40px; border-radius: 8px;"
placeholder="请输入课程名称"
/>
<a-input v-model:value="name" style="width: 424px; height: 40px; border-radius: 8px;"
placeholder="请输入课程名称" />
</div>
</div>
<!--
@@ -106,31 +94,17 @@
<div class="main_table">
<a-table
class="ant-table-striped"
:row-class-name="
<a-table class="ant-table-striped" :row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
"
:row-selection="rowSelection"
:columns="columns1"
:data-source="classTableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
/>
" :row-selection="rowSelection" :columns="columns1" :data-source="classTableData"
:loading="tableDataTotal === -1 ? true : false" :pagination="false" />
<div class="tableBox" style="margin-top:85px;">
<div class="pa" style="display:flex;justify-content:center;">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
/>
</div></div>
<a-pagination v-if="tableDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
hideOnSinglePage="true" :pageSize="pageSize" :current="currentPage" :total="tableDataTotal"
class="pagination" @change="changePaginationStu" />
</div>
</div>
</div>
</div>
<div class="main_btns">
@@ -142,21 +116,21 @@
</template>
<script>
//import { ApiFilled } from "@ant-design/icons-vue";
import {reactive, toRefs, computed} from "vue";
import { reactive, toRefs, computed } from "vue";
// import { planList } from "../../api/indexTaskadd";
//import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd";
import { list } from "../../api/indexTaskadd";
const columns1 = [
// {
// title: "课程编号",
// title: "课程编号",
// title: "课程编号",
// width: "20%",
// dataIndex: "num",
// key: "num",
//// align: "center",
// },
// },
{
title: "名称",
width: "30%",
@@ -234,126 +208,133 @@ export default {
],
options2222: [
{
title: "领导力",
value: "100",
selectable: false,
title: '领导力',
value: '100',
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',
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',
children: [
{
title: '战略与企划',
value: '200701',
},
{
title: "流程管理",
value: "2008",
title: '流程管理',
value: '200702',
},
{
title: "业绩管理",
value: "2009",
title: '业绩管理',
value: '200703',
},
{
title: "项目管理",
value: "20010",
title: '项目管理',
value: '200704',
},
{
title: "信息技术",
value: "20011",
title: '信息技术',
value: '200705',
},
{
title: "环境与安全",
value: "20012",
title: '环境与安全',
value: '200706',
},
{
title: "人力资源",
value: "20013",
title: '人力资源',
value: '200707',
},
{
title: "企业文化",
value: "20014",
title: '企业文化',
value: '200708',
},
{
title: "品牌",
value: "20015",
title: '品牌',
value: '200709',
},
{
title: "财务",
value: "20016",
title: '财务',
value: '200710',
},
{
title: "法务",
value: "20017",
title: '法务',
value: '200711',
},
{
title: "行政",
value: "20018",
title: '风险控制',
value: '200712',
},
{
title: "医工",
value: "20019",
title: '行政',
value: '200713'
},
]
},
{
title: '医工',
value: '2008',
}
],
},
{
title: "通用力",
value: "300",
selectable: false,
title: '通用力',
value: '300',
children: [
{
title: "职业操守与道德",
value: "3001",
title: '职业操守与道德',
value: '3001',
},
{
title: "职业素养与技能",
value: "3002",
title: '职业素养与技能',
value: '3002',
},
{
title: "规章制度",
value: "3003",
title: '规章制度',
value: '3003',
},
],
},
}
],
currentPage: 1,
tableDataTotal: null,
@@ -388,7 +369,7 @@ export default {
},
}
})
const submitCourse=()=>{
const submitCourse = () => {
state.chooseCourse && ctx.emit("update:chooseCourse", state.chooseCourse);
state.chooseCourseName && ctx.emit("update:chooseCourseName", state.chooseCourseName);
closeDrawer();
@@ -449,37 +430,67 @@ export default {
creator: value.createName || "-",
time: value.publishTime,
categoryId: value.categoryId,
category:"",
category: "",
//需要判断content
};
console.log("obj",obj);
console.log("obj", obj);
var breaked = false;
for (let i = 0; i < options.length; i++) {
for (let j = 0; j < options[i].children.length; j++) {
if (
String(options[i].children[j].value) ===
String(obj.categoryId)
) {
console.log("obj.categoryId",obj.categoryId);
obj.category = options[i].children[j].title;
console.log("obj. obj.category ", obj.category );
obj.category = changeTreeSelectValue(String(obj.categoryId))
// console.log("obj.categoryId", obj.categoryId);
// obj.category = options[i].children[j].title;
// console.log("obj. obj.category ", obj.category);
breaked = true;
break;
}
}
if(breaked){
if (breaked) {
break;
}
}
if(!obj.category ){
obj.category ="-";
if (!obj.category) {
obj.category = "-";
}
console.log("obj. obj.category22 ", obj.category );
console.log("obj. obj.category22 ", obj.category);
array.push(obj);
});
state.classTableData = array;
};
// 格式化树型结构选择数据
const changeTreeSelectValue = (values) => {
let data = state.options2222;
console.log(values, data)
let str = ''
for (let i = 0; i < data.length; i++) {
if (data[i].value == values) {
str = data[i].title
} else {
for (let j = 0; j < data[i].children.length; j++) {
if (data[i].children[j].value == values) {
str = data[i].title + '/' + data[i].children[j].title
} else {
if (data[i].children[j].children) {
for (let k = 0; k < data[i].children[j].children.length; k++) {
if (data[i].children[j].children[k].value == values) {
str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
}
}
}
}
}
}
}
console.log('str-str-str-str', str)
state.fen_lei1 = str;
return str;
}
@@ -729,28 +740,33 @@ export default {
}
}
}
.main_table {
position: relative;
padding-bottom: 80px;
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 5px !important;
}
.ant-table-thead > tr > th {
.ant-table-thead>tr>th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
@@ -760,6 +776,7 @@ export default {
bottom: 20px;
}
}
.main_btns {
height: 72px;
width: 100%;

View File

@@ -2695,21 +2695,15 @@ export default defineComponent({
value: '100',
children: [
{
title: '领导业务',
title: '管理业务',
value: '1001',
children: [
{
title: '业务能力领导',
value: '100101',
}
]
},
{
title: '领导团队',
title: '管理团队',
value: '1002',
},
{
title: '领导自我',
title: '管理自我',
value: '1003',
},
],
@@ -2723,7 +2717,7 @@ export default defineComponent({
value: '2001',
},
{
title: '产品和解决方案',
title: '系统和解决方案',
value: '2002',
},
{
@@ -2743,56 +2737,66 @@ export default defineComponent({
value: '2006',
},
{
title: '战略与企划',
title: '专业职能',
value: '2007',
children: [
{
title: '战略与企划',
value: '200701',
},
{
title: '流程管理',
value: '2008',
value: '200702',
},
{
title: '业绩管理',
value: '2009',
value: '200703',
},
{
title: '项目管理',
value: '20010',
value: '200704',
},
{
title: '信息技术',
value: '20011',
value: '200705',
},
{
title: '环境与安全',
value: '20012',
value: '200706',
},
{
title: '人力资源',
value: '20013',
value: '200707',
},
{
title: '企业文化',
value: '20014',
value: '200708',
},
{
title: '品牌',
value: '20015',
value: '200709',
},
{
title: '财务',
value: '20016',
value: '200710',
},
{
title: '法务',
value: '20017',
value: '200711',
},
{
title: '风险控制',
value: '200712',
},
{
title: '行政',
value: '20018',
value: '200713'
},
]
},
{
title: '医工',
value: '20019',
value: '2008',
}
],
},
@@ -3091,8 +3095,6 @@ export default defineComponent({
for (let k = 0; k < data[i].children[j].children.length; k++) {
if (data[i].children[j].children[k].value == values) {
str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
} else {
str = '-'
}
}
}

View File

@@ -228,126 +228,133 @@ export default defineComponent({
imgList: [],
options2222: [
{
title: "领导力",
value: "100",
selectable: false,
title: '领导力',
value: '100',
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',
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',
children: [
{
title: '战略与企划',
value: '200701',
},
{
title: "流程管理",
value: "2008",
title: '流程管理',
value: '200702',
},
{
title: "业绩管理",
value: "2009",
title: '业绩管理',
value: '200703',
},
{
title: "项目管理",
value: "20010",
title: '项目管理',
value: '200704',
},
{
title: "信息技术",
value: "20011",
title: '信息技术',
value: '200705',
},
{
title: "环境与安全",
value: "20012",
title: '环境与安全',
value: '200706',
},
{
title: "人力资源",
value: "20013",
title: '人力资源',
value: '200707',
},
{
title: "企业文化",
value: "20014",
title: '企业文化',
value: '200708',
},
{
title: "品牌",
value: "20015",
title: '品牌',
value: '200709',
},
{
title: "财务",
value: "20016",
title: '财务',
value: '200710',
},
{
title: "法务",
value: "20017",
title: '法务',
value: '200711',
},
{
title: "行政",
value: "20018",
title: '风险控制',
value: '200712',
},
{
title: "医工",
value: "20019",
title: '行政',
value: '200713'
},
]
},
{
title: '医工',
value: '2008',
}
],
},
{
title: "通用力",
value: "300",
selectable: false,
title: '通用力',
value: '300',
children: [
{
title: "职业操守与道德",
value: "3001",
title: '职业操守与道德',
value: '3001',
},
{
title: "职业素养与技能",
value: "3002",
title: '职业素养与技能',
value: '3002',
},
{
title: "规章制度",
value: "3003",
title: '规章制度',
value: '3003',
},
],
},
}
],
ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
@@ -370,14 +377,45 @@ export default defineComponent({
if (txt) {
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;
}
str = changeTreeSelectValue(String(txt))
// if (String(options2.value[i].children[j].value) === String(txt)) {
// str = options2.value[i].children[j].title;
// }
}
}
}
return str;
};
// 格式化树型结构选择数据
const changeTreeSelectValue = (values) => {
let data = state.options2222;
console.log(values, data)
let str = ''
for (let i = 0; i < data.length; i++) {
if (data[i].value == values) {
str = data[i].title
} else {
for (let j = 0; j < data[i].children.length; j++) {
if (data[i].children[j].value == values) {
str = data[i].title + '/' + data[i].children[j].title
} else {
if (data[i].children[j].children) {
for (let k = 0; k < data[i].children[j].children.length; k++) {
if (data[i].children[j].children[k].value == values) {
str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
}
}
}
}
}
}
}
console.log('str-str-str-str', str)
state.fen_lei1 = str;
return str;
}
const filterSenceTxt = (txt) => {
let str = "-";
if (txt) {

View File

@@ -368,21 +368,15 @@ export default defineComponent({
value: '100',
children: [
{
title: '领导业务',
title: '管理业务',
value: '1001',
children: [
{
title: '业务能力领导',
value: '100101',
}
]
},
{
title: '领导团队',
title: '管理团队',
value: '1002',
},
{
title: '领导自我',
title: '管理自我',
value: '1003',
},
],
@@ -396,7 +390,7 @@ export default defineComponent({
value: '2001',
},
{
title: '产品和解决方案',
title: '系统和解决方案',
value: '2002',
},
{
@@ -416,56 +410,66 @@ export default defineComponent({
value: '2006',
},
{
title: '战略与企划',
title: '专业职能',
value: '2007',
children: [
{
title: '战略与企划',
value: '200701',
},
{
title: '流程管理',
value: '2008',
value: '200702',
},
{
title: '业绩管理',
value: '2009',
value: '200703',
},
{
title: '项目管理',
value: '20010',
value: '200704',
},
{
title: '信息技术',
value: '20011',
value: '200705',
},
{
title: '环境与安全',
value: '20012',
value: '200706',
},
{
title: '人力资源',
value: '20013',
value: '200707',
},
{
title: '企业文化',
value: '20014',
value: '200708',
},
{
title: '品牌',
value: '20015',
value: '200709',
},
{
title: '财务',
value: '20016',
value: '200710',
},
{
title: '法务',
value: '20017',
value: '200711',
},
{
title: '风险控制',
value: '200712',
},
{
title: '行政',
value: '20018',
value: '200713'
},
]
},
{
title: '医工',
value: '20019',
value: '2008',
}
],
},
@@ -903,8 +907,6 @@ export default defineComponent({
for (let k = 0; k < data[i].children[j].children.length; k++) {
if (data[i].children[j].children[k].value == values) {
str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
} else {
str = '-'
}
}
}

View File

@@ -272,21 +272,15 @@ export default {
value: '100',
children: [
{
title: '领导业务',
title: '管理业务',
value: '1001',
children: [
{
title: '业务能力领导',
value: '100101',
}
]
},
{
title: '领导团队',
title: '管理团队',
value: '1002',
},
{
title: '领导自我',
title: '管理自我',
value: '1003',
},
],
@@ -300,7 +294,7 @@ export default {
value: '2001',
},
{
title: '产品和解决方案',
title: '系统和解决方案',
value: '2002',
},
{
@@ -320,56 +314,66 @@ export default {
value: '2006',
},
{
title: '战略与企划',
title: '专业职能',
value: '2007',
children: [
{
title: '战略与企划',
value: '200701',
},
{
title: '流程管理',
value: '2008',
value: '200702',
},
{
title: '业绩管理',
value: '2009',
value: '200703',
},
{
title: '项目管理',
value: '20010',
value: '200704',
},
{
title: '信息技术',
value: '20011',
value: '200705',
},
{
title: '环境与安全',
value: '20012',
value: '200706',
},
{
title: '人力资源',
value: '20013',
value: '200707',
},
{
title: '企业文化',
value: '20014',
value: '200708',
},
{
title: '品牌',
value: '20015',
value: '200709',
},
{
title: '财务',
value: '20016',
value: '200710',
},
{
title: '法务',
value: '20017',
value: '200711',
},
{
title: '风险控制',
value: '200712',
},
{
title: '行政',
value: '20018',
value: '200713'
},
]
},
{
title: '医工',
value: '20019',
value: '2008',
}
],
},
@@ -426,8 +430,6 @@ export default {
for (let k = 0; k < data[i].children[j].children.length; k++) {
if (data[i].children[j].children[k].value == values) {
str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
} else {
str = '-'
}
}
}

View File

@@ -281,21 +281,15 @@ export default {
value: '100',
children: [
{
title: '领导业务',
title: '管理业务',
value: '1001',
children: [
{
title: '业务能力领导',
value: '100101',
}
]
},
{
title: '领导团队',
title: '管理团队',
value: '1002',
},
{
title: '领导自我',
title: '管理自我',
value: '1003',
},
],
@@ -309,7 +303,7 @@ export default {
value: '2001',
},
{
title: '产品和解决方案',
title: '系统和解决方案',
value: '2002',
},
{
@@ -329,56 +323,66 @@ export default {
value: '2006',
},
{
title: '战略与企划',
title: '专业职能',
value: '2007',
children: [
{
title: '战略与企划',
value: '200701',
},
{
title: '流程管理',
value: '2008',
value: '200702',
},
{
title: '业绩管理',
value: '2009',
value: '200703',
},
{
title: '项目管理',
value: '20010',
value: '200704',
},
{
title: '信息技术',
value: '20011',
value: '200705',
},
{
title: '环境与安全',
value: '20012',
value: '200706',
},
{
title: '人力资源',
value: '20013',
value: '200707',
},
{
title: '企业文化',
value: '20014',
value: '200708',
},
{
title: '品牌',
value: '20015',
value: '200709',
},
{
title: '财务',
value: '20016',
value: '200710',
},
{
title: '法务',
value: '20017',
value: '200711',
},
{
title: '风险控制',
value: '200712',
},
{
title: '行政',
value: '20018',
value: '200713'
},
]
},
{
title: '医工',
value: '20019',
value: '2008',
}
],
},
@@ -655,8 +659,6 @@ export default {
for (let k = 0; k < data[i].children[j].children.length; k++) {
if (data[i].children[j].children[k].value == values) {
str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
} else {
str = '-'
}
}
}