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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/views/learningpath/LearningPath.vue
#	src/views/projectcenter/ProjectManage.vue
This commit is contained in:
yuping
2022-12-19 21:03:03 +08:00
parent f8650e799a 23f3d134c5
commit 66464fee6a
5 changed files with 877 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/request.js
View File

@@ -138,7 +138,7 @@ export async function request(_url, params) {
} }
} }
const body = method !== 'get' ? params || {} : {} const body = method !== 'get' ? params || {} : {}
url = process.env.VUE_APP_BOE_API_URL + url // url = process.env.VUE_APP_BOE_API_URL + url
return fetch(url, { return fetch(url, {
method, method,
headers: { headers: {

51
src/assets/scss/common.scss
View File

@@ -51,31 +51,37 @@ body {
height: 6px; height: 6px;
/*对水平流动条有效*/ /*对水平流动条有效*/
} }
::-o-scrollbar { ::-o-scrollbar {
width: 6px; width: 6px;
/*对垂直流动条有效*/ /*对垂直流动条有效*/
height: 6px; height: 6px;
/*对水平流动条有效*/ /*对水平流动条有效*/
} }
.scrollbar { .scrollbar {
width: 6px; width: 6px;
/*对垂直流动条有效*/ /*对垂直流动条有效*/
height: 6px; height: 6px;
/*对水平流动条有效*/ /*对水平流动条有效*/
} }
/*定义滚动条的轨道颜色、内阴影及圆角*/ /*定义滚动条的轨道颜色、内阴影及圆角*/
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);
border-radius: 6px; border-radius: 6px;
} }
::-moz-scrollbar-track { ::-moz-scrollbar-track {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);
border-radius: 6px; border-radius: 6px;
} }
::-o-scrollbar-track { ::-o-scrollbar-track {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);
border-radius: 6px; border-radius: 6px;
} }
.scrollbar-track { .scrollbar-track {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);
border-radius: 6px; border-radius: 6px;
@@ -86,14 +92,17 @@ body {
border-radius: 3px; border-radius: 3px;
background-color: rgba(78, 166, 255, 1); background-color: rgba(78, 166, 255, 1);
} }
::-moz-scrollbar-thumb { ::-moz-scrollbar-thumb {
border-radius: 3px; border-radius: 3px;
background-color: rgba(78, 166, 255, 1); background-color: rgba(78, 166, 255, 1);
} }
::-o-scrollbar-thumb { ::-o-scrollbar-thumb {
border-radius: 3px; border-radius: 3px;
background-color: rgba(78, 166, 255, 1); background-color: rgba(78, 166, 255, 1);
} }
.scrollbar-thumb { .scrollbar-thumb {
border-radius: 3px; border-radius: 3px;
background-color: rgba(78, 166, 255, 1); background-color: rgba(78, 166, 255, 1);
@@ -104,35 +113,43 @@ body {
background-color: cyan; background-color: cyan;
display: none; display: none;
} }
::-moz-scrollbar-button { ::-moz-scrollbar-button {
background-color: cyan; background-color: cyan;
display: none; display: none;
} }
::-o-scrollbar-button { ::-o-scrollbar-button {
background-color: cyan; background-color: cyan;
display: none; display: none;
} }
.scrollbar-button { .scrollbar-button {
background-color: cyan; background-color: cyan;
display: none; display: none;
} }
/*定义右下角汇合处的样式*/ /*定义右下角汇合处的样式*/
::-webkit-scrollbar-corner { ::-webkit-scrollbar-corner {
background: rgba(239, 244, 252, 1); background: rgba(239, 244, 252, 1);
; ;
} }
::-moz-scrollbar-corner { ::-moz-scrollbar-corner {
background: rgba(239, 244, 252, 1); background: rgba(239, 244, 252, 1);
; ;
} }
::-o-scrollbar-corner { ::-o-scrollbar-corner {
background: rgba(239, 244, 252, 1); background: rgba(239, 244, 252, 1);
; ;
} }
.scrollbar-corner { .scrollbar-corner {
background: rgba(239, 244, 252, 1); background: rgba(239, 244, 252, 1);
; ;
} }
//隐藏滚动条---------------------------------------------------------------- //隐藏滚动条----------------------------------------------------------------
//禁止选中---------------------------------------------------------- //禁止选中----------------------------------------------------------
@@ -329,6 +346,7 @@ textarea {
//抽屉-------------------------------------------------------- //抽屉--------------------------------------------------------
.drawerStyle { .drawerStyle {
// transform: translateX(0px) !important; // transform: translateX(0px) !important;
.ant-drawer-content-wrapper { .ant-drawer-content-wrapper {
max-width: 1050px; max-width: 1050px;
@@ -437,29 +455,34 @@ textarea {
} }
} }
.ant-modal{ .ant-modal {
.modalHeader{ .modalHeader {
background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
} }
.top{
background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; .top {
background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
} }
.del_header{
background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; .del_header {
background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
} }
} }
//弹窗-------------------------------------------------------- //弹窗--------------------------------------------------------
//loading-------------------------------------------------------- //loading--------------------------------------------------------
.aeLoading { .aeLoading {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: absolute; position: absolute;
left: 0; left: 0;
top:0, top: 0;
z-index: 100
} }
//loading-------------------------------------------------------- //loading--------------------------------------------------------

39
src/views/learningpath/LevelAdd.vue
View File

@@ -17,11 +17,12 @@
@click="showCodeModel2()" @click="showCodeModel2()"
/> />
<div v-if="action == 1 || action == 0" class="line"></div>--> <div v-if="action == 1 || action == 0" class="line"></div>-->
<div class ="pubIcon" v-if="action == 1 || action == 0" @click="pubIcon(action)"> <div
<img class="pubIcon"
class="img2" v-if="action == 1 || action == 0"
src="../../assets/images/leveladd/pub.png" @click="pubIcon(action)"
/> >
<img class="img2" src="../../assets/images/leveladd/pub.png" />
<!-- 已发布的显示 --> <!-- 已发布的显示 -->
<div class="pub" style="width: 28px"> <div class="pub" style="width: 28px">
{{ act }} {{ act }}
@@ -29,7 +30,7 @@
</div> </div>
<div class="line"></div> <div class="line"></div>
<router-link to="/learningpath" <router-link to="/learningpath"
><div style="display: flex; "> ><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 class="return">返回</div>
</div> </div>
@@ -703,7 +704,6 @@
</a-tabs> </a-tabs>
</a-tab-pane> </a-tab-pane>
--> -->
</a-tabs> </a-tabs>
<a-modal <a-modal
@@ -1114,6 +1114,7 @@ import { codeUrl } from "../../api/method";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import TableStudent from "@/components/student/TableStudent"; import TableStudent from "@/components/student/TableStudent";
// import * as student from "@/api/student"; // import * as student from "@/api/student";
import { getStuPage } from "@/api/index1";
export default { export default {
name: "LevelAdd", name: "LevelAdd",
components: { components: {
@@ -1680,10 +1681,10 @@ export default {
let stuobj = { let stuobj = {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
routerId: state.routerId, pid: state.routerId,
type: 2,
}; };
api getStuPage(stuobj)
.getStudent(stuobj)
.then((res) => { .then((res) => {
console.log("获取学员列表", res.data.data.total); console.log("获取学员列表", res.data.data.total);
if (res.data.code === 200) { if (res.data.code === 200) {
@@ -1695,14 +1696,13 @@ export default {
console.log("获取学员列表失败", err); console.log("获取学员列表失败", err);
}); });
}; };
const pubIcon =(action)=>{ const pubIcon = (action) => {
if(action ==1){ if (action == 1) {
showBackModal(); showBackModal();
}else{ } else {
showPub(); showPub();
} }
};
}
//显示撤回弹窗 //显示撤回弹窗
const showBackModal = () => { const showBackModal = () => {
state.backModal = true; state.backModal = true;
@@ -1868,7 +1868,10 @@ export default {
state.nodata = false; state.nodata = false;
} }
let data = res.data.data.chapterList; let data = res.data.data.chapterList;
state.stage = res.data.data.chapterList.map(e => ({id: e.chapterId, name: e.name})) state.stage = res.data.data.chapterList.map((e) => ({
id: e.chapterId,
name: e.name,
}));
state.taskSyllabus = data; state.taskSyllabus = data;
// for(let i in data) { // for(let i in data) {
// state.taskSyllabus[i].name = data[i].name // state.taskSyllabus[i].name = data[i].name
@@ -2851,7 +2854,7 @@ export default {
background-color: #e8effa; background-color: #e8effa;
margin-right: 28px; margin-right: 28px;
} }
.pubIcon{ .pubIcon {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -4262,7 +4265,5 @@ export default {
} }
} }
} }
} }
</style> </style>

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

@@ -3,7 +3,7 @@
<div class="taskpage"> <div class="taskpage">
<div class="addhead" style="flex-shrink: 0"> <div class="addhead" style="flex-shrink: 0">
<div class="leftimg"> <div class="leftimg">
<img class="img" :src="picUrl"/> <img class="img" :src="picUrl" />
</div> </div>
<div class="imgfor"> <div class="imgfor">
<div class="forz">{{ name }}</div> <div class="forz">{{ name }}</div>
@@ -171,7 +171,7 @@
<div class="line"></div> <div class="line"></div>
<router-link to="/projectmanage"> <router-link to="/projectmanage">
<div style="display: flex"> <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 class="return">返回</div>
</div> </div>
</router-link> </router-link>
@@ -208,13 +208,13 @@
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)" style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left1.png"/> <img src="../../assets/images/taskpage/left1.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture1.png"/> <img src="../../assets/images/taskpage/picture1.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<img src="../../assets/images/taskpage/right1.png"/> <img src="../../assets/images/taskpage/right1.png" />
</div> </div>
<div class="centerbox" style="color: rgba(255, 182, 78, 1)"> <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
添加任务 添加任务
@@ -227,13 +227,13 @@
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)" style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left2.png"/> <img src="../../assets/images/taskpage/left2.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture2.png"/> <img src="../../assets/images/taskpage/picture2.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<img src="../../assets/images/taskpage/right2.png"/> <img src="../../assets/images/taskpage/right2.png" />
</div> </div>
<div class="centerbox" style="color: rgba(78, 166, 255, 1)"> <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
添加学员 添加学员
@@ -640,13 +640,13 @@
v-if="taskSyllabus.length == 0" v-if="taskSyllabus.length == 0"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left2.png"/> <img src="../../assets/images/taskpage/left2.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture8.png"/> <img src="../../assets/images/taskpage/picture8.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<img src="../../assets/images/taskpage/right2.png"/> <img src="../../assets/images/taskpage/right2.png" />
</div> </div>
<div class="centerbox" style="color: rgba(78, 166, 255, 1)"> <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
创建任务 创建任务
@@ -669,13 +669,13 @@
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)" style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left1.png"/> <img src="../../assets/images/taskpage/left1.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture1.png"/> <img src="../../assets/images/taskpage/picture1.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<img src="../../assets/images/taskpage/right1.png"/> <img src="../../assets/images/taskpage/right1.png" />
</div> </div>
<div class="centerbox" style="color: rgba(255, 182, 78, 1)"> <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
添加任务 添加任务
@@ -691,7 +691,12 @@
<div class="content3"> <div class="content3">
<a-tabs v-model:activeKey="activeKey1"> <a-tabs v-model:activeKey="activeKey1">
<a-tab-pane key="8" tab="学员管理"> <a-tab-pane key="8" tab="学员管理">
<TableStudent :type="1" :id="projectId" :columns="stuColumns" :stage="stage"></TableStudent> <TableStudent
:type="1"
:id="projectId"
:columns="stuColumns"
:stage="stage"
></TableStudent>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</div> </div>
@@ -1044,7 +1049,7 @@
:title="showFaceText" :title="showFaceText"
/> />
<!-- 学员（小组管理）创建小组抽屉 --> <!-- 学员（小组管理）创建小组抽屉 -->
<subset-manage v-model:Svisible="subsetVisivle"/> <subset-manage v-model:Svisible="subsetVisivle" />
<!-- 学员管理-添加学员抽屉 --> <!-- 学员管理-添加学员抽屉 -->
<!-- <stu-add v-model:Stuvisible="Stuvisible" /> --> <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
<!-- 添加学员抽屉 --> <!-- 添加学员抽屉 -->
@@ -1057,7 +1062,7 @@
:type="2" :type="2"
/> />
<!-- 学员管理-导入学员抽屉 --> <!-- 学员管理-导入学员抽屉 -->
<import-stu v-model:Importvisible="Importvisible"/> <import-stu v-model:Importvisible="Importvisible" />
<!-- 查看学员 传入查看学员的id--> <!-- 查看学员 传入查看学员的id-->
<see-stu <see-stu
v-model:Seevisible="Seevisible" v-model:Seevisible="Seevisible"
@@ -1080,9 +1085,9 @@
v-model:projectId="projectId" v-model:projectId="projectId"
/> />
<!-- 面授学员抽屉 --> <!-- 面授学员抽屉 -->
<face-stu v-model:FSvisible="FSvisible"/> <face-stu v-model:FSvisible="FSvisible" />
<!-- 活动考勤抽屉 --> <!-- 活动考勤抽屉 -->
<active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText"/> <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
<!-- 作业管理抽屉 --> <!-- 作业管理抽屉 -->
<work-manage <work-manage
v-model:Wvisible="Wvisible" v-model:Wvisible="Wvisible"
@@ -1097,7 +1102,7 @@
:itemsType="itemstype" :itemsType="itemstype"
/> />
<!-- 批量面授报名 --> <!-- 批量面授报名 -->
<task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"/> <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
<!-- 概览（无数据）-项目发布弹窗 --> <!-- 概览（无数据）-项目发布弹窗 -->
<div> <div>
@@ -1156,7 +1161,7 @@
</div> </div>
</div> </div>
<div class="send"> <div class="send">
<a-switch v-model:checked="checked" size="small"/> <a-switch v-model:checked="checked" size="small" />
<span class="sendtext">发送项目通知</span> <span class="sendtext">发送项目通知</span>
</div> </div>
<div class="ckb"> <div class="ckb">
@@ -1420,7 +1425,7 @@
</a-modal> </a-modal>
</div> </div>
<!-- 编辑项目弹窗 --> <!-- 编辑项目弹窗 -->
<proj-set v-model:editHs="editHs" v-model:projectId="projectId"/> <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
<!-- 发布弹窗 --> <!-- 发布弹窗 -->
<a-modal <a-modal
@@ -1502,7 +1507,7 @@
class="aeLoading" class="aeLoading"
:style="{ display: projectPubLoading ? 'flex' : 'none' }" :style="{ display: projectPubLoading ? 'flex' : 'none' }"
> >
<a-spin :spinning="projectPubLoading"/> <a-spin :spinning="projectPubLoading" />
</div> </div>
</a-modal> </a-modal>
@@ -1644,9 +1649,9 @@
</div> </div>
</template> </template>
<script> <script>
import {reactive, toRefs, onMounted, watch, computed} from "vue"; import { reactive, toRefs, onMounted, watch, computed } from "vue";
import {useRoute} from "vue-router"; import { useRoute } from "vue-router";
import {useRouter} from "vue-router"; import { useRouter } from "vue-router";
import TimeManage from "../../components/drawers/TimeManage"; import TimeManage from "../../components/drawers/TimeManage";
import FaceManage from "../../components/drawers/FaceManage"; import FaceManage from "../../components/drawers/FaceManage";
import SubsetManage from "../../components/drawers/SubsetManage"; import SubsetManage from "../../components/drawers/SubsetManage";
@@ -1662,7 +1667,7 @@ import ChangeGroup from "../../components/drawers/ChangeGroup";
import NoticePub from "../../components/drawers/NoticePub"; import NoticePub from "../../components/drawers/NoticePub";
import NoticeHis from "../../components/drawers/NoticeHis"; import NoticeHis from "../../components/drawers/NoticeHis";
import TaskImpStu from "../../components/drawers/TaskFaceIn"; import TaskImpStu from "../../components/drawers/TaskFaceIn";
import {storage} from "../../api/storage"; import { storage } from "../../api/storage";
import * as api from "../../api/index1"; import * as api from "../../api/index1";
import * as apis from "../../api/index"; import * as apis from "../../api/index";
import * as apiproj from "../../api/index"; import * as apiproj from "../../api/index";
@@ -1675,20 +1680,20 @@ import {
editGroup, editGroup,
topStudent, topStudent,
} from "../../api/indexProjStu"; } from "../../api/indexProjStu";
import {message, Modal} from "ant-design-vue"; import { message, Modal } from "ant-design-vue";
import * as apitl from "../../api/index"; import * as apitl from "../../api/index";
import {getTask} from "../../api/indexTaskadd"; import { getTask } from "../../api/indexTaskadd";
import {editProj} from "../../api/indexTaskadd"; import { editProj } from "../../api/indexTaskadd";
import {toDate, codeUrl} from "../../api/method"; import { toDate, codeUrl } from "../../api/method";
import projSet from "../../components/Modals/projSet"; import projSet from "../../components/Modals/projSet";
import {overview} from "../../api/indexProjStu"; import { overview } from "../../api/indexProjStu";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
import ProjectLevel from "@/components/project/ProjectLevel"; import ProjectLevel from "@/components/project/ProjectLevel";
import TrainClass from "@/components/project/TrainClass"; import TrainClass from "@/components/project/TrainClass";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import TableStudent from "@/components/student/TableStudent"; import TableStudent from "@/components/student/TableStudent";
import { getStuPage } from "@/api/index1";
export default { export default {
name: "taskPage", name: "taskPage",
components: { components: {
@@ -1714,14 +1719,15 @@ export default {
NoticeHis, NoticeHis,
TwoDimensionalCode, TwoDimensionalCode,
ProjectManager, ProjectManager,
TableStudent TableStudent,
}, },
setup() { setup() {
const store = useStore(); const store = useStore();
const route = useRoute(); const route = useRoute();
const state = reactive({ const state = reactive({
stage: [], stage: [],
stuColumns: [{ stuColumns: [
{
title: "进度", title: "进度",
dataIndex: "progress", dataIndex: "progress",
key: "progress", key: "progress",
@@ -1729,8 +1735,11 @@ export default {
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true, ellipsis: true,
customRender: ({record}) => <div>{record.finishTaskNum}/{record.totalTaskNum}</div> customRender: ({ record }) => (
<div>
{record.finishTaskNum}/{record.totalTaskNum}
</div>
),
}, },
{ {
title: "最近学习时间", title: "最近学习时间",
@@ -1739,7 +1748,8 @@ export default {
width: 80, width: 80,
align: "center", align: "center",
className: "h", className: "h",
}], },
],
loading: false, loading: false,
projectId: route.query.projectId, projectId: route.query.projectId,
isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null, isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null,
@@ -1806,23 +1816,23 @@ export default {
projectTaskId: "", //项目任务任务id projectTaskId: "", //项目任务任务id
//进度排行学员 //进度排行学员
rankjindu: [ rankjindu: [
{value: "学员", label: "学员"}, { value: "学员", label: "学员" },
{value: "小组", label: "小组"}, { value: "小组", label: "小组" },
], ],
valuestu1: "学员", valuestu1: "学员",
//进度排行阶段 //进度排行阶段
rankjieduan: [{value: "第一阶段", label: "第一阶段"}], rankjieduan: [{ value: "第一阶段", label: "第一阶段" }],
valuestu2: "第一阶段", valuestu2: "第一阶段",
//积分排行 //积分排行
rankxuefen: [ rankxuefen: [
{value: "学员", label: "学员"}, { value: "学员", label: "学员" },
{value: "小组", label: "小组"}, { value: "小组", label: "小组" },
], ],
valuestu3: "学员", valuestu3: "学员",
//学时排行 //学时排行
rankxueshi: [ rankxueshi: [
{value: "学员", label: "学员"}, { value: "学员", label: "学员" },
{value: "小组", label: "小组"}, { value: "小组", label: "小组" },
], ],
valuestu4: "学员", valuestu4: "学员",
visible: false, //时间管理 visible: false, //时间管理
@@ -1970,21 +1980,21 @@ export default {
if (text.record.rank == "1") { if (text.record.rank == "1") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")} src={require("../../assets/images/taskpage/one.png")}
/> />
); );
} else if (text.record.rank == "2") { } else if (text.record.rank == "2") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")} src={require("../../assets/images/taskpage/two.png")}
/> />
); );
} else if (text.record.rank == "3") { } else if (text.record.rank == "3") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")} src={require("../../assets/images/taskpage/three.png")}
/> />
); );
@@ -2077,21 +2087,21 @@ export default {
if (text.record.rank == "1") { if (text.record.rank == "1") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")} src={require("../../assets/images/taskpage/one.png")}
/> />
); );
} else if (text.record.rank == "2") { } else if (text.record.rank == "2") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")} src={require("../../assets/images/taskpage/two.png")}
/> />
); );
} else if (text.record.rank == "3") { } else if (text.record.rank == "3") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")} src={require("../../assets/images/taskpage/three.png")}
/> />
); );
@@ -2184,21 +2194,21 @@ export default {
if (text.record.rank == "1") { if (text.record.rank == "1") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")} src={require("../../assets/images/taskpage/one.png")}
/> />
); );
} else if (text.record.rank == "2") { } else if (text.record.rank == "2") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")} src={require("../../assets/images/taskpage/two.png")}
/> />
); );
} else if (text.record.rank == "3") { } else if (text.record.rank == "3") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")} src={require("../../assets/images/taskpage/three.png")}
/> />
); );
@@ -2530,7 +2540,7 @@ export default {
// state.activeKey = "2"; // state.activeKey = "2";
routered.push({ routered.push({
path: `/taskadd`, path: `/taskadd`,
query: {projectId: state.projectId}, query: { projectId: state.projectId },
}); });
}; };
const tostudent = () => { const tostudent = () => {
@@ -2971,7 +2981,7 @@ export default {
width: "20%", width: "20%",
align: "center", align: "center",
className: "h", className: "h",
scopedSlots: {customRender: "action"}, //引入的插槽 scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => { customRender: (text) => {
// console.log(text); // console.log(text);
return ( return (
@@ -3297,7 +3307,7 @@ export default {
title: "确定清空所有学员吗？", title: "确定清空所有学员吗？",
onOk: async () => { onOk: async () => {
state.tabledata = []; state.tabledata = [];
student.studentDelAll({id: state.projectId, type: 1}); student.studentDelAll({ id: state.projectId, type: 1 });
}, },
bodyStyle: "margin-top:70%", bodyStyle: "margin-top:70%",
}); });
@@ -3343,7 +3353,10 @@ export default {
console.log("get task", res.data.data); console.log("get task", res.data.data);
if (res.data.code === 200) { if (res.data.code === 200) {
// 判断当前审核是否通过 // 判断当前审核是否通过
if (res.data.data.status == -5 && res.data.data.projectAuditLogDtoList !== null) { if (
res.data.data.status == -5 &&
res.data.data.projectAuditLogDtoList !== null
) {
console.log("审核信息是什么", res.data.data.projectAuditLogDtoList); console.log("审核信息是什么", res.data.data.projectAuditLogDtoList);
let dataset = res.data.data.projectAuditLogDtoList; let dataset = res.data.data.projectAuditLogDtoList;
state.passInfo = dataset[dataset.length - 1]; state.passInfo = dataset[dataset.length - 1];
@@ -3358,7 +3371,10 @@ export default {
} }
*/ */
} }
state.stage = res.data.data.stageList.map(e => ({id: e.stageId, name: e.name})) state.stage = res.data.data.stageList.map((e) => ({
id: e.stageId,
name: e.name,
}));
let info = res.data.data.projectInfo; let info = res.data.data.projectInfo;
// let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let start = info.beginTime; let start = info.beginTime;
@@ -3524,7 +3540,7 @@ export default {
//start---------项目概览 //start---------项目概览
// 获取项目概览 // 获取项目概览
const getOverview = () => { const getOverview = () => {
overview({projectId: state.projectId}) overview({ projectId: state.projectId })
.then((res) => { .then((res) => {
Object.keys(res.data.data.projectInfoOverview).forEach((item) => { Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
levelList.projectInfoOverview[item] = levelList.projectInfoOverview[item] =
@@ -3583,7 +3599,7 @@ export default {
}); });
}; };
const handleChange = ({file, fileList}) => { const handleChange = ({ file, fileList }) => {
let list = []; let list = [];
if (file.status !== "uploading") { if (file.status !== "uploading") {
console.log("上传的list", fileList); console.log("上传的list", fileList);
@@ -3727,10 +3743,10 @@ export default {
let obj = { let obj = {
pageNo: 0, pageNo: 0,
pageSize: 0, pageSize: 0,
projectId: state.projectId, pid: state.projectId,
type: 1,
}; };
apiproj getStuPage(obj)
.projectStudent(obj)
.then((res) => { .then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
// console.log("res", res.data); // console.log("res", res.data);
@@ -5629,7 +5645,6 @@ export default {
.group { .group {
display: flex; display: flex;
.groupleft { .groupleft {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

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

@@ -174,7 +174,11 @@
<!--操作弹窗 --> <!--操作弹窗 -->
</div> </div>
<!-- 加载动画 --> <!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }"> <div
class="aeLoading"
style="z-index: 100"
:style="{ display: addLoading ? 'flex' : 'none' }"
>
<a-spin :spinning="addLoading" tip="" /> <a-spin :spinning="addLoading" tip="" />
</div> </div>
</template> </template>