feat:编辑测评选择测评选项可以回显,修复删除后tag没清除,修改时间的传参;管理的催促提示修改

This commit is contained in:
Ggysh-7
2022-11-25 21:54:57 +08:00
parent 586d06148f
commit 142e923d05
10 changed files with 202 additions and 453 deletions

View File

@@ -10,19 +10,11 @@
@click="showCancel"
/>
</div>
<!-- @click="showModal" -->
<div class="btn btn3" @click="showModal()" style="margin-left: 19px">
<div class="search"></div>
<div class="btnText">添加阶段</div>
</div>
<div class="maincon" style="background-color: #fff">
<!-- <div
class="items"
:class="{ active: isActive == true }"
@click="changebgc"
v-for="item in level"
:key="item.id"
> -->
<draggable
v-model="level"
@@ -691,12 +683,6 @@
</div> -->
</div>
</div>
<!-- 编辑在线侧弹窗 -->
<div>
<edit-online v-model:editonlineVisible="editonlinevisible" />
</div>
<!-- 编辑在线侧弹窗 -->
</div>
</div>
</div>
@@ -1034,7 +1020,6 @@
<script>
import { reactive, toRefs, onMounted, onUnmounted, onUpdated } from "vue";
import AddOnline from "../../components/drawers/AddOnline.vue";
import EditOnline from "../../components/drawers/EditOnline.vue";
import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
import AddCase from "../../components/drawers/AddCase.vue";
import AddHomework from "../../components/drawers/AddHomework.vue";
@@ -1055,50 +1040,11 @@ import { storage } from "../../api/storage";
import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import * as api1 from "../../api/index1";
const drawercolumns = [
{
title: "项目名称",
dataIndex: "projectName",
key: "projectName",
width: 200,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽
// customRender: (text, record) => {
// console.log(text, record);
// return <span>{text.text}</span>;
// },
},
{
title: "项目经理",
dataIndex: "manager",
key: "manager",
width: 100,
align: "center",
},
{
title: "创建人",
dataIndex: "creater",
// width: "30%",
key: "creater",
width: 100,
align: "center",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width: 180,
align: "center",
},
];
export default {
name: "TaskAdd",
components: {
draggable,
AddOnline,
EditOnline,
AddFaceteach,
AddCase,
AddHomework,
@@ -1136,45 +1082,11 @@ export default {
EditOnlineId: null, //要编辑的在线id
EditFaceTeach: null,
EditFaceId: null,
EditEvalId: null,
EditEvalId: null, //要编辑的测评id
EditInvistId: null,
EditVoteId: null, //编辑需要投票的id
ballotId: "", //编辑需要的题干id
projectTaskId: null, // 要编辑的具体任务id
projectNameList: [
{
id: 1,
value: "项目一",
label: "项目一",
},
{
id: 2,
value: "项目二",
label: "项目二",
},
{
id: 3,
value: "项目三",
label: "项目三",
},
{
id: 4,
value: "项目四",
label: "项目四",
},
],
projectNameList2: [
{
id: 1,
value: "删除任务",
label: "删除任务",
},
{
id: 2,
value: "移动任务到关卡",
label: "移动任务到关卡",
},
],
//阶段数据
level: [],
@@ -1182,93 +1094,12 @@ export default {
picUrl: null,
//任务数据
tableData: [],
drawertableData: [
{
key: 1,
projectName: "管理者进阶",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
children: [
{
key: "1-1",
projectName: "管理者进阶-腾飞班",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
children: [
{
key: "1-1-1",
projectName: "管理者进阶-腾飞班K1",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
],
},
],
},
{
key: 2,
projectName: "管理者进阶",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
children: [
{
key: "2-1",
projectName: "管理者进阶-腾飞班",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
children: [
{
key: "2-1-1",
projectName: "管理者进阶-腾飞班K1",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
],
},
],
},
{
key: 3,
projectName: "管理者进阶-腾飞班K1",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
{
key: 4,
projectName: "管理者进阶-腾飞班K1",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
{
key: 5,
projectName: "管理者进阶-腾飞班K1",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
{
key: "1-1-1",
projectName: "管理者进阶-腾飞班K1",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
},
],
currentPage: 1,
tableDataTotal: 100,
pageSize: 10,
addonlinevisible: false,
addfaceteachvisible: false,
addcasevisible: false,
editonlinevisible: false,
addhomeworkvisible: false,
addtestvisible: false,
addlivevisible: false,
@@ -1488,7 +1319,6 @@ export default {
<div class="opacation">
<span
onClick={() => {
state.editonlinevisible = true;
console.log(text, "编辑text");
}}
style="color:#4EA6FF;margin-right:25px;cursor:pointer"
@@ -1600,8 +1430,7 @@ export default {
api
.deleteTask(obj)
.then((res) => {
console.log(res, "gggggggggggggggg");
// deleteVoteText();
console.log(res);
})
.catch((err) => {
console.log(err);
@@ -1850,7 +1679,6 @@ export default {
state.projectTaskId = eleId;
state.adddiscussvisible = true;
};
const showDrawerAddActive = (id, eleId) => {
state.addactivevisible = true;
state.EditActiveId = id;
@@ -1859,8 +1687,7 @@ export default {
};
const showDrawerAddEval = (id, eleId) => {
state.addevalvisible = true;
// state.EditEvalId = id;
state.evaluationId = id;
state.EditEvalId = id;
state.projectTaskId = eleId;
};
const showDrawerAddInvist = (id, eleId) => {
@@ -1869,7 +1696,6 @@ export default {
state.projectTaskId = eleId;
};
const showDrawerAddVote = (id, eleId) => {
state.addvotevisible = true;
state.EditVoteId = id;
state.projectTaskId = eleId;
@@ -1985,13 +1811,6 @@ export default {
message.warning("修改失败");
});
};
//打开测评的弹窗
const showEditEvalDrawer = (id, eleId) => {
state.addevalvisible = true;
state.projectTaskId = eleId;
state.EditEvalId = id;
};
//编辑的按钮
const decideType = (type, id, eleId) => {
state.edit = true;
@@ -2001,7 +1820,7 @@ export default {
} else if (type == "直播") {
showDrawerAddLive(id, eleId);
} else if (type == "测评") {
showEditEvalDrawer(id, eleId);
showDrawerAddEval(id, eleId);
} else if (type == "评估") {
showDrawerAddInvist(id, eleId);
} else if (type == "投票") {
@@ -2049,9 +1868,7 @@ export default {
tableDataFunc,
showModal,
closeModal,
// showDrawer,
afterVisibleChange,
drawercolumns,
onSelectChange,
showDrawerOnline,
showDrawerFaceteach,
@@ -2063,7 +1880,6 @@ export default {
showDrawerAddDiscuss,
showDrawerAddActive,
showDrawerAddEval,
showEditEvalDrawer,
showDrawerAddInvist,
showDrawerAddVote,
showConfirm,
@@ -2104,12 +1920,6 @@ export default {
</script>
<style lang="scss">
// .ant-input {
// border-radius: 8px;
// // height: 120%;
// width: 384px;
// height: 88px;
// }
.ConfirmModal {
.ant-modal {
width: 424px !important;
@@ -2128,10 +1938,6 @@ export default {
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
// position: absolute;
// left: 50%;
// top: 10%;
// transform: translate(-50%, -50%);
.del_header {
position: absolute;
width: calc(100%);
@@ -2174,7 +1980,6 @@ export default {
justify-content: center;
align-items: center;
flex-direction: column;
// background-color: red;
position: relative;
.back {
position: absolute;
@@ -2248,12 +2053,9 @@ export default {
.name {
width: 78%;
// background-color: lightcoral;
display: flex;
margin-top: 20px;
align-items: center;
//height: 40px;
// border: 1px solid black;
.namebox {
width: 120px;
display: flex;
@@ -2287,7 +2089,6 @@ export default {
left: 50%;
top: 50%;
height: 50px;
//margin-left: -5px;
margin-top: -25px;
border-left: 2px solid rgba(78, 166, 255, 1);
}
@@ -2300,16 +2101,12 @@ export default {
.in {
margin-left: 14px;
flex: 1;
// .ant-radio-wrapper {
// }
.ant-input-affix-wrapper {
width: 384px;
border-radius: 8px;
}
.ant-input {
border-radius: 8px;
// height: 120%;
//width: 384px;
height: 30px;
}
}
@@ -2327,7 +2124,6 @@ export default {
width: 549px !important;
height: 245px !important;
.con {
// background-color: #bfa;
width: 100%;
height: 100%;
@@ -2416,133 +2212,20 @@ export default {
}
}
}
// .info {
// width: 78%;
// // background-color: lightcoral;
// display: flex;
// margin-top: 30px;
// // align-items: center;
// // height: 40px;
// // border: 1px solid black;
// .inname {
// color: #6f6f6f;
// font-size: 14px;
// margin-left: 26px;
// margin-top: 15px;
// }
// .in {
// margin-left: 14px;
// width: 81%;
// position: relative;
// .ant-input {
// border-radius: 5px;
// // height: 120%;
// width: 100%;
// height: 130px;
// resize: none;
// }
// }
// }
// .drawerStyle {
// .ant-drawer-content-wrapper {
// // max-width: 1000px;
// .ant-drawer-header {
// display: none !important;
// }
// .ant-drawer-body {
// padding: 0;
// }
// }
// .drawerMain {
// min-width: 600px;
// margin: 0px 32px 0px 32px;
// overflow-x: auto;
// display: flex;
// flex-direction: column;
// .header {
// height: 73px;
// border-bottom: 1px solid #e8e8e8;
// display: flex;
// justify-content: space-between;
// align-items: center;
// // background-color: red;
// margin-bottom: 20px;
// .headerTitle {
// font-size: 18px;
// font-weight: 600;
// color: #333333;
// line-height: 25px;
// // margin-left: 24px;
// }
// }
// .drawerbox {
// margin: 20px 38px 30px;
// th {
// background-color: #eff4fc !important;
// }
// .ant-table-tbody
// > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
// > td {
// background: #f6f9fd;
// }
// }
// .btnn {
// height: 72px;
// width: 100%;
// position: absolute;
// bottom: 0;
// left: 0;
// display: flex;
// align-items: center;
// justify-content: center;
// box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
// .btn1 {
// width: 100px;
// height: 40px;
// border: 1px solid #4ea6ff;
// border-radius: 8px;
// color: #4ea6ff;
// background-color: #fff;
// cursor: pointer;
// }
// .btn2 {
// cursor: pointer;
// width: 100px;
// height: 40px;
// background: #4ea6ff;
// border-radius: 8px;
// border: 0;
// margin-left: 15px;
// color: #fff;
// }
// }
// }
// }
.taskadd {
width: 100%;
display: flex;
flex-direction: column;
min-width: 933px;
// min-width: 1200px;
// overflow-x: hidden;
// min-width: 1400px;
// overflow: scroll;
background-color: rgba(245, 247, 250, 1);
.left {
margin-right: 20px;
width: 208px;
// height: 100%;
// flex: 1;
// height: 100%;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
display: flex;
justify-content: center;
.leftmain {
// width: 86%;
margin-top: 20px;
.tit {
margin-left: 20px;
@@ -2550,17 +2233,14 @@ export default {
color: #363636;
}
// flex-wrap: wrap;
.btn {
margin-top: 20px;
// padding: 0px 26px 0px 26px;
height: 38px;
background: #fff6e8;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
// margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
@@ -2570,7 +2250,6 @@ export default {
font-size: 14px;
font-weight: 400;
color: #ffb64e;
// line-height: 38px;
margin-top: 4px;
margin-left: 5px;
}
@@ -2594,12 +2273,10 @@ export default {
align-items: center;
.ghost {
// background-color: red;
opacity: 0 !important;
}
.items {
width: 171px;
// height: 83px;
background: rgba(255, 182, 78, 0.1);
border: 1px solid #ffb64e;
opacity: 0.45;
@@ -2647,9 +2324,6 @@ export default {
.items2 {
.nname {
width: 140px;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
font-weight: bold;
overflow: hidden;
@@ -2662,21 +2336,16 @@ export default {
}
.active {
opacity: 1;
// transition: all 0.5s;
}
}
}
}
.right {
flex: 1;
// background-color: #fff;
display: flex;
flex-direction: column;
.addhead {
width: 100%;
// min-width: 500px;
// height: 130px;
// flex: 1;
background-color: #fff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex;
@@ -2692,7 +2361,6 @@ export default {
.le {
display: flex;
align-items: center;
// margin-bottom: 10px;
.leftimg {
width: 151px;
height: 100px;
@@ -2719,11 +2387,7 @@ export default {
}
.rightt {
// width: 500px;
height: 100%;
// background-color: red;
// position: absolute;
// right: 0;
display: flex;
align-items: center;
.select {
@@ -2849,7 +2513,6 @@ export default {
.mid {
width: 100%;
// height: 130px;
margin-top: 20px;
margin-bottom: 20px;
background-color: #fff;
@@ -2859,7 +2522,6 @@ export default {
flex-wrap: wrap;
.item {
height: 115px;
// width: 7.7%;
display: flex;
align-items: center;
.itcon {
@@ -2900,8 +2562,6 @@ export default {
justify-content: center;
.boomcen {
width: 95%;
// height: 100%;
// background-color: #bfa;
.onerow {
width: 100%;
display: flex;
@@ -3011,7 +2671,6 @@ export default {
height: 50px;
background: #f5faff;
border: 1px solid #4ea6ff;
// opacity: 0.22;
display: flex;
align-items: center;
.im {
@@ -3045,15 +2704,11 @@ export default {
opacity: 1;
}
.ghost {
// background-color: red;
opacity: 0;
}
.tableRow:hover {
background-color: #f2f6fc;
}
// .tableRow: {
// background-color: #f2f6fc;
// }
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
@@ -3081,8 +2736,6 @@ export default {
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
@@ -3092,18 +2745,6 @@ export default {
}
}
}
// .drawerbox {
// // margin: 20px 38px 30px;
// th.h {
// background-color: #eff4fc !important;
// }
// .ant-table-tbody
// > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
// > td {
// background: #f6f9fd;
// }
// }
}
.opat {
@@ -3115,13 +2756,11 @@ export default {
background-color: #5dc988;
}
.showt {
// margin-top: 10px;
display: flex;
margin-left: 10px;
height: 23px;
position: relative;
.bi {
// margin-top: 10px;
width: 63px;
height: 23;
background-color: #5dc988;
@@ -3136,7 +2775,6 @@ export default {
height: 23px;
background-color: #f2f6fc;
line-height: 23px;
// display: none;
position: absolute;
z-index: 998;
color: #5dc988;
@@ -3153,8 +2791,6 @@ export default {
width: 17px;
height: 14px;
background-image: url("../../assets/images/leveladd/z1.png");
// position: absolute;
// left: -40px;
}
.ch {
margin-left: 10px;
@@ -3164,7 +2800,6 @@ export default {
width: 100%;
height: 80px;
margin-top: 16px;
// flex: 1;
background-color: #fff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex;