3 次代码提交 20924c8188 ... 2f1837d3d7

作者 SHA1 备注 提交日期
  zjq 2f1837d3d7 Merge remote-tracking branch 'origin/test/exam' into dev 5 天之前
  zjq 07cd44587c 我的练习,我的考试 5 天之前
  zjq 1d4a6f31cd 培训模板、计划列表更改 2 周之前

+ 5 - 0
src/views/examTrain/exam/practice/components/Practice-exam.vue

@@ -170,6 +170,10 @@ const onSelQuestion = async (value: any) => {
     }
 }
 const onGetQuestionDetail = async (value) => {
+    if (!value){
+        state.loading = false;
+        return;
+    }
     // 初始化选择选择/填写的答案
     state.selRadioValue = '';  
     state.selCheckboxValue = []; 
@@ -196,6 +200,7 @@ const onGetQuestionDetail = async (value) => {
 // 结束考试
 const onSubmit = async () => {
     state.loading = true;
+    await onSelQuestion('');
 	submitUserPractice({
         practiceId: state.practiceId
     }).then(() => {

+ 8 - 8
src/views/examTrain/exam/practice/components/Practice-view.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog v-model="state.dialogVisible" draggable append-to-body destroy-on-close :show-close="false" width="80%" :before-close="closeDialog">
+	<el-dialog v-model="state.dialogVisible" draggable destroy-on-close :show-close="false" width="80%" :before-close="closeDialog">
         <template #header="{ close, titleId, titleClass }">
             <div class="topContent">
                 <div class="titleBox">
@@ -43,13 +43,13 @@
                     <span>参考答案:</span>
                     <p>{{state.questionDetail.answerDesc || '略'}}</p>
                 </div>
-                <div class="referenceAnswer" v-if="state.questionDetail" v-for="item in state.questionDetail.practiceQuestionKnowladgeDtos">
+                <div class="referenceAnswer" v-if="state.questionDetail && state.questionDetail.practiceQuestionKnowladgeDtos.length > 0">
                     <span>关联知识:</span>
-                    <p @click="onKnowladgeTo(item)">{{item.title}}</p>
+                    <p v-for="item in state.questionDetail.practiceQuestionKnowladgeDtos" @click="onKnowladgeTo(item)">{{item.title}}</p>
                 </div>
-                <div class="referenceAnswer" v-if="state.questionDetail" v-for="item in state.questionDetail.practiceQuestionSourcewareDtos">
+                <div class="referenceAnswer" v-if="state.questionDetail && state.questionDetail.practiceQuestionSourcewareDtos.length > 0">
                     <span>关联课件:</span>
-                    <p @click="onSourcewareTo(item)">{{item.name}}</p>
+                    <p v-for="item in state.questionDetail.practiceQuestionSourcewareDtos" @click="onSourcewareTo(item)">{{item.name}}</p>
                 </div>
             </el-col>
         </el-row>
@@ -232,7 +232,7 @@ defineExpose({
     .questionBox{padding: 20px 10px 0;}
     .questionBox .questionTitle{margin-bottom: 10px;font-size: 16px;}
     .questionBox .questionAnswer{padding: 0 20px;}
-    .questionBox .referenceAnswer{background-color: #ebf9ff;margin: 15px 40px 15px 30px;padding: 10px;}
-    .questionBox .referenceAnswer span{vertical-align: top;display: inline-block;}
-    .questionBox .referenceAnswer p{width: calc(100% - 80px);display: inline-block;}
+    .referenceAnswer{background-color: #ebf9ff;margin: 15px 40px 15px 30px;padding: 10px;}
+    .referenceAnswer span{display: block;}
+    .referenceAnswer p{width: calc(100% - 80px);display: block;margin-top: 10px;color: #1890ff;cursor: pointer;}
 </style>

+ 5 - 0
src/views/examTrain/exam/userExam/components/UserExam-exam.vue

@@ -232,6 +232,10 @@ const onSelQuestion = async (value: any) => {
     }
 }
 const onGetQuestionDetail = async (value) => {
+    if (!value){
+        state.loading = false;
+        return;
+    }
     // 初始化选择选择/填写的答案
     state.selRadioValue = '';  
     state.selCheckboxValue = []; 
@@ -262,6 +266,7 @@ const onGetQuestionDetail = async (value) => {
 // 结束考试
 const onSubmit = async () => {
     state.loading = true;
+    await onSelQuestion('');
 	submitUserExam({
         isSubmit: 1
     }).then(() => {

+ 2 - 2
src/views/examTrain/train/plan/index.vue

@@ -59,11 +59,11 @@
 							{{ formatDate(row.trainEndTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
-                    <vxe-column field="status" title="状态" width="160">
+                    <!-- <vxe-column field="status" title="状态" width="160">
                         <template #default="{ row }">
                             <el-switch v-model="row.status" />
                         </template>
-                    </vxe-column>
+                    </vxe-column> -->
                     <vxe-column field="creatorName" title="创建人" width="150"></vxe-column>
                     <vxe-column field="creatorOrgName" title="创建部门" width="150"></vxe-column>
                     <vxe-column field="creationTime" title="创建时间" width="160">

+ 2 - 2
src/views/examTrain/train/template/index.vue

@@ -53,11 +53,11 @@
                     <vxe-column field="code" title="模板编号" width="200"></vxe-column>
                     <vxe-column field="name" title="模板标题" min-width="200"></vxe-column>
                     <vxe-column field="isContainsPracticeDes" title="是否包含习题" width="150"></vxe-column>
-                    <vxe-column field="status" title="状态" width="160">
+                    <!-- <vxe-column field="status" title="状态" width="160">
                         <template #default="{ row }">
                             <el-switch v-model="row.status" />
                         </template>
-                    </vxe-column>
+                    </vxe-column> -->
                     <vxe-column field="creatorName" title="创建人" width="150"></vxe-column>
                     <vxe-column field="creatorOrgName" title="创建部门" width="150"></vxe-column>
                     <vxe-column field="creationTime" title="创建时间" width="160">