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

This commit is contained in:
岳佳鑫
2022-11-07 13:54:20 +08:00
10 changed files with 289 additions and 250 deletions

View File

@@ -1,28 +1,12 @@
import http from "./config";
//新建关卡
export const editChapter = (obj) => http.post('/admin/router/editChapter', obj, {
headers: {
'token': '123'
}
});
export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
//编辑关卡
export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj, {
headers: {
'token': '123'
}
});
export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj);
//删除任务
export const deleteTask = (obj) => http.delete('/admin/router/deleteTask',{params: obj}, {
headers: {
'token': '123'
}
});
export const deleteTask = (obj) => http.delete('/admin/router/deleteTask',{params: obj});
//移动任务到关卡
export const moveTask = (obj) => http.post('/admin/router/moveTask',obj,{
headers: {
'token': '123'
}
});
export const moveTask = (obj) => http.post('/admin/router/moveTask',obj);

View File

@@ -1,8 +1,4 @@
import http from "./config";
//移动任务到阶段
export const moveTask = (obj) => http.post('/admin/project/moveTask',obj,{
headers: {
'token': '123'
}
})
export const moveTask = (obj) => http.post('/admin/project/moveTask',obj)

View File

@@ -1,8 +1,4 @@
import http from "./config";
//添加阶段
export const editStage = (obj) => http.post('/admin/project/editStage', obj, {
headers: {
'token': '123'
}
});
export const editStage = (obj) => http.post('/admin/project/editStage', obj);

View File

@@ -7,11 +7,7 @@ export const getTask = (obj) => http.get('/admin/project/detail', { params: obj
})
//项目里的新建或编辑阶段任务
export const addTask = (obj) => http.post('/admin/project/editTask', obj, {
headers: {
'token': '123'
}
})
export const addTask = (obj) => http.post('/admin/project/editTask', obj)
//项目里的删除任务

View File

@@ -131,6 +131,14 @@ export default {
type: Number,
default: 0,
},
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
@@ -242,6 +250,7 @@ export default {
console.log("创建成功", res);
message.success("创建成功");
closeDrawer();
//渲染到学历路径列表
if (props.learn == 0)
apitaskadd
.addTask({
@@ -249,9 +258,9 @@ export default {
duration: 0,
flag: true,
name: obj.evaluationName,
projectId: 28,
projectId: props.projectId,
projectTaskId: 0,
stageId: 3,
stageId: props.chooseStageId,
type: 10,
})
.then((res) => {
@@ -265,6 +274,7 @@ export default {
.catch((err) => {
console.log(err);
});
//渲染到项目列表
else {
let editObj1 = {
chapterId: 36,

View File

@@ -46,6 +46,7 @@
@expand="expandTable"
:pagination="false"
:row-selection="rowSelection"
filterMultiple:false
/>
<div class="pa">
@@ -93,6 +94,14 @@ export default {
type: Number,
default: 0,
},
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
@@ -171,27 +180,35 @@ export default {
return columns;
};
const rowSelection = {
onChange: (selectedRowKeys, selectedRows) => {
console.log(
`selectedRowKeys: ${selectedRowKeys}`,
"selectedRows: ",
selectedRows
);
},
getCheckboxProps: (record) => ({
// disabled: record.name === 'Disabled User',
// // Column configuration not to be checked
name: record.name,
}),
type: 'radio',
// onChange: (selectedRowKeys, selectedRows) => {
// this.selectedRowKeys = selectedRowKeys
// if (selectedRows.length > 1) {
// //获取选中的数据的key
// var selectNumber = this.selectedRowKeys[1]
// //清空选中的key
// this.selectedRowKeys = []
// //选中的数据的key重新赋值给selectedRowKeys
// this.selectedRowKeys.push(selectNumber)
// }
// },
// getCheckboxProps: (record) => ({
// // disabled: record.name === 'Disabled User',
// // // Column configuration not to be checked
// name: record.name,
// }),
onSelect: ( selectedRows, selected,selectedRowKeys) => {
console.log('selectedRowKeys',selectedRowKeys,'selectedRows', selectedRows, 'selected', selected)
}
};
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
console.log("123", value);
// console.log("123", value);
let obj = {
id: value.routerId,
// id: value.routerId,
key: index,
num: value.essayQuestionVoList.length,
name: value.assessmentName ? value.assessmentName : "-",
@@ -218,7 +235,7 @@ export default {
.queryAssessmentDetailList(obj)
.then((res) => {
if (res.status === 200) {
// console.log("获取路径列表数据", res.data.data);
console.log("获取全部评估信息", res.data.data);
let arr = res.data.data.rows;
if (
arr.length === 0 &&
@@ -271,9 +288,9 @@ export default {
duration: 0,
flag: true,
name: obj.appraiseName,
projectId: 28,
projectId: props.projectId,
projectTaskId: 0,
stageId: 3,
stageId: props.chooseStageId,
type: 11,
})
.then((res) => {

View File

@@ -558,6 +558,7 @@ export default {
state.obj = {
afterSignIn: state.inputV6,
beforeSignIn: state.inputV7,
assessmentId: 0,
createTime: "",
createUser: 0,
// liveCover: state.fileList,//直播封面

View File

@@ -3,7 +3,6 @@
:visible="addrefVisible"
class="drawerStyle addrefDrawer"
width="80%"
title="添加外链"
placement="right"
@after-visible-change="afterVisibleChange"
>
@@ -77,7 +76,7 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs, ref } from "vue";
import { reactive, toRefs, ref, onMounted } from "vue";
import * as api from "../../api/indexExternalChain";
import * as apiTask from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
@@ -123,17 +122,22 @@ export default {
type: Number,
default: null,
},
EditRefId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
inputV1: "",
inputV2: "",
textV1: "",
title: props.isRefEdit == 2 ? "编辑" : "添加",
title: null,
});
const closeDrawer = () => {
console.log(props, 1111);
ctx.emit("update:addrefVisible", false);
ctx.emit("update:isRefEdit", 1);
console.log("props", props.routerId);
state.inputV2 = "";
state.inputV1 = "";
@@ -142,7 +146,7 @@ export default {
const afterVisibleChange = (bool) => {
console.log("state", bool);
};
//编辑外链
//创建外链
const createExternalChain = () => {
if (!state.inputV1) return message.warning("请输入外链名称");
@@ -153,66 +157,82 @@ export default {
linkAddress: state.inputV2,
linkDescription: state.textV1,
linkFlag: "",
linkId: 0,
linkId: props.EditRefId == null ? 0 : props.EditRefId,
linkName: state.inputV1,
linkTag: "",
updateTime: "",
updateUser: 0,
};
api
.createExternalChain(obj)
.then((res) => {
console.log(res.data.data);
message.success("提交成功");
closeDrawer();
//学习路径的创建
if (props.isStudy == 1) {
let objj = {
chapterId: 36,
courseId: 0,
duration: 0,
flag: true,
name: obj.linkName,
routerId: 92,
routerTaskId: 0,
type: 7,
};
RouterEditTask(objj)
.then((res) => {
console.log(res, 11111);
})
.catch((err) => {
console.log(err, 1111);
});
} else {
//项目的创建
apiTask
.addTask({
//编辑外链
if (props.isRefEdit == 2) {
api
.updateLinks(obj)
.then((res) => {
console.log("编辑成功", res);
message.success("编辑成功");
closeDrawer();
})
.catch((err) => console.log(err));
} else {
api
.createExternalChain(obj)
.then((res) => {
console.log(res.data.data, "外链添加成功了");
message.success("提交成功");
closeDrawer();
//学习路径的创建
if (props.isStudy == 1) {
let objj = {
chapterId: 36,
courseId: 0,
duration: 0,
flag: true,
name: obj.linkName,
projectId: props.projectId,
projectTaskId: 0,
stageId: props.chooseStageId,
routerId: 92,
routerTaskId: 0,
type: 7,
})
.then((res) => {
console.log("调用项目添加接口后111", res.data, 11111);
ctx.emit("changeData", false);
//重新获取任务列表
// apiTask.getTask({ projectId: 28 });
// router.push("/taskadd");
})
.catch((err) => {
console.log(err, 111111);
});
}
})
.catch((err) => {
console.log(err);
});
};
RouterEditTask(objj)
.then((res) => {
console.log(res, 11111);
})
.catch((err) => {
console.log(err, 1111);
});
} else {
//项目的创建
apiTask
.addTask({
courseId: res.data.data.linkId,
duration: 0,
flag: true,
name: obj.linkName,
projectId: props.projectId,
projectTaskId: 0,
stageId: props.chooseStageId,
type: 7,
})
.then((res) => {
console.log("调用项目添加接口后111", res.data, 11111);
ctx.emit("changeData", false);
//重新获取任务列表
// apiTask.getTask({ projectId: 28 });
// router.push("/taskadd");
})
.catch((err) => {
console.log(err, 111111);
});
}
})
.catch((err) => {
console.log(err);
});
}
};
//不生效
onMounted(() => {
state.title = props.isRefEdit == 2 ? "编辑" : "添加";
});
return {
...toRefs(state),
afterVisibleChange,

View File

@@ -156,6 +156,14 @@ export default {
type: Number,
default: 0,
},
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
@@ -240,9 +248,9 @@ export default {
duration: 0,
flag: true,
name: obj.voteName,
projectId: 28,
projectId: props.projectId,
projectTaskId: 0,
stageId: 3,
stageId: props.chooseStageId,
type: 12,
})
.then((res) => {

View File

@@ -192,6 +192,7 @@
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:isRefEdit="isRefEdit"
v-model:EditRefId="EditRefId"
/>
</div>
<!-- 添加外链侧弹窗 -->
@@ -247,6 +248,8 @@
<add-eval
v-model:addevalVisible="addevalvisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
/>
</div>
<!-- 添加测评侧弹窗 -->
@@ -264,6 +267,8 @@
<add-invist
v-model:addinvistVisible="addinvistvisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
/>
</div>
<!-- 添加评估侧弹窗 -->
@@ -280,6 +285,8 @@
<add-vote
v-model:addvoteVisible="addvotevisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
/>
</div>
<!-- 添加投票侧弹窗 -->
@@ -484,6 +491,7 @@
margin-right: 25px;
cursor: pointer;
"
@click="decideType(element.lei, element.courseId)"
>
编辑
</span>
@@ -831,6 +839,7 @@ export default {
: null,
chooseStageId: null,
isRefEdit: 1, //外链编辑
EditRefId: null, //要编辑的外链的id
projectNameList: [
{
id: 1,
@@ -1059,6 +1068,7 @@ export default {
cretime: value.duration ? value.duration : "-",
checked1: value.flag ? true : false,
checked: false, //是否选中类型
courseId: value.courseId,
};
array.push(obj);
});
@@ -1082,135 +1092,128 @@ export default {
state.level = array;
};
const tableDataFunc = () => {
const columns = [
{
title: "类型",
dataIndex: "state",
// width: "30%",
key: "state",
width: 60,
align: "left",
className: "classify",
scopedSlots: { customRender: "action" },
customRender: (text) => {
// console.log(text.record.checked1);
return (
<div class="racona">
<div
class="img"
style={{ cursor: "pointer" }}
onClick={() => {
console.log("点击了");
}}
></div>
<span> {text.record.lei}</span>
{/**
<div class="img"></div>
<a-checkbox class="ch" checked={text.record.checkedd}>
{text.record.lei}
</a-checkbox>
*/}
</div>
);
},
},
{
title: "任务名称",
dataIndex: "creater",
// width: "30%",
key: "creater",
width: 200,
align: "center",
className: "h",
},
{
title: "必修/选修",
dataIndex: "pubtime",
key: "pubtime",
// width: 100,
align: "center",
className: "h",
scopedSlots: { customRender: "action" },
customRender: (text) => {
// console.log(text.record.checked1);
return (
<div class="opat">
<div class="opacationt clearfix">
<a-switch
style="margin-left:-50px;margin-top:3px"
checked={text.record.checked1}
size="small"
active-color="red"
onClick={() => {
console.log("点击了");
text.record.checked1 = !text.record.checked1;
}}
/>
<div class="showt clearfix">
<div
class="bi"
style={
text.record.checked1 ? "z-index:999" : "z-index:998"
}
>
必修
</div>
<div class="xuan">选修</div>
</div>
</div>
</div>
);
},
},
{
title: "时长",
dataIndex: "cretime",
key: "cretime",
// width: 100,
align: "center",
className: "h",
},
{
title: "操作",
className: "h",
dataIndex: "opacation",
key: "opacation",
// width: 100,
align: "center",
scopedSlots: { customRender: "action" },
customRender: (text) => {
return (
<div class="opa">
<div class="opacation">
<span
onClick={() => {
state.editonlinevisible = true;
console.log(text, "编辑text");
editInvistPath();
}}
style="color:#4EA6FF;margin-right:25px;cursor:pointer"
>
编辑
</span>
<span
style="color:#4EA6FF;cursor:pointer"
onClick={() => {
showDelete();
state.deleteID = text.record.id;
}}
>
删除
</span>
</div>
</div>
);
},
},
];
return columns;
};
// const tableDataFunc = () => {
// const columns = [
// {
// title: "类型",
// dataIndex: "state",
// // width: "30%",
// key: "state",
// width: 60,
// align: "left",
// className: "classify",
// scopedSlots: { customRender: "action" },
// customRender: (text) => {
// // console.log(text.record.checked1);
// return (
// <div class="racona">
// <div
// class="img"
// style={{ cursor: "pointer" }}
// onClick={() => {
// console.log("点击了");
// }}
// ></div>
// <span> {text.record.lei}</span>
// </div>
// );
// },
// },
// {
// title: "任务名称",
// dataIndex: "creater",
// // width: "30%",
// key: "creater",
// width: 200,
// align: "center",
// className: "h",
// },
// {
// title: "必修/选修",
// dataIndex: "pubtime",
// key: "pubtime",
// // width: 100,
// align: "center",
// className: "h",
// scopedSlots: { customRender: "action" },
// customRender: (text) => {
// // console.log(text.record.checked1);
// return (
// <div class="opat">
// <div class="opacationt clearfix">
// <a-switch
// style="margin-left:-50px;margin-top:3px"
// checked={text.record.checked1}
// size="small"
// active-color="red"
// onClick={() => {
// console.log("点击了");
// text.record.checked1 = !text.record.checked1;
// }}
// />
// <div class="showt clearfix">
// <div
// class="bi"
// style={
// text.record.checked1 ? "z-index:999" : "z-index:998"
// }
// >
// 必修
// </div>
// <div class="xuan">选修</div>
// </div>
// </div>
// </div>
// );
// },
// },
// {
// title: "时长",
// dataIndex: "cretime",
// key: "cretime",
// // width: 100,
// align: "center",
// className: "h",
// },
// {
// title: "操作",
// className: "h",
// dataIndex: "opacation",
// key: "opacation",
// // width: 100,
// align: "center",
// scopedSlots: { customRender: "action" },
// customRender: (text) => {
// return (
// <div class="opa">
// <div class="opacation">
// <span
// onClick={() => {
// state.editonlinevisible = true;
// console.log(text, "编辑text");
// editInvistPath();
// }}
// style="color:#4EA6FF;margin-right:25px;cursor:pointer"
// >
// 编辑
// </span>
// <span
// style="color:#4EA6FF;cursor:pointer"
// onClick={() => {
// showDelete();
// state.deleteID = text.record.id;
// }}
// >
// 删除
// </span>
// </div>
// </div>
// );
// },
// },
// ];
// return columns;
// };
//获取任务列表
const getTask = () => {
@@ -1736,13 +1739,12 @@ export default {
};
//批量删除
const deleteTaskAll = () => {
let arr = state.selectRow;
console.log("选择的行信息", arr);
arr.map((value) => {
let obj = {
projectTaskIds: value,
};
api
//let arr = state.selectRow;
console.log("selectRow数组",state.selectRow);
let obj = {
projectTaskIds: state.selectRow,
}
api
.deleteTask(obj)
.then((res) => {
console.log(res);
@@ -1753,7 +1755,6 @@ export default {
.catch((err) => {
console.log(err);
});
})
}
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
@@ -1920,15 +1921,24 @@ export default {
const changeCourseType = (id) => {
console.log("任务id", id);
};
//展示编辑外链弹窗
const showDrawerEditRef = () => {
//打开编辑外链弹窗
const showEditRefDrawer = (id) => {
state.addrefvisible = true;
state.isRefEdit = 2;
state.EditRefId = id;
};
//编辑的按钮
const decideType = (type, id) => {
console.log(type, id);
if (type == "外链") {
showEditRefDrawer(id);
}
};
return {
...toRefs(state),
selectProjectName,
selectProjectName2,
tableDataFunc,
// tableDataFunc,
showModal,
closeModal,
// showDrawer,
@@ -1984,7 +1994,8 @@ export default {
updateWork,
deleteTest,
deleteWork,
showDrawerEditRef,
decideType,
showEditRefDrawer,
};
},
};