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

Merge branch 'pre-dev' into 'develop'

Browse Source 
Pre dev

See merge request !24
This commit is contained in:
huangshengfa
2022-12-21 19:34:22 +08:00
parent e7edadbc26 cb1a7dbc9a
commit c99164246c
16 changed files with 2277 additions and 2113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本0.9.20------------"); console.log("版本1.0------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

2
src/api/method.js
View File

@@ -236,7 +236,7 @@ const setCookie = (name, value, perpetual) => {
console.log('存储token到cookie') console.log('存储token到cookie')
let exdate = new Date() let exdate = new Date()
exdate.setDate(perpetual * 24 * 60 * 60 * 1000) //exdate.setDate(exdate.getDate() + 365) exdate.setDate(perpetual * 24 * 60 * 60 * 1000) //exdate.setDate(exdate.getDate() + 365)
document.cookie = name + '=' + value + ';expires=' + exdate.toGMTString() document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/`
//永久有效 //永久有效
//document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT' //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT'
} }

91
src/components/drawers/AddCase.vue
View File

@@ -46,7 +46,7 @@
</div> </div>
<div class="main_table"> <div class="main_table">
<!-- <!--
<a-table <a-table
v-if="edit" v-if="edit"
class="ant-table-striped" class="ant-table-striped"
@@ -64,7 +64,6 @@
:pagination="false" :pagination="false"
/>--> />-->
<a-table <a-table
class="ant-table-striped" class="ant-table-striped"
:row-class-name=" :row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null) (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
@@ -80,19 +79,20 @@
:pagination="false" :pagination="false"
/> />
<div class="tableBox"> <div class="tableBox">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="false"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
:current="currentPage" :current="currentPage"
:total="tableDataTotal" :total="tableDataTotal"
class="pagination" class="pagination"
@change="handelChangePage" @change="handelChangePage"
/> />
</div></div> </div>
</div>
</div> </div>
</div> </div>
<div class="main_btns"> <div class="main_btns">
@@ -171,7 +171,7 @@ export default {
time: undefined, time: undefined,
caseId: null, caseId: null,
caseName: "", caseName: "",
isClick: false isClick: false,
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addcaseVisible", false); ctx.emit("update:addcaseVisible", false);
@@ -202,13 +202,13 @@ export default {
width: "200px", width: "200px",
align: "center", align: "center",
}, },
// { // {
// title: "导入时间", // title: "导入时间",
// dataIndex: "time", // dataIndex: "time",
// key: "time", // key: "time",
// width: "400px", // width: "400px",
// align: "center", // align: "center",
// }, // },
]; ];
return columns; return columns;
}; };
@@ -218,6 +218,7 @@ export default {
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows; state.apiTaskList = selectedRows;
console.log("selectedRows", selectedRows);
}; };
const handelChangePage = (page, pageSize) => { const handelChangePage = (page, pageSize) => {
state.selectedRowKeys = []; state.selectedRowKeys = [];
@@ -276,16 +277,16 @@ export default {
}; };
const updateTask = () => { const updateTask = () => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
if(!props.isactive){ if (!props.isactive) {
message.destroy(); message.destroy();
return message.warning("请先选中关卡"); return message.warning("请先选中关卡");
} }
if(state.isClick){ if (state.isClick) {
message.destroy(); message.destroy();
message.error('请勿频繁点击') message.error("请勿频繁点击");
return return;
} }
state.isClick = true; state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) { for (let i = 0; i < state.apiTaskList.length; i++) {
RouterEditTask({ RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
@@ -308,12 +309,12 @@ export default {
}); });
} }
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
if(state.isClick){ if (state.isClick) {
message.destroy(); message.destroy();
message.error('请勿频繁点击') message.error("请勿频繁点击");
return return;
} }
state.isClick = true; state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) { for (let i = 0; i < state.apiTaskList.length; i++) {
apiTask apiTask
.addTask({ .addTask({
@@ -338,19 +339,21 @@ export default {
}); });
} }
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
if(state.isClick){ if (state.isClick) {
message.destroy(); message.destroy();
message.error('请勿频繁点击') message.error("请勿频繁点击");
return return;
} }
state.isClick = true; state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) { for (let i = 0; i < state.apiTaskList.length; i++) {
apiTask apiTask
.addTaskTemplate({ .addTaskTemplate({
courseId: Number(state.apiTaskList[i].casesId), courseId: Number(state.apiTaskList[i].casesId),
name: state.apiTaskList[i].title, name: state.apiTaskList[i].title,
projectTaskId: props.projectTaskId, projectTaskId: props.projectTaskId,
projectTemplateId: Number(localStorage.getItem("projectTemplateId")), projectTemplateId: Number(
localStorage.getItem("projectTemplateId")
),
stageId: Number(props.chooseStageId) || 0, stageId: Number(props.chooseStageId) || 0,
type: 3, type: 3,
}) })
@@ -432,7 +435,7 @@ export default {
.main_items { .main_items {
margin-top: 32px; margin-top: 32px;
display: flex; display: flex;
margin-bottom: 12px; margin-bottom: 12px;
flex-wrap: wrap; flex-wrap: wrap;
.mi_ipts { .mi_ipts {

1632
src/components/drawers/AddOnline.vue
View File

File diff suppressed because it is too large Load Diff

1542
src/components/drawers/AddTest.vue
View File

File diff suppressed because it is too large Load Diff

8
src/components/drawers/AssessmentAll.vue
View File

@@ -185,8 +185,8 @@ export default {
assessmentId: info.assessmentId, assessmentId: info.assessmentId,
name: info.assessmentName, name: info.assessmentName,
num: num, num: num,
creator: info.createUser ? info.createUser : "-", creator: info.createUserName ? info.createUserName : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"), time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
}; };
//更新讨论信息 //更新讨论信息
state.assessment = obj; state.assessment = obj;
@@ -277,8 +277,8 @@ export default {
assessmentId: value.assessmentId, assessmentId: value.assessmentId,
num: num, num: num,
name: value.assessmentName ? value.assessmentName : "-", name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-", creator: value.createUserName ? value.createUserName : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"), time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
}; };
array.push(obj); array.push(obj);
}); });

4
src/components/drawers/AssessmentList.vue
View File

@@ -202,8 +202,8 @@ export default {
assessmentId: value.assessmentId, assessmentId: value.assessmentId,
num: num, num: num,
name: value.assessmentName ? value.assessmentName : "-", name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-", creator: value.createUserName ? value.createUserName : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"), time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
}; };
array.push(obj); array.push(obj);
}); });

61
src/components/drawers/EvList.vue
View File

@@ -24,7 +24,7 @@
<div class="fi_input"> <div class="fi_input">
<a-input <a-input
v-model:value="inputV1" v-model:value="inputV1"
style="width:424px; height: 40px; border-radius: 8px" style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称" placeholder="请输入项目名称"
/> />
</div> </div>
@@ -54,20 +54,21 @@
onChange: onSelectChange, onChange: onSelectChange,
}" }"
/> />
<div class="tableBox" style="margin-top:85px;"> <div class="tableBox" style="margin-top: 85px">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="false"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
:current="currentPage" :current="currentPage"
:total="tableDataTotal" :total="tableDataTotal"
class="pagination" class="pagination"
@change="changePagination" @change="changePagination"
/> />
</div></div> </div>
</div>
</div> </div>
</div> </div>
<div class="main_btns"> <div class="main_btns">
@@ -131,20 +132,20 @@ export default {
align: "center", align: "center",
ellipsis: true, ellipsis: true,
}, },
// { // {
// title: "状态", // title: "状态",
// width: "13%", // width: "13%",
// dataIndex: "status", // dataIndex: "status",
// key: "status", // key: "status",
// align: "center", // align: "center",
// }, // },
// { // {
// title: "价格", // title: "价格",
// width: "13%", // width: "13%",
// dataIndex: "quiz_price", // dataIndex: "quiz_price",
// key: "price", // key: "price",
// align: "center", // align: "center",
// }, // },
{ {
title: "可答题人数", title: "可答题人数",
width: "20%", width: "20%",
@@ -161,7 +162,7 @@ export default {
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.evListData = selectedRows[0] ? selectedRows[0] : {}; state.evListData = selectedRows[0] ? selectedRows[0] : {};
console.log("state.evListData",state.evListData); console.log("state.evListData", state.evListData);
}; };
const closeDrawer = () => { const closeDrawer = () => {
state.selectedRowKeys = []; state.selectedRowKeys = [];
@@ -229,13 +230,13 @@ export default {
//获取测评列表 //获取测评列表
const getAllEvalText = () => { const getAllEvalText = () => {
let objael = { let objael = {
keyword:state.inputV1, keyword: state.inputV1,
}; };
api api
.choiceEvaluation(objael) .choiceEvaluation(objael)
.then((res) => { .then((res) => {
state.tableDataTotal=9; state.tableDataTotal = 9;
// console.log("测评列表", res.data.data);
getTableDataList(res.data.data); getTableDataList(res.data.data);
}) })
.catch(() => {}); .catch(() => {});
@@ -311,7 +312,7 @@ export default {
} }
.mi_btns { .mi_btns {
display: flex; display: flex;
cursor: pointer; cursor: pointer;
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;

783
src/components/student/CommonStudent.vue
View File

File diff suppressed because it is too large Load Diff

26
src/components/student/TableStudent.vue
View File

@@ -6,7 +6,7 @@
style="padding-left: 20px; margin-right: 0px" style="padding-left: 20px; margin-right: 0px"
> >
<a-col> <a-col>
<a-form-item title="姓名：" @click="getStuList"> <a-form-item title="姓名：" >
<a-input <a-input
class="cus-input" class="cus-input"
v-model:value="tableParam.studentName" v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col> <a-col>
<a-button class="cus-btn" style="width: 100px"> <a-button class="cus-btn" style="width: 100px" @click="getStuList">
<template #icon> <template #icon>
<img <img
style="margin-right: 10px" style="margin-right: 10px"
@@ -63,12 +63,12 @@
批量删除 批量删除
</a-button> </a-button>
</a-col> </a-col>
<a-col :span="1.5" v-if="type == 2"> <!-- <a-col :span="1.5" v-if="type == 2">
<a-button class="cus-btn white" @click="showChangeModal"> <a-button class="cus-btn white" @click="showChangeModal">
<template #icon></template> <template #icon></template>
批量调整关卡 批量调整关卡
</a-button> </a-button>
</a-col> </a-col> -->
</a-row> </a-row>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<a-table <a-table
@@ -117,6 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
import { delStudentList, getStuPage } from "@/api/index1"; import { delStudentList, getStuPage } from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue"; import ChangeLevelModal from "./ChangeLevelModal.vue";
import { message } from "ant-design-vue";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
id: String, id: String,
@@ -232,9 +233,16 @@ function getStuList() {
}); });
} }
function reset() {} function reset() {
tableParam.value.studentName="";
}
function bathDel() { function bathDel() {
if( stuSelectKeys.value &&
stuSelectKeys.value.length == 0){
message.destroy();
return message.warning("请先选中学员");
}
stuSelectKeys.value && stuSelectKeys.value &&
stuSelectKeys.value.length && stuSelectKeys.value.length &&
delStudentList({ delStudentList({
@@ -259,10 +267,10 @@ function submitCall(flag) {
} }
//调整关卡 //调整关卡
const visiblene = ref(false); // const visiblene = ref(false);
const showChangeModal = () => { // const showChangeModal = () => {
visiblene.value = true; // visiblene.value = true;
}; // };
</script> </script>
<style> <style>
.studentopea1 { .studentopea1 {

16
src/views/courselibrary/CoursewareManage.vue
View File

@@ -143,7 +143,6 @@
placeholder="请输入课程名称" placeholder="请输入课程名称"
v-model:value="xzinputV1" v-model:value="xzinputV1"
v-model:validate="validate" v-model:validate="validate"
:maxlength="20" :maxlength="20"
show-count show-count
:type="2" :type="2"
@@ -226,7 +225,8 @@
</div> </div>
<a-radio-group v-model:value="valueE1"> <a-radio-group v-model:value="valueE1">
<div class="bc_box"> <div class="bc_box">
<div class="bc_boxl"> <!-- 2022-12-21 隐藏 后面放开 lixiaoge -->
<!-- <div class="bc_boxl">
<div class="ol_checkbox" @click="expectOnline"> <div class="ol_checkbox" @click="expectOnline">
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
@@ -237,7 +237,7 @@
线上 线上
</a-radio> </a-radio>
</div> </div>
</div> </div> -->
<div class="bc_boxr"> <div class="bc_boxr">
<div class="ol_checkbox"> <div class="ol_checkbox">
<a-radio <a-radio
@@ -364,7 +364,6 @@
placeholder="请输入课程名称" placeholder="请输入课程名称"
v-model:value="qdms_inputV1" v-model:value="qdms_inputV1"
v-model:validate="validate" v-model:validate="validate"
:maxlength="20" :maxlength="20"
show-count show-count
:type="2" :type="2"
@@ -2278,7 +2277,11 @@
<span>{{ currentPlanItem.teacher }}</span> <span>{{ currentPlanItem.teacher }}</span>
</div> </div>
<div class="stmm_i5"> <div class="stmm_i5">
<TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns"> <TableStudent
:type="3"
:id="offcoursePlanId"
:columns="stuColumns"
>
<!-- <template #extension = "data">--> <!-- <template #extension = "data">-->
<!-- <div style="display: flex">--> <!-- <div style="display: flex">-->
<!-- <button @click="handlJoinStu(data)">成绩录入</button>--> <!-- <button @click="handlJoinStu(data)">成绩录入</button>-->
@@ -3732,7 +3735,7 @@ export default defineComponent({
codevisible: false, //二维码弹窗 codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容 codeInfo: null, //二维码内容
codeUrl: codeUrl, codeUrl: codeUrl,
// 课程三级分类 // 课程三级分类
options2222: [ options2222: [
{ {
@@ -4658,7 +4661,6 @@ export default defineComponent({
} }
console.log("state.validate", state.validate); console.log("state.validate", state.validate);
if (!state.validate) { if (!state.validate) {
message.destroy(); message.destroy();

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

@@ -4,7 +4,7 @@
<div class="left clearfix"> <div class="left clearfix">
<div class="leftmain"> <div class="leftmain">
<div class="tit" style="margin-left: 18px">关卡</div> <div class="tit" style="margin-left: 18px">关卡</div>
<div class="btn btn3" @click="showModal()" style="margin-left: 19px"> <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
<div class="search"></div> <div class="search"></div>
<div class="btnText">添加关卡</div> <div class="btnText">添加关卡</div>
</div> </div>
@@ -206,7 +206,8 @@
<router-link to="/leveladd"> <router-link to="/leveladd">
<div style="display: flex"> <div style="display: flex">
<img <img
class="img2" style="margin-right:22px;" class="img2"
style="margin-right: 22px"
src="../../assets/images/leveladd/back.png" src="../../assets/images/leveladd/back.png"
/> />
<div class="return">返回</div> <div class="return">返回</div>
@@ -688,7 +689,7 @@
</div> </div>
</div> </div>
<div style="width: 87px; text-align: center"> <div style="width: 87px; text-align: center">
{{ element.cretime }}分钟 {{ element.cretime ? element.cretime + "分钟" : "-" }}
</div> </div>
<div <div
style=" style="
@@ -1309,22 +1310,21 @@ export default {
api api
.deleteChapter(obj) .deleteChapter(obj)
.then((res) => { .then((res) => {
if(res.data.code==200){ if (res.data.code == 200) {
console.log("删除关卡成功", res); console.log("删除关卡成功", res);
message.destroy(); message.destroy();
message.success("删除关卡成功"); message.success("删除关卡成功");
let chapter = localStorage.getItem("chapterId") let chapter = localStorage.getItem("chapterId");
if(state.deleteChapterId == chapter){ if (state.deleteChapterId == chapter) {
localStorage.removeItem("chapterId") localStorage.removeItem("chapterId");
} }
closeDeleteChapter(); closeDeleteChapter();
getDetail(); getDetail();
}else if(res.data.code==-1){ } else if (res.data.code == -1) {
message.destroy(); message.destroy();
message.success("至少保留一个关卡"); message.success("至少保留一个关卡");
closeDeleteChapter(); closeDeleteChapter();
} }
}) })
.catch((err) => { .catch((err) => {
console.log("删除关卡失败", err); console.log("删除关卡失败", err);
@@ -1418,13 +1418,16 @@ export default {
state.chooseProjectList = JSON.stringify(state.level[i].taskList); state.chooseProjectList = JSON.stringify(state.level[i].taskList);
console.log("state.level[i].taskList", state.level[i].taskList); console.log("state.level[i].taskList", state.level[i].taskList);
state.level[i].taskList.forEach((element) => { state.level[i].taskList.forEach((element) => {
// console.log("element", element); console.log("element", element);
let obj = { let obj = {
id: element.routerTaskId, id: element.routerTaskId,
key: element.routerTaskId, key: element.routerTaskId,
lei: checkType(element.type), lei: checkType(element.type),
creater: element.name, creater: element.name,
cretime: element.duration, cretime:
element.duration || element.duration == 0
? element.duration
: "-",
checked1: element.flag, checked1: element.flag,
routerTaskId: element.routerTaskId, routerTaskId: element.routerTaskId,
courseId: element.courseId, courseId: element.courseId,
@@ -1466,7 +1469,7 @@ export default {
? JSON.parse(localStorage.getItem("chapterId")) ? JSON.parse(localStorage.getItem("chapterId"))
: null; : null;
console.log("chapter", chapter); console.log("chapter", chapter);
if (chapter >0) { if (chapter > 0) {
dataAssignment(chapter); //用哪个的任务表 dataAssignment(chapter); //用哪个的任务表
state.isactive = chapter; //哪个亮 state.isactive = chapter; //哪个亮
} else { } else {
@@ -1535,13 +1538,13 @@ export default {
align: "center", align: "center",
className: "h", className: "h",
}, },
// { // {
// title: "岗位", // title: "岗位",
// dataIndex: "gang", // dataIndex: "gang",
// key: "gang", // key: "gang",
// width: 110, // width: 110,
// align: "center", // align: "center",
// className: "h", // className: "h",
// }, // },
{ {
title: "当前关卡", title: "当前关卡",
@@ -1551,14 +1554,14 @@ export default {
align: "center", align: "center",
className: "h", className: "h",
}, },
{ {
title: "进度", title: "进度",
dataIndex: "jin", dataIndex: "jin",
key: "jin", key: "jin",
width: 110, width: 110,
align: "center", align: "center",
className: "h", className: "h",
}, },
{ {
title: "开始时间", title: "开始时间",
dataIndex: "time", dataIndex: "time",
@@ -1853,7 +1856,7 @@ export default {
let obj = { let obj = {
chapterId: ele.chapterId, chapterId: ele.chapterId,
courseId: ele.courseId, courseId: ele.courseId,
duration: ele.cretime, duration: ele.cretime == "-" ? 0 : ele.cretime,
flag: ele.checked1, flag: ele.checked1,
name: ele.creater, name: ele.creater,
routerId: ele.routerId, routerId: ele.routerId,
@@ -2667,7 +2670,7 @@ export default {
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex; display: flex;
justify-content: center; justify-content: center;
min-height:512px; min-height: 512px;
.boomcen { .boomcen {
width: 95%; width: 95%;
// height: 100%; // height: 100%;

4
src/views/projectcenter/LibraryAdd.vue
View File

@@ -332,7 +332,7 @@
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-tab-pane> </a-tab-pane>
<!--
<a-tab-pane key="3" tab="项目积分"> <a-tab-pane key="3" tab="项目积分">
<div class="split"></div> <div class="split"></div>
<div class="projectscore"> <div class="projectscore">
@@ -478,6 +478,8 @@
</div> </div>
</div> </div>
</a-tab-pane> </a-tab-pane>
-->
<a-tab-pane key="4" tab="设置"> <a-tab-pane key="4" tab="设置">
<div class="split"></div> <div class="split"></div>
<a-tabs> <a-tabs>

2
src/views/projectcenter/ProjectAdd.vue
View File

@@ -461,7 +461,6 @@ export default {
} }
const createProject = async () => { const createProject = async () => {
state.loading = true
console.log("保存", state.projectInfo); console.log("保存", state.projectInfo);
if (!validate(state.projectInfo, errorMsgs)) { if (!validate(state.projectInfo, errorMsgs)) {
return; return;
@@ -485,6 +484,7 @@ export default {
} }
state.projectInfo.type = 3; state.projectInfo.type = 3;
state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0; state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
state.loading = true
api.createProject(state.projectInfo).then((res) => { api.createProject(state.projectInfo).then((res) => {
state.loading = false state.loading = false
state.projectInfo.projectId || state.projectInfo.projectId ||

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

@@ -316,7 +316,7 @@
<!-- 添加外链侧弹窗 --> <!-- 添加外链侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddDiscuss"> <div class="item" @click="showDrawerAddDiscuss">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -407,9 +407,9 @@
v-model:EditInvistId="EditInvistId" v-model:EditInvistId="EditInvistId"
/> />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddVote"> <div class="item" @click="showDrawerAddVote">
@@ -437,9 +437,7 @@
</div> </div>
</div> </div>
--> --></div>
</div>
<div class="boom"> <div class="boom">
<div class="boomcen"> <div class="boomcen">
<div class="onerow"> <div class="onerow">
@@ -632,7 +630,11 @@
</div> </div>
</div> </div>
<div style="width: 87px; text-align: center"> <div style="width: 87px; text-align: center">
{{ element.cretime }}分钟 {{
element.cretime
? element.cretime + "分钟"
: "-"
}}
</div> </div>
<div <div
style=" style="
@@ -1026,7 +1028,7 @@
<div class="close_exit" @click="closeDeleteStage"></div> <div class="close_exit" @click="closeDeleteStage"></div>
</div> </div>
<div class="body"> <div class="body">
<span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span> <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn1" @click="closeDeleteStage"> <div class="del_btn btn1" @click="closeDeleteStage">
@@ -1082,7 +1084,7 @@ export default {
AddTest, AddTest,
AddLive, AddLive,
AddRef, AddRef,
// AddDiscuss, // AddDiscuss,
AddActive, AddActive,
AddEval, AddEval,
AddInvist, AddInvist,
@@ -1094,8 +1096,9 @@ export default {
const route = useRoute(); const route = useRoute();
const state = reactive({ const state = reactive({
projectId: route.query.projectId, projectId: route.query.projectId,
chooseStageId: null, chooseStageId: null,
removeStageId: null, removeStageId: null,
onceChoice: true,
edit: false, edit: false,
isLevel: 2, //学习路径1项目2模板库3 isLevel: 2, //学习路径1项目2模板库3
// isRefEdit: 1, //外链编辑 // isRefEdit: 1, //外链编辑
@@ -1222,7 +1225,8 @@ export default {
? "投票" ? "投票"
: "-", : "-",
creater: value.name, creater: value.name,
cretime: value.duration ? value.duration : "-", cretime:
value.duration || value.duration == 0 ? value.duration : "-",
checked1: value.flag ? true : false, checked1: value.flag ? true : false,
checked: false, //是否选中类型 checked: false, //是否选中类型
courseId: value.courseId, courseId: value.courseId,
@@ -1253,7 +1257,8 @@ export default {
array.push(obj); array.push(obj);
} }
}); });
state.level = array; console.log(array)
state.level = array.sort((a,b)=>{ return a.id - b.id });
}; };
const tableDataFunc = () => { const tableDataFunc = () => {
@@ -1391,12 +1396,26 @@ export default {
}; };
await api.getTask(obj).then((res) => { await api.getTask(obj).then((res) => {
console.log("22222", res.data.data.stageList); console.log("22222", res.data.data.stageList);
if(state.onceChoice){
let data = res.data.data.stageList;
state.onceChoice = false;
let arraynew = []
for(let i=0;i<data.length;i++){
if(data[i].stageId!=='0'){
arraynew.push(data[i])
}
}
console.log(arraynew)
state.chooseStageId = Number(arraynew[arraynew.length-1].stageId);
}
state.projectTitle = res.data.data.projectInfo.name; state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl; state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList; state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList); getStageData(res.data.data.stageList);
updateStageChoosd(); updateStageChoosd();
}); });
}; };
@@ -1620,7 +1639,7 @@ export default {
const showDeleteStage = (id) => { const showDeleteStage = (id) => {
state.deleteStageId = id; state.deleteStageId = id;
state.deleteStageModal = true; state.deleteStageModal = true;
console.log(state.level) console.log(state.level);
}; };
//关闭删除阶段弹窗 //关闭删除阶段弹窗
const closeDeleteStage = () => { const closeDeleteStage = () => {
@@ -1759,35 +1778,35 @@ export default {
// 删除所有阶段 // 删除所有阶段
const removeAllLevel = () => { const removeAllLevel = () => {
// state.cancelModal = false; // state.cancelModal = false;
console.log(state.level) console.log(state.level);
let removeArr = state.level; let removeArr = state.level;
for(let i=0;i<removeArr.length;i++){ for (let i = 0; i < removeArr.length; i++) {
let obj = { let obj = {
stageId: removeArr[i].id stageId: removeArr[i].id,
} };
apistage apistage
.deleteStage(obj) .deleteStage(obj)
.then((res) => { .then((res) => {
console.log("删除阶段成功", res); console.log("删除阶段成功", res);
if(removeArr.length-1==i){ if (removeArr.length - 1 == i) {
message.destroy(); message.destroy();
message.success("删除全部阶段成功"); message.success("删除全部阶段成功");
closeDeleteStage(); closeDeleteStage();
localStorage.setItem("stageId", ""); localStorage.setItem("stageId", "");
getTask(); getTask();
state.cancelModal = false; state.cancelModal = false;
} }
}) })
.catch((err) => { .catch((err) => {
if(removeArr.length-1==i){ if (removeArr.length - 1 == i) {
console.log("删除阶段失败", err); console.log("删除阶段失败", err);
message.destroy(); message.destroy();
message.success("删除全部阶段失败"); message.success("删除全部阶段失败");
state.cancelModal = false; state.cancelModal = false;
} }
}); });
} }
} };
//选择单个任务 //选择单个任务
const changeRow = (e) => { const changeRow = (e) => {
@@ -1993,7 +2012,7 @@ export default {
temporaryStorage, temporaryStorage,
submitStorage, submitStorage,
cancelStorage, cancelStorage,
removeAllLevel removeAllLevel,
}; };
}, },
}; };

57
src/views/projectcenter/temTask.vue
View File

@@ -329,7 +329,7 @@
<!-- 添加外链侧弹窗 --> <!-- 添加外链侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddDiscuss"> <div class="item" @click="showDrawerAddDiscuss">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -427,7 +427,7 @@
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!--TODO1216
<div class="item" @click="showDrawerAddVote"> <div class="item" @click="showDrawerAddVote">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -455,7 +455,6 @@
</div> </div>
</div> </div>
--> -->
</div> </div>
<div class="boom"> <div class="boom">
<div class="boomcen"> <div class="boomcen">
@@ -649,7 +648,7 @@
</div> </div>
</div> </div>
<div style="width: 87px; text-align: center"> <div style="width: 87px; text-align: center">
{{ element.cretime }}分钟 {{ element.cretime ? element.cretime + "分钟" : "-" }}
</div> </div>
<div <div
style=" style="
@@ -1389,7 +1388,7 @@ export default {
? "投票" ? "投票"
: "-", : "-",
creater: value.name, creater: value.name,
cretime: Number(value.duration) > 0 ? value.duration : "-", cretime: value.duration || value.duration == 0 ? value.duration : "-",
checked1: value.flag ? true : false, checked1: value.flag ? true : false,
checked: false, //是否选中类型 checked: false, //是否选中类型
courseId: value.courseId, courseId: value.courseId,
@@ -1402,12 +1401,16 @@ export default {
state.tableData = array; state.tableData = array;
console.log("state.tableData", state.tableData); console.log("state.tableData", state.tableData);
}; };
//把阶段放到level里 //把阶段放到level里
const getStageData = (tableData) => { const getStageData = (tableData) => {
let data = tableData; let data = tableData;
let array = []; let array = [];
data.map((value) => { data.map((value) => {
console.log("dd",Number(value.templateStageId) ,Number(value.templateStageId) > 0); console.log(
"dd",
Number(value.templateStageId),
Number(value.templateStageId) > 0
);
if (Number(value.templateStageId) > 0) { if (Number(value.templateStageId) > 0) {
let obj = { let obj = {
id: value.templateStageId, id: value.templateStageId,
@@ -1624,19 +1627,18 @@ export default {
}); });
};*/ };*/
//获取任务列表 //获取任务列表
const getTask = async () => { const getTask = async () => {
await api
await api .templateDetail(localStorage.getItem("projectTemplateId"))
.templateDetail(localStorage.getItem("projectTemplateId")).then((res) => { .then((res) => {
console.log("22222", res.data.data.stageList); console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectTemplateInfo.name; state.projectTitle = res.data.data.projectTemplateInfo.name;
state.picUrl = res.data.data.projectTemplateInfo.picUrl; state.picUrl = res.data.data.projectTemplateInfo.picUrl;
state.stageList = res.data.data.stageList; state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList); getStageData(res.data.data.stageList);
updateStageChoosd(); updateStageChoosd();
});
});
}; };
function updateStageChoosd() { function updateStageChoosd() {
@@ -1659,9 +1661,15 @@ export default {
getTableData(state.stageList[0].taskList); getTableData(state.stageList[0].taskList);
return; return;
} }
console.log(state.chooseStageId,state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList,state.stageList); console.log(
state.chooseStageId,
state.stageList.find((e) => e.templateStageId == state.chooseStageId)
?.taskList,
state.stageList
);
getTableData( getTableData(
state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList state.stageList.find((e) => e.templateStageId == state.chooseStageId)
?.taskList
); );
} }
@@ -1956,10 +1964,9 @@ export default {
console.log("state.level", id, state.level); console.log("state.level", id, state.level);
state.chooseStageId = id; state.chooseStageId = id;
let final = state.level.find((item) => item.id === id); let final = state.level.find((item) => item.id === id);
if(final !=null){ if (final != null) {
getTableData(final.taskList); getTableData(final.taskList);
} }
}; };
//选择单个任务 //选择单个任务