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

Merge branch 'develop' into manage-release

Browse Source 
# Conflicts:
#	src/App.vue
#	src/components/drawers/AddHomework.vue
#	src/components/drawers/AddTest.vue
#	src/components/student/ChangeLevelModal.vue
#	src/components/student/TableStudent.vue
#	src/views/examine/ProjectReviewed.vue
This commit is contained in:
yuping
2022-12-22 19:05:26 +08:00
parent 52bf37a00d 52db18777d
commit 7dfaf3a3b0
24 changed files with 5578 additions and 5740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/App.vue
View File

@@ -19,7 +19,7 @@
</div>
</template>
<script>
import { computed, defineComponent, ref, watch } from "vue";
import { computed, defineComponent, ref } from "vue";
import { useRouter, useRoute } from "vue-router";
import { useStore } from "vuex";
import NavLeft from "@/components/NavLeft";
@@ -44,16 +44,16 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.9.14------------");
console.log("版本1.01------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
watch(
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
);
// watch(
// () => route.path,
// () => {
// route.path === "/login" && (isLogin.value = true);
// }
// );
const currentRouteName = computed(() => route.name);
function init() {
@@ -186,6 +186,34 @@ export default defineComponent({
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
}
.cus-btn {
width: 100%;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 16px;
border: 1px solid #4ea6ff;
border-radius: 8px;
background: #4ea6ff;
cursor: pointer;
color: #fff;
}
.white {
background: #fff;
color: #4ea6ff;
}
.cus-input {
height: 40px;
border-radius: 8px;
}
.cus-select {
height: 40px;
border-radius: 8px;
}
// @media screen and (max-width: 1366px) {
// .cmMain {
// width: 750px;

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

@@ -64,7 +64,6 @@
:pagination="false"
/>-->
<a-table
class="ant-table-striped"
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
@@ -92,7 +91,8 @@
class="pagination"
@change="handelChangePage"
/>
</div></div>
</div>
</div>
</div>
</div>
<div class="main_btns">
@@ -171,7 +171,7 @@ export default {
time: undefined,
caseId: null,
caseName: "",
isClick: false
isClick: false,
});
const closeDrawer = () => {
ctx.emit("update:addcaseVisible", false);
@@ -218,6 +218,7 @@ export default {
}
state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows;
console.log("selectedRows", selectedRows);
};
const handelChangePage = (page, pageSize) => {
state.selectedRowKeys = [];
@@ -276,14 +277,14 @@ export default {
};
const updateTask = () => {
if (props.isLevel == 1) {
if(!props.isactive){
if (!props.isactive) {
message.destroy();
return message.warning("请先选中关卡");
}
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
message.error("请勿频繁点击");
return;
}
state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) {
@@ -308,10 +309,10 @@ export default {
});
}
} else if (props.isLevel == 2) {
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
message.error("请勿频繁点击");
return;
}
state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) {
@@ -338,10 +339,10 @@ export default {
});
}
} else if (props.isLevel == 3) {
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
message.error("请勿频繁点击");
return;
}
state.isClick = true;
for (let i = 0; i < state.apiTaskList.length; i++) {
@@ -350,7 +351,9 @@ export default {
courseId: Number(state.apiTaskList[i].casesId),
name: state.apiTaskList[i].title,
projectTaskId: props.projectTaskId,
projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
projectTemplateId: Number(
localStorage.getItem("projectTemplateId")
),
stageId: Number(props.chooseStageId) || 0,
type: 3,
})
@@ -371,6 +374,7 @@ export default {
};
//搜索案例列表
const searchList = () => {
state.selectedRowKeys = [];
if (state.inputV1 !== "") {
getAllCaseText();
} else {

108
src/components/drawers/AddHomework.vue
View File

@@ -1,43 +1,21 @@
<template>
<a-drawer
:visible="addhomeworkVisible"
class="drawerStyle addhomeworkDrawer"
width="80%"
placement="right"
@after-visible-change="afterVisibleChange"
>
<a-drawer :visible="addhomeworkVisible" class="drawerStyle addhomeworkDrawer" width="80%" placement="right"
@after-visible-change="afterVisibleChange">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer2"
/>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer2" />
</div>
<a-form
ref="formRef"
name="custom-validation"
:model="formState"
:rules="rules"
v-bind="layout"
@finish="handleFinish"
@validate="handleValidate"
@finishFailed="handleFinishFailed"
>
<a-form ref="formRef" name="custom-validation" :model="formState" :rules="rules" v-bind="layout"
@finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="作业名称" name="workName">
<a-input
v-model:value="formState.workName"
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入作业名称"
autocomplete="off"
show-count
:maxlength="20"
/>
<a-input v-model:value="formState.workName" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入作业名称" autocomplete="off" show-count :maxlength="20" />
</a-form-item>
</div>
</div>
@@ -45,48 +23,30 @@
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="提交时间" name="choosedTime">
<a-range-picker
:show-time="{ format: 'HH:mm' }"
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formState.choosedTime"
format="YYYY/MM/DD HH:mm"
:placeholder="[' 开始时间', ' 结束时间']"
/>
<a-range-picker :disabled-date="disabledDate" :disabled-time="disabledRangeTime" show-time
style="width: 400px; height: 40px; border-radius: 8px" v-model:value="formState.choosedTime"
format="YYYY/MM/DD HH:mm" :placeholder="[' 开始时间', ' 结束时间']" />
</a-form-item>
</div>
</div>
<div class="main_item2">
<a-form-item has-feedback label="作业要求" name="workRequirement">
<div class="textarea">
<a-textarea
v-model:value="formState.workRequirement"
placeholder="请输入作业要求"
autocomplete="off"
allow-clear
:rows="6"
show-count
:maxlength="200"
/>
<a-textarea v-model:value="formState.workRequirement" placeholder="请输入作业要求" autocomplete="off"
allow-clear :rows="6" show-count :maxlength="200" />
</div>
</a-form-item>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/enclosure.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/enclosure.png" alt="" />
</div>
<span style="margin-right: 3px">附件：</span>
</div>
<div class="btnbox">
<a-upload
v-model:file-list="fileList"
name="file"
:action="`${process.env.VUE_APP_BASE_API}/file/upload`"
@change="handleChange"
>
<a-upload v-model:file-list="fileList" name="file" action="/manageApi/file/upload"
@change="handleChange">
<button class="xkbtn" type="button">上传附件</button>
</a-upload>
</div>
@@ -94,9 +54,7 @@
<div class="main_item" style="margin-top: -25px">
<div class="signbox"></div>
<div class="btnbox">
<span style="color: #999999"
>支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span
>
<span style="color: #999999">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
</div>
</div>
</div>
@@ -367,7 +325,7 @@ export default {
};
if (props.EditWorkId > 0) {
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
@@ -388,7 +346,7 @@ export default {
state.isClick = false;
});
} else {
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
@@ -527,7 +485,33 @@ export default {
}
};
const range = (start, end) => {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
};
const disabledDate = (current) => {
// Can not select days before today and today
console.log('1111', dayjs().endOf('day'))
return current && current < dayjs().startOf('day');
};
const disabledDateTime = () => {
return {
disabledHours: () => range(0, 24).splice(4, 20),
disabledMinutes: () => range(30, 60),
disabledSeconds: () => [55, 56],
};
};
return {
disabledDate,
disabledDateTime,
afterVisibleChange,
closeDrawer,
closeDrawer2,
@@ -620,6 +604,7 @@ export default {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
.textarea {
width: 400px;
@@ -641,6 +626,7 @@ export default {
border-radius: 8px;
}
}
.signbox {
width: 120px;
display: flex;

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

@@ -1,12 +1,21 @@
<template>
<a-drawer :visible="addonlineVisible" class="drawerStyle addonlineDrawer" width="80%" title="添加在线" placement="right"
@after-visible-change="afterVisibleChange">
<a-drawer
:visible="addonlineVisible"
class="drawerStyle addonlineDrawer"
width="80%"
title="添加在线"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div v-if="edit" class="headerTitle">编辑在线</div>
<div v-else class="headerTitle">添加在线</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
<div class="main_items">
@@ -14,16 +23,19 @@
<div class="mii_ipt">
<div class="ipt_name"></div>
<div class="fi_input">
<a-input v-model:value="inputV1" style="
<a-input
v-model:value="inputV1"
style="
width: 280px;
height: 40px;
border-radius: 8px;
padding-right: 49px;
" placeholder="请输入课程名称" maxlength="20" />
"
placeholder="请输入课程名称"
maxlength="20"
/>
<div class="inp_num" style="position: absolute; right: 7px">
<span style="color: #c7cbd2">
</span>
<span style="color: #c7cbd2"> </span>
</div>
</div>
</div>
@@ -79,19 +91,34 @@
<!-- 编辑的表格 -->
<div>
<div>
<a-table class="ant-table-striped" :row-class-name="
<a-table
class="ant-table-striped"
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
" :row-selection="{
"
:row-selection="{
type: 'radio',
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}" :columns="tableDataFunc()" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false"
:pagination="false" />
<div class="tableBox" style="margin-top:85px;">
}"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
/>
<div class="tableBox" style="margin-top: 85px">
<div class="pa">
<a-pagination v-if="tableDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
hideOnSinglePage="true" :pageSize="pageSize" :current="currentPage" :total="tableDataTotal"
class="pagination" @change="handelChangePage" />
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="handelChangePage"
/>
</div>
</div>
</div>
@@ -232,7 +259,7 @@ export default {
pageSize: 10,
choicecourse: true,
ddLoading: false,
isClick: false
isClick: false,
});
const ChoiceCourse = () => {
state.choicecourse = false;
@@ -256,9 +283,7 @@ export default {
}
};
//TODO 根据id 获取在线课信息
const getOnlineById = () => {
}
const getOnlineById = () => {};
const tableDataFunc = () => {
const columns = [
// {
@@ -317,6 +342,7 @@ export default {
return columns;
};
const onSelectChange = (selectedRowKeys, selectedRows) => {
console.log("selectedRows", selectedRows);
state.selectedRowKeys = selectedRowKeys;
state.addOnlineList = selectedRows;
console.log(selectedRowKeys, selectedRows);
@@ -357,7 +383,9 @@ export default {
createTime: value.sysCreateTime,
publishTime: value.publishTime,
courseId: Number(value.onlineClassesId),
studyTime: value.studyTime,
};
// console.log("objobjobjobj", obj, value);
array.push(obj);
}
});
@@ -456,10 +484,10 @@ export default {
l_data_id.push(item["courseId"]);
});
console.log("需要查询的在线课ID", l_data_id);
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
message.error("请勿频繁点击");
return;
}
state.isClick = true;
IsExistence({
@@ -487,7 +515,7 @@ export default {
return;
} else {
state.addOnlineList.map((value) => {
console.log(value);
console.log("要添加的在线课任务", value);
RouterEditTask({
chapterId: Number(props.isactive),
courseId: value.num,
@@ -495,6 +523,7 @@ export default {
routerId: props.routerId,
routerTaskId: props.routerTaskId || 0,
type: 1,
duration: value.studyTime,
})
.then((res) => {
if (res.data.code == 200) {
@@ -531,10 +560,10 @@ export default {
p_data_id.push(item["courseId"]);
});
console.log("需要查询的在线课ID", p_data_id);
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
message.error("请勿频繁点击");
return;
}
state.isClick = true;
IsExistenceProject({
@@ -569,6 +598,7 @@ export default {
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 1,
duration: value.studyTime,
})
.then(() => {
message.destroy();
@@ -589,17 +619,16 @@ export default {
console.log(err);
});
} else if (props.isLevel == 3) {
let p_data = state.addOnlineList;
let p_data_id = [];
p_data.map((item) => {
p_data_id.push(item["courseId"]);
});
console.log("需要查询的在线课ID", p_data_id);
if(state.isClick){
if (state.isClick) {
message.destroy();
message.error('请勿频繁点击')
return
message.error("请勿频繁点击");
return;
}
state.isClick = true;
IsExistenceProjectTemplate({
@@ -625,8 +654,7 @@ export default {
return;
} else {
state.addOnlineList.map((value) => {
console.log(props, props.projectTemplateId, props.projectTaskId)
console.log(props, props.projectTemplateId, props.projectTaskId);
addTempTask({
courseId: value.num,
name: value.name,
@@ -634,24 +662,28 @@ export default {
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 1,
duration: value.studyTime,
})
.then((res) => {
console.log('新增或者编辑在线课', res)
console.log("新增或者编辑在线课", res);
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
message.success(
`${props.edit ? "编辑" : "新增"}模板库任务成功`
);
ctx.emit("changeData", false);
closeDrawer();
state.isClick = false;
})
.catch(() => {
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
message.error(
`${props.edit ? "编辑" : "新增"}模板库任务失败`
);
state.isClick = false;
});
})
});
}
});
}
//if(state.addOnlineList.Target==undefined){
// closeDrawer();
@@ -660,6 +692,8 @@ export default {
//搜索在线列表
const searchList = () => {
if (state.inputV1 || state.selectV) {
state.selectedRowKeys = [];
state.addOnlineList = [];
getAllOnlineText();
} else {
resetOnline();
@@ -674,9 +708,7 @@ export default {
state.currentPage = 1;
getAllOnlineText();
};
onMounted(() => {
});
onMounted(() => {});
return {
...toRefs(state),
afterVisibleChange,
@@ -870,7 +902,7 @@ export default {
padding-left: 5px !important;
}
.ant-table-thead>tr>th {
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
@@ -878,7 +910,9 @@ export default {
background-color: #eff4fc !important;
}
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}

2
src/components/drawers/AddProject.vue
View File

@@ -374,9 +374,11 @@ export default {
// this.selectedRows = selectedRows;
// };
const searchProjectList = () => {
state.selectedRowKeys = [];
getAllProjText();
};
const resetProjectList = () => {
state.selectedRowKeys = [];
state.inputV1 = "";
state.inputV2 = "";
state.inputV3 = "";

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

@@ -1,11 +1,19 @@
<template>
<a-drawer :visible="addtestVisible" class="drawerStyle addtestDrawer" width="80%" placement="right"
@after-visible-change="afterVisibleChange">
<a-drawer
:visible="addtestVisible"
class="drawerStyle addtestDrawer"
width="80%"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}考试</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer2" />
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer2"
/>
</div>
<!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 -->
<div style="display: flex; flex-direction: row; padding-top: 0px">
@@ -31,20 +39,30 @@
<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>
<div class="btnbox">
<a-input v-model:value="test.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入考试名称" :maxlength="20" />
<a-input
v-model:value="test.examinationName"
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入考试名称"
:maxlength="20"
/>
</div>
</div>
<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>
@@ -62,8 +80,11 @@
</div>
<!-- 选择面授侧弹窗 -->
<div>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"
v-model:chooseCourseName="chooseCourseName" />
<sel-facet
v-model:selfacetVisible="selfacetvisible"
v-model:chooseCourse="chooseCourse"
v-model:chooseCourseName="chooseCourseName"
/>
</div>
<!-- 选择面授侧弹窗 -->
</div>
@@ -71,25 +92,41 @@
<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>
<div class="btnbox">
<a-range-picker style="width: 400px; height: 40px; border-radius: 8px" :show-time="{ format: 'HH:mm' }" format="YYYY/MM/DD HH:mm"
v-model:value="test.chooseTime" :placeholder="[' 开始时间', ' 结束时间']" />
<a-range-picker
style="width: 400px; height: 40px; border-radius: 8px"
show-time
format="YYYY/MM/DD HH:mm"
v-model:value="test.chooseTime"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</div>
<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>
<div class="select">
<a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="test.examinationDuration"></a-input-number>
<a-input-number
:min="0"
:max="300"
:precision="0"
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="test.examinationDuration"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
@@ -98,8 +135,14 @@
<span style="margin-right: 3px">考试说明：</span>
</div>
<div class="textarea">
<a-textarea v-model:value="test.examinationExplain" placeholder="请输入考试说明" allow-clear show-count
:maxlength="200" :rows="6" />
<a-textarea
v-model:value="test.examinationExplain"
placeholder="请输入考试说明"
allow-clear
show-count
:maxlength="200"
:rows="6"
/>
</div>
</div>
<div class="main_item2">
@@ -110,13 +153,21 @@
<div class="setbox">
<div class="timerbox">
<span>允许重复考试：</span>
<a-input-number :min="-1" :max="300" :precision="0" style="
<a-input-number
:min="-1"
:max="300"
:precision="0"
style="
width: 100px;
height: 32px;
border-radius: 8px;
overflow: hidden;
" v-model:value="test.examinationLimit"></a-input-number>
<span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
"
v-model:value="test.examinationLimit"
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>次,-1表示无限制</span
>
</div>
</div>
</div>
@@ -127,10 +178,15 @@
<span style="margin-right: 3px">显示答案：</span>
</div>
<div class="btnbox">
<a-radio-group style="margin-right: 12px" v-model:value="test.showAnswers">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看
<a-radio-group
style="margin-right: 12px"
v-model:value="test.showAnswers"
>
<a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>允许查看
</a-radio>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1">不允许查看
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>不允许查看
</a-radio>
</a-radio-group>
</div>
@@ -140,10 +196,15 @@
<span style="margin-right: 3px">显示解析：</span>
</div>
<div class="btnbox">
<a-radio-group style="margin-right: 12px" v-model:value="test.showAnalysis">
<a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看
<a-radio-group
style="margin-right: 12px"
v-model:value="test.showAnalysis"
>
<a-radio v-model:checked="checked" :value="1" @click="cloradio2"
>允许查看
</a-radio>
<a-radio v-model:checked="checked" :value="2" @click="cloradio2">不允许查看
<a-radio v-model:checked="checked" :value="2" @click="cloradio2"
>不允许查看
</a-radio>
</a-radio-group>
</div>
@@ -153,21 +214,35 @@
<span style="margin-right: 3px">评分模式：</span>
</div>
<div class="btnbox">
<a-radio-group style="margin-right: 12px" v-model:value="test.scoringModel">
<a-radio v-model:checked="checked" :value="1" @click="cloradio3">最高一次
<a-radio-group
style="margin-right: 12px"
v-model:value="test.scoringModel"
>
<a-radio v-model:checked="checked" :value="1" @click="cloradio3"
>最高一次
</a-radio>
<a-radio v-model:checked="checked" :value="2" @click="cloradio3">最后一次
<a-radio v-model:checked="checked" :value="2" @click="cloradio3"
>最后一次
</a-radio>
</a-radio-group>
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">及格线：</span>
</div>
<div class="btnbox">
<a-input v-model:value="test.passLine" type="number"
style="width: 400px; height: 40px; border-radius: 8px" />
<a-input
v-model:value="test.passLine"
type="number"
style="width: 400px; height: 40px; border-radius: 8px"
/>
<span style="color: #999999; margin-left: 8px">分</span>
</div>
@@ -178,14 +253,33 @@
<span style="margin-right: 3px">试题排列：</span>
</div>
<div class="btnbox">
<a-radio-group style="margin-right: 12px" v-model:value="test.questionArrangement">
<a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序
<a-radio-group
style="margin-right: 12px"
v-model:value="test.questionArrangement"
>
<a-radio
v-model:checked="checked"
:value="1"
@click="cloradio4"
>试题乱序
</a-radio>
<a-radio v-model:checked="checked" :value="2" @click="cloradio4">选项乱序
<a-radio
v-model:checked="checked"
:value="2"
@click="cloradio4"
>选项乱序
</a-radio>
<a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序
<a-radio
v-model:checked="checked"
:value="3"
@click="cloradio4"
>全部乱序
</a-radio>
<a-radio v-model:checked="checked" :value="4" @click="cloradio4">不乱序
<a-radio
v-model:checked="checked"
:value="4"
@click="cloradio4"
>不乱序
</a-radio>
</a-radio-group>
</div>
@@ -309,7 +403,10 @@ export default {
},
],
});
state.test.showAnswers = 1;
state.test.showAnalysis = 1;
state.test.scoringModel = 2;
state.test.questionArrangement = 4;
const clearAll = () => {
state.test = {};
};
@@ -389,6 +486,10 @@ export default {
message.destroy();
return message.warning("请输入考试时长");
}
if (!state.test.passLine) {
message.destroy();
return message.warning("请输入及格线");
}
state.addLoading = true;
console.log("test", state.test);
@@ -400,10 +501,13 @@ export default {
// new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
// "Y-M-D h:m"
// );
state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format("YYYY-MM-DD HH:mm"),
state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format("YYYY-MM-DD HH:mm"),
state.test.examinationPaperId = state.paperId;
(state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format(
"YYYY-MM-DD HH:mm"
)),
(state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format(
"YYYY-MM-DD HH:mm"
)),
(state.test.examinationPaperId = state.paperId);
//TODO缺少paperName字段
state.test.examinationTestName = state.paperName;
@@ -529,7 +633,7 @@ export default {
const changeOuter = (value) => {
state.isOuter = value;
};
const chooseTest = () => { };
const chooseTest = () => {};
const closeTag = (removedTag) => {
const tags = state.choosedTestList.filter(
(item) => item.key != removedTag
@@ -756,7 +860,7 @@ export default {
padding-left: 5px !important;
}
.ant-table-thead>tr>th {
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
@@ -764,7 +868,9 @@ export default {
background-color: #eff4fc !important;
}
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}

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

@@ -9,7 +9,7 @@
maxlength="20"
/>
</div>
<div class="btns" @click="getAllInvistText">
<div class="btns" @click="searchList">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
@@ -43,10 +43,11 @@
>创建人：
<span class="data">{{ assessment.creator }}</span>
</span>
<!--
<span class="title"
>创建时间：
<span class="data">{{ assessment.time }}</span>
</span>
</span>-->
</div>
<!--
<div v-else>
@@ -144,14 +145,19 @@ export default {
assessmentId: null,
assessmentName: null,
});
const afterVisibleChange=()=>{
}
const closeDrawer = () => {
ctx.emit("update:assessmentVisible", false);
};
//清空所选
const clearLine = () => {
console.log("state.selectedRowKeys", state.selectedRowKeys);
state.selectedRowKeys = [];
state.addOnlineList = [];
state.inputV1 = "";
};
const queryInfo = () => {
//if (props.edit) {
@@ -185,8 +191,8 @@ export default {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: num,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
creator: info.createUserName ? info.createUserName : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
};
//更新讨论信息
state.assessment = obj;
@@ -277,8 +283,8 @@ export default {
assessmentId: value.assessmentId,
num: num,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),
creator: value.createUserName ? value.createUserName : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
};
array.push(obj);
});
@@ -287,6 +293,7 @@ export default {
};
//获取全部评估信息接口
const getAllInvistText = () => {
api
.queryAssessmentDetailList({
assessmentName: state.inputV1,
@@ -308,9 +315,15 @@ export default {
// state.createLoading = false;
});
};
//重置评估信息
const searchList = () => {
state.selectedRowKeys = [];
getAllInvistText();
};
//重置评估信息
const resetInvist = () => {
state.selectedRowKeys = [];
state.inputV1 = "";
getAllInvistText();
};
@@ -321,10 +334,7 @@ export default {
state.selectedRowKeys,
state.assessmentId
);
if (!state.assessmentId) {
clearLine();
}
state.inputV1 = "";
queryInfo();
getAllInvistText();
});
@@ -336,6 +346,7 @@ export default {
state.assessment = null;
} else {
queryInfo();
console.log("dd");
}
console.log("props.assessmentId", props.assessmentId);
},
@@ -353,6 +364,8 @@ export default {
resetInvist,
handelChangePage,
queryInfo,
searchList,
afterVisibleChange,
};
},
};

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

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

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

@@ -24,7 +24,7 @@
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width:424px; height: 40px; border-radius: 8px"
style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
/>
</div>
@@ -54,7 +54,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox" style="margin-top:85px;">
<div class="tableBox" style="margin-top: 85px">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
@@ -67,7 +67,8 @@
class="pagination"
@change="changePagination"
/>
</div></div>
</div>
</div>
</div>
</div>
<div class="main_btns">
@@ -161,7 +162,7 @@ export default {
}
state.selectedRowKeys = selectedRowKeys;
state.evListData = selectedRows[0] ? selectedRows[0] : {};
console.log("state.evListData",state.evListData);
console.log("state.evListData", state.evListData);
};
const closeDrawer = () => {
state.selectedRowKeys = [];
@@ -229,19 +230,20 @@ export default {
//获取测评列表
const getAllEvalText = () => {
let objael = {
keyword:state.inputV1,
keyword: state.inputV1,
};
api
.choiceEvaluation(objael)
.then((res) => {
state.tableDataTotal=9;
state.tableDataTotal = 9;
// console.log("测评列表", res.data.data);
getTableDataList(res.data.data);
})
.catch(() => {});
};
//搜索测评列表
const searchList = () => {
state.selectedRowKeys = [];
if (state.inputV1 !== "") {
getAllEvalText();
} else {

10
src/components/drawers/ProjectAudit.vue
View File

@@ -63,16 +63,12 @@
:unCheckedValue="0"
:disabled="true"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
style="width: 100%;color: rgba(109, 117, 132, 1);font-size: 14px;"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-switch>
</div>
</div>
<div class="set_content">
<div class="set_content" v-if="projectInfo.boeFlag">
<div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main">
<a-switch
@@ -83,7 +79,7 @@
></a-switch>
</div>
</div>
<div class="set_content">
<div class="set_content" v-if="projectInfo.remark ">
<div class="setc_name"><span>项目说明：</span></div>
<div class="setc_main">
<span style="color: #999999">{{ projectInfo.remark }}</span>

1
src/components/drawers/SelFacet.vue
View File

@@ -527,6 +527,7 @@ export default {
};
//搜索
const search = () => {
state.selectedRows = [];
//重新获取列表
getClassList();
};

1
src/components/drawers/SelectTest.vue
View File

@@ -245,6 +245,7 @@ export default {
// };
//获取选择考试列表
const getManageList = () => {
state.selectedRowKeys = [];
let obj = {
keyWord: state.inputPname,
pageIndex: state.currentPage,

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

@@ -4,14 +4,14 @@
<div class="CommonStudent">
<a-drawer
:visible="visiable"
class="drawerStyle ProjCheckship"
class="drawerStyle ProjCheckship CommonStudent"
placement="right"
width="60%"
>
<div class="drawerMain" id="ProjCheckship">
<div class="drawerMain" id="ProjCheckship" style="">
<div class="header">
<div class="headerTitle">
{{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }}
{{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
@@ -19,8 +19,8 @@
@click="closeDrawer"
/>
</div>
<div style="width:100%;display: grid;grid-template-columns: 750px auto;">
<div class="tabs" style="min-height:800px;">
<div style="display: flex; overflow-x: auto; overflow-y: auto">
<div class="tabs" style="min-width: 800px">
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane :key="1" tab="快速选人">
<div :style="{ height: screenHeight - 235 + 'px' }">
@@ -31,19 +31,35 @@
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
<a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
<a-button
type="primary"
@click="onSearchStu"
style="margin-left: 20px; border-radius: 4px"
>
<template #icon>
<SearchOutlined/>
<SearchOutlined />
</template>
搜索
</a-button>
<a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
<a-button
@click="resetStu"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>
</a-form-item>
</div>
<div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
<div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}"
style="border: 1px solid #f0f0f0; ;">
<div class="tree" style="margin: 10px 4px 220px 10px;">
<div
class="chooseLeft"
style="display: grid; grid-template-columns: 250px auto"
>
<div
:style="{
height: screenHeight - 180 + 'px',
overflowY: 'auto',
}"
style="border: 1px solid #f0f0f0"
>
<div class="tree" style="margin: 10px 4px 220px 10px">
<a-tree
allow-clear
tree-default-expand-all
@@ -59,7 +75,13 @@
</a-tree>
</div>
</div>
<div class="tableBox tabb" style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;">
<div
class="tableBox tabb"
style="
margin: 0px 4px 120px 10px;
border: 1px solid #f0f0f0;
"
>
<a-table
:columns="stuColumns"
:data-source="stuData"
@@ -111,9 +133,7 @@
<!-- </div>-->
<!-- </a-tab-pane>-->
<a-tab-pane :key="3" tab="受众关联">
<div
:style="{ height: screenHeight - 235 + 'px' }"
>
<div :style="{ height: screenHeight - 235 + 'px' }">
<div>
<a-form-item label="受众名称：">
<a-input
@@ -121,13 +141,21 @@
style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入受众名称"
/>
<a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
<a-button
type="primary"
@click="searchAudi"
style="margin-left: 20px; border-radius: 4px"
>
<template #icon>
<SearchOutlined/>
<SearchOutlined />
</template>
搜索
</a-button>
<a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
<a-button
@click="resetAudienceInfo"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>
</a-form-item>
</div>
<div class="tableBox tabb">
@@ -145,13 +173,11 @@
</a-tab-pane>
</a-tabs>
</div>
<div class="right1">
<div class="right1" style="min-width: 200px">
<div class="onerow">
<div class="onleft">
<div class="already">已选</div>
</div>
</div>
<div
class="selecteds"
@@ -159,8 +185,8 @@
style="overflow-y: auto"
>
<div class="person">快速选人</div>
<div v-for="(item,i) in selectsData.studentList">
<div v-if="i<11">
<div v-for="(item, i) in selectsData.studentList">
<div v-if="i < 11">
<div class="chose">
{{ item.realName }}
<div class="ch" @click="stuDel(i)"></div>
@@ -173,17 +199,20 @@
<div class="ch" @click="stuDel(i)"></div>
</div>
</div>
</div>
</div>
<div v-if="!person && selectsData.studentList.length >10" class="ifsw">
<div @click="person = !person" class=“sw”>查看更多></div>
<div
v-if="!person && selectsData.studentList.length > 10"
class="ifsw"
>
<div @click="person = !person" class="“sw”">查看更多></div>
</div>
<div v-if="person && selectsData.studentList.length >10" class="ifsw">
<div @click="person = !person" class="sw"> 收起&lt;</div>
<div
v-if="person && selectsData.studentList.length > 10"
class="ifsw"
>
<div @click="person = !person" class="sw">收起&lt;</div>
</div>
<!--组织-->
<!-- <div class="dept">添加组织</div>-->
<!-- <div v-for="(item,i) in selectsData.deptList" >-->
@@ -206,36 +235,33 @@
<!-- </div>-->
<!-- <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>-->
<!-- <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt; </div></div>-->
<!--受众-->
<div class="group">受众关联</div>
<div v-for="(item,i) in selectsData.groupList">
<div v-if="i<11">
<div v-for="(item, i) in selectsData.groupList">
<div v-if="i < 11">
<div class="chose2">
<div class="span"> {{ item.audienceName }}</div>
<div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div>
</div>
</div>
<div v-else>
<div v-if="group">
<div class="chose2">
<div class="span"> {{ item.audienceName }}</div>
<div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div>
</div>
</div>
</div>
</div>
<div v-if="!group && selectsData.groupList.length >10" class="ifsw">
<div @click="group = !group" class=“sw”>查看更多></div>
<div
v-if="!group && selectsData.groupList.length > 10"
class="ifsw"
>
<div @click="group = !group" class="“sw”">查看更多></div>
</div>
<div v-if="group && selectsData.groupList >10" class="ifsw">
<div @click="group = !group" class="sw"> 收起&lt;</div>
<div v-if="group && selectsData.groupList > 10" class="ifsw">
<div @click="group = !group" class="sw">收起&lt;</div>
</div>
</div>
</div>
<!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
@@ -243,7 +269,6 @@
<div style="margin-top: 20px">快速选人</div>
// eslint-disable-next-line vue/require-v-for-key
<div v-for="(item,i) in selectsData.studentList" >
<a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)"
:key="i" style="margin-top:20px">
{{ item.realName }}
@@ -252,7 +277,6 @@
style="margin-top:20px">
{{ item.realName }}
</a-tag>
<div></div>
</div>
</div>
@@ -283,100 +307,103 @@
<slot></slot>
</div>
</div>
<a-modal v-model:visible="stageVisible" width="1000px" title="选择阶段" @ok="handleStageOk">
<a-modal
v-model:visible="stageVisible"
width="1000px"
title="选择阶段"
@ok="handleStageOk"
>
<div>
{{ type === 1 ? '选择阶段' : '选择关卡' }}
<a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId"
className="cus-select">
<a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{
item.name || '默认'
}}
{{ type === 1 ? "选择阶段" : "选择关卡" }}
<a-select
style="width: 150px"
:placeholder="type === 1 ? '选择阶段' : '选择关卡'"
v-model:value="selectsData.stageId"
className="cus-select"
>
<a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id"
>{{ item.name || "默认" }}
</a-select-option>
</a-select>
</div>
</a-modal>
</template>
<script setup>
import {computed, defineEmits, defineProps, ref, watch} from "vue";
import {useStore} from "vuex";
import {useBoeApiPage} from "@/api/request";
import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi";
import {saveStu} from "@/api/index1";
import { computed, defineEmits, defineProps, ref, watch } from "vue";
import { useStore } from "vuex";
import { useBoeApiPage } from "@/api/request";
import { AUDIENCE_LIST, USER_LIST } from "@/api/ThirdApi";
import { saveStu } from "@/api/index1";
const store = useStore();
const emit = defineEmits({})
const emit = defineEmits({});
const props = defineProps({
type: Number,
id: String,
stage: {
type: Array,
default: () => []
}
})
const person = ref(false)
default: () => [],
},
});
const person = ref(false);
// const dept =ref(false)
const group = ref(false)
const visiable = ref(false)
const activeKey = ref(1)
const stageVisible = ref(false)
const group = ref(false);
const visiable = ref(false);
const activeKey = ref(1);
const stageVisible = ref(false);
const selectsData = ref({
stageId: '',
stageId: "",
studentList: [],
deptList: [],
groupList: []
})
groupList: [],
});
const nameSearch = ref({
keyword: '',
keyword: "",
departId: null,
page: 1,
pageSize: 10
})
pageSize: 10,
});
const audienceName = ref({
keyword: '',
keyword: "",
page: 1,
pageSize: 10
})
pageSize: 10,
});
// const searchOrgName = ref({
// keyword: '',
// page: 1,
// pageSize: 10
// })
const stageIds = computed(() => props.stage)
const stageIds = computed(() => props.stage);
const {
data: stuData,
fetch: searchStu,
page: stuPageNo,
pageSize: stuPageSize,
loading: stuLoading,
total: stuTotal
total: stuTotal,
} = useBoeApiPage(USER_LIST, nameSearch.value, {
init: false,
result: res => res.result.userInfoList,
totalPage: res => res.result.totalPage,
total: res => res.result.totalElement
})
result: (res) => res.result.userInfoList,
totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement,
});
// const {
// data: orgData,
// fetch: searchOrg,
// } = useBoeApi(ORG_LIST, searchOrgName.value)
const {
data: audiData,
fetch: searchAudi,
page: audiPageNo,
pageSize: audiPageSize,
loading: audiLoading,
total: audiTotal
total: audiTotal,
} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
init: true,
result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
totalPage: res => res.result.totalPage,
total: res => res.result.totalElement
})
result: (res) =>
res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement,
});
const stuColumns = ref([
{
title: "姓名",
@@ -414,7 +441,7 @@ const stuColumns = ref([
className: "h",
ellipsis: true,
},
])
]);
const audiColums = ref([
{
title: "受众名称",
@@ -441,142 +468,127 @@ const audiColums = ref([
align: "center",
className: "h",
},
])
const stuSelectKeys = ref([])
const orgSelectKeys = ref([])
const auditSelectKeys = ref([])
const screenHeight = ref(document.body.clientHeight)
]);
const stuSelectKeys = ref([]);
const orgSelectKeys = ref([]);
const auditSelectKeys = ref([]);
const screenHeight = ref(document.body.clientHeight);
const stuRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange,
preserveSelectedRowKeys: true,
}))
}));
const orgRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: orgSelectKeys.value,
onChange: onOrgSelectChange,
preserveSelectedRowKeys: true,
}))
}));
const stuPagination = computed(() => ({
total: stuTotal.value,
showSizeChanger: false,
current: stuPageNo.value,
pageSize: stuPageSize.value,
onChange: changePagination
}))
onChange: changePagination,
}));
const auditPagination = computed(() => ({
total: audiTotal.value,
showSizeChanger: false,
current: audiPageNo.value,
pageSize: audiPageSize.value,
onChange: auditChangePagination
}))
onChange: auditChangePagination,
}));
const auditRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: auditSelectKeys.value,
onChange: onAuditSelectChange,
preserveSelectedRowKeys: true,
}))
}));
const closeDrawer = () => {
visiable.value = false
visiable.value = false;
stuData.value = [];
};
const openDrawer = () => {
visiable.value = true
visiable.value = true;
};
//获取组织树
const treeData = computed(() => {
return store.state.orgtreeList ? store.state.orgtreeList : [];
});
function onSearchStu() {
nameSearch.value.page = 1
searchStu()
nameSearch.value.page = 1;
searchStu();
}
function stuStuOrgSelect(e) {
nameSearch.value.departId = e.join('')
searchStu()
nameSearch.value.departId = e.join("");
searchStu();
}
function stuDel(i) {
stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
selectsData.value.studentList.splice(i, 1)
stuSelectKeys.value = stuSelectKeys.value.filter(
(e) => e !== selectsData.value.studentList[i].id
);
selectsData.value.studentList.splice(i, 1);
}
// function orgDel(i) {
// orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
// selectsData.value.deptList.splice(i, 1)
// }
function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
selectsData.value.groupList.splice(i, 1)
auditSelectKeys.value = auditSelectKeys.value.filter(
(e) => e !== selectsData.value.groupList[i].id
);
selectsData.value.groupList.splice(i, 1);
}
// function orgSelect(key, obj) {
// console.log(obj)
//request(ORG_CHILD_LIST, {orgId: null}).then(res => {
//console.log(res.result)
//})
//}
function onStuSelectChange(e, l) {
stuSelectKeys.value = e
selectsData.value.studentList = l
stuSelectKeys.value = e;
selectsData.value.studentList = l;
}
function onOrgSelectChange(e, l) {
orgRowSelection.value = e
selectsData.value.deptList = l.selectedNodes
orgRowSelection.value = e;
selectsData.value.deptList = l.selectedNodes;
}
function onAuditSelectChange(e, l) {
auditSelectKeys.value = e
selectsData.value.groupList = l
auditSelectKeys.value = e;
selectsData.value.groupList = l;
}
// const stuDepartmentSelect = (e) => {
// nameSearch.value.orgId = e.join('')
// searchStu()
// };
//分页获取学员
const changePagination = (page) => {
nameSearch.value.page = page;
searchStu()
searchStu();
};
const auditChangePagination = (page) => {
audienceName.value.page = page;
searchAudi()
searchAudi();
};
//重置
const resetStu = () => {
deleteDepSelect();
nameSearch.value = {keyword: '', page: 1, pageSize: 10}
nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
};
//清空选择部门信息
const deleteDepSelect = () => {
stuSelectKeys.value = []
stuSelectKeys.value = [];
};
//重置组织
// const resetOrg = () => {
// searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
// };
//重置受众
const resetAudienceInfo = () => {
audienceName.value = {keyword: '', page: 1, pageSize: 10}
audienceName.value = { keyword: "", page: 1, pageSize: 10 };
};
//全部清除
// const deleteAll = () => {
// selectsData.value = {
@@ -588,57 +600,52 @@ const resetAudienceInfo = () => {
//确定添加授权
const submitAuth = () => {
if (props.type === 2) {
stageVisible.value = true
stageVisible.value = true;
} else {
handleStageOk()
handleStageOk();
}
};
function handleStageOk() {
stageVisible.value = false
visiable.value = false
emit('finash', false)
stageVisible.value = false;
visiable.value = false;
emit("finash", false);
saveStu({
targetId: props.id,
type: props.type,
deptIds: selectsData.value.deptList?.map(e => e.id),
deptIds: selectsData.value.deptList?.map((e) => e.id),
stageId: selectsData.value.stageId,
groupIds: selectsData.value.groupList?.map(e => e.id),
studentList: selectsData.value.studentList
groupIds: selectsData.value.groupList?.map((e) => e.id),
studentList: selectsData.value.studentList,
}).then(() => {
emit('finash', true)
})
emit("finash", true);
});
}
watch(visiable, () => {
stuSelectKeys.value = []
orgSelectKeys.value = []
auditSelectKeys.value = []
stuData.value = []
audienceName.value.keyword = ''
audienceName.value.page = 1
audienceName.value.pageSize = 10
stuSelectKeys.value = [];
orgSelectKeys.value = [];
auditSelectKeys.value = [];
stuData.value = [];
audienceName.value.keyword = "";
audienceName.value.page = 1;
audienceName.value.pageSize = 10;
selectsData.value = {
stageId: '',
stageId: "",
studentList: [],
deptList: [],
groupList: []
}
searchAudi()
})
groupList: [],
};
searchAudi();
});
</script>
<style lang="scss">
.CommonStudent {
.ant-btn-primary {
background-color: #4ea6ff !important;
}
.cus-select {
height: 40px;
border-radius: 8px;
}
.tableBox .ant-table-row .ant-table-cell {
height: 48px;
font-size: 14px;
@@ -647,25 +654,18 @@ watch(visiable, () => {
line-height: 29px;
padding: 0px;
}
.tableBox .ant-table-thead tr th {
font-size: 14px;
}
.ant-tabs-tabpane {
height: 100%;
}
.ant-tabs {
overflow: visible;
}
}
.right1 {
.right1 {
border-left: 1px solid #f2f6fe;
width: 100%;
margin-left: 20px;
.onerow {
display: flex;
justify-content: space-between;
@@ -700,7 +700,6 @@ watch(visiable, () => {
font-weight: 500;
}
}
.clbox {
margin-right: 50px;
display: flex;
@@ -711,7 +710,6 @@ watch(visiable, () => {
height: 32px;
border-radius: 4px;
background: #4ea6ff;
.colose {
width: 16px;
height: 16px;
@@ -722,25 +720,21 @@ watch(visiable, () => {
background-size: 100%;
margin-right: 4px;
}
.allclear {
color: rgba(255, 255, 255, 1);
font-size: 14px;
}
}
}
.selecteds {
display: flex;
flex-wrap: wrap;
margin-left: 32px;
.person {
width: 100%;
margin-top: 20px;
border-top: 1px solid #f2f6fe;
}
.chose {
width: 64px;
height: 24px;
@@ -754,7 +748,6 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.ch {
position: absolute;
width: 18px;
@@ -764,14 +757,12 @@ watch(visiable, () => {
top: -8px;
}
}
.ifsw {
display: flex;
align-items: end;
justify-content: center;
color: #4ea6ff;
}
.sw {
display: flex;
align-items: center;
@@ -781,13 +772,11 @@ watch(visiable, () => {
margin-top: 23px;
margin-left: 10px;
}
.dept {
width: 100%;
margin-top: 30px;
border-top: 1px solid #f2f6fe;
}
.chose1 {
//width: 90px;
height: 24px;
@@ -801,13 +790,11 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch1 {
position: absolute;
width: 18px;
@@ -817,13 +804,11 @@ watch(visiable, () => {
top: -8px;
}
}
.group {
width: 100%;
margin-top: 30px;
border-top: 1px solid #f2f6fe;
}
.chose2 {
//width: 120px;
height: 24px;
@@ -837,13 +822,11 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch2 {
position: absolute;
width: 18px;
@@ -854,6 +837,6 @@ watch(visiable, () => {
}
}
}
}
}
</style>

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

@@ -6,7 +6,7 @@
style="padding-left: 20px; margin-right: 0px"
>
<a-col>
<a-form-item title="姓名：" @click="getStuList">
<a-form-item title="姓名：" >
<a-input
class="cus-input"
v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
</a-form-item>
</a-col>
<a-col>
<a-button class="cus-btn" style="width: 100px">
<a-button class="cus-btn" style="width: 100px" @click="getStuList">
<template #icon>
<img
style="margin-right: 10px"
@@ -117,7 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
import { delStudentList, getStuPage } from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue";
import {message} from "ant-design-vue";
import { message } from "ant-design-vue";
const props = defineProps({
type: Number,
id: String,
@@ -191,7 +191,7 @@ const tableData = ref({
});
const stuRowSelection = computed(() => ({
columnWidth: 10,
columnWidth: 20,
selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange,
preserveSelectedRowKeys: true,
@@ -233,9 +233,16 @@ function getStuList() {
});
}
function reset() {}
function reset() {
tableParam.value.studentName="";
}
function bathDel() {
if( stuSelectKeys.value &&
stuSelectKeys.value.length === 0){
message.destroy();
return message.warning("请先选中学员");
}
stuSelectKeys.value &&
stuSelectKeys.value.length &&
delStudentList({

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

@@ -143,7 +143,6 @@
placeholder="请输入课程名称"
v-model:value="xzinputV1"
v-model:validate="validate"
:maxlength="20"
show-count
:type="2"
@@ -226,7 +225,8 @@
</div>
<a-radio-group v-model:value="valueE1">
<div class="bc_box">
<div class="bc_boxl">
<!-- 2022-12-21 隐藏 后面放开 lixiaoge -->
<!-- <div class="bc_boxl">
<div class="ol_checkbox" @click="expectOnline">
<a-radio
v-model:checked="checked"
@@ -237,7 +237,7 @@
线上
</a-radio>
</div>
</div>
</div> -->
<div class="bc_boxr">
<div class="ol_checkbox">
<a-radio
@@ -364,7 +364,6 @@
placeholder="请输入课程名称"
v-model:value="qdms_inputV1"
v-model:validate="validate"
:maxlength="20"
show-count
:type="2"
@@ -2219,9 +2218,7 @@
</div>
</div>
</div>
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="" />
</div>
</a-modal>
<!--新建开课页面 -->
<!--开课学员管理页面 -->
@@ -2278,7 +2275,11 @@
<span>{{ currentPlanItem.teacher }}</span>
</div>
<div class="stmm_i5">
<TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns">
<TableStudent
:type="3"
:id="offcoursePlanId"
:columns="stuColumns"
>
<!-- <template #extension = "data">-->
<!-- <div style="display: flex">-->
<!-- <button @click="handlJoinStu(data)">成绩录入</button>-->
@@ -3412,21 +3413,21 @@ export default defineComponent({
}
},
},
{
title: "加入方式",
width: "10%",
dataIndex: "join",
key: "6",
align: "center",
customRender: ({ record }) => {
switch (String(record.source)) {
case "1":
return "手动加入";
case "2":
return "报名加入";
}
},
},
// {
// title: "加入方式",
// width: "10%",
// dataIndex: "join",
// key: "6",
// align: "center",
// customRender: ({ record }) => {
// switch (String(record.source)) {
// case "1":
// return "手动加入";
// case "2":
// // return "报名加入";
// }
// },
// },
// {
// title: "签到状态",
// width: '10%',
@@ -4659,7 +4660,6 @@ export default defineComponent({
console.log("state.validate", state.validate);
if (!state.validate) {
message.destroy();
return message.warning("该课程名称已存在");
@@ -4842,7 +4842,7 @@ export default defineComponent({
};
//保存开课
const handleSureStu = () => {
state.addLoading = true;
let startTime,
endTime = 0;
if (state.xjkkinputV3) {
@@ -4884,17 +4884,19 @@ export default defineComponent({
message.destroy();
return message.error("请输入必填项");
} else {
state.addLoading = true;
console.log("state.addLoading ", state.addLoading);
}
state.addLoading = true;
editPlan(postData).then((res) => {
if (res.data.code === 200) {
getTableDate3();
handleCancelStu();
rest();
}
});
state.addLoading = false;
});
};
//编辑开课
const handelEditStu = async (itm) => {
@@ -8125,183 +8127,9 @@ export default defineComponent({
display: flex;
justify-content: space-between;
.i5_left {
display: flex;
.select {
margin-right: 20px;
margin-bottom: 20px;
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
}
.btnn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #ffffff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
line-height: 36px;
margin-left: 5px;
}
}
.btn1 {
.search {
width: 15px;
height: 17px;
background-image: url("../../assets/images/courseManage/search0.png");
}
}
.btn2 {
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
.btnText {
color: #ffffff;
}
}
.btn1:active {
background: #0982ff;
}
.btn2:hover {
background: rgba(64, 158, 255, 0.1);
}
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
}
.btns {
display: flex;
// flex-wrap: wrap;
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
}
.btn3 {
margin-right: 0px;
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
}
}
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:active {
background: #0982ff;
}
}
}
.stmm_i6 {
@@ -8641,29 +8469,7 @@ export default defineComponent({
margin-bottom: 20px;
}
.cus-btn {
width: 100%;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 16px;
border: 1px solid #4ea6ff;
border-radius: 8px;
background: #4ea6ff;
cursor: pointer;
color: #fff;
}
.white {
background: #fff;
color: #4ea6ff;
}
.cus-input {
height: 40px;
border-radius: 8px;
}
// .tableSelect {
// position: relative;

36
src/views/examine/ProjectReviewed.vue
View File

@@ -49,17 +49,22 @@
placeholder="请输入创建人"
/>
</div>
<div class="inpbox1">
<div class="select addTimeBox">
<div class="addTime">审核时间：</div>
<a-range-picker
v-model:value="valueDate"
:show-time="{ format: 'HH:mm' }"
style="border-radius: 8px; height: 40px; margin-left: 5px"
style="width: 360px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
format="YYYY/MM/DD HH:mm"
/>
</div>
</div>
</div>
</div>
<div class="tmplh_btn">
<div class="btn btn1" @click="getProjList">
<div class="search"></div>
@@ -144,6 +149,7 @@
import { onMounted, reactive, toRefs } from "vue";
import { auditedlist } from "../../api/indexAudit";
import * as moment from "moment";
import dayjs from "dayjs";
export default {
name: "ProjectViewed",
@@ -324,8 +330,8 @@ export default {
const getProjList = () => {
state.loading=true
let objn = {
beginTime: state.valueDate ? state.valueDate[0] : "",
endTime: state.valueDate ? state.valueDate[1] : "",
beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "",
endTime: state.valueDate ? dayjs(state.valueDate[1]).format("YYYY-MM-DD") : "",
createName: state.valuecreater,
manager: state.valuename,
name: state.valueproj,
@@ -408,6 +414,7 @@ export default {
</script>
<style lang="scss">
.projAuditModal {
.ant-modal {
width: 816px !important;
min-height: 420px !important;
@@ -539,7 +546,26 @@ export default {
.projectviewed {
width: 100%;
.addTimeBox {
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.tmpl {
width: 100%;

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

@@ -206,7 +206,8 @@
<router-link to="/leveladd">
<div style="display: flex">
<img
class="img2" style="margin-right:22px;"
class="img2"
style="margin-right: 22px"
src="../../assets/images/leveladd/back.png"
/>
<div class="return">返回</div>
@@ -688,7 +689,7 @@
</div>
</div>
<div style="width: 87px; text-align: center">
{{ element.cretime }}分钟
{{ element.cretime ? element.cretime + "分钟" : "-" }}
</div>
<div
style="
@@ -1309,22 +1310,21 @@ export default {
api
.deleteChapter(obj)
.then((res) => {
if(res.data.code==200){
if (res.data.code == 200) {
console.log("删除关卡成功", res);
message.destroy();
message.success("删除关卡成功");
let chapter = localStorage.getItem("chapterId")
if(state.deleteChapterId == chapter){
localStorage.removeItem("chapterId")
let chapter = localStorage.getItem("chapterId");
if (state.deleteChapterId == chapter) {
localStorage.removeItem("chapterId");
}
closeDeleteChapter();
getDetail();
}else if(res.data.code==-1){
} else if (res.data.code == -1) {
message.destroy();
message.success("至少保留一个关卡");
closeDeleteChapter();
}
})
.catch((err) => {
console.log("删除关卡失败", err);
@@ -1418,13 +1418,16 @@ export default {
state.chooseProjectList = JSON.stringify(state.level[i].taskList);
console.log("state.level[i].taskList", state.level[i].taskList);
state.level[i].taskList.forEach((element) => {
// console.log("element", element);
console.log("element", element);
let obj = {
id: element.routerTaskId,
key: element.routerTaskId,
lei: checkType(element.type),
creater: element.name,
cretime: element.duration,
cretime:
element.duration || element.duration == 0
? element.duration
: "-",
checked1: element.flag,
routerTaskId: element.routerTaskId,
courseId: element.courseId,
@@ -1466,7 +1469,7 @@ export default {
? JSON.parse(localStorage.getItem("chapterId"))
: null;
console.log("chapter", chapter);
if (chapter >0) {
if (chapter > 0) {
dataAssignment(chapter); //用哪个的任务表
state.isactive = chapter; //哪个亮
} else {
@@ -1513,7 +1516,7 @@ export default {
title: "姓名",
dataIndex: "name",
key: "name",
width: 60,
width: 160,
align: "left",
ellipsis: true,
className: "classify",
@@ -1853,7 +1856,7 @@ export default {
let obj = {
chapterId: ele.chapterId,
courseId: ele.courseId,
duration: ele.cretime,
duration: ele.cretime == "-" ? 0 : ele.cretime,
flag: ele.checked1,
name: ele.creater,
routerId: ele.routerId,
@@ -2667,7 +2670,7 @@ export default {
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex;
justify-content: center;
min-height:512px;
min-height: 512px;
.boomcen {
width: 95%;
// height: 100%;

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

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

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

@@ -175,7 +175,7 @@
</a-radio-group>
</div>
</div>
<div class="name name2">
<div class="name name2" v-if="courseSyncFlag">
<div class="namebox">
<div class="inname">同步学习记录</div>
</div>
@@ -194,7 +194,7 @@
>
</div>
</div>
<div class="name name2">
<div class="name name2" v-if="projectInfo.remark">
<div class="namebox">
<div class="inname" style="margin-top: 13px">项目说明</div>
</div>

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

@@ -5,31 +5,18 @@
<div class="leftmain">
<div class="tit">
阶段
<img
src="../../assets/images/projectadd/right.png"
style="margin-left: 10px; cursor: pointer"
@click="showCancel"
/>
<img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
@click="showCancel" />
</div>
<div class="btn btn3" @click="showModal()" style="margin-left: 19px">
<div class="search"></div>
<div class="btnText">添加阶段</div>
</div>
<div class="maincon" style="background-color: #fff">
<draggable
v-model="level"
chosenClass="chosen"
ghostClass="ghost"
forceFallback="true"
group="stage"
animation="500"
>
<draggable v-model="level" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="stage"
animation="500">
<template #item="{ element }">
<div
class="items"
:class="chooseStageId == element.id ? 'active' : ''"
@click="changebgc(element.id)"
>
<div class="items" :class="chooseStageId == element.id ? 'active' : ''" @click="changebgc(element.id)">
<div class="items1">
<div class="boxs_left">
<a-popover placement="topLeft" trigger="click">
@@ -42,26 +29,18 @@
<span>阶段说明</span>
</template>
<div class="script">
<span style="font-size: 12px; color: #ffffff"
>说明</span
>
<span style="font-size: 12px; color: #ffffff">说明</span>
</div>
</a-popover>
<div class="imgIcon" @click="showModal(element)"></div>
</div>
<div class="boxs_right">
<div
class="imgIcon"
@click="showDeleteStage(element.id)"
></div>
<div class="imgIcon" @click="showDeleteStage(element.id)"></div>
</div>
</div>
<div class="items2">
<a-popover
placement="topLeft"
v-if="element.tit?.length > 10"
>
<a-popover placement="topLeft" v-if="element.tit?.length > 10">
<template #content>
<div style="width: 130px">
{{ element.tit }}
@@ -140,14 +119,9 @@
<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
<div class="pub">保存</div>
<div class="line"></div> -->
<router-link
:to="{ path: `/taskpage`, query: { projectId: projectId } }"
>
<router-link :to="{ path: `/taskpage`, query: { projectId: projectId } }">
<div style="display: flex">
<img
class="img2"
src="../../assets/images/leveladd/back.png"
/>
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
</div>
</router-link>
@@ -164,16 +138,9 @@
</div>
<!-- 添加在线侧弹窗 -->
<div>
<add-online
v-model:addonlineVisible="addonlinevisible"
@changeData="updateTableData"
:isLevel="isLevel"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId"
v-model:EditOnlineId="EditOnlineId"
/>
<add-online v-model:addonlineVisible="addonlinevisible" @changeData="updateTableData" :isLevel="isLevel"
v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:EditOnlineId="EditOnlineId" />
</div>
<!-- 添加在线侧弹窗 -->
<div class="lin"></div>
@@ -187,16 +154,10 @@
</div>
<!-- 添加面授侧弹窗 -->
<div>
<add-faceteach
v-model:addfaceteachVisible="addfaceteachvisible"
v-model:EditFaceId="EditFaceId"
v-model:edit="edit"
:isLevel="isLevel"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
@changeData="updateTableData"
v-model:projectTaskId="projectTaskId"
/>
<add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" v-model:EditFaceId="EditFaceId"
v-model:edit="edit" :isLevel="isLevel" v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId" @changeData="updateTableData"
v-model:projectTaskId="projectTaskId" />
</div>
<!-- 添加面授侧弹窗 -->
<div class="lin"></div>
@@ -210,16 +171,9 @@
</div>
<!-- 添加案例侧弹窗 -->
<div>
<add-case
v-model:addcaseVisible="addcasevisible"
@changeData="updateTableData"
:isLevel="isLevel"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId"
v-model:EditCaseId="EditCaseId"
/>
<add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" :isLevel="isLevel"
v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:EditCaseId="EditCaseId" />
</div>
<!-- 添加案例侧弹窗 -->
<div class="lin"></div>
@@ -233,16 +187,10 @@
</div>
<!-- 添加作业侧弹窗 -->
<div>
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
@changeData="updateTableData"
v-model:isLevel="isLevel"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:EditWorkId="EditWorkId"
v-model:projectTaskId="projectTaskId"
/>
<add-homework v-model:addhomeworkVisible="addhomeworkvisible" @changeData="updateTableData"
v-model:isLevel="isLevel" v-model:edit="edit" v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId"
v-model:projectTaskId="projectTaskId" />
</div>
<!-- 添加作业侧弹窗 -->
<div class="lin"></div>
@@ -256,16 +204,9 @@
</div>
<!-- 添加考试侧弹窗 -->
<div>
<add-test
v-model:addtestVisible="addtestvisible"
@changeData="updateTableData"
:isLevel="isLevel"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:EditTestId="EditTestId"
v-model:projectTaskId="projectTaskId"
/>
<add-test v-model:addtestVisible="addtestvisible" @changeData="updateTableData" :isLevel="isLevel"
v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:EditTestId="EditTestId" v-model:projectTaskId="projectTaskId" />
</div>
<!-- 添加考试侧弹窗 -->
<div class="lin"></div>
@@ -279,16 +220,9 @@
</div>
<!-- 添加直播侧弹窗 -->
<div>
<add-live
v-model:addliveVisible="addlivevisible"
:isLevel="isLevel"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:edit="edit"
v-model:EditLiveId="EditLiveId"
v-model:projectTaskId="projectTaskId"
/>
<add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:edit="edit"
v-model:EditLiveId="EditLiveId" v-model:projectTaskId="projectTaskId" />
</div>
<!-- 添加直播侧弹窗 -->
<div class="lin"></div>
@@ -302,16 +236,9 @@
</div>
<!-- 添加外链侧弹窗 -->
<div>
<add-ref
v-model:addrefVisible="addrefvisible"
:isLevel="isLevel"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:edit="edit"
v-model:EditRefId="EditRefId"
v-model:projectTaskId="projectTaskId"
/>
<add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:edit="edit"
v-model:EditRefId="EditRefId" v-model:projectTaskId="projectTaskId" />
</div>
<!-- 添加外链侧弹窗 -->
<div class="lin"></div>
@@ -350,16 +277,9 @@
</div>
<!-- 添加活动侧弹窗 -->
<div>
<add-active
v-model:addactiveVisible="addactivevisible"
v-model:projectId="projectId"
v-model:EditActiveId="EditActiveId"
v-model:projectTaskId="projectTaskId"
v-model:edit="edit"
:isLevel="isLevel"
v-model:chooseStageId="chooseStageId"
@changeData="updateTableData"
/>
<add-active v-model:addactiveVisible="addactivevisible" v-model:projectId="projectId"
v-model:EditActiveId="EditActiveId" v-model:projectTaskId="projectTaskId" v-model:edit="edit"
:isLevel="isLevel" v-model:chooseStageId="chooseStageId" @changeData="updateTableData" />
</div>
<!-- 添加活动侧弹窗 -->
<div class="lin"></div>
@@ -373,16 +293,9 @@
</div>
<!-- 添加测评侧弹窗 -->
<div>
<add-eval
v-model:addevalVisible="addevalvisible"
@changeData="updateTableData"
v-model:edit="edit"
:isLevel="isLevel"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId"
v-model:EditEvalId="EditEvalId"
/>
<add-eval v-model:addevalVisible="addevalvisible" @changeData="updateTableData" v-model:edit="edit"
:isLevel="isLevel" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:EditEvalId="EditEvalId" />
</div>
<!-- 添加测评侧弹窗 -->
<div class="lin"></div>
@@ -396,16 +309,9 @@
</div>
<!-- 添加评估侧弹窗 -->
<div>
<add-invist
v-model:addinvistVisible="addinvistvisible"
@changeData="updateTableData"
v-model:edit="edit"
:isLevel="isLevel"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId"
v-model:EditInvistId="EditInvistId"
/>
<add-invist v-model:addinvistVisible="addinvistvisible" @changeData="updateTableData" v-model:edit="edit"
:isLevel="isLevel" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:EditInvistId="EditInvistId" />
</div>
<div class="lin"></div>
@@ -438,7 +344,6 @@
</div>
</div>
-->
</div>
<div class="boom">
<div class="boomcen">
@@ -448,10 +353,7 @@
移动任务到阶段
</button>
<div class="edit" @click="showdeAll">
<img
class="editimg"
src="../../assets/images/projectadd/delete.png"
/>
<img class="editimg" src="../../assets/images/projectadd/delete.png" />
<span class="editext">批量删除</span>
</div>
</div>
@@ -486,8 +388,7 @@
</div>
</div> -->
<div class="tableBox" style="border: 1px solid #f2f6fc">
<div
style="
<div style="
height: 50px;
display: flex;
justify-content: space-between;
@@ -498,32 +399,25 @@
color: #999ba3;
line-height: 36px;
border-bottom: 1px solid #f2f6fc;
"
>
<div
style="
">
<div style="
width: 87px;
text-align: center;
display: flex;
margin-left: 46px;
"
>
<img
style="
">
<img style="
width: 16px;
height: 16px;
cursor: pointer;
margin-top: 12px;
"
:src="
" :src="
selectAll === 0
? require('../../assets/images/notSelect.png')
: selectAll === 1
? require('../../assets/images/selectAll.png')
: require('../../assets/images/select.png')
"
@click="selectRowAll"
/>
" @click="selectRowAll" />
<!-- <a-checkbox
v-model:checked="selectAll"
@change="selectRowAll"
@@ -534,25 +428,14 @@
<div style="width: 120px; text-align: center">任务名称</div>
<div style="width: 120px; text-align: center">必修/选修</div>
<div style="width: 87px; text-align: center">时长</div>
<div
style="width: 120px; text-align: center; margin-right: 20px"
>
<div style="width: 120px; text-align: center; margin-right: 20px">
操作
</div>
</div>
<draggable
v-model="tableData"
chosenClass="chosen"
ghostClass="ghost"
forceFallback="true"
group="task"
animation="500"
@start="onStart"
@end="onEnd"
>
<draggable v-model="tableData" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="task"
animation="500" @start="onStart" @end="onEnd">
<template #item="{ element }">
<div
style="
<div style="
height: 50px;
display: flex;
justify-content: space-between;
@@ -562,68 +445,46 @@
font-weight: 400;
color: #4f5156;
line-height: 36px;
"
class="tableRow"
>
<div
style="
" class="tableRow">
<div style="
width: 87px;
text-align: center;
margin-left: 46px;
position: relative;
"
>
">
<div class="racona">
<div
class="img"
style="
<div class="img" style="
cursor: pointer;
margin-top: 2px;
margin-right: 9px;
position: absolute;
left: -25px;
"
></div>
<a-checkbox
:id="element.id"
v-model:checked="element.checked"
@change="changeRow"
>
"></div>
<a-checkbox :id="element.id" v-model:checked="element.checked" @change="changeRow">
</a-checkbox>
<div style="margin-top: 2px; margin-left: 8px">
{{ element.lei }}
</div>
</div>
</div>
<div
style="
<div style="
width: 120px;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
"
:title="element.creater"
>
" :title="element.creater">
{{ element.creater }}
</div>
<div style="width: 120px; text-align: center">
<div class="opat">
<div class="opacationt clearfix">
<a-switch
style="margin-left: -50px; margin-top: 3px"
v-model:checked="element.checked1"
size="small"
active-color="red"
@click="changeCourseType(element)"
/>
<a-switch style="margin-left: -50px; margin-top: 3px" v-model:checked="element.checked1"
size="small" active-color="red" @click="changeCourseType(element)" />
<div class="showt clearfix">
<div
class="bi"
:style="{
<div class="bi" :style="{
'z-index': element.checked1 ? 999 : 998,
}"
>
}">
必修
</div>
<div class="xuan">选修</div>
@@ -632,37 +493,33 @@
</div>
</div>
<div style="width: 87px; text-align: center">
{{ element.cretime }}分钟
{{
element.cretime
? element.cretime + "分钟"
: "-"
}}
</div>
<div
style="
<div style="
width: 120px;
text-align: center;
margin-right: 20px;
"
>
">
<div class="opa">
<div class="opacation">
<span
style="
<span style="
color: #4ea6ff;
margin-right: 25px;
cursor: pointer;
"
@click="
" @click="
decideType(
element.lei,
element.courseId,
element.id
)
"
>
">
编辑
</span>
<span
style="color: #4ea6ff; cursor: pointer"
@click="showDelete(element.id)"
>
<span style="color: #4ea6ff; cursor: pointer" @click="showDelete(element.id)">
删除
</span>
</div>
@@ -720,58 +577,32 @@
<!-- 添加阶段弹窗 -->
<div>
<a-modal
v-model:visible="stage"
:title="null"
@ok="closeModal"
:footer="null"
:closable="false"
wrapClassName="addstage"
width="624px"
height="388px"
centered="true"
@cancel="closeModal"
>
<div
class="modalHeader"
style="
<a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
wrapClassName="addstage" width="624px" height="388px" centered="true" @cancel="closeModal">
<div class="modalHeader" style="
width: 100%;
height: 68px;
display: flex;
align-items: center;
justify-content: space-between;
"
>
">
<div class="headerLeft" style="margin-left: 32px">
<span class="headerLeftText" style="font-size: 16px"
>编辑/添加阶段</span
>
<span class="headerLeftText" style="font-size: 16px">编辑/添加阶段</span>
</div>
<div style="cursor: pointer; margin-right: 32px" @click="closeModal">
<img
style="width: 22px; height: 22px"
src="../../assets/images/basicinfo/close22.png"
/>
<img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
</div>
</div>
<div class="modalMain" style="width: 100%">
<div class="name">
<div class="namebox">
<div>
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<div class="inname">阶段名称：</div>
</div>
<div class="in">
<a-input
v-model:value="valuesname"
show-count
:maxlength="20"
placeholder="请输入阶段名称"
/>
<a-input v-model:value="valuesname" show-count :maxlength="20" placeholder="请输入阶段名称" />
</div>
</div>
<div class="name" style="display: flex; align-items: flex-start">
@@ -779,26 +610,17 @@
<div class="inname">阶段说明：</div>
</div>
<div class="intext" style="margin-left: 14px">
<a-textarea
v-model:value="valuesnotice"
style="height: 88px"
show-count
:maxlength="100"
placeholder="请输入阶段说明"
/>
<a-textarea v-model:value="valuesnotice" style="height: 88px" show-count :maxlength="100"
placeholder="请输入阶段说明" />
</div>
</div>
<div
style="
<div style="
display: flex;
width: 100%;
justify-content: center;
margin-top: 40px;
"
>
<button
@click="closeModal"
style="
">
<button @click="closeModal" style="
cursor: pointer;
height: 40px;
width: 100px;
@@ -806,13 +628,10 @@
border-radius: 4px;
color: #4ea6ff;
background-color: #ffffff;
"
>
">
取消
</button>
<button
@click="editStage"
style="
<button @click="editStage" style="
cursor: pointer;
margin-left: 16px;
margin-bottom: 40px;
@@ -822,31 +641,18 @@
border-radius: 4px;
color: #ffffff;
background-color: #4ea6ff;
"
>
">
确定
</button>
</div>
</div>
<div
class="aeLoading"
:style="{ display: addLoading ? 'flex' : 'none' }"
>
<a-spin
:spinning="addLoading"
:tip="updateStageID ? '修改中...' : ''"
/>
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" :tip="updateStageID ? '修改中...' : ''" />
</div>
</a-modal>
</div>
<!-- 确认添加阶段弹窗 -->
<a-modal
v-model:visible="confirmModal"
:footer="null"
:closable="cC"
wrapClassName="ConfirmModal"
centered="true"
>
<a-modal v-model:visible="confirmModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -870,13 +676,7 @@
</div>
</a-modal>
<!-- 确认取消阶段弹窗 -->
<a-modal
v-model:visible="cancelModal"
:footer="null"
:closable="cC"
wrapClassName="ConfirmModal"
centered="true"
>
<a-modal v-model:visible="cancelModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -900,13 +700,7 @@
</div>
</a-modal>
<!-- 确认删除任务弹窗 -->
<a-modal
v-model:visible="deleteModal"
:footer="null"
:closable="cC"
wrapClassName="ConfirmModal"
centered="true"
>
<a-modal v-model:visible="deleteModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -929,13 +723,7 @@
</div>
</div>
</a-modal>
<a-modal
v-model:visible="deAll"
:footer="null"
:closable="cC"
wrapClassName="ConfirmModal"
centered="true"
>
<a-modal v-model:visible="deAll" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -959,14 +747,8 @@
</div>
</a-modal>
<!-- 移动任务到阶段 -->
<a-modal
style="padding: 0"
:closable="sh"
v-model:visible="visiblene"
:footer="null"
centered="true"
wrapClassName="moveModal"
>
<a-modal style="padding: 0" :closable="sh" v-model:visible="visiblene" :footer="null" centered="true"
wrapClassName="moveModal">
<div class="con">
<div class="header">
<div class="inhe">
@@ -978,29 +760,14 @@
<div class="inher">
<div class="cur">已选中{{ selectRow.length }}个任务</div>
<div class="select">
<a-select
v-model:value="curLevel"
style="width: 100%"
placeholder="请选择阶段"
:options="level"
@change="handleChangeStage"
allowClear
showSearch
></a-select>
<a-select v-model:value="curLevel" style="width: 100%" placeholder="请选择阶段" :options="level"
@change="handleChangeStage" allowClear showSearch></a-select>
</div>
<div class="btn">
<button
style="cursor: pointer"
class="sameb btn1"
@click="closeChangeModal"
>
<button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
取消
</button>
<button
style="cursor: pointer"
class="sameb btn2"
@click="moveTask"
>
<button style="cursor: pointer" class="sameb btn2" @click="moveTask">
确定
</button>
</div>
@@ -1010,13 +777,8 @@
</a-modal>
<!-- 是否删除阶段弹窗 -->
<a-modal
v-model:visible="deleteStageModal"
:footer="null"
:closable="cC"
wrapClassName="ConfirmModal"
centered="true"
>
<a-modal v-model:visible="deleteStageModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal"
centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -1026,7 +788,9 @@
<div class="close_exit" @click="closeDeleteStage"></div>
</div>
<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 class="del_btnbox">
<div class="del_btn btn1" @click="closeDeleteStage">
@@ -1096,6 +860,7 @@ export default {
projectId: route.query.projectId,
chooseStageId: null,
removeStageId: null,
onceChoice: true,
edit: false,
isLevel: 2, //学习路径1项目2模板库3
// isRefEdit: 1, //外链编辑
@@ -1222,7 +987,8 @@ export default {
? "投票"
: "-",
creater: value.name,
cretime: value.duration ? value.duration : "-",
cretime:
value.duration || value.duration == 0 ? value.duration : "-",
checked1: value.flag ? true : false,
checked: false, //是否选中类型
courseId: value.courseId,
@@ -1253,7 +1019,8 @@ export default {
array.push(obj);
}
});
state.level = array;
console.log(array)
state.level = array.sort((a, b) => { return a.id - b.id });
};
const tableDataFunc = () => {
@@ -1391,6 +1158,22 @@ export default {
};
await api.getTask(obj).then((res) => {
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)
if (arraynew.length !== 0) {
state.chooseStageId = Number(arraynew[arraynew.length - 1].stageId);
}
}
state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList;
@@ -1620,7 +1403,7 @@ export default {
const showDeleteStage = (id) => {
state.deleteStageId = id;
state.deleteStageModal = true;
console.log(state.level)
console.log(state.level);
};
//关闭删除阶段弹窗
const closeDeleteStage = () => {
@@ -1759,17 +1542,17 @@ export default {
// 删除所有阶段
const removeAllLevel = () => {
// state.cancelModal = false;
console.log(state.level)
console.log(state.level);
let removeArr = state.level;
for(let i=0;i<removeArr.length;i++){
for (let i = 0; i < removeArr.length; i++) {
let obj = {
stageId: removeArr[i].id
}
stageId: removeArr[i].id,
};
apistage
.deleteStage(obj)
.then((res) => {
console.log("删除阶段成功", res);
if(removeArr.length-1==i){
if (removeArr.length - 1 == i) {
message.destroy();
message.success("删除全部阶段成功");
closeDeleteStage();
@@ -1779,7 +1562,7 @@ export default {
}
})
.catch((err) => {
if(removeArr.length-1==i){
if (removeArr.length - 1 == i) {
console.log("删除阶段失败", err);
message.destroy();
message.success("删除全部阶段失败");
@@ -1787,7 +1570,7 @@ export default {
}
});
}
}
};
//选择单个任务
const changeRow = (e) => {
@@ -1993,7 +1776,7 @@ export default {
temporaryStorage,
submitStorage,
cancelStorage,
removeAllLevel
removeAllLevel,
};
},
};
@@ -2026,10 +1809,8 @@ export default {
position: absolute;
width: calc(100%);
height: 40px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
}
.del_main {
@@ -2128,11 +1909,9 @@ export default {
padding: 0 !important;
.modalHeader {
background: linear-gradient(
0deg,
background: linear-gradient(0deg,
rgba(78, 166, 255, 0) 0%,
rgba(78, 166, 255, 0.2) 100%
);
rgba(78, 166, 255, 0.2) 100%);
}
.modalMain {
@@ -2247,10 +2026,8 @@ export default {
position: relative;
justify-content: center;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
.inhe {
width: 80%;
@@ -2356,6 +2133,7 @@ export default {
.leftmain {
margin-top: 20px;
min-height: 800px;
.tit {
margin-left: 20px;
font-size: 18px;
@@ -2608,6 +2386,7 @@ export default {
.pub {
margin-right: 10px;
}
.line {
margin-right: 10px;
}
@@ -2924,7 +2703,7 @@ export default {
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
.ant-table-thead>tr>th {
background-color: rgba(239, 244, 252, 1);
}
@@ -2932,9 +2711,7 @@ export default {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
background: #f6f9fd;
}

11
src/views/projectcenter/TaskPage.vue
View File

@@ -851,7 +851,7 @@
<div class="img"></div>
<div class="ed">编辑</div>
</div> -->
<div class="edit" @click="toEdit">
<div class="edit" v-if="status!=3 && status!=2" @click="toEdit">
<div class="img"></div>
<div class="ed">编辑</div>
</div>
@@ -1442,14 +1442,7 @@
>
<div
class="modalHeader"
style="
width: 100%;
height: 68px;
display: flex;
align-items: center;
justify-content: space-between;
"
>
style="width: 100%;height: 68px;display: flex;align-items: center; justify-content: space-between; ">
<div class="headerLeft" style="margin-left: 32px">
<span style="width: 15px; height: 15px"
><img src="../../assets/images/taskpage/pub.png"

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

@@ -455,7 +455,6 @@
</div>
</div>
-->
</div>
<div class="boom">
<div class="boomcen">
@@ -649,7 +648,7 @@
</div>
</div>
<div style="width: 87px; text-align: center">
{{ element.cretime }}分钟
{{ element.cretime ? element.cretime + "分钟" : "-" }}
</div>
<div
style="
@@ -913,10 +912,10 @@
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="delete_exit">取消</div>
<div class="btnText" @click="closeCancel">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="showModal">确定</div>
<div class="btnText" @click="removeAllLevel">确定</div>
</div>
</div>
</div>
@@ -1389,7 +1388,7 @@ export default {
? "投票"
: "-",
creater: value.name,
cretime: Number(value.duration) > 0 ? value.duration : "-",
cretime: value.duration || value.duration == 0 ? value.duration : "-",
checked1: value.flag ? true : false,
checked: false, //是否选中类型
courseId: value.courseId,
@@ -1407,7 +1406,11 @@ export default {
let data = tableData;
let array = [];
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) {
let obj = {
id: value.templateStageId,
@@ -1623,19 +1626,47 @@ export default {
console.log("获取任务列表失败", err);
});
};*/
// 删除所有阶段
const removeAllLevel = () => {
// state.cancelModal = false;
console.log(state.level);
let removeArr = state.level;
for (let i = 0; i < removeArr.length; i++) {
api
.deleteStage(removeArr[i].id)
.then((res) => {
console.log("删除阶段成功", res);
if (removeArr.length - 1 == i) {
message.destroy();
message.success("删除全部阶段成功");
closeDeleteStage();
localStorage.setItem("stageId", "");
getTask();
state.cancelModal = false;
}
})
.catch((err) => {
if (removeArr.length - 1 == i) {
console.log("删除阶段失败", err);
message.destroy();
message.success("删除全部阶段失败");
state.cancelModal = false;
}
});
}
};
//获取任务列表
const getTask = async () => {
await api
.templateDetail(localStorage.getItem("projectTemplateId")).then((res) => {
.templateDetail(localStorage.getItem("projectTemplateId"))
.then((res) => {
console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectTemplateInfo.name;
state.picUrl = res.data.data.projectTemplateInfo.picUrl;
state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList);
updateStageChoosd();
});
};
@@ -1659,9 +1690,15 @@ export default {
getTableData(state.stageList[0].taskList);
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(
state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList
state.stageList.find((e) => e.templateStageId == state.chooseStageId)
?.taskList
);
}
@@ -1956,10 +1993,9 @@ export default {
console.log("state.level", id, state.level);
state.chooseStageId = id;
let final = state.level.find((item) => item.id === id);
if(final !=null){
if (final != null) {
getTableData(final.taskList);
}
};
//选择单个任务
@@ -2154,6 +2190,7 @@ export default {
getTableData,
deleteTask,
editStage,
removeAllLevel,
updateTableData,
changeVData,
changeRow,

14
src/views/projectcenter/templateAdd.vue
View File

@@ -78,6 +78,7 @@
<div class="in">
<a-range-picker
show-time
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
@@ -214,7 +215,7 @@ import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectLevel from "@/components/project/ProjectLevel";
import dayjs from "dayjs";
const route = useRoute();
const router = useRouter();
const store = useStore();
@@ -240,9 +241,8 @@ const getDetail = () =>
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
projectInfo.value.rangeTime = [
projectInfo.value.beginTime,
projectInfo.value.endTime,
projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
});
@@ -253,8 +253,8 @@ const backPage = () => {
function timeChange(e) {
if (e && e.length === 2) {
projectInfo.value.beginTime = e[0];
projectInfo.value.endTime = e[1];
projectInfo.value.beginTime = dayjs(e[0]).format("YYYY-MM-DD HH:mm"),
projectInfo.value.endTime =dayjs(e[1]).format("YYYY-MM-DD HH:mm")
}
}
@@ -281,6 +281,8 @@ const createProject = () => {
}
}
projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
projectInfo.value.beginTime = dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
projectInfo.value.endTime =dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm")
api
.templateEdit({
...projectInfo.value,

33
src/views/research/ResearchManage.vue
View File

@@ -24,12 +24,17 @@
></a-select>
</div>
<div class="select">
<div class="select addTimeBox">
<div class="addTime">创建时间：</div>
<a-range-picker
v-model:value="projectTime"
style="width: 420px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</div>
<div style="display: flex; margin-bottom: 20px">
<div class="btn btn1" @click="handleSearch">
<div class="search"></div>
@@ -166,7 +171,8 @@
<div class="btnText" @click="handleCancelModal">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="handleSure">确定</div>
<div class="btnText" v-if="!addLoading" @click="handleSure">确定</div>
<div class="btnText" v-else>确定</div>
</div>
</div>
</div>
@@ -414,7 +420,7 @@ export default {
if (state.projectTime) {
startTime = toDate(
new Date(state.projectTime[0].$d).getTime() / 1000,
"Y-M-D"
"Y-M-D hh:mm"
);
endTime = toDate(
new Date(state.projectTime[1].$d).getTime() / 1000,
@@ -665,6 +671,7 @@ export default {
state.copy_hs = true;
};
const handleSure = () => {
// 发布
if (state.pub_hs) {
editReleaseStatus({
@@ -710,11 +717,13 @@ export default {
}
// 复制
if (state.copy_hs) {
state.addLoading = true;
let resultPost = restData(state.copyItem);
resultPost.assessmentName = resultPost.assessmentName + "(1)";
console.log("resultPost");
console.log(resultPost);
createResearch(resultPost).then((res) => {
state.addLoading =false;
console.log(res);
handleCancelModal();
getTableDate();
@@ -865,6 +874,26 @@ export default {
display: block;
clear: both;
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.out {
//display: flex;
display: block;