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

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

Browse Source 
# Conflicts:
#	src/components/student/TableModelStudent.vue
#	src/views/projectcenter/ProjectAdd.vue
#	src/views/projectcenter/ProjectManage.vue
This commit is contained in:
yuping
2023-01-31 17:32:10 +08:00
parent 9e972b2ae4 961396eb0b
commit d43ea119d6
11 changed files with 1488 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -771,7 +771,7 @@ export default {
})
}}
style="display:flex;justify-content:center;align-items:center;margin-right:12px;cursor:pointer;">
{value.signStatus?
{value.record.signStatus?
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
<div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
</div>:
@@ -814,7 +814,7 @@ export default {
})
}}
style="display:flex;justify-content:center;align-items:center;cursor:pointer;">
{value.leaveStatus?
{value.record.leaveStatus?
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
<div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
</div>:

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

@@ -457,9 +457,10 @@ export default {
//获取项目修改记录
const getrecord = () => {
console.log("props.chooseProject", props.chooseProject);
editRecord(props.chooseProject)
.then((res) => {
console.log("获取修改记录", res);
console.log("获取修改记录2", res);
if (res.data.code === 200) {
state.tableData = res.data.data.records;
// console.log("state.tableData", state.tableData);

26
src/components/drawers/SubsetManage.vue
View File

@@ -42,9 +42,14 @@
v-model:value="value.name"
style="border-radius: 8px; height: 40px"
/>
<div class="peopleNum">{{ peopleNum2 }}</div>
<a-input-number
:min="1"
:precision="0"
style="width: 64px; height: 40px; border-radius: 8px"
v-model:value="peopleNum"
/>
<span style="margin-left: 3px">人</span>
<div class="delete">删除</div>
<div class="delete" @click="deleteGroup(value)">删除</div>
</div>
</div>
</div>
@@ -110,6 +115,7 @@ export default {
let arr = [];
for (let i = 0; i < state.groupNum; i++) {
let obj = {
key: i,
name: "",
number: state.peopleNum,
};
@@ -118,10 +124,19 @@ export default {
state.groupNum2 = arr;
state.peopleNum2 = state.peopleNum;
};
//删除单个小组
const deleteGroup = (item) => {
for (let i = 0; i < state.groupNum2.length; i++) {
if (item.key === state.groupNum2[i].key) {
state.groupNum2.splice(i, 1);
}
}
};
//添加小组
const addGroup = () => {
console.log("state.groupNum2", state.groupNum2);
};
return {
...toRefs(state),
afterVisibleChange,
@@ -130,6 +145,7 @@ export default {
showAddGroup,
addGroup,
// change,
deleteGroup,
};
},
};
@@ -169,6 +185,12 @@ export default {
}
}
.main {
.ant-input-number-input {
height: 38px;
}
.ant-input-number {
margin-left: 10px;
}
.group {
display: flex;
align-items: center;

700
src/components/drawers/router/RouterProjectManage.vue Normal file
View File

@@ -0,0 +1,700 @@
<template>
<a-drawer
v-if="PjModelVisible"
:visible="PjModelVisible"
class="drawerStyle RouterProjectManage"
placement="right"
width="80%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">
【项目】{{ title }}
</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
<div
v-if="datasource.type !== 6 && datasource.type !== 9"
class="endtime"
>
<!-- 起止时间：—-->
</div>
<div v-else class="endtime">
起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
</div>
<div class="search" style="justify-content:flex-start;">
<div class="sealeft">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
<div v-if="datasource.type !==1" class="namecon" style="margin-right: 50px">
<div class="name">任务状态：</div>
<div class="select">
<a-select
v-model:value="projectName"
style="width: 200px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
></a-select>
</div>
</div>
</div>
<div class="btns">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2" @click="resetTaskList">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
</div>
</div>
<div class="btnss" style="margin-top: 20px">
<!--
<div class="btn btn1" @click="godie" style="margin-right: 20px">
<div class="img1"></div>
<div class="wz">催促学习</div>
</div>-->
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
</div>
<div class="tab" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tabledata"
:loading="tableDataTotalLoading"
:scroll="{ x: 900 }"
:pagination="false"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
v-if="tableDataTotal > 10"
/>
</div>
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>-->
</div>
</a-drawer>
<CVote
v-model:CVvisible="CVvisible"
:voteID="voteID"
:courseID="courseID"
/>
</template>
<script>
import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue";
// import * as api from "../../../api/index";
import * as api from "../../../api/indexTaskManage";
import CVote from "../CheckVote.vue"
export default {
name: "RouterProjectManage",
components:{
CVote,
},
props: {
PjModelVisible: {
type: Boolean,
default: false,
},
title: {
type: String,
default: "",
},
levelName: {
type: String,
default: "",
},
projectTaskId: {
type: Number,
default: null,
},
itemsType: {
type: Number,
default: null,
},
datasource: {
type: Object,
default: function () {
return {};
},
},
},
setup(props, ctx) {
const state = reactive({
visible: props.PjModelVisible,
name: "",
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
projectName: undefined,
projectNameList: [
{
id: 1,
value: "1",
label: "未开始",
},
{
id: 2,
value: "2",
label: "进行中",
},
{
id: 3,
value: "3",
label: "已完成",
},
{
id: 4,
value: "4",
label: "未完成",
},
],
tabledata: [],
tableDataTotalLoading: true, // 表格loading加载配置
CVvisible:false, //查看投票抽屉
voteID: "",
courseID: ""
});
const tableDataFunc = () => {
const columns = [
{
title: "工号",
dataIndex: "studentUserNo",
key: "studentUserNo",
width: "20%",
align: "center",
ellipsis: true,
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
</div>
);
},
},
{
title: "姓名",
dataIndex: "studentName",
key: "studentName",
width: "10%",
align: "center",
ellipsis: true,
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "所在部门",
dataIndex: "studentDepartName",
key: "studentDepartName",
width: "20%",
align: "center",
className: "h",
ellipsis: true,
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
</div>
);
},
},
{
title: "所在岗位",
dataIndex: "studentJobName",
key: "studentJobName",
width: "10%",
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "学员关卡",
dataIndex: "currentStageName",
key: "currentStageName",
width: "10%",
align: "center",
ellipsis: true,
className: "h",
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
},
},
{
title: "完成时间",
dataIndex: "lastStudyTime",
key: "lastStudyTime",
width: "15%",
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "finishStatus",
key: "finishStatus",
width: "10%",
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishStatus == 1 || text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 3 ? "已完成" :"未完成"}</span>
</div>
);
},
},
{
title: "操作",
dataIndex: "voteSubmitId",
key: "voteSubmitId",
width: "10%",
align: "center",
ellipsis: true,
className: "h",
customRender: (value) => {
return (
<div
style="color:#387df7;cursor:pointer"
onClick={
() => {
if(value.record.finishStatus !== 3){
message.destroy()
message.error("当前任务未完成")
return
}
{/* 当前投票提交的ID 用来查看投票详情 */}
console.log(value.record.voteSubmitId);
state.voteID = value.record.voteSubmitId;
state.CVvisible = true;
}}>
{value.record.finishStatus == 3 ?
<span style='color:#387df7;'> 查看 </span>
:
<span style='color:#999;'> 查看 </span>}
</div>
);
},
},
];
return columns;
};
const closeDrawer = () => {
ctx.emit("update:PjModelVisible", false);
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
if (bol == true) {
console.log("当前是什么类型", props.datasource.type);
state.tableDataTotalLoading = true;
{/* getData(); */}
}
};
const selectProjectName = (value) => {
state.projectName = value;
};
//催促
const godie = () => {
message.destroy();
message.success("催促" + props.title + "成功");
};
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
};
// 获取数据
function getData() {
if(props.datasource.type == 12){
console.log("我是传递的查询参数", {
"pageNo": state.currentPage,
"pageSize": state.pageSize,
"chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId,
"status": state.projectName,
"studentName": state.name,
"targetId":props.datasource.projectId,
"taskId": props.datasource.courseId,
"type": 1
});
api.QueryVoteManagementDetail({
"pageNo": state.currentPage,
"pageSize": state.pageSize,
"chapterId": props.datasource.chapterId,
"status": state.projectName,
"studentName": state.name,
"targetId":props.datasource.routerId,
"taskId": props.datasource.courseId,
"type": 1
}).then(res=>{
console.log('投票数据获取', res)
if(res.data.code==200){
state.tableDataTotalLoading = false;
let newData = []
for(let i=0;i<res.data.data.rows.length;i++){
// 处理在线课字段和表格中字段保持一致
let obj = {
studentUserNo: res.data.data.rows[i].studentCode,
studentName: res.data.data.rows[i].studentName,
studentDepartName: res.data.data.rows[i].studentDepartName,
studentJobName: res.data.data.rows[i].studentJobName,
lastStudyTime: res.data.data.rows[i].submitTime,
finishStatus: res.data.data.rows[i].status?res.data.data.rows[i].status:0,
voteSubmitId: res.data.data.rows[i].voteSubmitId
}
newData.push(obj)
}
state.tabledata = newData;
state.courseID = props.datasource.courseId;
state.tableDataTotal = res.data.data.total;
}
}).catch(err=>{
console.log(err)
state.tableDataTotalLoading = false;
})
}else{
state.tableDataTotalLoading = false;
state.tabledata = [];
}
}
// 搜索按钮
function searchTaskList() {
state.currentPage = 1;
state.tableDataTotalLoading = true;
getData();
}
// 重置按钮
function resetTaskList() {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
getData();
}
//分页
const changePaginationStu = (page) => {
state.tableDataTotalLoading = true;
state.currentPage = page;
getData();
};
// 导出数据
function exportTaskStu() {
console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.routerTaskId}`)
window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.routerTaskId}`)
}
return {
...toRefs(state),
selectProjectName,
closeDrawer,
afterVisibleChange,
tableDataFunc,
godie,
onMounted,
onUnmounted,
onChange,
searchTaskList,
resetTaskList,
changePaginationStu,
exportTaskStu,
};
},
};
</script>
<style lang="scss">
.RouterProjectManage {
// overflow-x: auto;
.drawerMain {
min-width: 550px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.noticebox {
width: 240px;
height: 64px;
background: rgba(255, 255, 255, 1);
border-radius: 4px;
position: absolute;
top: 161px;
display: flex;
align-items: center;
justify-content: center;
.notext {
color: rgba(51, 51, 51, 1);
font-size: 14px;
font-weight: 500;
margin-left: 20px;
}
}
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
flex-shrink: 0;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
// background-color: #bfa;
overflow-y: auto;
padding-right: 10px;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 20px;
justify-content: space-between;
.sealeft {
display: flex;
flex-wrap: wrap;
.namecon {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
white-space: nowrap;
}
}
}
.btns {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 100px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
background-image: url(../../../assets/images/courseManage/search0.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #ffffff;
color: #4ea6ff;
border: 1px solid #4ea6ff;
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 130px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 18px;
height: 18px;
background-image: url(../../../assets/images/basicinfo/call.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #ffffff;
color: #4ea6ff;
border: 1px solid #4ea6ff;
}
}
.tab {
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.tableBox {
.pa {
// left: 0;
margin-top: 15px;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
// position: absolute;
// bottom: 20px;
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-item,
.ant-pagination-options {
margin-bottom: 10px;
}
}
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
bottom: 0;
left: 0;
background-color: #fff;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

94
src/components/student/ChangeGroupModal.vue Normal file
View File

@@ -0,0 +1,94 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-20 17:00:37
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-31 15:51:36
* @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<a-modal
style="padding: 0"
:closable="true"
:visible="changegroupV"
:footer="null"
centered="true"
wrapClassName="changeModal"
>
<div class="con">
<div class="header">
<div class="inhe">
<div class="mod"></div>
<div class="tz">换组</div>
<div class="mg" @click="closeChangeModal"></div>
</div>
</div>
<div class="mid">
<div class="inher">
<!-- <div class="cur">当前关卡：关卡2</div> -->
<div class="select">
<a-select
v-model:value="selectStage"
style="width: 100%"
placeholder="请选择小组"
:options="option"
allowClear
></a-select>
</div>
<div class="btn">
<button
class="sameb btn1"
@click="closeChangeModal"
style="cursor: pointer"
>
取消
</button>
<button
class="sameb btn2"
@click="changeGroup"
style="cursor: pointer"
>
确定
</button>
</div>
</div>
</div>
</div>
</a-modal>
</template>
<script setup>
import { computed, defineEmits, defineProps, ref } from "vue";
// import { moveStudent } from "@/api/index1";
// import { message } from "ant-design-vue";
const props = defineProps({
changegroupV: {
type: Boolean,
default: false,
},
stage: {
type: Array,
default: () => [],
},
ids: {
type: Array,
default: () => [],
},
});
const option = computed(() => {
return props.stage.map((e) => ({ label: e.name, value: e.id }));
});
console.log("changegroupV", props.changegroupV);
const selectStage = ref();
const emit = defineEmits({});
const closeChangeModal = () => {
emit("update:changegroupV", false);
};
//确认换组
const changeGroup = (item) => {
console.log("换组", item);
};
</script>

31
src/components/student/OwnerTableModelStudent.vue
View File

@@ -1,15 +1,31 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-31 13:41:35
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-31 13:45:07
* @FilePath: /fe-manage/src/components/student/OwnerTableModelStudent.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<TableModelStudent :types="types" :id="id" ref="tableModelRef">
<template #extension="{ data: { record } }">
<CommonStudent v-if="record.type===type" :type="type" :id="id" @finash="submitCall" :clear="true" :select-stu="true" :select-one="true">
<a-button type="link">转移归属权</a-button>
</CommonStudent>
<CommonStudent
v-if="record.type === type"
:type="type"
:id="id"
@finash="submitCall"
:clear="true"
:select-stu="true"
:select-one="true"
>
<a-button type="link">转移归属权</a-button>
</CommonStudent>
</template>
<slot></slot>
</TableModelStudent>
</template>
<script setup>
import {defineProps, ref} from "vue";
import { defineProps, ref } from "vue";
import TableModelStudent from "@/components/student/TableModelStudent";
import CommonStudent from "@/components/student/CommonStudent";
@@ -21,12 +37,11 @@ defineProps({
default: () => [],
},
});
const tableModelRef = ref()
console.log("props", props.types);
const tableModelRef = ref();
function submitCall(flag) {
tableModelRef.value.loading = true
tableModelRef.value.loading = true;
flag && tableModelRef.value.searchStu();
}
</script>

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

@@ -117,7 +117,7 @@
导出学习信息
</a-button>
</a-col>
<a-col :span="1.5" v-if="type === 2">
<a-button class="cus-btn white" @click="exportTaskStuRouter">
导出学习信息
@@ -196,7 +196,7 @@
:scroll="{ x: 1500 }"
row-key="id"
:row-selection="stuRowSelection"
>
>
<template #action="{ record }">
<!-- <div style="display:flex;justify-content: center;align-items: center;">-->
<!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -216,9 +216,19 @@
<!-- </div>-->
<a-space :size="2">
<slot name="extension" v-bind:data="{ record }"></slot>
<a-button v-if="type === 1" @click="updateStatus(0, record.id)" type="link">换组</a-button>
<a-button v-if="type === 3 && record.status!==0" @click="updateStatus(0, record.id)" type="link">通过</a-button>
<a-button v-if="type === 3 && record.status!==0" @click="updateStatus(2, record.id)" type="link">拒绝</a-button>
<a-button
v-if="type === 3 && record.status !== 0"
@click="updateStatus(0, record.id)"
type="link"
>通过</a-button
>
<a-button
v-if="type === 3 && record.status !== 0"
@click="updateStatus(2, record.id)"
type="link"
>拒绝</a-button
>
<a-button @click="del(record.id)" type="link" danger>删除</a-button>
</a-space>
</template>
@@ -329,11 +339,11 @@
/>
</template>
<script setup>
import {computed, createVNode, defineProps, onMounted, ref, watch} from "vue";
import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue";
import { delStudentList, getStuPage, batchUpdateStatus } from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue";
import {message, Modal} from "ant-design-vue";
import { message, Modal } from "ant-design-vue";
// import { topStudent } from "../../api/indexProjStu";
import SeeStu from "../../components/drawers/SeeStu";
import EScore from "../drawers/ExportScore.vue";
@@ -341,7 +351,7 @@ import OrgClass from "@/components/project/OrgClass";
import ExportHomeWork from "../Modals/ExportHomeWork.vue";
import * as api from "../../api/index1";
import ImpStu from "../drawers/AddLevelImportStu";
import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
const props = defineProps({
type: Number,
@@ -423,7 +433,7 @@ const tablecolumns = ref([
className: "h",
ellipsis: true,
customRender: ({ record: { studentOrgName, studentDepartName } }) =>
(allDepartShow(studentOrgName, studentDepartName)),
allDepartShow(studentOrgName, studentDepartName),
},
{
title: "加入方式",
@@ -433,7 +443,15 @@ const tablecolumns = ref([
align: "center",
customRender: ({ record: { source } }) =>
// ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
({ 0: "手动加入", 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名", 5: "手动加入", 6: "手动加入"}[source]),
({
0: "手动加入",
1: "手动加入",
2: "手动加入",
3: "手动加入",
4: "报名",
5: "手动加入",
6: "手动加入",
}[source]),
},
...props.columns,
{
@@ -446,10 +464,15 @@ const tablecolumns = ref([
},
]);
function allDepartShow(a,b) {
let org = (a=="" || a == null || a == undefined) ? a = "" : a.slice(0,1) =='/' ? a.slice(1,a.length) : a;
let depart = (b=="" || b == null || b == undefined) ? b = "" : b;
let allname = org == "" && depart == "" ? '-' : org + depart;
function allDepartShow(a, b) {
let org =
a == "" || a == null || a == undefined
? (a = "")
: a.slice(0, 1) == "/"
? a.slice(1, a.length)
: a;
let depart = b == "" || b == null || b == undefined ? (b = "") : b;
let allname = org == "" && depart == "" ? "-" : org + depart;
return allname;
}
@@ -486,7 +509,7 @@ function exportTaskStu() {
}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
);
}
function exportTaskStuRouter() {
console.log("props.datasource", props);
window.open(
@@ -565,14 +588,14 @@ function bathDel() {
function del(id) {
Modal.confirm({
title: () => '确定删除?',
title: () => "确定删除?",
icon: () => createVNode(ExclamationCircleOutlined),
content: () => '数据删除后不可恢复！',
okText: () => '确定',
okType: 'danger',
cancelText: () => '取消',
content: () => "数据删除后不可恢复！",
okText: () => "确定",
okType: "danger",
cancelText: () => "取消",
onOk() {
id && delStudentList({ids: [id]}).then(() => getStuList())
id && delStudentList({ ids: [id] }).then(() => getStuList());
},
});
}
@@ -913,8 +936,6 @@ const AddImpStuvisibleClose = (isget) => {
background-image: url("@/assets/images/coursewareManage/export.png");
}
}
}
/*.delete {
z-index: 9999;

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

@@ -1719,18 +1719,18 @@ import { useStore } from "vuex";
//列表表格
const columns1 = [
// {
// title: "序号",
// width: 100,
// dataIndex: "num",
// key: "num",
// align: "center",
// customRender: ({ index, record }) => {
// const pageNum =
// Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
// return index + 1 + pageNum;
// },
// },
{
title: "课程编号",
width: 100,
dataIndex: "num",
key: "num",
align: "center",
customRender: ({ index, record }) => {
const pageNum =
Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
return index + 1 + pageNum;
},
},
{
title: "名称",
width: 400,

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

@@ -173,13 +173,13 @@
</div>
<div class="stagemess">
<div
v-for="(item,index) in stageList"
v-for="(item, index) in stageList"
:class="{
stage1: item.stageId == choosedStageId,
stage2: item.stageId != choosedStageId,
}"
:key="item.stageId"
@click="stageChange(item.name, item.stageId,index)"
@click="stageChange(item.name, item.stageId, index)"
>
关卡{{ item.stageId }}
</div>
@@ -195,7 +195,9 @@
<a-progress
type="dashboard"
gapDegree="0"
:percent="chapterOverviewList[choosedStageIndex]?.completeCourseRatio"
:percent="
chapterOverviewList[choosedStageIndex]?.completeCourseRatio
"
:width="140"
/>
<div class="protext">课程完成率</div>
@@ -204,7 +206,9 @@
<a-progress
type="dashboard"
gapDegree="0"
:percent="chapterOverviewList[choosedStageIndex]?.completeExamRatio"
:percent="
chapterOverviewList[choosedStageIndex]?.completeExamRatio
"
:width="140"
/>
<div class="protext">考试通过率</div>
@@ -213,39 +217,65 @@
<a-progress
type="dashboard"
gapDegree="0"
:percent="chapterOverviewList[choosedStageIndex]?.completeRatio"
:percent="
chapterOverviewList[choosedStageIndex]?.completeRatio
"
:width="140"
/>
<div class="protext">作业完成率</div>
</div>
<div class="proright">
<div class="pronub" style="margin-left: 142px">
{{ chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalTaskCnt:0 }}
{{
chapterOverviewList[choosedStageIndex]
? chapterOverviewList[choosedStageIndex].totalTaskCnt
: 0
}}
</div>
<div class="proright1">
<span class="textpro">关卡任务总数</span>
<a-progress
:percent="chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalTaskCnt:0"
:percent="
chapterOverviewList[choosedStageIndex]
? chapterOverviewList[choosedStageIndex].totalTaskCnt
: 0
"
style="width: 369px"
/>
</div>
<div class="pronub" style="margin-left: 142px">
{{ chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalReqCnt:0 }}
{{
chapterOverviewList[choosedStageIndex]
? chapterOverviewList[choosedStageIndex].totalReqCnt
: 0
}}
</div>
<div class="proright1">
<span class="textpro">必修课</span>
<a-progress
:percent="chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalReqCnt:0"
:percent="
chapterOverviewList[choosedStageIndex]
? chapterOverviewList[choosedStageIndex].totalReqCnt
: 0
"
style="width: 369px"
/>
</div>
<div class="pronub" style="margin-left: 142px">
{{ chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalOptCnt:0 }}
{{
chapterOverviewList[choosedStageIndex]
? chapterOverviewList[choosedStageIndex].totalOptCnt
: 0
}}
</div>
<div class="proright1">
<span class="textpro">选修课</span>
<a-progress
:percent="chapterOverviewList[choosedStageIndex]?chapterOverviewList[choosedStageIndex].totalOptCnt:0"
:percent="
chapterOverviewList[choosedStageIndex]
? chapterOverviewList[choosedStageIndex].totalOptCnt
: 0
"
style="width: 369px"
/>
</div>
@@ -431,13 +461,19 @@
<a-progress
:showInfo="false"
:percent="
parseInt((item.finishStuNum / item.totalStuNum) * 100)
parseInt(
(item.finishStuNum / item.totalStuNum) * 100
)
"
strokeColor="#FFC067"
trailColor="rgba(253, 209, 98, 0.2)"
/>
<span class="progresstext" style="margin-left: 10px"
>{{parseInt((item.finishStuNum / item.totalStuNum) * 100) || 0}}%</span
>{{
parseInt(
(item.finishStuNum / item.totalStuNum) * 100
) || 0
}}%</span
>
</div>
</div>
@@ -500,6 +536,8 @@
? evaluationModel(item, value.name)
: item.type === 12
? voteModel(item, value.name)
: item.type === 13
? projectModel(item, value.name)
: null
"
>
@@ -1024,7 +1062,7 @@
v-model:AAvisible="AAvisible"
:datasource="liveData"
:title="showKaoqinText"
types="1"
types="1"
classify="2"
/>
<!-- 时间管理抽屉 -->
@@ -1273,6 +1311,15 @@
:levelName="voteLevelName"
/>
<!-- 投票管理抽屉 结束-->
<!-- 项目管理抽屉 开始-->
<router-project-manage
v-model:PjModelVisible="pjModelVisible"
:title="pjModelVisibleTitle"
:datasource="pjData"
:levelName="pjLevelName"
/>
<!-- 项目管理抽屉 结束-->
</div>
</template>
<script>
@@ -1310,6 +1357,7 @@ import RouterEvaluationManage from "../../components/drawers/router/RouterEvalua
import RouterHomeworkManage from "../../components/drawers/router/RouterHomeworkManage";
import RouterCommonManage from "../../components/drawers/router/RouterCommonManage";
import RouterVoteManage from "../../components/drawers/router/RouterVoteManage";
import RouterProjectManage from "../../components/drawers/router/RouterProjectManage";
export default {
name: "LevelAdd",
@@ -1333,13 +1381,15 @@ export default {
RouterEvaluationManage,
RouterHomeworkManage,
RouterCommonManage,
RouterVoteManage
RouterVoteManage,
RouterProjectManage,
},
setup() {
const router = useRouter();
// const store = useStore();
const state = reactive({
hasTask:false,
pjModelVisible: false,
hasTask: false,
stage: [],
statess: [],
routerId: storage.get("routerId")
@@ -1504,19 +1554,22 @@ export default {
previewEndNum: 0,
studyStartNum: 0,
studyEndNum: 0,
pjModelVisible: false,
faceTeachModelVisible: false,
examinationModelVisible: false,
evaluationModelVisible: false,
homeworkModelVisible: false,
commonModelVisible: false,
voteModelVisible: false,
projectModelVisible: false,
faceTeachModelVisibleTitle: "",
examinationModelVisibleTitle: "",
evaluationModelVisibleTitle: "",
homeworkModelVisibleTitle: "",
commonModelVisibleTitle: "",
voteModelVisibleTitle: "",
projectModelVisibleTitle: "",
pjModelVisibleTitle: "",
faceData: "",
examinationData: "",
@@ -1525,10 +1578,14 @@ export default {
commonData: "",
liveData: "",
voteData: "",
projectData: "",
pjData: "",
commonLevelName: "",
examLevelName: "",
evaluationLevelName: "",
voteLevelName: "",
projectLevelName: "",
pjLevelName: "",
facestudent: "",
locationHref:
@@ -1792,7 +1849,7 @@ export default {
const closehuodModal = () => {
state.huodModal = false;
};
const stageChange = (name, id,index) => {
const stageChange = (name, id, index) => {
state.choosedStageId = id;
state.stateName = name;
state.choosedStageIndex = index;
@@ -1843,6 +1900,15 @@ export default {
state.voteData = data;
// 投票弹框名称 RouterVoteManage
};
// 项目点击管理弹框
const projectModel = (data, levelsName) => {
console.log(data, levelsName);
state.pjModelVisible = true;
state.pjLevelName = levelsName;
state.pjModelVisibleTitle = data.name;
state.pjData = data;
// 项目弹框名称 RouterProjectManage
};
// 作业点击管理弹框
const homeworkModel = (data) => {
console.log(data);
@@ -2094,13 +2160,17 @@ export default {
const reget = () => {
GetRouterDetail(state.routerId, "N").then((res) => {
console.log("获取路径图详情", res);
console.log(!!res.data.data?.chapterList.some(({taskList})=>taskList.length));
console.log(
!!res.data.data?.chapterList.some(({ taskList }) => taskList.length)
);
state.styTitle = res.data.data.routerInfo.name;
state.cretime = res.data.data.routerInfo.createTime;
state.picUrl = res.data.data.routerInfo.picUrl;
state.action = res.data.data.routerInfo.status;
state.remark = res.data.data.routerInfo.remark;
state.hasTask = !!res.data.data?.chapterList.some(({taskList})=>taskList.length);
state.hasTask = !!res.data.data?.chapterList.some(
({ taskList }) => taskList.length
);
state.act =
state.action == 0
? "发布"
@@ -2115,7 +2185,7 @@ export default {
const getOverview = () => {
getRouterOverview(state.routerId)
.then((res) => {
console.log('学习路径图概览数据获取', res);
console.log("学习路径图概览数据获取", res);
Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
levelList.routerInfoOverview[item] =
res.data.data.routerInfoOverview[item] || 0;
@@ -2635,6 +2705,7 @@ export default {
examinationModel,
evaluationModel,
voteModel,
projectModel,
homeworkModel,
commonModel,
downloadFile,

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

@@ -3,15 +3,14 @@
<div class="projectAdd">
<div class="header">
<span class="title"
>{{
projectInfo.projectId ? "编辑" : "创建"
>{{ projectInfo.projectId ? "编辑" : "创建"
}}{{ ptojectType == "3" ? "班级" : "项目" }}</span
>
<div
@click="backPage"
style="cursor: pointer"
to="/projectmanage"
class="goback"
@click="backPage"
style="cursor: pointer"
to="/projectmanage"
class="goback"
>
<span class="return"></span><span class="returntext">返回</span>
</div>
@@ -21,8 +20,8 @@
<div class="name" v-if="projectInfo.parentName">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目归属</div>
</div>
@@ -35,8 +34,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">
{{ ptojectType == 3 ? "班级名称" : "项目名称" }}
@@ -44,27 +43,27 @@
</div>
<div class="in">
<NameInput
placeholder="请输入项目名称"
v-model:value="projectInfo.name"
v-model:validate="projectInfo.validate"
:maxlength="30"
show-count
:id="projectInfo.projectId"
placeholder="请输入项目名称"
v-model:value="projectInfo.name"
v-model:validate="projectInfo.validate"
:maxlength="30"
show-count
:id="projectInfo.projectId"
></NameInput>
</div>
</div>
<div class="name flex-top">
<div class="namebox" style="margin-top: 10px">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">封面图</div>
</div>
<div class="in select" style="flex: 1; display: flex">
<div
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
width: 100px;
height: 100px;
border-radius: 5px;
@@ -72,19 +71,19 @@
position: relative;
overflow: hidden;
"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
>
<img
style="
style="
width: 100px;
height: 100px;
margin-bottom: 4px;
margin-right: 4px;
"
:src="src.value"
alt="avatar"
:src="src.value"
alt="avatar"
/>
</div>
</div>
@@ -92,65 +91,65 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目时间</div>
</div>
<div class="in">
<a-range-picker
separator="至"
:show-time="{ format: 'HH:mm' }"
:placeholder="[' 开始时间', ' 结束时间']"
:disabled-date="disabledDate"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
:disabled="viewDetail ? true : false"
separator="至"
:show-time="{ format: 'HH:mm' }"
:placeholder="[' 开始时间', ' 结束时间']"
:disabled-date="disabledDate"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
:disabled="viewDetail ? true : false"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目经理</div>
</div>
<div class="in">
<ProjectManager
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
></ProjectManager>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">资源归属</div>
</div>
<div class="in select">
<OrgClass
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目级别</div>
</div>
@@ -161,8 +160,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">培训分类</div>
</div>
@@ -173,15 +172,15 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">是否BOEU实施</div>
</div>
<div class="in">
<a-radio-group
v-model:value="projectInfo.boeFlag"
:disabled="viewDetail ? true : false"
v-model:value="projectInfo.boeFlag"
:disabled="viewDetail ? true : false"
>
<a-radio :style="radioStyle" :value="1">是</a-radio>
<a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -194,30 +193,28 @@
</div>
<div class="in ggysxz" v-if="courseSyncFlag">
<!-- :disabled="viewDetail ? true : false" -->
<a-checkbox
v-model:checked="courseSyncFlag"
disabled>
<a-checkbox v-model:checked="courseSyncFlag" disabled>
<span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
">
"
>
同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
</span>
</a-checkbox>
</div>
<div class="in" v-else>
<!-- :disabled="viewDetail ? true : false" -->
<a-checkbox
v-model:checked="courseSyncFlag"
disabled>
<a-checkbox v-model:checked="courseSyncFlag" disabled>
<span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
">
"
>
同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
</span>
</a-checkbox>
@@ -229,12 +226,12 @@
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
:disabled="viewDetail ? true : false"
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
:disabled="viewDetail ? true : false"
/>
</div>
</div>
@@ -253,18 +250,18 @@
<div class="inname" style="width: 50px">模版</div>
<div class="in select" style="margin-left: 2px">
<a-select
:getPopupContainer="
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
placeholder="请选择模版"
:size="size"
style="width: 100%"
:options="classifyList5"
@change="classificationChange5"
@popupScroll="templateScroll"
:fieldNames="{
placeholder="请选择模版"
:size="size"
style="width: 100%"
:options="classifyList5"
@change="classificationChange5"
@popupScroll="templateScroll"
:fieldNames="{
label: 'name',
value: 'projectTemplateId',
}"
@@ -278,35 +275,34 @@
<div class="btn">
<a-button @click="backPage" class="btn2">取消</a-button>
<a-button
:loading="loading"
v-on:click="createProject"
type="primary"
class="btn1"
style="margin-left: 20px"
>确定
:loading="loading"
v-on:click="createProject"
type="primary"
class="btn1"
style="margin-left: 20px"
>确定
</a-button>
</div>
</div>
</div>
</template>
<script>
import {onMounted, reactive, toRefs, watch} from "vue";
import {message} from "ant-design-vue";
import {useRoute, useRouter} from "vue-router";
import { onMounted, reactive, toRefs, watch } from "vue";
import { message } from "ant-design-vue";
import { useRoute, useRouter } from "vue-router";
import * as api from "../../api/index";
import {useStore} from "vuex";
import { useStore } from "vuex";
// import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
import NameInput from "@/components/project/NameInput";
import ProjectLevel from "@/components/project/ProjectLevel";
import {storage} from "../../api/storage";
import { storage } from "../../api/storage";
import * as api2 from "../../api/indexAudit";
import {validateName} from "@/api/index1";
import { validateName } from "@/api/index1";
import dayjs from "dayjs";
import {scrollLoad} from "@/api/method";
import { scrollLoad } from "@/api/method";
export default {
name: "projectAdd",
components: {
@@ -369,17 +365,19 @@ export default {
state.projectInfo.parentId = routers.query.parentId;
state.projectInfo.projectId = routers.query.projectId;
(state.projectInfo.projectId || state.projectInfo.parentId) &&
api
api
.getProjectDetail({
projectId:
state.projectInfo.projectId || state.projectInfo.parentId,
state.projectInfo.projectId || state.projectInfo.parentId,
})
.then((res) => {
state.projectInfo = {
...res.data.data.projectInfo,
...state.projectInfo,
};
!routers.query.projectId && !!routers.query.parentId && (state.projectInfo.name = '')
!routers.query.projectId &&
!!routers.query.parentId &&
(state.projectInfo.name = "");
state.projectInfo.rangeTime = [
state.projectInfo.beginTime,
state.projectInfo.endTime,
@@ -398,8 +396,8 @@ export default {
if (res.rows && res.rows.length > 0) {
let i = res.rows.length;
state.auditDescription = res.rows[i - 1].description
? res.rows[i - 1].description
: "-";
? res.rows[i - 1].description
: "-";
}
}
});
@@ -504,29 +502,29 @@ export default {
}
state.projectInfo.type = 3;
state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
state.loading = true
state.loading = true;
api.createProject(state.projectInfo).then((res) => {
state.loading = false
state.loading = false;
message.destroy();
message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
// router.back();
router.push({
path: "/taskpage",
query: {projectId: res.data.data.projectId},
query: { projectId: res.data.data.projectId },
});
storage.set("projectId", res.data.data.projectId);
});
};
function managerChange(e, l, d, t, orgName) {
console.log(e, l)
state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongName = t
state.projectInfo.sourceBelongFullName = orgName
console.log(e, l);
state.projectInfo.sourceBelongId = d;
state.projectInfo.sourceBelongName = t;
state.projectInfo.sourceBelongFullName = orgName;
}
const disabledDate = (current) => {
return current && current < dayjs().startOf('day');
return current && current < dayjs().startOf("day");
};
return {
@@ -545,13 +543,12 @@ export default {
};
</script>
<style lang="scss">
.ggysxz {
.ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
border-color: #FFF !important;
border-color: #fff !important;
}
.ant-checkbox-disabled .ant-checkbox-inner {
background-color: #1890ff !important;
background-color: #1890ff !important;
}
}

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

@@ -191,7 +191,7 @@
<a-tab-pane key="1" tab="概览">
<div class="split"></div>
<!-- 概览（无数据） -->
<div v-if="!hasTask">
<div v-if="!hasTask">
<div class="onerow">
<div class="taskmain">快速创建项目详情</div>
</div>
@@ -266,7 +266,7 @@
</div>
<!-- 概览（无数据） -->
<!-- 概览（有数据） -->
<div v-if="hasTask">
<div v-if="hasTask">
<div class="onerow">
<div class="taskmain">项目概览</div>
</div>
@@ -326,15 +326,15 @@
</div> -->
<div class="stagemess">
<div
v-for="(item,index) in stageList"
v-for="(item, index) in stageList"
:class="{
stage1: index === choosedStageIndex,
stage2: index !== choosedStageIndex,
}"
:key="item.stageId"
@click="stageChange(item,index)"
@click="stageChange(item, index)"
>
{{ item.name || '无阶段' }}
{{ item.name || "无阶段" }}
</div>
<!-- <div class="stage1">阶段1</div>
<div class="stage2">阶段2</div> -->
@@ -348,7 +348,9 @@
<a-progress
type="dashboard"
gapDegree="0"
:percent="stageOverviewList[choosedStageIndex]?.completeCourseRatio"
:percent="
stageOverviewList[choosedStageIndex]?.completeCourseRatio
"
:width="140"
/>
<div class="protext">课程完成率</div>
@@ -357,7 +359,9 @@
<a-progress
type="dashboard"
gapDegree="0"
:percent="stageOverviewList[choosedStageIndex]?.completeExamRatio"
:percent="
stageOverviewList[choosedStageIndex]?.completeExamRatio
"
:width="140"
/>
<div class="protext">考试通过率</div>
@@ -378,7 +382,9 @@
<div class="proright1">
<span class="textpro">阶段任务总数</span>
<a-progress
:percent="stageOverviewList[choosedStageIndex]?.totalTaskCnt"
:percent="
stageOverviewList[choosedStageIndex]?.totalTaskCnt
"
style="width: 369px"
/>
</div>
@@ -540,17 +546,27 @@
</div>
<div class="progress">
<div class="progresstext">
{{item.finishStuCnt || 0 }}/{{item.totalStuCnt || 0}}人
{{ item.finishStuCnt || 0 }}/{{
item.totalStuCnt || 0
}}人
</div>
<div style="display: flex">
<a-progress
:showInfo="false"
:percent="parseInt((item.finishStuCnt / item.totalStuCnt) * 100)"
:percent="
parseInt(
(item.finishStuCnt / item.totalStuCnt) * 100
)
"
strokeColor="#FFC067"
trailColor="rgba(253, 209, 98, 0.2)"
/>
<span class="progresstext" style="margin-left: 10px"
>{{parseInt((item.finishStuCnt / item.totalStuCnt) * 100) || 0 }}%</span
>{{
parseInt(
(item.finishStuCnt / item.totalStuCnt) * 100
) || 0
}}%</span
>
</div>
</div>
@@ -701,11 +717,120 @@
:visable="tabFlag"
>
<template #extension="{ data: { record } }">
<a-button @click="showStudent(record)" type="link">查看</a-button>
<a-button @click="settingTopFlag(record)" type="link">{{ record.topFlag ? "取消优秀" : "优秀学员" }}</a-button>
<a-button @click="showStudent(record)" type="link"
>查看</a-button
>
<a-button @click="settingTopFlag(record)" type="link">{{
record.topFlag ? "取消优秀" : "优秀学员"
}}</a-button>
<a-button type="link" @click="showChangeGroupModal()"
>换组</a-button
>
</template>
</TableStudent>
</a-tab-pane>
<a-tab-pane key="9" tab="小组管理" force-render>
<div class="group">
<div class="groupleft">
<div class="groupname">小组名称：</div>
<a-input
v-model:value="valuestugn"
placeholder="请输入小组名称"
/>
</div>
<div class="groupright">
<div class="btn1" @click="searchGroup">
<img src="../../assets/images/courseManage/search0.png" />
<span class="btn1text">搜索</span>
</div>
<div class="btn2" @click="resetGroupName">
<img src="../../assets/images/courseManage/reset1.png" />
<span class="btn2text">重置</span>
</div>
</div>
</div>
<div class="second2">
<div class="btn1" @click="showModal2(1, null)">
<img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">创建小组</span>
</div>
<div class="btn2" @click="showSubset">
<img src="../../assets/images/courseManage/reset2.png" />
<span class="btn2text">随机分组</span>
</div>
<div class="btn2">
<span class="btn2text">导出小组</span>
</div>
<div class="btn2">
<span class="btn2text">导入小组长</span>
</div>
</div>
<!-- 小组列表 -->
<div class="groupmain">
<div
class="groupbox"
v-for="item in groupList"
:key="item.projectGroupId"
>
<div style="width: 90%">
<div class="grouptitle">
<div class="goodgruop">{{ item.groupName }}</div>
<div class="more">
<span
style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
>. . .</span
>
<div class="moreItems">
<div class="sammo" @click="showModal2(2, item)">
编辑
</div>
<div
class="sammo"
@click="deleteGroupBtn(item.projectGroupId)"
>
删除
</div>
</div>
</div>
</div>
<div class="leader">组长：{{ item.leaderName }}</div>
<div class="grocenter">
<div class="leader1">进度</div>
<a-progress :percent="item.completeRatio" />
</div>
<div
class="grofooter"
@click="showMemberList(item.projectGroupId)"
>
<div class="ftext">组员名单 ></div>
<div class="peoples">
<div class="people1">
<img
src="../../assets/images/taskpage/people1.png"
/>
</div>
<div class="people2">
<img
src="../../assets/images/taskpage/people2.png"
/>
</div>
<div class="people3">
<img
src="../../assets/images/taskpage/people3.png"
/>
</div>
<div class="people4">
<img
src="../../assets/images/taskpage/people4.png"
/>
</div>
</div>
</div>
</div>
</div>
</div>
</a-tab-pane>
</a-tabs>
</div>
</a-tab-pane>
@@ -723,11 +848,9 @@
</a-tab-pane>
</a-tabs>
</a-tab-pane>
<!-- 2022-11-30注释 后面放开 -->
<a-tab-pane key="5" tab="项目积分">
<ProjectScore :projectId="projectId"></ProjectScore>
</a-tab-pane>
<!-- 2022-11-30注释 后面放开 -->
<a-tab-pane key="6" tab="排行榜">
<div class="split"></div>
<div class="content6">
@@ -735,7 +858,6 @@
<div class="line"></div>
<div class="search">
<div class="left">
<div class="time">
<div class="text">选择时间：</div>
<a-range-picker
@@ -846,38 +968,112 @@
<a-tab-pane key="7" tab="证书">
<div class="split"></div>
<!-- 没有证书显示的页面 -->
<div v-if="3>7" style="display:flex; justify-content:center; align-items:center;height: 600px;flex-direction:column;">
<div
v-if="3 > 7"
style="
display: flex;
justify-content: center;
align-items: center;
height: 600px;
flex-direction: column;
"
>
<img
src="@/assets/images/nodata.png"
style=" width: 212px; height: 212px;"
style="width: 212px; height: 212px"
alt=""
/>
<button class="xkbtn11" @click="addCertificate">
添加证书
</button>
/>
<button class="xkbtn11" @click="addCertificate">添加证书</button>
</div>
<!-- 有证书显示的页面 -->
<div v-else style="padding: 36px; display: flex;min-height: 400px;">
<div style="width:170px;height:200px;border:1px solid #b1b3b8;display: flex;justify-content: center;align-items: center;color: #4ea6ff;cursor: pointer;" @click="addCertificate">
<div v-else style="padding: 36px; display: flex; min-height: 400px">
<div
style="
width: 170px;
height: 200px;
border: 1px solid #b1b3b8;
display: flex;
justify-content: center;
align-items: center;
color: #4ea6ff;
cursor: pointer;
"
@click="addCertificate"
>
<div class="ant-upload-text">+添加证书</div>
</div>
<div style="width:170px;height:200px;border:1px solid #b1b3b8;margin-left: 32px;display: flex;justify-content: center;align-items: center;flex-direction:column;">
<img
<div
style="
width: 170px;
height: 200px;
border: 1px solid #b1b3b8;
margin-left: 32px;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
"
>
<img
@click="previewPic"
style="cursor:pointer"
style="cursor: pointer"
width="140"
height="160"
src="https://picb6.photophoto.cn/32/552/32552236_1.jpg" alt="" srcset="">
<div style="display:flex;height: 26px;justify-content: space-around;align-items: center;">
<div style="font-size:14px; width: 85px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">培训认证证书</div>
<div style="font-size:12px;color:#999;width:50px;margin-left: 6px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">完成项目</div>
<div style="cursor:pointer;position: relative;">
src="https://picb6.photophoto.cn/32/552/32552236_1.jpg"
alt=""
srcset=""
/>
<div
style="
display: flex;
height: 26px;
justify-content: space-around;
align-items: center;
"
>
<div
style="
font-size: 14px;
width: 85px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>
培训认证证书
</div>
<div
style="
font-size: 12px;
color: #999;
width: 50px;
margin-left: 6px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>
完成项目
</div>
<div style="cursor: pointer; position: relative">
...
<div style="position:absolute;width: 45px;height: 60px;background: #fff;display: flex;flex-direction: column;justify-content: center;align-items: center;border: 1px solid #b1b3b8;">
<div style="font-size:12px;color:#999">查看</div>
<div style="font-size:12px;color:#999">编辑</div>
<div style="font-size:12px;color:#999">删除</div>
<div
style="
position: absolute;
width: 45px;
height: 60px;
background: #fff;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
border: 1px solid #b1b3b8;
"
>
<div style="font-size: 12px; color: #999">查看</div>
<div style="font-size: 12px; color: #999">编辑</div>
<div style="font-size: 12px; color: #999">删除</div>
</div>
</div>
</div>
@@ -995,7 +1191,7 @@
</div>
</div>
</a-tab-pane>
<a-tab-pane key="13" tab="共享文档">
<div class="sametab">
<div class="Gcon">
@@ -1027,7 +1223,13 @@
>
<img
src="@/assets/images/basicinfo/cloud.png"
style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
style="
cursor: pointer;
width: 24px;
height: 24px;
margin-left: 8px;
margin-bottom: 3px;
"
alt=""
/>
</a-upload>
@@ -1062,26 +1264,74 @@
"
alt=""
/> -->
<img v-if="
item.name.indexOf('jpg') !== -1 ||
item.name.indexOf('jpeg') !== -1 ||
item.name.indexOf('png') !== -1
"
style="width: 27px;height: 32px;margin-right: 40px;"
src="@/assets/images/coursewareManage/pngpic.png" />
<img
v-if="
item.name.indexOf('jpg') !== -1 ||
item.name.indexOf('jpeg') !== -1 ||
item.name.indexOf('png') !== -1
"
style="width: 27px; height: 32px; margin-right: 40px"
src="@/assets/images/coursewareManage/pngpic.png"
/>
<div v-else>
<img v-if="item.name.indexOf('doc') !== -1" style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
<img
v-if="item.name.indexOf('doc') !== -1"
style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/docpic.png"
/>
<div v-else>
<img v-if="item.name.indexOf('xls') !== -1" style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/xlspic.png" />
<img
v-if="item.name.indexOf('xls') !== -1"
style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/xlspic.png"
/>
<div v-else>
<img v-if="item.name.indexOf('ppt') !== -1" style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pptpic.png" />
<img
v-if="item.name.indexOf('ppt') !== -1"
style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/pptpic.png"
/>
<div v-else>
<img v-if="item.name.indexOf('pdf') !== -1" style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pdfpic.png" />
<img
v-if="item.name.indexOf('pdf') !== -1"
style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/pdfpic.png"
/>
<div v-else>
<img v-if="item.name.indexOf('zip') !== -1"
style="width: 27px;height: 32px;margin-right: 40px;"
src="@/assets/images/coursewareManage/zippic.png" />
<img v-else style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
<img
v-if="item.name.indexOf('zip') !== -1"
style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/zippic.png"
/>
<img
v-else
style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/docpic.png"
/>
</div>
</div>
</div>
@@ -1099,10 +1349,16 @@
:title="item.name"
>{{ item.name }}</span
>
<a
<a
href="javascript:void(0);"
@click="downloadFile(item.response ? item.response.data : '')"
style="margin-left: 5px">下载</a>
@click="
downloadFile(
item.response ? item.response.data : ''
)
"
style="margin-left: 5px"
>下载</a
>
<span
style="color: #4ea6ff; float: right; cursor: pointer"
@click="deFile(item.uid)"
@@ -1114,7 +1370,6 @@
</div>
</div>
</a-tab-pane>
</a-tabs>
</a-tab-pane>
</a-tabs>
@@ -1160,7 +1415,7 @@
<!-- 投票管理抽屉 -->
<ProjectVoteManage
v-model:ProjectVoteModelVisible="projectVoteModelVisible"
:title="voteModelVisibleTitle"
:title="voteModelVisibleTitle"
:levelName="voteLevelName"
:datasource="voteData"
/>
@@ -1172,16 +1427,12 @@
:itemsType="evaltype"
:datasource="evalData"
/>
<!-- 添加证书抽屉 -->
<AddCertificate
v-model:ACertificate="ACertificate"
/>
<AddCertificate v-model:ACertificate="ACertificate" />
<!-- 创建证书抽屉 -->
<CreateCertificate
v-model:CCertificate="CCertificate"
/>
<CreateCertificate v-model:CCertificate="CCertificate" />
<!-- 预览 -->
<a-modal
@@ -1189,12 +1440,15 @@
width="60%"
:footer="null"
v-model:visible="modal1Visible"
style="display:flex; justify-content:center; align-items:center;"
style="display: flex; justify-content: center; align-items: center"
@ok="setModal1Visible(false)"
>
<img
:width="screenWidth*0.55"
src="https://picb6.photophoto.cn/32/552/32552236_1.jpg" alt="" srcset="">
<img
:width="screenWidth * 0.55"
src="https://picb6.photophoto.cn/32/552/32552236_1.jpg"
alt=""
srcset=""
/>
</a-modal>
<!-- 学员（小组管理）创建小组抽屉 -->
@@ -1240,12 +1494,12 @@
/>
<!-- 活动直播考勤抽屉 -->
<active-attendance
v-model:AAvisible="AAvisible"
:datasource="liveData"
:title="showKaoqinText"
types="2"
classify="2"
/>
v-model:AAvisible="AAvisible"
:datasource="liveData"
:title="showKaoqinText"
types="2"
classify="2"
/>
<!-- 批量面授报名 -->
<task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
@@ -1792,6 +2046,10 @@
type="课程二维码"
/>
<!-- 二维码弹窗 -->
<!-- 换组弹窗 -->
<ChangeGroupModal v-model:changegroupV="changegroupV" />
<!-- 换组弹窗 -->
</div>
</template>
<script>
@@ -1803,9 +2061,9 @@ import ProjectFaceTaskManage from "../../components/drawers/project/ProjectFaceT
import ProjectOnlineManage from "../../components/drawers/project/ProjectOnlineManage";
import ProjectHomeWorkManage from "../../components/drawers/project/ProjectHomeWorkManage";
import ProjectExamManage from "../../components/drawers/project/ProjectExamManage";
import ProjectEvalManage from "../../components/drawers/project/ProjectEvalManage";
import AddCertificate from "../../components/drawers/project/AddCertificate";
import CreateCertificate from "../../components/drawers/project/CreateCertificate";
import ProjectEvalManage from "../../components/drawers/project/ProjectEvalManage";
import AddCertificate from "../../components/drawers/project/AddCertificate";
import CreateCertificate from "../../components/drawers/project/CreateCertificate";
import ProjectVoteManage from "../../components/drawers/project/ProjectVoteManage";
import SubsetManage from "../../components/drawers/SubsetManage";
@@ -1847,6 +2105,7 @@ import TrainClass from "@/components/project/TrainClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
import TableStudent from "@/components/student/TableStudent";
import { getStuPage } from "@/api/index1";
import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
export default {
name: "taskPage",
components: {
@@ -1877,17 +2136,18 @@ export default {
TableStudent,
AddCertificate,
CreateCertificate,
ProjectVoteManage
ProjectVoteManage,
ChangeGroupModal,
},
setup() {
const store = useStore();
const route = useRoute();
const state = reactive({
screenHeight: document.body.clientHeight,
screenWidth: document.body.clientWidth,
screenHeight: document.body.clientHeight,
screenWidth: document.body.clientWidth,
editRecord: {},
choosedStageIndex:0,
hasTask:false,
choosedStageIndex: 0,
hasTask: false,
tabFlag: true,
stage: [],
stuColumns: [
@@ -1901,7 +2161,7 @@ export default {
ellipsis: true,
customRender: ({ record }) => (
<div>
{record.finishTaskNum|| 0}/{record.totalTaskNum || 0}
{record.finishTaskNum || 0}/{record.totalTaskNum || 0}
</div>
),
},
@@ -1915,7 +2175,11 @@ export default {
ellipsis: true,
customRender: ({ record }) => (
<div>
{record.finishTaskNum ==0?"未开始":record.finishTaskNum == record.totalTaskNum?"已完成":"进行中"}
{record.finishTaskNum == 0
? "未开始"
: record.finishTaskNum == record.totalTaskNum
? "已完成"
: "进行中"}
</div>
),
},
@@ -2025,7 +2289,7 @@ export default {
projectVoteModelVisible: false, // 投票管理
TMvisible: false, //考试管理
Evalvisible: false, //测评管理
ACertificate: false, //证书添加
ACertificate: false, //证书添加
CCertificate: false, //证书创建
Stuvisible: false, //添加学员
Importvisible: false, //导入学员
@@ -2515,7 +2779,7 @@ export default {
showWorkText: "",
//直播、活动页面传递参数
showkaoqinText: "直播",
liveData:'',
liveData: "",
//所有抽屉的传过去的type
itemstype: null,
@@ -2567,11 +2831,13 @@ export default {
evaltype: "",
evalData: "",
voteData: "",
voteModelVisibleTitle:'',
voteLevelName:'',
voteModelVisibleTitle: "",
voteLevelName: "",
facestudent: "",
modal1Visible: false, // 证书预览
changegroupV: false, //换组弹窗
});
const levelList = reactive({
@@ -2593,7 +2859,7 @@ export default {
totalTaskCnt: 0,
totalReqCnt: 0,
totalOptCnt: 0,
}
},
],
stageList: [
// 阶段列表
@@ -2634,7 +2900,7 @@ export default {
}
}
}
levelList.stageList = res.data.data.stageList
levelList.stageList = res.data.data.stageList;
//暂时传个固定的id用 到时候看数据里面是否有在更换
// state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
let leng = res.data.data.stageList.length;
@@ -2777,6 +3043,12 @@ export default {
state.canclestu1 = false;
};
//显示学员换组弹窗
const showChangeGroupModal = () => {
state.changegroupV = true;
console.log("点击换组", state.changegroupV);
};
const showModal2 = (classify, item) => {
state.stuMemberClassify = classify;
state.projectGroupId =
@@ -2848,10 +3120,12 @@ export default {
state.chooseGroupId = id;
};
//活动考勤的抽屉
{/* const showAA = (title) => {
{
/* const showAA = (title) => {
state.AAvisible = true;
state.showkaoqinText = title;
}; */}
}; */
}
//考勤的抽屉
const showAA = (course, a, data) => {
state.AAvisible = true;
@@ -2866,14 +3140,16 @@ export default {
state.projectTaskId = id;
state.projectTaskInfo = item;
};
{/* 直播管理的抽屉 */}
{
/* 直播管理的抽屉 */
}
const showVote = (name, id, data) => {
console.log(name, id, data)
console.log(name, id, data);
state.projectVoteModelVisible = true;
state.voteData = data;
state.voteModelVisibleTitle = name;
state.voteLevelName = '无阶段任务';
}
state.voteLevelName = "无阶段任务";
};
//考试管理的抽屉
const showTest = (name, id, data) => {
state.examData = data;
@@ -3609,7 +3885,9 @@ export default {
state.noticeFlag = info.noticeFlag;
state.switchopen = info.attachSwitch == 1 ? true : false;
state.docChecked = info.attachSwitch == 1 ? true : false;
state.hasTask = !!res.data.data?.stageList.some(({taskList})=>taskList.length);
state.hasTask = !!res.data.data?.stageList.some(
({ taskList }) => taskList.length
);
// state.attach = info.attach;
// state.templateId = info.templateId;
state.sourceBelong =
@@ -4232,9 +4510,9 @@ export default {
// 共享文档文件下载
const downloadFile = (url) => {
console.log(url)
if(url){
window.open(url)
console.log(url);
if (url) {
window.open(url);
}
// if(url){
// const filename = '操作指南'
@@ -4251,14 +4529,16 @@ export default {
// }
// x.send()
// }
}
function stageChange(item,index){
state.choosedStageId = item.stageId
};
function stageChange(item, index) {
state.choosedStageId = item.stageId;
state.choosedStageIndex = index;
}
{/* 证书 */}
function addCertificate(){
{
/* 证书 */
}
function addCertificate() {
state.ACertificate = true;
}
@@ -4344,6 +4624,7 @@ export default {
searchGroup,
cancelyou,
cancelcanyou,
showChangeGroupModal,
changePaginationStu,
handleChange,
toEdit,
@@ -4376,7 +4657,7 @@ export default {
checkType,
downloadFile,
addCertificate,
previewPic
previewPic,
};
},
};
@@ -5952,7 +6233,7 @@ export default {
.groupright {
display: flex;
margin-left: 48px;
.btn1 {
width: 100px;
height: 40px;