diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index c52af5b3..a8987e13 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -52,7 +52,7 @@
{}); @@ -468,11 +468,11 @@ export default { activityAddress: state.inputV3, //活动地址 activityDuration: state.inputV2, //活动时长 activityExplain: state.textV2, //活动说明 - activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss"), //活动结束时间 + activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm"), //活动结束时间 activityId: props.edit ? props.EditActiveId : 0, //活动ID activityName: state.inputV1, //活动名称 activityNotice: state.textV1, //活动公告 - activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss"), //活动开始时间 + activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm"), //活动开始时间 activityTag: "", //活动逻辑删除标识 afterSignIn: state.inputV5, //活动开始后多少分钟签到 beforeSignIn: state.inputV4, //活动开始前多少分钟签到 diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 22d88fde..0566b5af 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -51,7 +51,7 @@
@@ -251,8 +251,8 @@ export default { state.evaluationTypeName = res.data.data.evaluationTypeName; state.evaluationTypeId = res.data.data.evaluationTypeId; state.time = res.data.data.evaluationStartTime ? [ - dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD HH:mm:ss"), - dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD HH:mm:ss"), + dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD HH:mm"), + dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD HH:mm"), ] : undefined; state.description = res.data.data.evaluationExplain; state.type = res.data.data.type; @@ -290,9 +290,9 @@ export default { } let objei = { evaluationName: state.inputV1, - evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss") : "", + evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm") : "", evaluationId: props.edit ? Number(props.EditEvalId) : 0, - evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss") : "", + evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm") : "", evaluationTypeId: state.evaluationTypeId, evaluationTypeName: state.evaluationTypeName, evaluationExplain: state.description, @@ -329,9 +329,9 @@ export default { } let obj = { evaluationName: state.inputV1, - evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss") : "", + evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm") : "", evaluationId: props.evaluationId, - evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss") : "", + evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm") : "", evaluationTypeId: state.evaluationTypeId, evaluationTypeName: state.evaluationTypeName, evaluationExplain: state.description, diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index ea937b01..8e1f08c6 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -540,8 +540,8 @@ export default { console.log("获取的数据", res); state.inputV1 = res.data.data.liveName; state.time = [ - dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm:ss"), - dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm:ss"), + dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"), + dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"), ]; console.log(state.time); diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 9dd01806..38ac3dd1 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -244,7 +244,7 @@
- 考试排序: + 试题排列:
{ console.log("查询评估xinxi ", res); + let info = res.data.data; + let n1 = info.essayQuestionVoList + ? Number(info.essayQuestionVoList.length) + : 0 ; + let n2 = info.multipleStemVoList + ? Number(info.multipleStemVoList.length) + : 0; + + let n3 = info.scoringQuestionVoList + ? Number(info.scoringQuestionVoList.length) + : 0; + let n4 = info.singleStemVoList + ? Number(info.singleStemVoList.length) + : 0; + + let num = n1 + n2 + n3 +n4; let obj = { assessmentId: info.assessmentId, name: info.assessmentName, - num: info.essayQuestionVoList - ? Number(info.essayQuestionVoList.length) - : 0 + info.multipleStemVoList - ? Number(info.multipleStemVoList.length) - : 0 + info.scoringQuestionVoList - ? Number(info.scoringQuestionVoList.length) - : 0 + info.singleStemVoList - ? Number(info.singleStemVoList.length) - : 0, + num: num, creator: info.createUser ? info.createUser : "-", time: dayjs(info.createTime).format("YYYY-MM-DD"), }; diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue index cb68071f..8ae37354 100644 --- a/src/components/drawers/AssessmentList.vue +++ b/src/components/drawers/AssessmentList.vue @@ -182,18 +182,25 @@ export default { let data = tableData; let array = []; data.map((value, index) => { + let n1 = value.essayQuestionVoList + ? Number(value.essayQuestionVoList.length) + : 0 ; + let n2 = value.multipleStemVoList + ? Number(value.multipleStemVoList.length) + : 0; + + let n3 = value.scoringQuestionVoList + ? Number(value.scoringQuestionVoList.length) + : 0; + let n4 = value.singleStemVoList + ? Number(value.singleStemVoList.length) + : 0; + + let num = n1 + n2 + n3 +n4; let obj = { key: index, assessmentId: value.assessmentId, - num:value.essayQuestionVoList - ? Number(value.essayQuestionVoList.length) - : 0 + value.multipleStemVoList - ? Number(value.multipleStemVoList.length) - : 0 + value.scoringQuestionVoList - ? Number(value.scoringQuestionVoList.length) - : 0 + value.singleStemVoList - ? Number(value.singleStemVoList.length) - : 0, + num: num, name: value.assessmentName ? value.assessmentName : "-", creator: value.createUser ? value.createUser : "-", time: dayjs(value.createTime).format("YYYY-MM-DD"), diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index cc7f3971..3475b8ba 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -330,8 +330,8 @@ export default { gangw: value.userInfoBo.jobName, //岗位 completeStageCnt: value.completeStageCnt, //当前完成阶段数 totalStageCnt: value.totalStageCnt, //总阶段数 - //progress: value.completeStageCnt + "/" + value.totalStageCnt, TODO接口返回value.completeStageCnt值不对 - progress: 0 + "/" + value.totalStageCnt, + progress: value.completeStageCnt + "/" + value.totalStageCnt, + stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间 }; diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index bebe972c..94a76617 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -43,9 +43,15 @@
-
项目说明:
+
项目级别:
- {{ projectInfo.remark }} + +
+
+
+
培训体系:
+
+
@@ -66,18 +72,6 @@ >
-
-
项目级别:
-
- -
-
-
-
培训体系:
-
- -
-
是否BOEU实施:
@@ -89,6 +83,12 @@ >
+
+
项目说明:
+
+ {{ projectInfo.remark }} +
+
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index 5483e5a0..4cf15db6 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -29,7 +29,11 @@ import {useStore} from "vuex"; const store = useStore(); const props = defineProps({ - value: String + value: String, + disabled: { + type: Boolean, + default: false + } }) const emit = defineEmits({}) @@ -38,9 +42,9 @@ const options = computed(() => store.state.orgtreeList) const id = computed(() => { return props.value }) -console.log("store.state.orgtreeList",store.state.orgtreeList); + function change(key, obj) { - console.log(obj[0],key,props.value); + console.log(obj[0], key, props.value); emit('update:name', obj[0]) emit('update:value', key) } diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 37dd191e..550ee7db 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -105,7 +105,7 @@
@@ -1949,7 +1949,7 @@
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 5092963e..b2f66dc3 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -380,6 +380,7 @@
+
@@ -474,13 +475,14 @@
+ +
- +
+ -->
@@ -1049,11 +1052,11 @@ 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"; @@ -1077,12 +1080,12 @@ export default { AddOnline, AddCase, AddHomework, - AddDiscuss, + //AddDiscuss, AddActive, AddTest, AddEval, AddInvist, - AddVote, + //AddVote, AddLive, AddRef, draggable, diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 0bea34c6..698f067f 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -3,7 +3,8 @@
{{ projectInfo.parentId ? "编辑" : "创建" }}项目{{ projectInfo.projectId ? "编辑" : "创建" + }}{{ ptojectType == "3" ? "班级" : "项目" }}
@@ -315,7 +316,7 @@ export default { classifyList5: [], courseSyncFlag: false, auditDescription: "", - ptojectType: null, + ptojectType: "", }); // 封面图选择 @@ -461,8 +462,8 @@ export default { if (!validate(state.projectInfo, errorMsgs)) { return; } - /** - if (!state.projectInfo.validate) { + /** + if (!state.projectInfo.validate) { message.destroy(); message.warning('项目名称重复,请修改名称!'); return; @@ -715,10 +716,12 @@ export default { .name2 { display: flex; align-items: flex-start; + .description { margin-top: 14px; margin-left: 11px; } + .ant-input-textarea { .ant-input { height: 88px; diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index ee98df2c..2964c0a0 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -46,6 +46,7 @@
创建时间:
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index b4307412..9dd953d3 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -316,6 +316,7 @@
+ +
- +
+ -->
@@ -405,16 +407,18 @@ v-model:EditInvistId="EditInvistId" />
- +
-
+
+ + +
- +
-
+ --> + +
@@ -1052,11 +1058,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"; @@ -1076,11 +1082,11 @@ export default { AddTest, AddLive, AddRef, - AddDiscuss, + // AddDiscuss, AddActive, AddEval, AddInvist, - AddVote, + //AddVote, // UnlockMode, }, setup() { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 1c7eda96..69dc6b93 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3588,7 +3588,7 @@ export default { console.log("审核信息是什么", res.data.data.projectAuditLogDtoList); let dataset = res.data.data.projectAuditLogDtoList; state.passInfo = dataset[dataset.length-1]; - + state.isPass = true; /** for (let i = 0; i < dataset.length; i++) { if (dataset[i].status == -5) { diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index d0378f6a..d6abd7e7 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -329,6 +329,7 @@
+ +
-
- +
+
-
+
-->
@@ -425,13 +426,15 @@
+ + +
- + +
+--> +
@@ -1069,11 +1075,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"; @@ -1131,11 +1137,11 @@ export default { AddTest, AddLive, AddRef, - AddDiscuss, + //AddDiscuss, AddActive, AddEval, AddInvist, - AddVote, + //AddVote, // UnlockMode, }, setup() { diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index 526840ef..b4186361 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -82,7 +82,7 @@ :placeholder="[' 开始时间', ' 结束时间']" v-model:value="projectInfo.rangeTime" style="width: 100%; height: 40px; border-radius: 5px" - valueFormat="YYYY-MM-DD HH:mm:ss" + valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" />