- {{ data.name }}
-
- 简介>
-
-
-
-
-
-
-
-
-
- {{ data.currentStageName }}
-
- ![]()
-
-
- {{ data.currentChapterCnt ? '进行中' : '未开始' }}
-
-
-
-
-
- {{ value.name }}
-
-
+
+ {{ data.name }}
+
+ 简介>
+
+
-
- {{ value.name }}
-
-
-
- 必修
-
-
- 选修
-
-
- {{ types.typeName[value.type] || "" }}
-
+
+
+
+
+
+
+ {{ data.currentStageName }}
+
+ ![]()
+
+
+ {{ data.currentChapterCnt ? '进行中' : '未开始' }}
+
+
+
@@ -356,7 +343,7 @@ const types = ref({
6: "/livebroadcast",
7: ({ courseId }) =>
request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
- window.open(linkAddress)
+ window.open(linkAddress, '_top')
), //外联
8: "/discusspage",
9: "/moreactive",
@@ -365,7 +352,7 @@ const types = ref({
(evaType == 0
? import.meta.env.VITE_BOE_TEST_DETAIL_URL
: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
- ), //测评
+ ,'_top'), //测评
11: "/surveydetail",
12: "/ballotpage",
13: "/projectdetails",
@@ -385,7 +372,7 @@ function toFinish(d) {
if (date1 < date2) {
dialogVisibleTip.value = '当前作业已结束';
dialogVisible.value = true;
-
+
return
}
}
@@ -446,7 +433,7 @@ function toFinish(d) {
}
}
if (d.type === 3 || d.type === 7) {
- d.status || request(STUDY_RECORD, {
+ d.status || request(STUDY_RECORD, {
studentId: userInfo.value.id,
targetId: data.value.routerId,
logo: 1,
@@ -457,17 +444,15 @@ function toFinish(d) {
if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] &&
types.value.path[d.type].startsWith("http") &&
- window.open(types.value.path[d.type] + d.targetId);
+ window.open(types.value.path[d.type] + d.targetId,'_top');
types.value.path[d.type] &&
types.value.path[d.type].startsWith("/") &&
router.push({
path: types.value.path[d.type],
query: {
id: d.routerTaskId,
- // id: routerId,
type: 1,
- taskId: routerId,
- taskIds: routerId,
+ infoId: routerId,
courseId: d.courseId,
pName: data.value.name,
sName: data.value.currentStageName,
@@ -508,6 +493,7 @@ function whiteTypes(type) {
margin-top: 24px;
display: flex;
z-index: 2;
+
.detailL {
flex: 1;
margin-right: 20px;
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 0c17b58..b038ec4 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -46,8 +46,8 @@
+
@@ -235,15 +222,15 @@
+
+ {{ value.name }}
+
+
+
+
+ {{ value.name }}
+
+
+
+ 必修
+
+
+ 选修
+
+
+ {{ types.typeName[value.type] || "" }}
+
@@ -75,36 +63,35 @@
+
{{ value.currentRatio }}%
- {{ value.currentRatio === 100 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
+ background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
+}" @click="toFinish(value)">
+ {{ value.status === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
@@ -203,26 +190,26 @@
+ color: {
+ 0: 'rgba(238, 112, 108, 1)',
+ 1: 'rgba(255, 151, 38, 1)',
+ 2: 'rgba(39, 122, 255, 1)',
+ 3: 'rgba(59, 94, 251, 1)',
+ 4: 'rgba(57, 219, 183, 1)',
+ 5: 'rgba(57, 219, 183, 1)',
+ }[parseInt((data.currentChapterCnt / data.totalChapterCnt * 100) / 20)],
+}">
{{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
+ color: {
+ 0: 'rgba(238, 112, 108, 1)',
+ 1: 'rgba(255, 151, 38, 1)',
+ 2: 'rgba(39, 122, 255, 1)',
+ 3: 'rgba(59, 94, 251, 1)',
+ 4: 'rgba(57, 219, 183, 1)',
+ 5: 'rgba(57, 219, 183, 1)',
+ }[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)],
+}">
{{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
+ return a[0].orderNumber - b[0].orderNumber
+}) " :key="index" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
@@ -56,9 +56,9 @@
完全没用
+ data.assessmentSingleChoiceDtoList &&
+ data.assessmentSingleChoiceDtoList.length
+">
{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+ data.assessmentMultipleChoiceDtoList &&
+ data.assessmentMultipleChoiceDtoList.length
+">
{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+ data.assessmentEssayQuestionDtoList?.length ||
+ data.assessmentMultipleChoiceDtoList?.length ||
+ data.assessmentSingleChoiceDtoList?.length ||
+ data.assessmentScoringQuestionDtoList?.length
+">
提交
@@ -334,7 +334,7 @@ import { ElMessage } from "element-plus";
import { ref } from "vue";
const {
- query: { courseId, id: taskId, taskIds, type, pName, sName, chapterOrStageId },
+ query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId },
} = useRoute();
const router = useRouter();
const returnclick = () => {
@@ -353,8 +353,8 @@ function formateArr(arr1) {
return newarr
}
-const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 });
-console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 })
+const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
+console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 })
console.log('我是需要排序得题目', data)
function goHome() {
@@ -369,10 +369,10 @@ function submit() {
if (1 > 0) {
console.log(data)
console.log('我是提交的数据', {
- targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+ targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
- taskId: taskId ? taskId : taskIds ? taskIds : 0,
+ taskId: taskId ? taskId : 0,
type,
result: JSON.stringify(data.value),
})
@@ -424,10 +424,10 @@ function submit() {
data.value.isSubmit = !data.value.isSubmit;
request(ASSESSMENT_SUBMIT, {
- targetId: taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+ targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
- taskId: taskIds ? taskIds : 0,
+ taskId: taskId ? taskId : 0,
type,
result: JSON.stringify(data.value),
}).then(() => {