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

feat:合并

Browse Source
This commit is contained in:
岳佳鑫
2022-11-07 11:14:46 +08:00
parent fee1f92126 be7daec9cc
commit 006a43743c
6 changed files with 420 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/components/drawers/AddInvist.vue
View File

@@ -70,10 +70,11 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import { reactive, toRefs, onMounted } from "vue";
import * as api from "../../api/indexInvist";
import * as apitaskadd from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
import { toDate } from "../../api/method";
import { RouterEditTask } from "@/api/indexTask";
export default {
name: "AddInvist",
@@ -97,6 +98,9 @@ export default {
const state = reactive({
inputV1: "",
time: undefined,
currentPage: 1,
pageSize: 10,
tableDataTotal: -1,
tableData: [
// {
// key: 1,
@@ -105,13 +109,6 @@ export default {
// creator: "管理员",
// time: "2022-07-21 14:30:25",
// },
// {
// key: 2,
// name: "评估",
// num: "8",
// creator: "管理员",
// time: "2022-07-21 14:30:25",
// },
],
});
const closeDrawer = () => {
@@ -175,14 +172,74 @@ export default {
};
const rowSelection = {
onChange: (selectedRowKeys, selectedRows) => {
console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
console.log(
`selectedRowKeys: ${selectedRowKeys}`,
"selectedRows: ",
selectedRows
);
},
getCheckboxProps: record => ({
getCheckboxProps: (record) => ({
// disabled: record.name === 'Disabled User',
// // Column configuration not to be checked
name: record.name,
}),
};
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
console.log("123", value);
let obj = {
id: value.routerId,
key: index,
num: value.essayQuestionVoList.length,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: value.createTime
? toDate(new Date(value.createTime).getTime() / 1000, "Y-M-D h:m:s")
: "-",
};
array.push(obj);
});
state.tableData = array;
};
//获取全部评估信息接口
const getAllInvistText = () => {
let obj = {
assessmentName: "",
pageNo: state.currentPage,
pageSize: state.pageSize,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
};
api
.queryAssessmentDetailList(obj)
.then((res) => {
if (res.status === 200) {
// console.log("获取路径列表数据", res.data.data);
let arr = res.data.data.rows;
if (
arr.length === 0 &&
res.data.data.total > 0 &&
state.currentPage > 1
) {
state.currentPage = state.currentPage - 1;
getAllInvistText();
}
getTableDate(arr);
state.tableDataTotal = Number(res.data.data.total);
}
console.log("获取全部评估信息接口成功", res);
message.success("获取全部评估信息接口成功");
console.log(obj);
})
.catch((err) => {
console.log("获取全部评估信息接口失败", err);
// state.createLoading = false;
});
};
//创建评估信息
const createInvist = () => {
let obj = {
@@ -241,7 +298,7 @@ export default {
routerTaskId: 0,
type: 11,
};
RouterEditTask(editObj1)
RouterEditTask(editObj1);
}
})
.catch((err) => {
@@ -250,28 +307,10 @@ export default {
});
};
//获取全部评估信息接口
const getAllInvistText = () => {
let obj = {
assessmentName: "",
pageNo: 0,
pageSize: 0,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
};
api
.queryAssessmentDetailList(obj)
.then((res) => {
console.log("获取全部评估信息接口成功", res);
message.success("获取全部评估信息接口成功");
console.log(obj);
})
.catch((err) => {
console.log("获取全部评估信息接口失败", err);
// state.createLoading = false;
onMounted(() => {
// createInvist();
getAllInvistText();
});
};
return {
...toRefs(state),
afterVisibleChange,

6
src/components/drawers/AddLive.vue
View File

@@ -338,6 +338,10 @@ export default {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
// const router = useRouter();
@@ -612,7 +616,7 @@ export default {
name: state.obj.liveName,
projectId: props.projectId,
projectTaskId: 0,
stageId: 0,
stageId: props.chooseStageId,
type: 6,
})
.then((res) => {

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

@@ -9,7 +9,7 @@
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">添加外链</div>
<div class="headerTitle">{{ title }}外链</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@@ -111,12 +111,25 @@ export default {
type: Number,
default: null,
},
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
isRefEdit: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
inputV1: "",
inputV2: "",
textV1: "",
title: props.isRefEdit == 2 ? "编辑" : "添加",
});
const closeDrawer = () => {
console.log(props, 1111);
@@ -129,6 +142,8 @@ export default {
const afterVisibleChange = (bool) => {
console.log("state", bool);
};
//编辑外链
//创建外链
const createExternalChain = () => {
if (!state.inputV1) return message.warning("请输入外链名称");
if (!state.inputV2) return message.warning("请输入链接");
@@ -150,7 +165,7 @@ export default {
console.log(res.data.data);
message.success("提交成功");
closeDrawer();
//学习路径的创建
if (props.isStudy == 1) {
let objj = {
chapterId: 36,
@@ -170,15 +185,16 @@ export default {
console.log(err, 1111);
});
} else {
//项目的创建
apiTask
.addTask({
courseId: 0,
duration: 0,
flag: true,
name: obj.linkName,
projectId: 28,
projectId: props.projectId,
projectTaskId: 0,
stageId: 3,
stageId: props.chooseStageId,
type: 7,
})
.then((res) => {

16
src/components/drawers/CreVote.vue
View File

@@ -20,10 +20,7 @@
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">投票名称</span>
</div>
@@ -112,7 +109,7 @@ export default {
setup(props, ctx) {
const state = reactive({
inputV1: "",
creVote:true,
creVote: true,
questions: [
{
inputV: "",
@@ -180,20 +177,17 @@ export default {
optionPictureAddress: "",
},
],
optionId: 0,
optionName: "",
optionPictureAddress: "",
stem: state.questions[0].inputV,
stemId: 0,
stemName: "",
updateTime: "",
updateUser: 0,
voteStemId: 0,
};
api
.createOptionMessage(obj)
.then((res) => {
console.log("创建成功", res);
message.success("创建成功");
ctx.emit("getData",state.creVote);
ctx.emit("getData", state.creVote);
closeDrawer();
})
.catch((err) => {

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",
});

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

@@ -28,9 +28,7 @@
<template #item="{ element }">
<div
class="item"
:class="
chooseStageId == element.id ? 'bgcactive' : ''
"
:class="chooseStageId == element.id ? 'bgcactive' : ''"
@click="changebgc(element.id)"
>
<div class="itemle">
@@ -173,6 +171,7 @@
v-model:addliveVisible="addlivevisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
/>
</div>
<!-- 添加直播侧弹窗 -->
@@ -190,6 +189,9 @@
<add-ref
v-model:addrefVisible="addrefvisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:isRefEdit="isRefEdit"
/>
</div>
<!-- 添加外链侧弹窗 -->
@@ -763,8 +765,8 @@ import * as apistage from "../../api/indexStage";
import * as apimove from "../../api/indexMovetask";
import draggable from "vuedraggable";
import { storage } from "../../api/storage";
import {updateExamination,deleteExaminationById} from "@/api/indexExam"
import { updateWorkTaskUsing, deleteWorkTask} from "@/api/indexWork";
import { updateExamination, deleteExaminationById } from "@/api/indexExam";
import { updateWorkTaskUsing, deleteWorkTask } from "@/api/indexWork";
const drawercolumns = [
{
@@ -824,8 +826,11 @@ export default {
},
setup() {
const state = reactive({
projectId: storage.get("projectId") ?JSON.parse(storage.get("projectId")) : null,
projectId: storage.get("projectId")
? JSON.parse(storage.get("projectId"))
: null,
chooseStageId: null,
isRefEdit: 1, //外链编辑
projectNameList: [
{
id: 1,
@@ -1019,7 +1024,7 @@ export default {
const getTableData = (tableData) => {
let data = tableData;
let array = [];
console.log('data',data)
console.log("data", data);
data.map((value) => {
let obj = {
id: value.projectTaskId,
@@ -1064,13 +1069,13 @@ export default {
const getStageData = (tableData) => {
let data = tableData;
let array = [];
console.log('tableData',data)
console.log("tableData", data);
data.map((value) => {
let obj = {
id: value.stageId,
tit: value.name,
name: value.remark,
taskList:value.taskList,
taskList: value.taskList,
};
array.push(obj);
});
@@ -1220,7 +1225,7 @@ export default {
console.log("22222", res.data.data.stageList);
// console.log("22222", res.data.data.stageList);
let leng = res.data.data.stageList.length;
if( leng > 0){
if (leng > 0) {
//获取任务列表
let arr = res.data.data.stageList[0].taskList;
getTableData(arr);
@@ -1257,40 +1262,43 @@ export default {
// 编辑考试
const updateTest = (id) => {
let obj = {
"createTime": "",
"createUser": 0,
"examinationDuration": '',
"examinationEndTime": '',
"examinationExplain": '',
"examinationFlag": "",
"examinationId": id || 0,
"examinationLimit": '',
"examinationName": '',
"examinationPaperId": 0,
"examinationPaperName": '',
"examinationStartTime": '',
"examinationTag": "",
"passLine": '',
"questionArrangement": '',
"scoringModel": '',
"showAnalysis": '',
"showAnswers": '',
"updateTime": "",
"updateUser": 0
}
updateExamination(obj).then((res)=>{
createTime: "",
createUser: 0,
examinationDuration: "",
examinationEndTime: "",
examinationExplain: "",
examinationFlag: "",
examinationId: id || 0,
examinationLimit: "",
examinationName: "",
examinationPaperId: 0,
examinationPaperName: "",
examinationStartTime: "",
examinationTag: "",
passLine: "",
questionArrangement: "",
scoringModel: "",
showAnalysis: "",
showAnswers: "",
updateTime: "",
updateUser: 0,
};
updateExamination(obj)
.then((res) => {
console.log(res);
message.error(`编辑成功`);
}).catch(()=>{
message.error(`编辑失败`)
})
}
.catch(() => {
message.error(`编辑失败`);
});
};
// 删除考试
const deleteTest = () => {
let obj = {
examinationId:0,
}
deleteExaminationById(obj).then((res) => {
examinationId: 0,
};
deleteExaminationById(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
//重新获取列表
@@ -1299,14 +1307,15 @@ export default {
.catch((err) => {
console.log(err);
});
}
};
// 删除作业
const deleteWork = () => {
let obj = {
workId:0,
}
deleteWorkTask(obj).then((res) => {
workId: 0,
};
deleteWorkTask(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
//重新获取列表
@@ -1315,29 +1324,31 @@ export default {
.catch((err) => {
console.log(err);
});
}
};
// 编辑作业
const updateWork = () => {
let obj = {
"createTime": "",
"createUser": 0,
"submitEndTime": '',
"submitStartTime": '',
"updateTime": "",
"updateUser": 0,
"workEnclosureAddress": "",
"workFlag": "",
"workId": 0,
"workName": '',
"workRequirement": '',
"workTag": ""
}
createTime: "",
createUser: 0,
submitEndTime: "",
submitStartTime: "",
updateTime: "",
updateUser: 0,
workEnclosureAddress: "",
workFlag: "",
workId: 0,
workName: "",
workRequirement: "",
workTag: "",
};
updateWorkTaskUsing(obj).then((res) => {
updateWorkTaskUsing(obj)
.then((res) => {
console.log(res);
}).catch((err) => {
message.error(`编辑失败${err}`)
})
.catch((err) => {
message.error(`编辑失败${err}`);
});
};
//删除直播
@@ -1702,9 +1713,9 @@ export default {
//移动任务到阶段
const moveTask = () => {
let arr = state.selectRow;
console.log("选择的行信息",arr);
arr.map( value => {
console.log("value:",value);
console.log("选择的行信息", arr);
arr.map((value) => {
console.log("value:", value);
let obj = {
chapterId: state.chooseStageId,
routerTaskIdList: value,
@@ -1717,18 +1728,18 @@ export default {
message.success("移动成功");
})
.catch((err) => {
console.log("移动失败",err);
})
})
console.log("移动失败", err);
});
});
};
//批量删除
const deleteTaskAll = () => {
let arr = state.selectRow;
console.log("选择的行信息",arr);
arr.map( value => {
console.log("选择的行信息", arr);
arr.map((value) => {
let obj = {
projectTaskIds: value,
}
};
api
.deleteTask(obj)
.then((res) => {
@@ -1842,11 +1853,11 @@ export default {
const closeDelete = () => {
state.deleteModal = false;
};
const changebgc = ( id) => {
const changebgc = (id) => {
state.isActive = !state.isActive;
state.selectRow = [] //选择行
state.selectAll = 0 //0：未选择，1：全选，2：部分选择
console.log('state.level',id,state.level);
state.selectRow = []; //选择行
state.selectAll = 0; //0：未选择，1：全选，2：部分选择
console.log("state.level", id, state.level);
state.chooseStageId = id;
let final = state.level.find((item) => item.id === id);
getTableData(final.taskList);
@@ -1907,6 +1918,10 @@ export default {
const changeCourseType = (id) => {
console.log("任务id", id);
};
//展示编辑外链弹窗
const showDrawerEditRef = () => {
state.addrefvisible = true;
};
return {
...toRefs(state),
selectProjectName,
@@ -1967,6 +1982,7 @@ export default {
updateWork,
deleteTest,
deleteWork,
showDrawerEditRef,
};
},
};