feat:合并

This commit is contained in:
lixg
2022-12-04 14:17:26 +08:00
2 changed files with 667 additions and 486 deletions

View File

@@ -988,7 +988,8 @@
</div>
</div>
</div>
</div></a-modal
</div>
</a-modal
>
<!-- 是否删除阶段弹窗 -->
@@ -1047,6 +1048,7 @@ import { storage } from "../../api/storage";
// import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import * as api1 from "../../api/index1";
import {useRouter} from "vue-router";
export default {
name: "TaskAdd",
components: {
@@ -1097,6 +1099,7 @@ export default {
projectTaskId: null, // 要编辑的具体任务id
//阶段数据
level: [],
stageList: [],
projectTitle: null,
picUrl: null,
@@ -1369,6 +1372,7 @@ export default {
// console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList;
let leng = res.data.data.stageList.length;
if (leng > 0) {
let stage = localStorage.getItem("stageId")
@@ -1603,6 +1607,10 @@ export default {
console.log("添加阶段失败", err);
});
} else {
//默认阶段
if (state.stageList.length === 1 && !state.stageList.name) {
}
let obj = {
name: state.valuesname,
projectId: state.projectId,
@@ -1978,13 +1986,16 @@ export default {
.ant-modal {
width: 424px !important;
height: 258px !important;
.ant-modal-content {
width: 424px !important;
height: 258px !important;
.ant-modal-body {
width: 424px !important;
height: 258px !important;
padding: 0 !important;
.delete {
z-index: 999;
width: 424px;
@@ -1992,6 +2003,7 @@ export default {
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
.del_header {
position: absolute;
width: calc(100%);
@@ -2001,15 +2013,18 @@ export default {
rgba(78, 166, 255, 0) 100%
);
}
.del_main {
width: 100%;
position: relative;
.header {
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.icon {
width: 16px;
height: 16px;
@@ -2017,6 +2032,7 @@ export default {
background-image: url(@/assets/images/coursewareManage/QR.png);
background-size: 100% 100%;
}
.close_exit {
position: absolute;
right: 42px;
@@ -2027,6 +2043,7 @@ export default {
background-size: 100% 100%;
}
}
.body {
width: 100%;
margin: 34px auto 56px auto;
@@ -2035,6 +2052,7 @@ export default {
align-items: center;
flex-direction: column;
position: relative;
.back {
position: absolute;
top: 30px;
@@ -2043,10 +2061,12 @@ export default {
color: #666666;
}
}
.del_btnbox {
display: flex;
margin: 30px auto;
justify-content: center;
.del_btn {
width: 100px;
height: 40px;
@@ -2058,17 +2078,20 @@ export default {
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.btn1 {
border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff;
margin-right: 14px;
}
.btn2 {
background-color: #4ea6ff;
color: #ffffff;
@@ -2080,10 +2103,12 @@ export default {
}
}
}
.addstage {
.ant-modal {
.ant-modal-body {
padding: 0 !important;
.modalHeader {
background: linear-gradient(
0deg,
@@ -2091,11 +2116,13 @@ export default {
rgba(78, 166, 255, 0.2) 100%
);
}
.modalMain {
.ant-input-textarea-show-count {
position: relative;
height: 88px;
}
.ant-input-textarea-show-count::after {
position: absolute;
right: 10px;
@@ -2110,25 +2137,30 @@ export default {
display: flex;
margin-top: 20px;
align-items: center;
.namebox {
width: 120px;
display: flex;
align-items: center;
justify-content: flex-end;
flex-shrink: 0;
.nameimg {
width: 10px;
height: 10px;
}
}
.d {
margin-top: 8px;
font-size: 25px;
color: #ff4e4e;
}
.box {
position: relative;
margin-left: 14px;
.box1 {
position: absolute;
left: 50%;
@@ -2138,6 +2170,7 @@ export default {
margin-top: -5px;
border-top: 2px solid rgba(78, 166, 255, 1);
}
.box2 {
position: absolute;
left: 50%;
@@ -2147,18 +2180,22 @@ export default {
border-left: 2px solid rgba(78, 166, 255, 1);
}
}
.inname {
color: #000000;
font-size: 14px;
margin-left: 7px;
}
.in {
margin-left: 14px;
flex: 1;
.ant-input-affix-wrapper {
width: 384px;
border-radius: 8px;
}
.ant-input {
border-radius: 8px;
height: 30px;
@@ -2166,17 +2203,21 @@ export default {
}
}
}
.moveModal {
.ant-modal {
width: 549px !important;
height: 245px !important;
.ant-modal-content {
width: 549px !important;
height: 245px !important;
.ant-modal-body {
padding: 0 !important;
width: 549px !important;
height: 245px !important;
.con {
width: 100%;
height: 100%;
@@ -2192,12 +2233,14 @@ export default {
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
.inhe {
width: 80%;
height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
.mod {
left: 30px;
top: 27px;
@@ -2206,11 +2249,13 @@ export default {
height: 17px;
background-image: url(../../assets/images/leveladd/mod.png);
}
.tz {
color: #000000;
font-weight: 400;
font-size: 16px;
}
.mg {
width: 20px;
height: 20px;
@@ -2220,26 +2265,32 @@ export default {
}
}
}
.mid {
width: 100%;
display: flex;
height: 100%;
justify-content: center;
.inher {
width: 80%;
height: 100%;
.cur {
color: #6f6f6f;
font-size: 14px;
}
.select {
margin-top: 10px;
}
.btn {
width: 100%;
display: flex;
justify-content: center;
margin-top: 30px;
.sameb {
width: 100px;
height: 40px;
@@ -2247,11 +2298,13 @@ export default {
border-radius: 8px;
}
.btn1 {
color: #4ea6ff;
background: #ffffff;
border: 1px solid #4ea6ff;
}
.btn2 {
margin-left: 16px;
border: 0;
@@ -2266,12 +2319,14 @@ export default {
}
}
}
.taskadd {
width: 100%;
display: flex;
flex-direction: column;
min-width: 933px;
background-color: rgba(245, 247, 250, 1);
.left {
margin-right: 20px;
width: 208px;
@@ -2279,8 +2334,10 @@ export default {
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
display: flex;
justify-content: center;
.leftmain {
margin-top: 20px;
.tit {
margin-left: 20px;
font-size: 18px;
@@ -2297,9 +2354,11 @@ export default {
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
@@ -2312,6 +2371,7 @@ export default {
.btn3 {
width: 171px;
margin-right: 0px;
.search {
width: 17px;
height: 18px;
@@ -2319,6 +2379,7 @@ export default {
background-size: 100% 100%;
}
}
.maincon {
margin-top: 17px;
width: 208px;
@@ -2329,6 +2390,7 @@ export default {
.ghost {
opacity: 0 !important;
}
.items {
width: 171px;
background: rgba(255, 182, 78, 0.1);
@@ -2340,14 +2402,17 @@ export default {
padding: 16px;
opacity: 0.5;
cursor: pointer;
.items1 {
margin-bottom: 12px;
display: flex;
justify-content: space-between;
align-items: center;
.boxs_left {
display: flex;
align-items: center;
.script {
display: flex;
justify-content: center;
@@ -2359,6 +2424,7 @@ export default {
margin-right: 12px;
white-space: nowrap;
}
.imgIcon {
width: 16px;
height: 16px;
@@ -2366,6 +2432,7 @@ export default {
background-size: 100% 100%;
}
}
.boxs_right {
.imgIcon {
width: 16px;
@@ -2375,6 +2442,7 @@ export default {
}
}
}
.items2 {
.nname {
width: 140px;
@@ -2388,16 +2456,19 @@ export default {
}
}
}
.active {
opacity: 1;
}
}
}
}
.right {
flex: 1;
display: flex;
flex-direction: column;
.addhead {
width: 100%;
background-color: #fff;
@@ -2405,6 +2476,7 @@ export default {
display: flex;
align-items: center;
position: relative;
.filt {
margin: 16px 30px 16px 22px;
display: flex;
@@ -2412,26 +2484,32 @@ export default {
width: 100%;
align-items: center;
flex-wrap: wrap;
.le {
display: flex;
align-items: center;
.leftimg {
width: 151px;
height: 100px;
border: 10px solid #e7f2ff;
border-radius: 8px;
margin-left: 20px;
.img {
width: 100%;
height: 100%;
}
}
.imgfor {
margin-left: 32px;
.forz {
color: #363636;
font-size: 16px;
}
.fort {
color: #878b92;
font-size: 14px;
@@ -2444,11 +2522,13 @@ export default {
height: 100%;
display: flex;
align-items: center;
.select {
display: flex;
align-items: center;
white-space: nowrap;
margin-right: 56px;
.inputbox {
display: flex;
align-items: center;
@@ -2456,10 +2536,12 @@ export default {
width: 238px;
height: 40px;
border-radius: 8px;
input {
border: none;
outline: none;
}
.bottonbox {
width: 100px;
height: 40px;
@@ -2470,6 +2552,7 @@ export default {
align-items: center;
cursor: pointer;
flex-shrink: 0;
.btnText {
font-size: 14px;
font-weight: 400;
@@ -2480,17 +2563,20 @@ export default {
}
}
}
.line {
height: 60px;
width: 1px;
background-color: #e8effa;
margin-right: 18px;
}
.img2 {
width: 42px;
height: 42px;
margin-right: 18px;
}
.pub {
color: #57c887;
font-size: 14px;
@@ -2499,6 +2585,7 @@ export default {
cursor: pointer;
white-space: nowrap;
}
@media screen and (max-width: 1050px) {
.pub {
margin-right: 10px;
@@ -2507,6 +2594,7 @@ export default {
margin-right: 10px;
}
}
.return {
color: #4ea6ff;
font-size: 14px;
@@ -2525,6 +2613,7 @@ export default {
cursor: pointer;
position: relative;
margin-right: 20px;
.roleArrow {
width: 13px;
height: 7px;
@@ -2532,6 +2621,7 @@ export default {
background-image: url(../../assets/images/navtop/down.png);
background-size: 100%;
}
.roleItems {
width: 109px;
height: 90px;
@@ -2545,19 +2635,23 @@ export default {
display: none;
z-index: 100;
}
.roleItem {
font-size: 14px;
font-weight: 400;
color: rgba(79, 81, 86, 1);
line-height: 36px;
}
.roleItem:hover {
color: #4ea6ff;
}
}
.role:hover .roleItems {
display: block;
}
.role:hover .roleArrow {
background-image: url(../../assets/images/navtop/up.png);
}
@@ -2574,10 +2668,12 @@ export default {
display: flex;
align-items: center;
flex-wrap: wrap;
.item {
height: 115px;
display: flex;
align-items: center;
.itcon {
display: flex;
flex-direction: column;
@@ -2587,9 +2683,11 @@ export default {
width: 100%;
margin-left: 38px;
margin-right: 38px;
.img {
cursor: pointer;
}
.text {
font-size: 16px;
color: #363636;
@@ -2597,16 +2695,19 @@ export default {
white-space: nowrap;
}
}
.lin {
width: 1px;
height: 60%;
background-color: #e8effa;
}
.no {
display: none;
}
}
}
.boom {
width: 100%;
flex: 1;
@@ -2614,19 +2715,23 @@ export default {
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex;
justify-content: center;
.boomcen {
width: 95%;
.onerow {
width: 100%;
display: flex;
height: 40px;
position: relative;
margin-top: 20px;
.taskmain {
font-size: 18px;
color: #000000;
margin-top: 10px;
}
.btn {
position: absolute;
top: 0;
@@ -2639,6 +2744,7 @@ export default {
color: #ffffff;
cursor: pointer;
}
.edit {
position: absolute;
right: 0;
@@ -2648,6 +2754,7 @@ export default {
height: 40px;
border: 1px solid #409eff;
border-radius: 8px;
.editimg {
width: 15px;
height: 15px;
@@ -2655,23 +2762,28 @@ export default {
margin-left: 25px;
margin-right: 5px;
}
.editext {
line-height: 40px;
}
}
.edit:hover {
color: #ffffff;
background-color: #409eff;
cursor: pointer;
.editimg {
background-image: url("../../assets/images/projectadd/delete1.png");
}
}
}
.notable {
width: 100%;
display: flex;
justify-content: center;
.notablebox {
width: 412px;
height: 212px;
@@ -2684,6 +2796,7 @@ export default {
margin-bottom: 109px;
cursor: pointer;
position: relative;
.smallleft {
position: absolute;
top: 18px;
@@ -2693,6 +2806,7 @@ export default {
border-radius: 0px 4px 4px 0px;
background-color: #ffb64e;
}
.smallright {
position: absolute;
bottom: 18px;
@@ -2702,6 +2816,7 @@ export default {
border-radius: 4px 0px 0px 4px;
background-color: #ffb64e;
}
.boxbody {
.boximg {
width: 72px;
@@ -2710,14 +2825,17 @@ export default {
background-image: url(@/assets/images/coursewareManage/nostate.png);
background-size: 100% 100%;
}
.boxtitle {
margin-bottom: 4px;
}
}
}
}
.rwbox {
position: relative;
.talk {
margin-top: 24px;
margin-bottom: 11px;
@@ -2727,57 +2845,71 @@ export default {
border: 1px solid #4ea6ff;
display: flex;
align-items: center;
.im {
width: 14px;
height: 15px;
margin-left: 27px;
}
.xu {
height: 100%;
line-height: 50px;
margin-left: 13px;
.yi {
color: #4f5156;
font-size: 14px;
}
.zon {
color: #999ba3;
font-size: 14px;
margin-left: 34px;
}
.th {
color: #4ea6ff;
}
}
}
.tableBox {
margin-bottom: 20px;
margin-top: 20px;
.chosen {
background-color: #f2f6fc;
opacity: 1;
}
.ghost {
opacity: 0;
}
.tableRow:hover {
background-color: #f2f6fc;
}
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
@@ -2787,6 +2919,7 @@ export default {
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
@@ -2806,14 +2939,17 @@ export default {
display: flex;
align-items: center;
justify-content: center;
.ant-switch-checked {
background-color: #5dc988;
}
.showt {
display: flex;
margin-left: 10px;
height: 23px;
position: relative;
.bi {
width: 63px;
height: 23;
@@ -2824,6 +2960,7 @@ export default {
color: #ffffff;
border-radius: 4px;
}
.xuan {
width: 63px;
height: 23px;
@@ -2837,19 +2974,23 @@ export default {
}
}
}
.racona {
display: flex;
align-items: center;
height: 100%;
.img {
width: 17px;
height: 14px;
background-image: url("../../assets/images/leveladd/z1.png");
}
.ch {
margin-left: 10px;
}
}
.footbtn {
width: 100%;
height: 80px;
@@ -2858,10 +2999,12 @@ export default {
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex;
justify-content: end;
.btnbox {
display: flex;
margin-right: 36px;
height: 80px;
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
@@ -2874,6 +3017,7 @@ export default {
margin: 21px 0px 19px 14px;
cursor: pointer;
white-space: nowrap;
.btnText {
font-size: 14px;
font-weight: 400;
@@ -2881,14 +3025,18 @@ export default {
margin-left: 5px;
}
}
.btn1 {
background-color: #409eff;
.btnText {
color: #ffffff;
}
}
.btn2 {
background-color: #ffffff;
.btnText {
color: #409eff;
}

View File

@@ -343,7 +343,14 @@
<span class="editext">编辑</span>
</router-link>
</div> -->
<div class="taskSyllabus">
<div
class="taskSyllabus"
v-if="
taskSyllabus &&
taskSyllabus.length &&
(taskSyllabus.length > 1 || taskSyllabus[0].name)
"
>
<a-collapse v-model:activeKey="taskSyllabusActive" accordion>
<template #expandIcon="{ isActive }">
<img
@@ -550,6 +557,31 @@
</router-link>
<!-- 无数据创建任务 -->
</div>
<div v-else>
<div
class="taskbox"
@click="
() => {
routered.push({ path: '/taskadd' });
}
"
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
>
<div class="leftt">
<img src="../../assets/images/taskpage/left1.png" />
</div>
<div class="photo">
<img src="../../assets/images/taskpage/picture1.png" />
</div>
<div class="rightt">
<img src="../../assets/images/taskpage/right1.png" />
</div>
<div class="centerbox" style="color: rgba(255, 182, 78, 1)">
添加任务
</div>
<div class="centermain">快速添加任务/阶段</div>
</div>
</div>
<div style="display: flex; height: 20px"></div>
</div>
</a-tab-pane>
@@ -3842,6 +3874,7 @@ export default {
changeGrouped,
deFile,
toDate,
routered,
};
},
};