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

feat:增加查看作业

Browse Source
This commit is contained in:
lixg
2023-01-29 14:27:05 +08:00
parent 9e979c2a06 1badfb721e
commit c2657cd812
9 changed files with 434 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -1,7 +1,7 @@
# 本项目基础url # 本项目基础url
VUE_APP_BASE=/manage VUE_APP_BASE=/manage
# api项目基础url # api项目基础url
VUE_APP_BASE_API=/manageApi VUE_APP_BASE_API=/manage
#文件路径 #文件路径
VUE_APP_FILE_PATH=/upload/ VUE_APP_FILE_PATH=/upload/
# 代理url 本地调试，不可以用在其他地方 # 代理url 本地调试，不可以用在其他地方

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

@@ -16,25 +16,25 @@
/> />
</div> </div>
<!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 --> <!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 -->
<div style="display: flex; flex-direction: row; padding-top: 0px"> <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
<!-- <button <button
style="width: 100px" style="width: 100px; cursor: pointer;"
@click="changeOuter(1)" @click="changeOuter(1)"
:class="[isOuter == 1 ? 'outer' : 'notOuter']" :class="[isOuter == 1 ? 'outer' : 'notOuter']"
> >
系统考试 系统考试
</button> --> </button>
<!-- <button <button
style="width: 100px" style="width: 100px; cursor: pointer;"
@click="changeOuter(2)" @click="changeOuter(2)"
:class="[isOuter == 2 ? 'outer' : 'notOuter']" :class="[isOuter == 2 ? 'outer' : 'notOuter']"
> >
外部考试 外部考试
</button> --> </button>
</div> </div>
<div class="contentMain"> <div v-if="isOuter==1" class="contentMain">
<div class="main_left"> <div class="main_left">
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
@@ -289,6 +289,63 @@
<div class="main_item" style="height: 20px;"></div> <div class="main_item" style="height: 20px;"></div>
</div> </div>
</div> </div>
<div v-else class="contentMain">
<div class="main_left">
<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="test1.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=""
/>
</div>
<span style="margin-right: 3px">数据来源：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="test1.examinationName"
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入考试名称"
:maxlength="20"
/>
</div>
</div>
<div class="main_item2">
<div class="signbox">
<span style="margin-right: 3px">考试说明：</span>
</div>
<div class="textarea">
<a-textarea
v-model:value="test1.examinationExplain"
placeholder="请输入考试说明"
allow-clear
show-count
:maxlength="200"
:rows="6"
/>
</div>
</div>
</div>
</div>
<div class="main_btns"> <div class="main_btns">
<a-button class="btn1" @click="closeDrawer2">取消</a-button> <a-button class="btn1" @click="closeDrawer2">取消</a-button>
<a-button class="btn2" @click="updateTest">确定</a-button> <a-button class="btn2" @click="updateTest">确定</a-button>
@@ -398,6 +455,18 @@ export default {
scoringModel: 2, scoringModel: 2,
questionArrangement: 4, questionArrangement: 4,
}, },
test1: {
examinationName: '',
chooseTime: '',
examinationDuration: '',
passLine: '',
examinationExplain: null,
examinationLimit: null,
showAnswers: 1,
showAnalysis: 1,
scoringModel: 2,
questionArrangement: 4,
},
addLoading: false, addLoading: false,
isOuter: 1, // 是否为外部考试 isOuter: 1, // 是否为外部考试

302
src/components/drawers/CheckWork.vue
View File

@@ -1,154 +1,188 @@
<template> <template>
<a-drawer <a-drawer
:visible="CWvisible" :visible="CWvisible"
class="drawerStyle CheckWork" class="drawerStyle CheckWork"
placement="right" placement="right"
width="40%" width="40%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">查看作业</div> <div class="headerTitle">查看作业</div>
<img <img
style="width:29px;height:29px;cursor:pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="main"> <div class="main">
<div class="basetext"><span>基础信息</span></div> <div class="basetext"><span>基础信息</span></div>
<div class="HW Name"><span>作业名称：</span ><span style="color:#999ba3">{{"管理者进阶作业"}}</span></div> <div class="HW Name">
<div class="HW Need"><span>作业要求：</span ><span style="color:#999ba3">{{"写一篇观后感，字数600字"}}</span></div> <span>作业名称：</span
<div class="HWText"> ><span style="color: #999ba3">{{ workName }}</span>
<span>作业信息：</span>
<div class="hwText">
<img src="@/assets/images/projectadd/keep.png"/>
<div class="hwName">{{"京东方商业模型.jpeg"}}</div>
<div class="op"> <span>查看</span> </div>
<div class="op"> <span>下载</span> </div>
</div>
</div>
</div>
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
</div> </div>
</a-drawer> <div class="HW Need">
<span>作业要求：</span
><span style="color: #999ba3">{{ workRequirement }}</span>
</div>
<div class="HWText">
<span>作业信息：</span>
<div class="hwText">
<img src="@/assets/images/projectadd/keep.png" />
<div class="hwName">{{ "京东方商业模型.jpeg" }}</div>
<div class="op"><span>查看</span></div>
<div class="op"><span>下载</span></div>
</div>
</div>
</div>
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
</div>
</a-drawer>
</template> </template>
<script> <script>
import { toRefs,reactive } from '@vue/reactivity'; import { toRefs, reactive } from "@vue/reactivity";
import { queryWorkDetailById } from "@/api/indexWork";
export default { export default {
name:"CheckWork", name: "CheckWork",
props:{ props: {
CWvisible:{ CWvisible: {
type:Boolean, type: Boolean,
default:false, default: false,
},
}, },
setup(props,ctx){ workId: {
const state = reactive({ type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
workName: null,
workRequirement: null,
});
const closeDrawer = () => {
ctx.emit("update:CWvisible", false);
state.workName = null;
state.workRequirement = null;
getWorkDetail();
};
const afterVisibleChange = (bool) => {
console.log(bool);
if (bool) {
getWorkDetail();
}
};
//获取作业详情
const getWorkDetail = () => {
queryWorkDetailById({ workId: props.workId })
.then((res) => {
console.log("获取作业详情", res);
if (res.data.code === 200) {
state.workName = res.data.data.workName;
state.workRequirement = res.data.data.workRequirement;
}
}) })
const closeDrawer = ()=> { .catch((err) => {
ctx.emit("update:CWvisible",false) console.log("获取作业详情失败", err);
} });
const afterVisibleChange = (bool) => { };
console.log(bool);
} return {
return{ ...toRefs(state),
...toRefs(state), closeDrawer,
closeDrawer, afterVisibleChange,
afterVisibleChange, getWorkDetail,
} };
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.CheckWork { .CheckWork {
.drawerMain { .drawerMain {
min-width: 400px; min-width: 400px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 20px; margin-bottom: 20px;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
color: #333333; color: #333333;
line-height: 25px; line-height: 25px;
} }
}
.main {
width: 100%;
overflow-y: auto;
margin-bottom: 70px;
.basetext{
font-size: 16px;
font-weight: 600;
color: #333333;
line-height: 25px;
margin-bottom: 27px ;
}
.HW{
margin-bottom: 20px;
}
.hwText{
display: flex;
align-items: center;
margin: 15px auto;
img{
background-size: 100% 100%;
}
.hwName{
margin:auto 10px;
}
.op{
color:#4ea6ff;
margin: auto 20px;
cursor: pointer;
}
}
}
.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;
}
}
} }
.main {
width: 100%;
overflow-y: auto;
margin-bottom: 70px;
.basetext {
font-size: 16px;
font-weight: 600;
color: #333333;
line-height: 25px;
margin-bottom: 27px;
}
.HW {
margin-bottom: 20px;
}
.hwText {
display: flex;
align-items: center;
margin: 15px auto;
img {
background-size: 100% 100%;
}
.hwName {
margin: auto 10px;
}
.op {
color: #4ea6ff;
margin: auto 20px;
cursor: pointer;
}
}
}
.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> </style>

42
src/components/drawers/project/ProjectHomeWorkManage.vue
View File

@@ -121,7 +121,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <!--
<div class="btnn"> <div class="btnn">
<button class="btn1">取消</button> <button class="btn1">取消</button>
<button class="btn2">确定</button> <button class="btn2">确定</button>
@@ -205,11 +205,11 @@ export default {
value: "0", value: "0",
label: "未开始", label: "未开始",
}, },
// { // {
// id: 2, // id: 2,
// value: "2", // value: "2",
// label: "进行中", // label: "进行中",
// }, // },
{ {
id: 3, id: 3,
value: "1", value: "1",
@@ -394,15 +394,15 @@ export default {
); );
}, },
}, },
// { {
// title: "操作", title: "操作",
// dataIndex: "operation", dataIndex: "operation",
// key: "operation", key: "operation",
// width: 100, width: 100,
// align: "center", align: "center",
// ellipsis: true, ellipsis: true,
// className: "h", className: "h",
// }, },
], ],
exportHomeWorkV: false, exportHomeWorkV: false,
downloadUrl: null, downloadUrl: null,
@@ -562,14 +562,17 @@ export default {
state.tableDataTotal2 = 0; state.tableDataTotal2 = 0;
getStudent(); getStudent();
}; };
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {
window.open( window.open(
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}&taskId=${props.projectTaskInfo.projectTaskId}` }&type=${1}&pid=${
props.projectTaskInfo.projectId
}&taskType=${4}&taskId=${props.projectTaskInfo.projectTaskId}`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
@@ -603,7 +606,7 @@ export default {
.then((res) => { .then((res) => {
console.log("导出作业", res.data.data); console.log("导出作业", res.data.data);
if (res.data.code === 200) { if (res.data.code === 200) {
// message.destroy(); // message.destroy();
//message.success("导出作业成功"); //message.success("导出作业成功");
state.exportHomeWorkV = true; state.exportHomeWorkV = true;
state.downloadUrl = res.data.data; state.downloadUrl = res.data.data;
@@ -621,7 +624,8 @@ export default {
console.log("props.projectTaskInfo", props.projectTaskInfo); console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open( window.open(
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${ process.env.VUE_APP_BASE_API
}/admin/student/exportHomeWork?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
props.projectTaskInfo.projectTaskId props.projectTaskInfo.projectTaskId

55
src/components/drawers/router/RouterHomeworkManage.vue
View File

@@ -116,7 +116,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <!--
<div class="btnn"> <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button> <button class="btn2" @click="closeDrawer">确定</button>
@@ -133,7 +133,7 @@
v-model:searchTaskList="searchTaskList" v-model:searchTaskList="searchTaskList"
/> />
<!-- 查看作业抽屉 --> <!-- 查看作业抽屉 -->
<CKWork v-model:CWvisible="CWvisible" /> <CKWork v-model:CWvisible="CWvisible" :workId="datasource?.courseId" />
<!-- 查看答卷抽屉 --> <!-- 查看答卷抽屉 -->
<CQue v-model:CQvisible="CQvisible" /> <CQue v-model:CQvisible="CQvisible" />
@@ -200,10 +200,10 @@ export default {
value: "0", value: "0",
label: "未开始", label: "未开始",
}, },
// { // {
// id: 2, // id: 2,
// value: "2", // value: "2",
// label: "进行中", // label: "进行中",
//}, //},
{ {
id: 3, id: 3,
@@ -323,7 +323,7 @@ export default {
); );
}, },
}, },
{ {
title: "成绩", title: "成绩",
dataIndex: "workScore", dataIndex: "workScore",
@@ -388,15 +388,15 @@ export default {
); );
}, },
}, },
// { {
// title: "操作", title: "操作",
// dataIndex: "operation", dataIndex: "operation",
// key: "operation", key: "operation",
// width: 100, width: 100,
// align: "center", align: "center",
// ellipsis: true, ellipsis: true,
// className: "h", className: "h",
// }, },
], ],
exportHomeWorkV: false, exportHomeWorkV: false,
downloadUrl: null, downloadUrl: null,
@@ -417,7 +417,7 @@ export default {
<a-button <a-button
type="link" type="link"
class="operation" class="operation"
style="cursor:pointer;margin-right:10px;" style="cursor:pointer;margin-right:10px;color: #387DF7;"
onClick={() => { onClick={() => {
state.CWvisible = true; state.CWvisible = true;
}} }}
@@ -435,12 +435,7 @@ export default {
justifyContent: "center", justifyContent: "center",
}} }}
> >
<a-button <a-button class="operation" style="margin-right:10px;">
type="link"
class="operation"
style="cursor:pointer;margin-right:10px;"
disabled
>
查看 查看
</a-button> </a-button>
</div> </div>
@@ -491,7 +486,7 @@ export default {
//获取学员 //获取学员
const getStudent = () => { const getStudent = () => {
console.log("我是传递的查询参数", { console.log("我是传递的查询参数", props.datasource.courseId, {
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
currentStageId: props.datasource.chapterId, currentStageId: props.datasource.chapterId,
@@ -558,9 +553,12 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${props.datasource.routerTaskId}` }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${
props.datasource.routerTaskId
}`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
@@ -594,8 +592,8 @@ export default {
.then((res) => { .then((res) => {
console.log("导出作业", res.data.data); console.log("导出作业", res.data.data);
if (res.data.code === 200) { if (res.data.code === 200) {
// message.destroy(); // message.destroy();
// message.success("导出作业成功"); // message.success("导出作业成功");
state.exportHomeWorkV = true; state.exportHomeWorkV = true;
state.downloadUrl = res.data.data; state.downloadUrl = res.data.data;
} }
@@ -612,7 +610,8 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${ process.env.VUE_APP_BASE_API
}/admin/student/exportHomeWork?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskId=${ }&type=${2}&pid=${props.datasource.routerId}&taskId=${
props.datasource.routerTaskId props.datasource.routerTaskId

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

@@ -39,7 +39,9 @@
</div> </div>
<div class="select"> <div class="select">
<a-tree-select <a-tree-select
:getPopupContainer="triggerNode => triggerNode.parentNode || document.body" :getPopupContainer="
(triggerNode) => triggerNode.parentNode || document.body
"
v-model:value="sysTypeId" v-model:value="sysTypeId"
show-search show-search
style="width: 200px" style="width: 200px"
@@ -2285,7 +2287,8 @@ import {
shallowRef, shallowRef,
onMounted, onMounted,
onBeforeUnmount, onBeforeUnmount,
watch, computed, watch,
computed,
} from "vue"; } from "vue";
import * as api from "../../api/indexInvist.js"; import * as api from "../../api/indexInvist.js";
@@ -2346,7 +2349,7 @@ import AddTest from "../../components/drawers/AddTest.vue";
import TableStudent from "@/components/student/TableStudent"; import TableStudent from "@/components/student/TableStudent";
import FJUpload from "@/components/common/FJUpload"; import FJUpload from "@/components/common/FJUpload";
import { updateStudent } from "@/api/indexProjStu"; import { updateStudent } from "@/api/indexProjStu";
import {useStore} from "vuex"; import { useStore } from "vuex";
//列表表格 //列表表格
const columns1 = [ const columns1 = [
@@ -2418,16 +2421,16 @@ const columns1 = [
return text ? text : "-"; return text ? text : "-";
}, },
}, },
// { {
// title: "学习人数", title: "学习人数",
// width: 130, width: 130,
// dataIndex: "stunum", dataIndex: "stunum",
// key: "4", key: "4",
// align: "center", align: "center",
// customRender: ({ text }) => { customRender: ({ text }) => {
// // return text ? text : "0"; return text ? text : "0";
// }, },
// }, },
// { // {
// title: "评分", // title: "评分",
// width: 130, // width: 130,
@@ -2538,7 +2541,7 @@ const columns2 = [
key: "studentName", key: "studentName",
width: "6%", width: "6%",
align: "center", align: "center",
customRender: ({record: {studentName}}) => (studentName || "-") customRender: ({ record: { studentName } }) => studentName || "-",
}, },
{ {
title: "工号", title: "工号",
@@ -2547,7 +2550,7 @@ const columns2 = [
width: "12%", width: "12%",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({record: {studentUserNo}}) => (studentUserNo || "-") customRender: ({ record: { studentUserNo } }) => studentUserNo || "-",
}, },
{ {
title: "开课名称", title: "开课名称",
@@ -2556,7 +2559,7 @@ const columns2 = [
width: "12%", width: "12%",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({record: {name}}) => (name || "-") customRender: ({ record: { name } }) => name || "-",
}, },
{ {
title: "地点", title: "地点",
@@ -2565,7 +2568,7 @@ const columns2 = [
width: "12%", width: "12%",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({record: {address}}) => (address || "-") customRender: ({ record: { address } }) => address || "-",
}, },
{ {
title: "数据来源", title: "数据来源",
@@ -2574,7 +2577,8 @@ const columns2 = [
ellipsis: true, ellipsis: true,
width: "12%", width: "12%",
align: "center", align: "center",
customRender: ({record:{courseName,routerName}}) => (courseName || routerName || "开课"), customRender: ({ record: { courseName, routerName } }) =>
courseName || routerName || "开课",
}, },
{ {
title: "学习时间", title: "学习时间",
@@ -2583,7 +2587,7 @@ const columns2 = [
width: "10%", width: "10%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({record:{lastStudyTime}}) => (lastStudyTime || "-") customRender: ({ record: { lastStudyTime } }) => lastStudyTime || "-",
}, },
{ {
title: "签到时间", title: "签到时间",
@@ -2592,7 +2596,7 @@ const columns2 = [
width: "10%", width: "10%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({record:{signTime}}) => (signTime || "-") customRender: ({ record: { signTime } }) => signTime || "-",
}, },
{ {
title: "状态", title: "状态",
@@ -2994,7 +2998,8 @@ export default defineComponent({
dataIndex: "signstatus", dataIndex: "signstatus",
key: "7", key: "7",
align: "center", align: "center",
customRender: ({ record }) => record.signStatus?'已签到':'未签到', customRender: ({ record }) =>
record.signStatus ? "已签到" : "未签到",
}, },
{ {
title: "评估状态", title: "评估状态",
@@ -3025,7 +3030,7 @@ export default defineComponent({
// > // >
// 成绩录入 // 成绩录入
// </span> // </span>
<span></span> <span></span>
)} )}
</div> </div>
); );
@@ -3683,7 +3688,7 @@ export default defineComponent({
// 渲染列表1操作 // 渲染列表1操作
const getTableDate = async () => { const getTableDate = async () => {
console.log('我是点击搜索的数据',state.sysTypeId) console.log("我是点击搜索的数据", state.sysTypeId);
// let datas = state.tableData1; // let datas = state.tableData1;
let startTime = ""; let startTime = "";
let endTime = ""; let endTime = "";
@@ -3701,8 +3706,8 @@ export default defineComponent({
pageNo: state.currentPage1, pageNo: state.currentPage1,
pageSize: state.pageSize1, pageSize: state.pageSize1,
auditStatus: state.auditStatus, auditStatus: state.auditStatus,
// categoryId: state.categoryId, // categoryId: state.categoryId,
sysTypeId: state.sysTypeId, sysTypeId: state.sysTypeId,
projectName: state.projectName, projectName: state.projectName,
name: state.name, name: state.name,
createName: state.createName, createName: state.createName,
@@ -3739,16 +3744,32 @@ export default defineComponent({
datas.forEach((itm) => { datas.forEach((itm) => {
itm.pageNo = pageNo; itm.pageNo = pageNo;
itm.contentTxt = findClassFullName(sysTypeOptions.value,itm.sysTypeId) || '-' itm.contentTxt =
findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
}); });
state.tableData1 = datas; state.tableData1 = datas;
}; };
function findClassFullName(list,classify, name = '') { function findClassFullName(list, classify, name = "") {
return list && list.length && list return (
.map(e => classify == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, classify,name ? name + '-' + e.dictName : e.dictName)) (list &&
.filter(name => name) list.length &&
.join('') || '' list
.map((e) =>
classify == e.dictCode
? name
? name + "-" + e.dictName
: e.dictName
: findClassFullName(
e.children,
classify,
name ? name + "-" + e.dictName : e.dictName
)
)
.filter((name) => name)
.join("")) ||
""
);
} }
getTableDate(); getTableDate();
@@ -5754,7 +5775,7 @@ export default defineComponent({
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset1.png");
} }
.daochu{ .daochu {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/coursewareManage/export.png"); background-image: url("../../assets/images/coursewareManage/export.png");
@@ -6858,7 +6879,7 @@ export default defineComponent({
} }
} }
.btn2 { .btn2 {
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
@@ -6866,7 +6887,6 @@ export default defineComponent({
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset1.png");
} }
} }
} }
} }
} }
@@ -7523,23 +7543,21 @@ export default defineComponent({
background-image: url(../../assets/images/coursewareManage/export1.png); background-image: url(../../assets/images/coursewareManage/export1.png);
} }
} }
} }
.btn3 { .btn3 {
.search { .search {
width: 17px; width: 17px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/add0.png"); background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
} }
.btnText {
color: #ffffff;
}
}
} }
} }
/** /**
.btn3 { .btn3 {
width: 130px; width: 130px;
height: 40px; height: 40px;

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

@@ -381,7 +381,7 @@
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!-- TODO1216 <!-- TODO1216 -->
<div class="item" @click="showDrawerAddDiscuss"> <div class="item" @click="showDrawerAddDiscuss">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -403,7 +403,7 @@
/> />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div>--> </div>
<div class="item" @click="showDrawerAddActive"> <div class="item" @click="showDrawerAddActive">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -476,7 +476,7 @@
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!-- TODO1216 -->
<div class="item" @click="showDrawerAddVote"> <div class="item" @click="showDrawerAddVote">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -524,7 +524,7 @@
</div> </div>
</div> </div>
</div> </div>
-->
</div> </div>
<div class="boom" :style="{minHeight:level.length>6? ((level.length - 6)*106+512) + 'px' : 512 + 'px'}"> <div class="boom" :style="{minHeight:level.length>6? ((level.length - 6)*106+512) + 'px' : 512 + 'px'}">
<div class="boomcen"> <div class="boomcen">
@@ -1068,14 +1068,14 @@ import AddOnline from "../../components/drawers/AddOnline.vue";
import AddCase from "../../components/drawers/AddCase.vue"; import AddCase from "../../components/drawers/AddCase.vue";
import AddHomework from "../../components/drawers/AddHomework.vue"; import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue"; import AddTest from "../../components/drawers/AddTest.vue";
//import AddDiscuss from "../../components/drawers/AddDiscuss.vue"; import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue"; import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue"; import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue"; import AddInvist from "../../components/drawers/AddInvist.vue";
//import AddVote from "../../components/vote/AddVote.vue"; import AddVote from "../../components/vote/AddVote.vue";
import AddLive from "../../components/drawers/AddLive.vue"; import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue"; import AddRef from "../../components/drawers/AddRef.vue";
//import AddProject from "../../components/drawers/AddProject.vue"; import AddProject from "../../components/drawers/AddProject.vue";
import AddFaceteach from "../../components/drawers/AddFaceteach.vue"; import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
import * as api from "../../api/indexLevel"; import * as api from "../../api/indexLevel";
import { GetRouterDetail } from "../../api/indexTask"; import { GetRouterDetail } from "../../api/indexTask";
@@ -1096,18 +1096,18 @@ export default {
AddOnline, AddOnline,
AddCase, AddCase,
AddHomework, AddHomework,
//AddDiscuss, AddDiscuss,
AddActive, AddActive,
AddTest, AddTest,
AddEval, AddEval,
AddInvist, AddInvist,
//AddVote, AddVote,
AddLive, AddLive,
AddRef, AddRef,
draggable, draggable,
// UnlockMode, // UnlockMode,
AddFaceteach, AddFaceteach,
//AddProject, AddProject,
}, },
setup() { setup() {
const router = useRouter(); const router = useRouter();

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

@@ -243,31 +243,31 @@
<!-- 添加外链侧弹窗 --> <!-- 添加外链侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!-- TODO1216 -->
<div class="item" @click="showDrawerAddDiscuss"> <div class="item" @click="showDrawerAddDiscuss">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
<img src="../../assets/images/leveladd/tao.png" /> <img src="../../assets/images/leveladd/tao.png" />
</div> </div>
<div class="text">讨论</div> <div class="text">讨论</div>
</div> </div>
<div> <div>
<add-discuss <add-discuss
v-model:adddiscussVisible="adddiscussvisible" v-model:adddiscussVisible="adddiscussvisible"
v-model:edit="edit" v-model:edit="edit"
:isLevel="isLevel" :isLevel="isLevel"
v-model:projectId="projectId" v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId" v-model:chooseStageId="chooseStageId"
v-model:EditDiscussId="EditDiscussId" v-model:EditDiscussId="EditDiscussId"
v-model:projectTaskId="projectTaskId" v-model:projectTaskId="projectTaskId"
@changeData="updateTableData" @changeData="updateTableData"
/> />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
-->
<div class="item" @click="showDrawerAddActive"> <div class="item" @click="showDrawerAddActive">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -317,33 +317,33 @@
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!-- TODO1216 -->
<div class="item" @click="showDrawerAddVote"> <div class="item" @click="showDrawerAddVote">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
<img src="../../assets/images/leveladd/tou.png" /> <img src="../../assets/images/leveladd/tou.png" />
</div> </div>
<div class="text">投票</div> <div class="text">投票</div>
<div> <div>
<add-vote <add-vote
v-model:addvoteVisible="addvotevisible" v-model:addvoteVisible="addvotevisible"
@changeData="updateTableData" @changeData="updateTableData"
@getData="changeVData" @getData="changeVData"
v-model:edit="edit" v-model:edit="edit"
:isLevel="isLevel" :isLevel="isLevel"
v-model:projectId="projectId" v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:projectTaskId="projectTaskId"
v-model:EditVoteId="EditVoteId" v-model:EditVoteId="EditVoteId"
v-model:voteId="voteId" v-model:voteId="voteId"
v-model:ballotId="ballotId" v-model:ballotId="ballotId"
/> />
</div> </div>
</div> </div>
</div> </div>
-->
</div> </div>
<div class="boom"> <div class="boom">
<div class="boomcen"> <div class="boomcen">
@@ -831,11 +831,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue"; import AddTest from "../../components/drawers/AddTest.vue";
import AddLive from "../../components/drawers/AddLive.vue"; import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue"; import AddRef from "../../components/drawers/AddRef.vue";
//import AddDiscuss from "../../components/drawers/AddDiscuss.vue"; import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue"; import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue"; import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue"; import AddInvist from "../../components/drawers/AddInvist.vue";
//import AddVote from "../../components/vote/AddVote.vue"; import AddVote from "../../components/vote/AddVote.vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import * as api from "../../api/indexTaskadd"; import * as api from "../../api/indexTaskadd";
import * as apistage from "../../api/indexStage"; import * as apistage from "../../api/indexStage";
@@ -855,11 +855,11 @@ export default {
AddTest, AddTest,
AddLive, AddLive,
AddRef, AddRef,
// AddDiscuss, AddDiscuss,
AddActive, AddActive,
AddEval, AddEval,
AddInvist, AddInvist,
//AddVote, AddVote,
// UnlockMode, // UnlockMode,
}, },
setup() { setup() {

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

@@ -329,7 +329,7 @@
<!-- 添加外链侧弹窗 --> <!-- 添加外链侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!-- TODO1216 -->
<div class="item" @click="showDrawerAddDiscuss"> <div class="item" @click="showDrawerAddDiscuss">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -353,7 +353,7 @@
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div>--> </div>
<div class="item" @click="showDrawerAddActive"> <div class="item" @click="showDrawerAddActive">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -427,7 +427,7 @@
<div class="lin"></div> <div class="lin"></div>
</div> </div>
<!--TODO1216 <!-- TODO1216 -->
<div class="item" @click="showDrawerAddVote"> <div class="item" @click="showDrawerAddVote">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -454,7 +454,7 @@
</div> </div>
</div> </div>
-->
</div> </div>
<div class="boom"> <div class="boom">
<div class="boomcen"> <div class="boomcen">
@@ -1082,11 +1082,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue"; import AddTest from "../../components/drawers/AddTest.vue";
import AddLive from "../../components/drawers/AddLive.vue"; import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue"; import AddRef from "../../components/drawers/AddRef.vue";
//import AddDiscuss from "../../components/drawers/AddDiscuss.vue"; import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue"; import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue"; import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue"; import AddInvist from "../../components/drawers/AddInvist.vue";
//import AddVote from "../../components/vote/AddVote.vue"; import AddVote from "../../components/vote/AddVote.vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import * as api from "../../api/indexTemplate"; import * as api from "../../api/indexTemplate";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
@@ -1144,11 +1144,11 @@ export default {
AddTest, AddTest,
AddLive, AddLive,
AddRef, AddRef,
//AddDiscuss, AddDiscuss,
AddActive, AddActive,
AddEval, AddEval,
AddInvist, AddInvist,
//AddVote, AddVote,
// UnlockMode, // UnlockMode,
}, },
setup() { setup() {