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

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

Browse Source
This commit is contained in:
dongwug
2022-11-07 11:45:03 +08:00
parent 666459a6e5 006a43743c
commit 033f1afe25
6 changed files with 303 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/indexLevel.js
View File

@@ -12,3 +12,17 @@ export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj
'token': '123'
}
});
//删除任务
export const deleteTask = (obj) => http.delete('/admin/router/deleteTask',{params: obj}, {
headers: {
'token': '123'
}
});
//移动任务到关卡
export const moveTask = (obj) => http.post('/admin/router/moveTask',obj,{
headers: {
'token': '123'
}
});

24
src/components/drawers/AddActive.vue
View File

@@ -257,6 +257,22 @@ export default {
type: Boolean,
default: false,
},
isactive: {
type: Number,
default: null,
},
routerId: {
type: Number,
default: null,
},
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
}
},
setup(props, ctx) {
//console.log("学习路径",props.isStudiscuss);
@@ -356,12 +372,12 @@ export default {
console.log("学习路径",props.isStudiscuss);
if(props.isStudiscuss){
let editObj1 = {
chapterId:36,
chapterId:props.isactive,
courseId: 0,
duration: obj.activityDuration,
flag: true,
name: obj.activityName,
routerId: 92,
routerId: props.routerId,
routerTaskId: 0,
type: 9,
}
@@ -378,9 +394,9 @@ export default {
duration: obj.activityDuration,
flag: true,
name: obj.activityName,
projectId: 28,
projectId: props.projectId,
projectTaskId: 0,
stageId: 3,
stageId: props.chooseStageId,
type: 9,
})
.then((res) => {

24
src/components/drawers/AddDiscuss.vue
View File

@@ -102,6 +102,22 @@ export default {
isStudiscuss: {
type: Boolean,
default: false,
},
isactive: {
type: Number,
default: null,
},
routerId: {
type: Number,
default: null,
},
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
}
},
setup(props, ctx) {
@@ -152,12 +168,12 @@ export default {
console.log("学习路径",props.isStudiscuss);
if(props.isStudiscuss){
let editObj1 = {
chapterId:36,
chapterId:props.isactive,
courseId: 0,
duration: 0,
flag: true,
name: obj.discussName,
routerId: 92,
routerId: props.routerId,
routerTaskId: 0,
type: 8,
}
@@ -175,9 +191,9 @@ export default {
duration: 0,
flag: true,
name: obj.discussName,
projectId: 28,
projectId: props.projectId,
projectTaskId: 0,
stageId: 3,
stageId: props.chooseStageId,
type: 8,
})
.then((res) => {

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

@@ -341,7 +341,7 @@
<span>任务列表</span>
</div>
<div class="tit_right">
<div class="btn btn1">
<div class="btn btn1" @click="moveTask">
<div class="btnText">移动到任务阶段</div>
</div>
<div class="btn btn2">
@@ -729,6 +729,8 @@
<add-discuss
v-model:adddiscussVisible="adddiscussvisible"
v-model:isStudiscuss="isStudiscuss"
v-model:isactive="isactive"
v-model:routerId="routerId"
/>
</div>
<!-- 添加讨论侧弹窗 -->
@@ -737,6 +739,8 @@
<add-active
v-model:addactiveVisible="addactivevisible"
v-model:isStudiscuss="isStudiscuss"
v-model:isactive="isactive"
v-model:routerId="routerId"
/>
</div>
<!-- 添加活动侧弹窗 -->
@@ -1073,7 +1077,6 @@ export default {
addevalvisible: false,
addinvistvisible: false,
addvotevisible: false,
updateChapterID: null, //修改关卡id
// 表示当前触发列表的id,用来发送编辑和删除
ListChoosedId: 0,
selectRow: [], //选择行
@@ -1567,6 +1570,7 @@ export default {
};
const delete_exit = () => {
state.deleteAll = false;
deletecTaskAll();
};
const showDeleteModal = (id) => {
state.deleteID = id;
@@ -1656,6 +1660,50 @@ export default {
state.tableData = arr;
state.selectRow = array;
};
//批量删除任务
const deletecTaskAll = () => {
let arr = state.selectRow;
console.log("选择的行信息",arr);
arr.map( value => {
let obj = {
routerTaskIds: value,
}
console.log("value",value);
api
.deleteTask(obj)
.then((res) => {
console.log(res);
message.destroy();
message.success("批量删除成功");
})
.catch((err) => {
console.log(err);
});
})
}
//移动任务到关卡
const moveTask = () => {
let arr = state.selectRow;
console.log("选择的行信息",arr);
console.log("选择的关卡id",state.isactive);
arr.map( value => {
console.log("value:",value);
let obj = {
chapterId: state.isactive,
routerTaskIdList: value,
}
api
.moveTask(obj)
.then((res) => {
console.log("移动成功",res);
message.destroy();
message.success("移动成功");
})
.catch((err) => {
console.log("移动失败",err);
})
})
};
return {
...toRefs(state),
tableDataFunc,
@@ -1691,6 +1739,8 @@ export default {
showDrawerAddActive,
selectRowAll,
changeRow,
deletecTaskAll,
moveTask,
};
},
};

180
src/views/projectcenter/ProjectManage.vue
View File

@@ -800,21 +800,41 @@ export default {
edname = key.target.value;
}
let edcategory = '';
let edcategory = 0;
const edclassificationChange = (key) => {
console.log(key)
edcategory = key;
}
let edmanage = '';
let edmanageid = '';
const edclassificationChange1 = (key) => {
console.log(key)
edmanage = key;
edmanageid = key;
let edmanage = "";
let edmanageid = "";
const edclassificationChange1 = (key, options) => {
console.log(`selected ${key}`, options);
let mstr = "";
let midstr = "";
for (let i = 0; i < key.length; i++) {
if (key.length - 1 !== i) {
midstr += key[i] + ",";
mstr += classifyList1.value[i].label + ",";
} else {
midstr += key[i];
mstr += classifyList1.value[i].label;
}
}
console.log(mstr, midstr);
edvalue3.value = options;
let newoptions = [];
for (let i = 0; i < edvalue3.value.length; i++) {
if (edvalue3.value[i].value) {
newoptions.push(edvalue3.value[i])
}
}
edvalue3.value = newoptions;
edmanage = mstr;
edmanageid = midstr;
}
let edsource = '';
let edsource = "";
const edclassificationChange5 = (key) => {
console.log(key)
edsource = key;
@@ -826,7 +846,7 @@ export default {
{ value: 3, label: '项目三' },
]);
let sourceBelongId = '';
let sourceBelongId = 0;
const classificationChange5 = (key) => {
console.log(`selected ${key}`);
sourceBelongId = key;
@@ -941,18 +961,34 @@ export default {
value5.value = [];
state.doublepro = false;
};
console.log(edmanage, edmanageid)
// 编辑多层项目
const editStoreyProject = () => {
// 查询下项目信息
api.getProjectDetail({ projectId: Number(state.dcProjectID) }).then(res => {
console.log(res)
let obj = {
projectId: Number(state.dcProjectID),
name: edname,
category: edcategory,
manager: edmanage.toString(","),
managerId: edmanageid.toString(","),
sourceBelongId: edsource,
type: 1,
picUrl: 0
"attach": res.data.data.projectInfo.attach,
"beginTime": Number(res.data.data.projectInfo.beginTime) / 1000,
"boeFlag": res.data.data.projectInfo.boeFlag,
"category": edcategory ? edcategory : res.data.data.projectInfo.category,
"courseSyncFlag": res.data.data.projectInfo.courseSyncFlag,
"endTime": Number(res.data.data.projectInfo.endTime) / 1000,
"level": res.data.data.projectInfo.level,
"manager": edmanage ? edmanage.toString(",") : res.data.data.projectInfo.manager,
"managerId": edmanageid ? edmanageid.toString(",") : res.data.data.projectInfo.managerId,
"name": edname ? edname : res.data.data.projectInfo.name,
"notice": res.data.data.projectInfo.notice,
"noticeFlag": res.data.data.projectInfo.noticeFlag,
"parentId": res.data.data.projectInfo.parentId,
"picUrl": res.data.data.projectInfo.picUrl,
"projectId": state.dcProjectID ? Number(state.dcProjectID) : res.data.data.projectInfo.projectId,
"remark": res.data.data.projectInfo.remark,
"sourceBelongId": edsource ? edsource : res.data.data.projectInfo.sourceBelongId,
"status": res.data.data.projectInfo.status,
"systemId": res.data.data.projectInfo.systemId,
"templateId": "",
"type": res.data.data.projectInfo.type
}
if (obj.name !== "" || obj.category !== "" || obj.manager !== "" || obj.sourceBelongId !== "") {
console.log("我需要编辑")
@@ -963,6 +999,7 @@ export default {
state.eddoublepro = false;
message.destroy();
message.success("编辑成功");
getTableDate();
}
}).catch(err => {
console.log(err)
@@ -974,6 +1011,12 @@ export default {
} else {
state.eddoublepro = false;
}
}).catch(err => {
console.log(err)
state.eddoublepro = false;
message.destroy();
message.error("编辑失败，请检查当前网络状态。");
})
}
const closeeditModal2 = () => {
@@ -1134,7 +1177,7 @@ export default {
let editChildrensName = '';
const edclassificationChange6 = (key) => {
console.log(key)
editChildrensName = key;
editChildrensName = key.target.value;
}
let editChildrensCategory = '';
@@ -1146,10 +1189,30 @@ export default {
let editChildrensManege = '';
let editChildrensManegeId = '';
const edclassificationChange3 = (key) => {
console.log(key)
editChildrensManege = key;
editChildrensManegeId = key;
const edclassificationChange3 = (key, options) => {
console.log(`selected ${key}`, options);
let mstr = "";
let midstr = "";
for (let i = 0; i < key.length; i++) {
if (key.length - 1 !== i) {
midstr += key[i] + ",";
mstr += classifyList1.value[i].label + ",";
} else {
midstr += key[i];
mstr += classifyList1.value[i].label;
}
}
console.log(mstr, midstr);
edvalue8.value = options;
let newoptions = [];
for (let i = 0; i < edvalue8.value.length; i++) {
if (edvalue8.value[i].value) {
newoptions.push(edvalue8.value[i])
}
}
edvalue8.value = newoptions;
editChildrensManege = mstr;
editChildrensManegeId = midstr;
}
let editChildrensSource = '';
@@ -1158,38 +1221,57 @@ export default {
editChildrensSource = key;
}
// 编辑多层子项目
const editChildsProject = () => {
api.getProjectDetail({ projectId: Number(state.currentEditChildrensProjectId) }).then(res => {
let obj = {
"attach": "",
"beginTime": 0,
"boeFlag": 0,
"category": editChildrensCategory,
"courseSyncFlag": 0,
"endTime": 0,
"level": 0,
"manager": editChildrensManege,
"managerId": editChildrensManegeId,
"name": editChildrensName,
"notice": "",
"noticeFlag": 0,
"parentId": 0,
"picUrl": "",
"projectId": state.currentEditChildrensProjectId,
"remark": "",
"sourceBelongId": editChildrensSource,
"status": 0,
"systemId": 0,
"templateId": 0,
"type": 2
"attach": res.data.data.projectInfo.attach,
"beginTime": Number(res.data.data.projectInfo.beginTime) / 1000,
"boeFlag": res.data.data.projectInfo.boeFlag,
"category": editChildrensCategory ? Number(editChildrensCategory) : res.data.data.projectInfo.category,
"courseSyncFlag": res.data.data.projectInfo.courseSyncFlag,
"endTime": Number(res.data.data.projectInfo.endTime) / 1000,
"level": res.data.data.projectInfo.level,
"manager": editChildrensManege ? editChildrensManege.toString(",") : res.data.data.projectInfo.manager,
"managerId": editChildrensManegeId ? editChildrensManegeId.toString(",") : res.data.data.projectInfo.managerId,
"name": editChildrensName ? editChildrensName : res.data.data.projectInfo.name,
"notice": res.data.data.projectInfo.notice,
"noticeFlag": res.data.data.projectInfo.noticeFlag,
"parentId": res.data.data.projectInfo.parentId,
"picUrl": res.data.data.projectInfo.picUrl,
"projectId": state.currentEditChildrensProjectId ? Number(state.currentEditChildrensProjectId) : res.data.data.projectInfo.projectId,
"remark": res.data.data.projectInfo.remark,
"sourceBelongId": editChildrensSource ? Number(editChildrensSource) : res.data.data.projectInfo.sourceBelongId,
"status": res.data.data.projectInfo.status,
"systemId": res.data.data.projectInfo.systemId,
"templateId": "",
"type": res.data.data.projectInfo.type
}
if (obj.name !== '' || obj.manager !== '' || obj.category !== '' || obj.sourceBelongId !== '') {
alert("我需要修改")
console.log("编辑多层子项目传递的参数", obj)
api.createProject(obj).then(ress => {
console.log(ress)
if (ress.status == 200 && ress.data.code == 200) {
state.eddoublesonpro = false;
message.destroy();
message.success("编辑成功");
getTableDate();
}
}).catch(err => {
console.log(err)
state.eddoublesonpro = false;
message.destroy();
message.error("编辑失败，请检查当前网络状态。");
})
} else {
state.eddoublesonpro = false;
}
}).catch(err => {
console.log(err)
state.eddoublesonpro = false;
message.destroy();
message.error("编辑失败，请检查当前网络状态。");
})
}
const closeeditModal3 = () => {
@@ -2001,7 +2083,7 @@ export default {
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div onClick={()=>{
<div onClick={() => {
router.push({
path: "/taskpage",
});
@@ -2054,7 +2136,7 @@ export default {
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div onClick={()=>{
<div onClick={() => {
router.push({
path: "/taskpage",
});
@@ -2097,7 +2179,7 @@ export default {
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div onClick={()=>{
<div onClick={() => {
router.push({
path: "/taskpage",
});

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

@@ -208,6 +208,8 @@
<div>
<add-discuss
v-model:adddiscussVisible="adddiscussvisible"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
@changeData="updateTableData"
/>
</div>
@@ -225,6 +227,8 @@
<div>
<add-active
v-model:addactiveVisible="addactivevisible"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
@changeData="updateTableData"
/>
</div>
@@ -1012,10 +1016,10 @@ export default {
.editStage(obj)
.then((res) => {
console.log("添加阶段成功", res);
(state.valuesname = ""),
(state.valuesnotice = ""),
(state.stage = false);
message.default();
state.valuesname = "",
state.valuesnotice = "",
state.stage = false;
message.destroy();
message.success("添加阶段成功");
})
.catch((err) => {
@@ -1720,13 +1724,13 @@ export default {
console.log("value:", value);
let obj = {
chapterId: state.chooseStageId,
routerTaskIdList: [],
};
routerTaskIdList: value,
}
apimove
.moveTask(obj)
.then((res) => {
console.log("移动成功", res);
message.default();
console.log("移动成功",res);
message.destroy();
message.success("移动成功");
})
.catch((err) => {
@@ -1746,12 +1750,15 @@ export default {
.deleteTask(obj)
.then((res) => {
console.log(res);
message.destroy();
message.success("批量删除成功");
getTask();
})
.catch((err) => {
console.log(err);
});
});
};
})
}
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;