diff --git a/.env b/.env index 5afca6ef..766e168d 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ # 本项目基础url VUE_APP_BASE=/manage # api项目基础url -VUE_APP_BASE_API=/manageApi +VUE_APP_BASE_API=/manage #文件路径 VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试,不可以用在其他地方 diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 5d58b557..6389e906 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -16,25 +16,25 @@ /> -
- + - +
-
+
@@ -289,6 +289,63 @@
+
+
+
+
+
+ +
+ 考试名称: +
+
+ +
+
+
+
+
+ +
+ 数据来源: +
+
+ +
+
+
+
+ 考试说明: +
+
+ +
+
+
+
取消 确定 @@ -398,6 +455,18 @@ export default { scoringModel: 2, questionArrangement: 4, }, + test1: { + examinationName: '', + chooseTime: '', + examinationDuration: '', + passLine: '', + examinationExplain: null, + examinationLimit: null, + showAnswers: 1, + showAnalysis: 1, + scoringModel: 2, + questionArrangement: 4, + }, addLoading: false, isOuter: 1, // 是否为外部考试 diff --git a/src/components/drawers/CheckWork.vue b/src/components/drawers/CheckWork.vue index bb36912b..4fba75bf 100644 --- a/src/components/drawers/CheckWork.vue +++ b/src/components/drawers/CheckWork.vue @@ -1,154 +1,188 @@ \ No newline at end of file diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index baf63238..4ab1286b 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -121,7 +121,7 @@
- - + @@ -200,10 +200,10 @@ export default { value: "0", label: "未开始", }, - // { + // { // id: 2, - // value: "2", - // label: "进行中", + // value: "2", + // label: "进行中", //}, { id: 3, @@ -323,7 +323,7 @@ export default { ); }, }, - + { title: "成绩", dataIndex: "workScore", @@ -388,15 +388,15 @@ export default { ); }, }, - // { - // title: "操作", - // dataIndex: "operation", - // key: "operation", - // width: 100, - // align: "center", - // ellipsis: true, - // className: "h", - // }, + { + title: "操作", + dataIndex: "operation", + key: "operation", + width: 100, + align: "center", + ellipsis: true, + className: "h", + }, ], exportHomeWorkV: false, downloadUrl: null, @@ -417,7 +417,7 @@ export default { { state.CWvisible = true; }} @@ -435,12 +435,7 @@ export default { justifyContent: "center", }} > - + 查看
@@ -491,7 +486,7 @@ export default { //获取学员 const getStudent = () => { - console.log("我是传递的查询参数", { + console.log("我是传递的查询参数", props.datasource.courseId, { pageNo: state.currentPage, pageSize: state.pageSize, currentStageId: props.datasource.chapterId, @@ -558,9 +553,12 @@ export default { console.log("props.datasource", props.datasource); 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 - }&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 // .exportTaskStudent({ @@ -594,8 +592,8 @@ export default { .then((res) => { console.log("导出作业", res.data.data); if (res.data.code === 200) { - // message.destroy(); - // message.success("导出作业成功"); + // message.destroy(); + // message.success("导出作业成功"); state.exportHomeWorkV = true; state.downloadUrl = res.data.data; } @@ -612,7 +610,8 @@ export default { console.log("props.datasource", props.datasource); 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 }&type=${2}&pid=${props.datasource.routerId}&taskId=${ props.datasource.routerTaskId diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 345f035e..b43edc33 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -39,7 +39,9 @@
{ - // // return text ? text : "0"; - // }, - // }, + { + title: "学习人数", + width: 130, + dataIndex: "stunum", + key: "4", + align: "center", + customRender: ({ text }) => { + return text ? text : "0"; + }, + }, // { // title: "评分", // width: 130, @@ -2538,7 +2541,7 @@ const columns2 = [ key: "studentName", width: "6%", align: "center", - customRender: ({record: {studentName}}) => (studentName || "-") + customRender: ({ record: { studentName } }) => studentName || "-", }, { title: "工号", @@ -2547,7 +2550,7 @@ const columns2 = [ width: "12%", ellipsis: true, align: "center", - customRender: ({record: {studentUserNo}}) => (studentUserNo || "-") + customRender: ({ record: { studentUserNo } }) => studentUserNo || "-", }, { title: "开课名称", @@ -2556,7 +2559,7 @@ const columns2 = [ width: "12%", ellipsis: true, align: "center", - customRender: ({record: {name}}) => (name || "-") + customRender: ({ record: { name } }) => name || "-", }, { title: "地点", @@ -2565,7 +2568,7 @@ const columns2 = [ width: "12%", ellipsis: true, align: "center", - customRender: ({record: {address}}) => (address || "-") + customRender: ({ record: { address } }) => address || "-", }, { title: "数据来源", @@ -2574,7 +2577,8 @@ const columns2 = [ ellipsis: true, width: "12%", align: "center", - customRender: ({record:{courseName,routerName}}) => (courseName || routerName || "开课"), + customRender: ({ record: { courseName, routerName } }) => + courseName || routerName || "开课", }, { title: "学习时间", @@ -2583,7 +2587,7 @@ const columns2 = [ width: "10%", align: "center", ellipsis: true, - customRender: ({record:{lastStudyTime}}) => (lastStudyTime || "-") + customRender: ({ record: { lastStudyTime } }) => lastStudyTime || "-", }, { title: "签到时间", @@ -2592,7 +2596,7 @@ const columns2 = [ width: "10%", align: "center", ellipsis: true, - customRender: ({record:{signTime}}) => (signTime || "-") + customRender: ({ record: { signTime } }) => signTime || "-", }, { title: "状态", @@ -2994,7 +2998,8 @@ export default defineComponent({ dataIndex: "signstatus", key: "7", align: "center", - customRender: ({ record }) => record.signStatus?'已签到':'未签到', + customRender: ({ record }) => + record.signStatus ? "已签到" : "未签到", }, { title: "评估状态", @@ -3025,7 +3030,7 @@ export default defineComponent({ // > // 成绩录入 // - + )}
); @@ -3683,7 +3688,7 @@ export default defineComponent({ // 渲染列表1操作 const getTableDate = async () => { - console.log('我是点击搜索的数据',state.sysTypeId) + console.log("我是点击搜索的数据", state.sysTypeId); // let datas = state.tableData1; let startTime = ""; let endTime = ""; @@ -3701,8 +3706,8 @@ export default defineComponent({ pageNo: state.currentPage1, pageSize: state.pageSize1, auditStatus: state.auditStatus, - // categoryId: state.categoryId, - sysTypeId: state.sysTypeId, + // categoryId: state.categoryId, + sysTypeId: state.sysTypeId, projectName: state.projectName, name: state.name, createName: state.createName, @@ -3739,16 +3744,32 @@ export default defineComponent({ datas.forEach((itm) => { itm.pageNo = pageNo; - itm.contentTxt = findClassFullName(sysTypeOptions.value,itm.sysTypeId) || '-' + itm.contentTxt = + findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-"; }); state.tableData1 = datas; }; - function findClassFullName(list,classify, name = '') { - return list && list.length && 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('') || '' + function findClassFullName(list, classify, name = "") { + return ( + (list && + list.length && + 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(); @@ -5754,7 +5775,7 @@ export default defineComponent({ height: 18px; background-image: url("../../assets/images/courseManage/reset1.png"); } - .daochu{ + .daochu { width: 16px; height: 18px; background-image: url("../../assets/images/coursewareManage/export.png"); @@ -6858,7 +6879,7 @@ export default defineComponent({ } } - .btn2 { + .btn2 { .search { width: 16px; height: 18px; @@ -6866,7 +6887,6 @@ export default defineComponent({ background-image: url("../../assets/images/courseManage/reset1.png"); } } - } } } @@ -7523,23 +7543,21 @@ export default defineComponent({ background-image: url(../../assets/images/coursewareManage/export1.png); } } - - } .btn3 { - .search { - width: 17px; - height: 18px; - background-image: url("../../assets/images/courseManage/add0.png"); - } - - .btnText { - color: #ffffff; - } + .search { + width: 17px; + height: 18px; + background-image: url("../../assets/images/courseManage/add0.png"); } + + .btnText { + color: #ffffff; + } + } } } -/** + /** .btn3 { width: 130px; height: 40px; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index d5f1ee8a..4962330e 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -381,7 +381,7 @@
-
@@ -403,7 +403,7 @@ />
-
--> +
@@ -476,7 +476,7 @@
-
@@ -524,7 +524,7 @@
- --> +
@@ -1068,14 +1068,14 @@ import AddOnline from "../../components/drawers/AddOnline.vue"; import AddCase from "../../components/drawers/AddCase.vue"; import AddHomework from "../../components/drawers/AddHomework.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 AddEval from "../../components/drawers/AddEval.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 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 * as api from "../../api/indexLevel"; import { GetRouterDetail } from "../../api/indexTask"; @@ -1096,18 +1096,18 @@ export default { AddOnline, AddCase, AddHomework, - //AddDiscuss, + AddDiscuss, AddActive, AddTest, AddEval, AddInvist, - //AddVote, + AddVote, AddLive, AddRef, draggable, // UnlockMode, AddFaceteach, - //AddProject, + AddProject, }, setup() { const router = useRouter(); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 95cd6c7c..17a536cd 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -243,31 +243,31 @@
- + +
+
+
+ +
+
讨论
+
+ +
+ +
+ +
+
+
@@ -317,33 +317,33 @@
- + +
+
+
+ +
+
投票
+ +
+ +
+ +
+
+
@@ -831,11 +831,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue"; import AddTest from "../../components/drawers/AddTest.vue"; import AddLive from "../../components/drawers/AddLive.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 AddEval from "../../components/drawers/AddEval.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 * as api from "../../api/indexTaskadd"; import * as apistage from "../../api/indexStage"; @@ -855,11 +855,11 @@ export default { AddTest, AddLive, AddRef, - // AddDiscuss, + AddDiscuss, AddActive, AddEval, AddInvist, - //AddVote, + AddVote, // UnlockMode, }, setup() { diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index 3ba444da..f9f3cf4e 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -329,7 +329,7 @@
-
@@ -353,7 +353,7 @@
-
--> +
@@ -427,7 +427,7 @@
-
@@ -454,7 +454,7 @@
---> +
@@ -1082,11 +1082,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue"; import AddTest from "../../components/drawers/AddTest.vue"; import AddLive from "../../components/drawers/AddLive.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 AddEval from "../../components/drawers/AddEval.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 * as api from "../../api/indexTemplate"; import draggable from "vuedraggable"; @@ -1144,11 +1144,11 @@ export default { AddTest, AddLive, AddRef, - //AddDiscuss, + AddDiscuss, AddActive, AddEval, AddInvist, - //AddVote, + AddVote, // UnlockMode, }, setup() {