zc

src/assets/styles/button.scss

@@ -307,9 +307,9 @@
   line-height:40px;
   font-size:14px;
   border-radius: 6px;
-  border: 1px solid $buttonColorC;
+  border: 1px solid $buttonColorI;
   color:$buttonColorA;
-  background-color:$buttonColorC;
+  background-color:$buttonColorI;
   margin:0 10px 0 0;
   overflow: hidden;
   i{

src/components/fullScreenFileLook/fullScreenFileLook.vue

@@ -251,6 +251,7 @@
       }
       .video-box{
         flex:1;
+        max-height: 1030px;
       }
       .rich-text-box {
         padding:20px 100px;

src/views/safetyEducationExaminationNew/courseManagement/coursewareManagement/addPage.vue

@@ -67,7 +67,7 @@
           </div>
           <div class="form-box" v-if="newData.materialType == 1">
             <el-form-item label="视频上传" prop="attachments">
-              <div class="form-flex-box">
+              <div class="form-flex-box" v-show="!uploadType">
                 <uploader
                   style="width:400px;"
                   :autoStart="false"
@@ -92,6 +92,10 @@
                 <video v-if="newData.attachments[0]" :src="newData.attachments[0].attachmentSourcePath?newData.attachments[0].attachmentSourcePath:newData.attachments[0].attachmentPath"
                        controls style="width: 424px;height:240px;margin-left: 20px;"></video>
               </div>
+              <div class="upLoad-box" v-if="uploadType">
+                <div v-loading="uploadType" style="width:400px;height:200px;"></div>
+                <p v-if="uploadType">正在上传请耐心等待</p>
+              </div>
             </el-form-item>
           </div>
           <div class="form-box" v-if="newData.materialType == 1">
@@ -348,6 +352,7 @@
           waiting: "等待中...",
           cmd5: "计算文件MD5中...",
         },
+        uploadType:false,
       }
     },
     watch: {
@@ -532,6 +537,7 @@
             }
           }).then((res) => {
             if (res.data.code==200) {
+              this.$set(this,'uploadType',false);
               this.$set(this.newData,'attachments',[{
                 attachmentSourcePath:res.data.data.url,
                 attachmentName:this.getLeftPart(res.data.data.name),
@@ -568,6 +574,7 @@
             this.msgError("文件格式不支持,请上传正确的文件.");
             file.ignored = true;
           }else{
+            this.$set(this,'uploadType',true);
             this.fileList.push(item);
             this.computeMD5(item);
           }
@@ -644,6 +651,20 @@
         .form-box{
 
         }
+        .upLoad-box{
+          width:400px;
+          height:240px;
+          div{
+            width:400px;
+            height:200px;
+          }
+          p{
+            line-height: 40px;
+            font-size:14px;
+            text-align: center;
+            color:#0183fa;
+          }
+        }
         .form-flex-box{
           display: flex;
           ::v-deep .el-upload-dragger{

src/views/safetyEducationExaminationNew/featurePage/startPracticing/index.vue

@@ -272,7 +272,7 @@
               const prevGroup = this.questionTypeGroups[this.groupIndex]
               this.questionIndex = prevGroup.questions.length - 1
             }
-            this.examElExamAttemptReviewQuestion(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].snapshotQuestionId)
+            this.examUserPracticeQuestionDetail(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].questionId,this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].userAnswer)
           })
         }else{
           //切换索引至下一题
@@ -285,7 +285,7 @@
             const prevGroup = this.questionTypeGroups[this.groupIndex]
             this.questionIndex = prevGroup.questions.length - 1
           }
-          this.examElExamAttemptReviewQuestion(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].snapshotQuestionId)
+          this.examUserPracticeQuestionDetail(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].questionId,this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].userAnswer)
         }
       },
       // 下一题
@@ -309,7 +309,7 @@
               this.groupIndex++
               this.questionIndex = 0
             }
-            this.examElExamAttemptReviewQuestion(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].snapshotQuestionId)
+            this.examUserPracticeQuestionDetail(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].questionId,this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].userAnswer)
           })
         }else{
           //切换索引至下一题
@@ -322,7 +322,7 @@
             this.groupIndex++
             this.questionIndex = 0
           }
-          this.examElExamAttemptReviewQuestion(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].snapshotQuestionId)
+          this.examUserPracticeQuestionDetail(this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].questionId,this.questionTypeGroups[this.groupIndex].questions[this.questionIndex].userAnswer)
         }
       },
       //右侧数据

src/views/safetyEducationExaminationNew/featurePage/startTheExam/index.vue

@@ -409,6 +409,7 @@
           type:2,
           attemptId:this.newData.attemptId,
         });
+        localStorage.setItem('startTrainingSkip',1)
         this.$set(this,'shadeType',false);
         this.$set(this,'pageType',2);
       },

src/views/safetyEducationExaminationNew/featurePage/startTraining/index.vue

@@ -308,7 +308,12 @@
       },
       //返回按钮
       backPage() {
-        this.$router.back()
+        if(localStorage.getItem('startTrainingSkip')){
+          localStorage.removeItem('startTrainingSkip')
+          this.$router.go(-2)
+        }else{
+          this.$router.back()
+        }
       },
       //查看错题返回
       tableButton(){

src/views/safetyEducationExaminationNew/publicConfiguration/basicConfiguration/otherConfiguration.vue

@@ -30,7 +30,6 @@
                                 :step="1" :precision="0" step-strictly
                                 v-model="newData.autoApprovalDays">
               </el-input-number>
-              <p class="form-min-p">G</p>
             </div>
           </el-form-item>
           <p class="form-text-p" style="margin:0 0 0 20px;">天，未处理则自动审批通过</p>

src/views/safetyEducationExaminationNew/safetyEducation/knowledgeLearning/index.vue

@@ -63,7 +63,7 @@
                 <img v-if="item.materialType == 1" :src="item.exampleImg">
                 <img v-else src="@/assets/ZDimages/basicsModules/image_986222064626770.png">
                 <div class="bottom-big-box">
-                  <p class="name-p">{{item.coursewareName}}{{item.coursewareName}}</p>
+                  <p class="name-p">{{item.coursewareName}}</p>
                   <p class="time-p">{{secondsToMinutes(item.minLearningDuration)}}分钟 丨 {{item.creditHours}}学时 丨 {{item.points}}积分</p>
                 </div>
                 <p class="type-p" :class="item.learnStatus=='0'?'type-p-1':(item.learnStatus=='1'?'type-p-2':(item.learnStatus=='2'?'type-p-3':''))">{{item.learnStatus=='0'?'未学习':(item.learnStatus=='1'?'学习中':(item.learnStatus=='2'?'已学完':''))}}</p>

src/views/safetyEducationExaminationNew/safetyTest/mockExam/index.vue

@@ -73,7 +73,6 @@
         />
       </div>
     </div>
-    <historyOfIncorrectQuestions :propsData="propsData" v-if="pageType === 2"></historyOfIncorrectQuestions>
   </div>
 </template>
 <script>
@@ -81,13 +80,9 @@
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
   //import addPage from "./addPage.vue";
-  import historyOfIncorrectQuestions from "@/views/safetyEducationExaminationNew/components/historyOfIncorrectQuestions.vue";
   import { examUserExamMockList,examUserExamTypeSelectExamType,examUserExamStart, } from "@/api/safetyEducationExaminationNew/index";
   export default {
     name: 'index',
-    components: {
-      historyOfIncorrectQuestions,
-    },
     data() {
       return {
         tableButtonType: this.hasPermiDom(['demo:demo:detail', 'demo:demo:edit', 'demo:demo:del']),

src/views/safetyEducationExaminationNew/safetyTest/onlineExam/index.vue

@@ -73,7 +73,6 @@
         />
       </div>
     </div>
-    <historyOfIncorrectQuestions :propsData="propsData" v-if="pageType === 2"></historyOfIncorrectQuestions>
   </div>
 </template>
 <script>
@@ -81,13 +80,9 @@
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
   //import addPage from "./addPage.vue";
-  import historyOfIncorrectQuestions from "@/views/safetyEducationExaminationNew/components/historyOfIncorrectQuestions.vue";
   import { examUserExamList,examUserExamTypeSelectExamType,examUserExamStart, } from "@/api/safetyEducationExaminationNew/index";
   export default {
     name: 'index',
-    components: {
-      historyOfIncorrectQuestions,
-    },
     data() {
       return {
         tableButtonType: this.hasPermiDom(['demo:demo:detail', 'demo:demo:edit', 'demo:demo:del']),