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

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

Browse Source
This commit is contained in:
zhangyc
2022-12-21 16:55:37 +08:00
parent cb0ffbf363 841d16f33e
commit cb1a7dbc9a
9 changed files with 2034 additions and 1864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/components/drawers/AddCase.vue
View File

@@ -46,7 +46,7 @@
</div> </div>
<div class="main_table"> <div class="main_table">
<!-- <!--
<a-table <a-table
v-if="edit" v-if="edit"
class="ant-table-striped" class="ant-table-striped"
@@ -64,7 +64,6 @@
:pagination="false" :pagination="false"
/>--> />-->
<a-table <a-table
class="ant-table-striped" class="ant-table-striped"
:row-class-name=" :row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null) (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
@@ -80,19 +79,20 @@
:pagination="false" :pagination="false"
/> />
<div class="tableBox"> <div class="tableBox">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="false"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
:current="currentPage" :current="currentPage"
:total="tableDataTotal" :total="tableDataTotal"
class="pagination" class="pagination"
@change="handelChangePage" @change="handelChangePage"
/> />
</div></div> </div>
</div>
</div> </div>
</div> </div>
<div class="main_btns"> <div class="main_btns">
@@ -171,7 +171,7 @@ export default {
time: undefined, time: undefined,
caseId: null, caseId: null,
caseName: "", caseName: "",
isClick: false isClick: false,
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addcaseVisible", false); ctx.emit("update:addcaseVisible", false);
@@ -202,13 +202,13 @@ export default {
width: "200px", width: "200px",
align: "center", align: "center",
}, },
// { // {
// title: "导入时间", // title: "导入时间",
// dataIndex: "time", // dataIndex: "time",
// key: "time", // key: "time",
// width: "400px", // width: "400px",
// align: "center", // align: "center",
// }, // },
]; ];
return columns; return columns;
}; };
@@ -218,6 +218,7 @@ export default {
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows; state.apiTaskList = selectedRows;
console.log("selectedRows", selectedRows);
}; };
const handelChangePage = (page, pageSize) => { const handelChangePage = (page, pageSize) => {
state.selectedRowKeys = []; state.selectedRowKeys = [];
@@ -276,16 +277,16 @@ export default {
}; };
const updateTask = () => { const updateTask = () => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
if(!props.isactive){ if (!props.isactive) {
message.destroy(); message.destroy();
return message.warning("请先选中关卡"); return message.warning("请先选中关卡");
} }
if(state.isClick){ if (state.isClick) {
message.destroy(); message.destroy();
message.error('请勿频繁点击') message.error("请勿频繁点击");
return return;
} }
state.isClick = true; state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) { for (let i = 0; i < state.apiTaskList.length; i++) {
RouterEditTask({ RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
@@ -308,12 +309,12 @@ export default {
}); });
} }
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
if(state.isClick){ if (state.isClick) {
message.destroy(); message.destroy();
message.error('请勿频繁点击') message.error("请勿频繁点击");
return return;
} }
state.isClick = true; state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) { for (let i = 0; i < state.apiTaskList.length; i++) {
apiTask apiTask
.addTask({ .addTask({
@@ -338,19 +339,21 @@ export default {
}); });
} }
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
if(state.isClick){ if (state.isClick) {
message.destroy(); message.destroy();
message.error('请勿频繁点击') message.error("请勿频繁点击");
return return;
} }
state.isClick = true; state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) { for (let i = 0; i < state.apiTaskList.length; i++) {
apiTask apiTask
.addTaskTemplate({ .addTaskTemplate({
courseId: Number(state.apiTaskList[i].casesId), courseId: Number(state.apiTaskList[i].casesId),
name: state.apiTaskList[i].title, name: state.apiTaskList[i].title,
projectTaskId: props.projectTaskId, projectTaskId: props.projectTaskId,
projectTemplateId: Number(localStorage.getItem("projectTemplateId")), projectTemplateId: Number(
localStorage.getItem("projectTemplateId")
),
stageId: Number(props.chooseStageId) || 0, stageId: Number(props.chooseStageId) || 0,
type: 3, type: 3,
}) })
@@ -432,7 +435,7 @@ export default {
.main_items { .main_items {
margin-top: 32px; margin-top: 32px;
display: flex; display: flex;
margin-bottom: 12px; margin-bottom: 12px;
flex-wrap: wrap; flex-wrap: wrap;
.mi_ipts { .mi_ipts {

1632
src/components/drawers/AddOnline.vue
View File

File diff suppressed because it is too large Load Diff

1542
src/components/drawers/AddTest.vue
View File

File diff suppressed because it is too large Load Diff

61
src/components/drawers/EvList.vue
View File

@@ -24,7 +24,7 @@
<div class="fi_input"> <div class="fi_input">
<a-input <a-input
v-model:value="inputV1" v-model:value="inputV1"
style="width:424px; height: 40px; border-radius: 8px" style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称" placeholder="请输入项目名称"
/> />
</div> </div>
@@ -54,20 +54,21 @@
onChange: onSelectChange, onChange: onSelectChange,
}" }"
/> />
<div class="tableBox" style="margin-top:85px;"> <div class="tableBox" style="margin-top: 85px">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="false"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
:current="currentPage" :current="currentPage"
:total="tableDataTotal" :total="tableDataTotal"
class="pagination" class="pagination"
@change="changePagination" @change="changePagination"
/> />
</div></div> </div>
</div>
</div> </div>
</div> </div>
<div class="main_btns"> <div class="main_btns">
@@ -131,20 +132,20 @@ export default {
align: "center", align: "center",
ellipsis: true, ellipsis: true,
}, },
// { // {
// title: "状态", // title: "状态",
// width: "13%", // width: "13%",
// dataIndex: "status", // dataIndex: "status",
// key: "status", // key: "status",
// align: "center", // align: "center",
// }, // },
// { // {
// title: "价格", // title: "价格",
// width: "13%", // width: "13%",
// dataIndex: "quiz_price", // dataIndex: "quiz_price",
// key: "price", // key: "price",
// align: "center", // align: "center",
// }, // },
{ {
title: "可答题人数", title: "可答题人数",
width: "20%", width: "20%",
@@ -161,7 +162,7 @@ export default {
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.evListData = selectedRows[0] ? selectedRows[0] : {}; state.evListData = selectedRows[0] ? selectedRows[0] : {};
console.log("state.evListData",state.evListData); console.log("state.evListData", state.evListData);
}; };
const closeDrawer = () => { const closeDrawer = () => {
state.selectedRowKeys = []; state.selectedRowKeys = [];
@@ -229,13 +230,13 @@ export default {
//获取测评列表 //获取测评列表
const getAllEvalText = () => { const getAllEvalText = () => {
let objael = { let objael = {
keyword:state.inputV1, keyword: state.inputV1,
}; };
api api
.choiceEvaluation(objael) .choiceEvaluation(objael)
.then((res) => { .then((res) => {
state.tableDataTotal=9; state.tableDataTotal = 9;
// console.log("测评列表", res.data.data);
getTableDataList(res.data.data); getTableDataList(res.data.data);
}) })
.catch(() => {}); .catch(() => {});
@@ -311,7 +312,7 @@ export default {
} }
.mi_btns { .mi_btns {
display: flex; display: flex;
cursor: pointer; cursor: pointer;
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;

339
src/components/student/CommonStudent.vue
View File

@@ -4,11 +4,11 @@
<div class="CommonStudent"> <div class="CommonStudent">
<a-drawer <a-drawer
:visible="visiable" :visible="visiable"
class="drawerStyle ProjCheckship" class="drawerStyle ProjCheckship CommonStudent"
placement="right" placement="right"
width="60%" width="60%"
> >
<div class="drawerMain" id="ProjCheckship"> <div class="drawerMain" id="ProjCheckship" style="">
<div class="header"> <div class="header">
<div class="headerTitle"> <div class="headerTitle">
{{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }} {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
@@ -19,10 +19,8 @@
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div <div style="display: flex; overflow-x: auto; overflow-y: auto">
style="width: 100%; display: grid; grid-template-columns: 750px auto" <div class="tabs" style="min-width: 800px">
>
<div class="tabs" style="min-height: 800px">
<a-tabs v-model:activeKey="activeKey"> <a-tabs v-model:activeKey="activeKey">
<a-tab-pane :key="1" tab="快速选人"> <a-tab-pane :key="1" tab="快速选人">
<div :style="{ height: screenHeight - 235 + 'px' }"> <div :style="{ height: screenHeight - 235 + 'px' }">
@@ -175,7 +173,7 @@
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</div> </div>
<div class="right1"> <div class="right1" style="min-width: 200px">
<div class="onerow"> <div class="onerow">
<div class="onleft"> <div class="onleft">
<div class="already">已选</div> <div class="already">已选</div>
@@ -663,179 +661,178 @@ watch(visiable, () => {
.ant-tabs { .ant-tabs {
overflow: visible; overflow: visible;
} }
} .right1 {
.right1 { border-left: 1px solid #f2f6fe;
border-left: 1px solid #f2f6fe; margin-left: 20px;
width: 100%; .onerow {
margin-left: 20px;
.onerow {
display: flex;
justify-content: space-between;
align-items: center;
margin-right: 40px;
flex-wrap: wrap;
width: 100%;
.onleft {
display: flex; display: flex;
text-align: center; justify-content: space-between;
align-items: center;
margin-right: 40px;
flex-wrap: wrap;
.already { width: 100%;
color: rgba(51, 51, 51, 1);
font-size: 16px; .onleft {
font-weight: 500; display: flex;
margin-left: 32px; text-align: center;
white-space: nowrap;
// margin-bottom: 20px; .already {
color: rgba(51, 51, 51, 1);
font-size: 16px;
font-weight: 500;
margin-left: 32px;
white-space: nowrap;
// margin-bottom: 20px;
}
.count {
color: #4ea6ff;
font-size: 16px;
margin: 0 6px;
}
.peo {
color: rgba(51, 51, 51, 1);
font-size: 16px;
font-weight: 500;
}
} }
.clbox {
.count { margin-right: 50px;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
width: 104px;
height: 32px;
border-radius: 4px;
background: #4ea6ff;
.colose {
width: 16px;
height: 16px;
// border-radius: 8px;
// background: #ffffff;
// position: relative;
background-image: url(../../assets/images/basicinfo/ch.png);
background-size: 100%;
margin-right: 4px;
}
.allclear {
color: rgba(255, 255, 255, 1);
font-size: 14px;
}
}
}
.selecteds {
display: flex;
flex-wrap: wrap;
margin-left: 32px;
.person {
width: 100%;
margin-top: 20px;
border-top: 1px solid #f2f6fe;
}
.chose {
width: 64px;
height: 24px;
margin-top: 25px;
margin-right: 25px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
border: 1px solid rgba(56, 139, 225, 1);
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.ch {
position: absolute;
width: 18px;
height: 18px;
background-image: url(../../assets/images/basicinfo/ch.png);
right: -8px;
top: -8px;
}
}
.ifsw {
display: flex;
align-items: end;
justify-content: center;
color: #4ea6ff; color: #4ea6ff;
font-size: 16px;
margin: 0 6px;
} }
.sw {
.peo { display: flex;
color: rgba(51, 51, 51, 1); align-items: center;
font-size: 16px; justify-content: center;
font-weight: 500; text-align: justify;
color: #4ea6ff;
margin-top: 23px;
margin-left: 10px;
} }
} .dept {
.clbox { width: 100%;
margin-right: 50px; margin-top: 30px;
display: flex; border-top: 1px solid #f2f6fe;
justify-content: center;
align-items: center;
cursor: pointer;
width: 104px;
height: 32px;
border-radius: 4px;
background: #4ea6ff;
.colose {
width: 16px;
height: 16px;
// border-radius: 8px;
// background: #ffffff;
// position: relative;
background-image: url(../../assets/images/basicinfo/ch.png);
background-size: 100%;
margin-right: 4px;
} }
.allclear { .chose1 {
color: rgba(255, 255, 255, 1); //width: 90px;
font-size: 14px; height: 24px;
margin-top: 25px;
margin-right: 25px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
border: 1px solid rgba(56, 139, 225, 1);
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch1 {
position: absolute;
width: 18px;
height: 18px;
background-image: url(../../assets/images/basicinfo/ch.png);
right: -8px;
top: -8px;
}
} }
} .group {
} width: 100%;
.selecteds { margin-top: 30px;
display: flex; border-top: 1px solid #f2f6fe;
flex-wrap: wrap;
margin-left: 32px;
.person {
width: 100%;
margin-top: 20px;
border-top: 1px solid #f2f6fe;
}
.chose {
width: 64px;
height: 24px;
margin-top: 25px;
margin-right: 25px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
border: 1px solid rgba(56, 139, 225, 1);
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.ch {
position: absolute;
width: 18px;
height: 18px;
background-image: url(../../assets/images/basicinfo/ch.png);
right: -8px;
top: -8px;
} }
} .chose2 {
.ifsw { //width: 120px;
display: flex; height: 24px;
align-items: end; margin-top: 25px;
justify-content: center; margin-right: 25px;
color: #4ea6ff; display: flex;
} align-items: center;
.sw { justify-content: center;
display: flex; border-radius: 2px;
align-items: center; border: 1px solid rgba(56, 139, 225, 1);
justify-content: center; color: rgba(56, 139, 225, 1);
text-align: justify; font-size: 12px;
color: #4ea6ff; position: relative;
margin-top: 23px; .span {
margin-left: 10px; white-space: nowrap;
} overflow: hidden;
.dept { text-overflow: ellipsis;
width: 100%; }
margin-top: 30px; .ch2 {
border-top: 1px solid #f2f6fe; position: absolute;
} width: 18px;
.chose1 { height: 18px;
//width: 90px; background-image: url(../../assets/images/basicinfo/ch.png);
height: 24px; right: -8px;
margin-top: 25px; top: -8px;
margin-right: 25px; }
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
border: 1px solid rgba(56, 139, 225, 1);
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch1 {
position: absolute;
width: 18px;
height: 18px;
background-image: url(../../assets/images/basicinfo/ch.png);
right: -8px;
top: -8px;
}
}
.group {
width: 100%;
margin-top: 30px;
border-top: 1px solid #f2f6fe;
}
.chose2 {
//width: 120px;
height: 24px;
margin-top: 25px;
margin-right: 25px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
border: 1px solid rgba(56, 139, 225, 1);
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch2 {
position: absolute;
width: 18px;
height: 18px;
background-image: url(../../assets/images/basicinfo/ch.png);
right: -8px;
top: -8px;
} }
} }
} }

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

@@ -143,7 +143,6 @@
placeholder="请输入课程名称" placeholder="请输入课程名称"
v-model:value="xzinputV1" v-model:value="xzinputV1"
v-model:validate="validate" v-model:validate="validate"
:maxlength="20" :maxlength="20"
show-count show-count
:type="2" :type="2"
@@ -226,7 +225,8 @@
</div> </div>
<a-radio-group v-model:value="valueE1"> <a-radio-group v-model:value="valueE1">
<div class="bc_box"> <div class="bc_box">
<div class="bc_boxl"> <!-- 2022-12-21 隐藏 后面放开 lixiaoge -->
<!-- <div class="bc_boxl">
<div class="ol_checkbox" @click="expectOnline"> <div class="ol_checkbox" @click="expectOnline">
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
@@ -237,7 +237,7 @@
线上 线上
</a-radio> </a-radio>
</div> </div>
</div> </div> -->
<div class="bc_boxr"> <div class="bc_boxr">
<div class="ol_checkbox"> <div class="ol_checkbox">
<a-radio <a-radio
@@ -364,7 +364,6 @@
placeholder="请输入课程名称" placeholder="请输入课程名称"
v-model:value="qdms_inputV1" v-model:value="qdms_inputV1"
v-model:validate="validate" v-model:validate="validate"
:maxlength="20" :maxlength="20"
show-count show-count
:type="2" :type="2"
@@ -2278,7 +2277,11 @@
<span>{{ currentPlanItem.teacher }}</span> <span>{{ currentPlanItem.teacher }}</span>
</div> </div>
<div class="stmm_i5"> <div class="stmm_i5">
<TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns"> <TableStudent
:type="3"
:id="offcoursePlanId"
:columns="stuColumns"
>
<!-- <template #extension = "data">--> <!-- <template #extension = "data">-->
<!-- <div style="display: flex">--> <!-- <div style="display: flex">-->
<!-- <button @click="handlJoinStu(data)">成绩录入</button>--> <!-- <button @click="handlJoinStu(data)">成绩录入</button>-->
@@ -3732,7 +3735,7 @@ export default defineComponent({
codevisible: false, //二维码弹窗 codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容 codeInfo: null, //二维码内容
codeUrl: codeUrl, codeUrl: codeUrl,
// 课程三级分类 // 课程三级分类
options2222: [ options2222: [
{ {
@@ -4658,7 +4661,6 @@ export default defineComponent({
} }
console.log("state.validate", state.validate); console.log("state.validate", state.validate);
if (!state.validate) { if (!state.validate) {
message.destroy(); message.destroy();

61
src/views/learningpath/LevelAddDetail.vue
View File

@@ -4,7 +4,7 @@
<div class="left clearfix"> <div class="left clearfix">
<div class="leftmain"> <div class="leftmain">
<div class="tit" style="margin-left: 18px">关卡</div> <div class="tit" style="margin-left: 18px">关卡</div>
<div class="btn btn3" @click="showModal()" style="margin-left: 19px"> <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
<div class="search"></div> <div class="search"></div>
<div class="btnText">添加关卡</div> <div class="btnText">添加关卡</div>
</div> </div>
@@ -206,7 +206,8 @@
<router-link to="/leveladd"> <router-link to="/leveladd">
<div style="display: flex"> <div style="display: flex">
<img <img
class="img2" style="margin-right:22px;" class="img2"
style="margin-right: 22px"
src="../../assets/images/leveladd/back.png" src="../../assets/images/leveladd/back.png"
/> />
<div class="return">返回</div> <div class="return">返回</div>
@@ -688,7 +689,7 @@
</div> </div>
</div> </div>
<div style="width: 87px; text-align: center"> <div style="width: 87px; text-align: center">
{{ element.cretime }}分钟 {{ element.cretime ? element.cretime + "分钟" : "-" }}
</div> </div>
<div <div
style=" style="
@@ -1309,22 +1310,21 @@ export default {
api api
.deleteChapter(obj) .deleteChapter(obj)
.then((res) => { .then((res) => {
if(res.data.code==200){ if (res.data.code == 200) {
console.log("删除关卡成功", res); console.log("删除关卡成功", res);
message.destroy(); message.destroy();
message.success("删除关卡成功"); message.success("删除关卡成功");
let chapter = localStorage.getItem("chapterId") let chapter = localStorage.getItem("chapterId");
if(state.deleteChapterId == chapter){ if (state.deleteChapterId == chapter) {
localStorage.removeItem("chapterId") localStorage.removeItem("chapterId");
} }
closeDeleteChapter(); closeDeleteChapter();
getDetail(); getDetail();
}else if(res.data.code==-1){ } else if (res.data.code == -1) {
message.destroy(); message.destroy();
message.success("至少保留一个关卡"); message.success("至少保留一个关卡");
closeDeleteChapter(); closeDeleteChapter();
} }
}) })
.catch((err) => { .catch((err) => {
console.log("删除关卡失败", err); console.log("删除关卡失败", err);
@@ -1418,13 +1418,16 @@ export default {
state.chooseProjectList = JSON.stringify(state.level[i].taskList); state.chooseProjectList = JSON.stringify(state.level[i].taskList);
console.log("state.level[i].taskList", state.level[i].taskList); console.log("state.level[i].taskList", state.level[i].taskList);
state.level[i].taskList.forEach((element) => { state.level[i].taskList.forEach((element) => {
// console.log("element", element); console.log("element", element);
let obj = { let obj = {
id: element.routerTaskId, id: element.routerTaskId,
key: element.routerTaskId, key: element.routerTaskId,
lei: checkType(element.type), lei: checkType(element.type),
creater: element.name, creater: element.name,
cretime: element.duration, cretime:
element.duration || element.duration == 0
? element.duration
: "-",
checked1: element.flag, checked1: element.flag,
routerTaskId: element.routerTaskId, routerTaskId: element.routerTaskId,
courseId: element.courseId, courseId: element.courseId,
@@ -1466,7 +1469,7 @@ export default {
? JSON.parse(localStorage.getItem("chapterId")) ? JSON.parse(localStorage.getItem("chapterId"))
: null; : null;
console.log("chapter", chapter); console.log("chapter", chapter);
if (chapter >0) { if (chapter > 0) {
dataAssignment(chapter); //用哪个的任务表 dataAssignment(chapter); //用哪个的任务表
state.isactive = chapter; //哪个亮 state.isactive = chapter; //哪个亮
} else { } else {
@@ -1535,13 +1538,13 @@ export default {
align: "center", align: "center",
className: "h", className: "h",
}, },
// { // {
// title: "岗位", // title: "岗位",
// dataIndex: "gang", // dataIndex: "gang",
// key: "gang", // key: "gang",
// width: 110, // width: 110,
// align: "center", // align: "center",
// className: "h", // className: "h",
// }, // },
{ {
title: "当前关卡", title: "当前关卡",
@@ -1551,14 +1554,14 @@ export default {
align: "center", align: "center",
className: "h", className: "h",
}, },
{ {
title: "进度", title: "进度",
dataIndex: "jin", dataIndex: "jin",
key: "jin", key: "jin",
width: 110, width: 110,
align: "center", align: "center",
className: "h", className: "h",
}, },
{ {
title: "开始时间", title: "开始时间",
dataIndex: "time", dataIndex: "time",
@@ -1853,7 +1856,7 @@ export default {
let obj = { let obj = {
chapterId: ele.chapterId, chapterId: ele.chapterId,
courseId: ele.courseId, courseId: ele.courseId,
duration: ele.cretime, duration: ele.cretime == "-" ? 0 : ele.cretime,
flag: ele.checked1, flag: ele.checked1,
name: ele.creater, name: ele.creater,
routerId: ele.routerId, routerId: ele.routerId,
@@ -2667,7 +2670,7 @@ export default {
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex; display: flex;
justify-content: center; justify-content: center;
min-height:512px; min-height: 512px;
.boomcen { .boomcen {
width: 95%; width: 95%;
// height: 100%; // height: 100%;

99
src/views/projectcenter/TaskAdd.vue
View File

@@ -316,7 +316,7 @@
<!-- 添加外链侧弹窗 --> <!-- 添加外链侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddDiscuss"> <div class="item" @click="showDrawerAddDiscuss">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -407,9 +407,9 @@
v-model:EditInvistId="EditInvistId" v-model:EditInvistId="EditInvistId"
/> />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddVote"> <div class="item" @click="showDrawerAddVote">
@@ -437,9 +437,7 @@
</div> </div>
</div> </div>
--> --></div>
</div>
<div class="boom"> <div class="boom">
<div class="boomcen"> <div class="boomcen">
<div class="onerow"> <div class="onerow">
@@ -632,7 +630,11 @@
</div> </div>
</div> </div>
<div style="width: 87px; text-align: center"> <div style="width: 87px; text-align: center">
{{ element.cretime }}分钟 {{
element.cretime
? element.cretime + "分钟"
: "-"
}}
</div> </div>
<div <div
style=" style="
@@ -1026,7 +1028,7 @@
<div class="close_exit" @click="closeDeleteStage"></div> <div class="close_exit" @click="closeDeleteStage"></div>
</div> </div>
<div class="body"> <div class="body">
<span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span> <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn1" @click="closeDeleteStage"> <div class="del_btn btn1" @click="closeDeleteStage">
@@ -1082,7 +1084,7 @@ export default {
AddTest, AddTest,
AddLive, AddLive,
AddRef, AddRef,
// AddDiscuss, // AddDiscuss,
AddActive, AddActive,
AddEval, AddEval,
AddInvist, AddInvist,
@@ -1094,8 +1096,9 @@ export default {
const route = useRoute(); const route = useRoute();
const state = reactive({ const state = reactive({
projectId: route.query.projectId, projectId: route.query.projectId,
chooseStageId: null, chooseStageId: null,
removeStageId: null, removeStageId: null,
onceChoice: true,
edit: false, edit: false,
isLevel: 2, //学习路径1项目2模板库3 isLevel: 2, //学习路径1项目2模板库3
// isRefEdit: 1, //外链编辑 // isRefEdit: 1, //外链编辑
@@ -1222,7 +1225,8 @@ export default {
? "投票" ? "投票"
: "-", : "-",
creater: value.name, creater: value.name,
cretime: value.duration ? value.duration : "-", cretime:
value.duration || value.duration == 0 ? value.duration : "-",
checked1: value.flag ? true : false, checked1: value.flag ? true : false,
checked: false, //是否选中类型 checked: false, //是否选中类型
courseId: value.courseId, courseId: value.courseId,
@@ -1253,7 +1257,8 @@ export default {
array.push(obj); array.push(obj);
} }
}); });
state.level = array; console.log(array)
state.level = array.sort((a,b)=>{ return a.id - b.id });
}; };
const tableDataFunc = () => { const tableDataFunc = () => {
@@ -1391,12 +1396,26 @@ export default {
}; };
await api.getTask(obj).then((res) => { await api.getTask(obj).then((res) => {
console.log("22222", res.data.data.stageList); console.log("22222", res.data.data.stageList);
if(state.onceChoice){
let data = res.data.data.stageList;
state.onceChoice = false;
let arraynew = []
for(let i=0;i<data.length;i++){
if(data[i].stageId!=='0'){
arraynew.push(data[i])
}
}
console.log(arraynew)
state.chooseStageId = Number(arraynew[arraynew.length-1].stageId);
}
state.projectTitle = res.data.data.projectInfo.name; state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl; state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList; state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList); getStageData(res.data.data.stageList);
updateStageChoosd(); updateStageChoosd();
}); });
}; };
@@ -1620,7 +1639,7 @@ export default {
const showDeleteStage = (id) => { const showDeleteStage = (id) => {
state.deleteStageId = id; state.deleteStageId = id;
state.deleteStageModal = true; state.deleteStageModal = true;
console.log(state.level) console.log(state.level);
}; };
//关闭删除阶段弹窗 //关闭删除阶段弹窗
const closeDeleteStage = () => { const closeDeleteStage = () => {
@@ -1759,35 +1778,35 @@ export default {
// 删除所有阶段 // 删除所有阶段
const removeAllLevel = () => { const removeAllLevel = () => {
// state.cancelModal = false; // state.cancelModal = false;
console.log(state.level) console.log(state.level);
let removeArr = state.level; let removeArr = state.level;
for(let i=0;i<removeArr.length;i++){ for (let i = 0; i < removeArr.length; i++) {
let obj = { let obj = {
stageId: removeArr[i].id stageId: removeArr[i].id,
} };
apistage apistage
.deleteStage(obj) .deleteStage(obj)
.then((res) => { .then((res) => {
console.log("删除阶段成功", res); console.log("删除阶段成功", res);
if(removeArr.length-1==i){ if (removeArr.length - 1 == i) {
message.destroy(); message.destroy();
message.success("删除全部阶段成功"); message.success("删除全部阶段成功");
closeDeleteStage(); closeDeleteStage();
localStorage.setItem("stageId", ""); localStorage.setItem("stageId", "");
getTask(); getTask();
state.cancelModal = false; state.cancelModal = false;
} }
}) })
.catch((err) => { .catch((err) => {
if(removeArr.length-1==i){ if (removeArr.length - 1 == i) {
console.log("删除阶段失败", err); console.log("删除阶段失败", err);
message.destroy(); message.destroy();
message.success("删除全部阶段失败"); message.success("删除全部阶段失败");
state.cancelModal = false; state.cancelModal = false;
} }
}); });
} }
} };
//选择单个任务 //选择单个任务
const changeRow = (e) => { const changeRow = (e) => {
@@ -1993,7 +2012,7 @@ export default {
temporaryStorage, temporaryStorage,
submitStorage, submitStorage,
cancelStorage, cancelStorage,
removeAllLevel removeAllLevel,
}; };
}, },
}; };

57
src/views/projectcenter/temTask.vue
View File

@@ -329,7 +329,7 @@
<!-- 添加外链侧弹窗 --> <!-- 添加外链侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddDiscuss"> <div class="item" @click="showDrawerAddDiscuss">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -427,7 +427,7 @@
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddVote"> <div class="item" @click="showDrawerAddVote">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -455,7 +455,6 @@
</div> </div>
</div> </div>
--> -->
</div> </div>
<div class="boom"> <div class="boom">
<div class="boomcen"> <div class="boomcen">
@@ -649,7 +648,7 @@
</div> </div>
</div> </div>
<div style="width: 87px; text-align: center"> <div style="width: 87px; text-align: center">
{{ element.cretime }}分钟 {{ element.cretime ? element.cretime + "分钟" : "-" }}
</div> </div>
<div <div
style=" style="
@@ -1389,7 +1388,7 @@ export default {
? "投票" ? "投票"
: "-", : "-",
creater: value.name, creater: value.name,
cretime: Number(value.duration) > 0 ? value.duration : "-", cretime: value.duration || value.duration == 0 ? value.duration : "-",
checked1: value.flag ? true : false, checked1: value.flag ? true : false,
checked: false, //是否选中类型 checked: false, //是否选中类型
courseId: value.courseId, courseId: value.courseId,
@@ -1402,12 +1401,16 @@ export default {
state.tableData = array; state.tableData = array;
console.log("state.tableData", state.tableData); console.log("state.tableData", state.tableData);
}; };
//把阶段放到level里 //把阶段放到level里
const getStageData = (tableData) => { const getStageData = (tableData) => {
let data = tableData; let data = tableData;
let array = []; let array = [];
data.map((value) => { data.map((value) => {
console.log("dd",Number(value.templateStageId) ,Number(value.templateStageId) > 0); console.log(
"dd",
Number(value.templateStageId),
Number(value.templateStageId) > 0
);
if (Number(value.templateStageId) > 0) { if (Number(value.templateStageId) > 0) {
let obj = { let obj = {
id: value.templateStageId, id: value.templateStageId,
@@ -1624,19 +1627,18 @@ export default {
}); });
};*/ };*/
//获取任务列表 //获取任务列表
const getTask = async () => { const getTask = async () => {
await api
await api .templateDetail(localStorage.getItem("projectTemplateId"))
.templateDetail(localStorage.getItem("projectTemplateId")).then((res) => { .then((res) => {
console.log("22222", res.data.data.stageList); console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectTemplateInfo.name; state.projectTitle = res.data.data.projectTemplateInfo.name;
state.picUrl = res.data.data.projectTemplateInfo.picUrl; state.picUrl = res.data.data.projectTemplateInfo.picUrl;
state.stageList = res.data.data.stageList; state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList); getStageData(res.data.data.stageList);
updateStageChoosd(); updateStageChoosd();
});
});
}; };
function updateStageChoosd() { function updateStageChoosd() {
@@ -1659,9 +1661,15 @@ export default {
getTableData(state.stageList[0].taskList); getTableData(state.stageList[0].taskList);
return; return;
} }
console.log(state.chooseStageId,state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList,state.stageList); console.log(
state.chooseStageId,
state.stageList.find((e) => e.templateStageId == state.chooseStageId)
?.taskList,
state.stageList
);
getTableData( getTableData(
state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList state.stageList.find((e) => e.templateStageId == state.chooseStageId)
?.taskList
); );
} }
@@ -1956,10 +1964,9 @@ export default {
console.log("state.level", id, state.level); console.log("state.level", id, state.level);
state.chooseStageId = id; state.chooseStageId = id;
let final = state.level.find((item) => item.id === id); let final = state.level.find((item) => item.id === id);
if(final !=null){ if (final != null) {
getTableData(final.taskList); getTableData(final.taskList);
} }
}; };
//选择单个任务 //选择单个任务