zc

src/views/safetyEducationExaminationNew/components/answerKey.vue

@@ -32,7 +32,8 @@
           <!-- 答案解析 -->
           <div class="analysis-box">
             <div class="analysis-title">答案解析</div>
-            <div class="analysis-content" v-html="questionData.analysis"></div>
+            <div class="analysis-content" v-if="questionData.analysis" v-html="questionData.analysis"></div>
+            <div class="analysis-content" style="color:#999;" v-else>未配置</div>
           </div>
         </div>
       </div>

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/addPage.vue

@@ -33,13 +33,20 @@
                                  :value="item.id"/>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="安全分类" :prop="placementTest?'disciplineTypeId':''">
-                    <el-select :disabled="showType" v-model="newData.disciplineTypeId" placeholder="安全分类" @change="examChange" style="width:200px;">
+                  <el-form-item label="安全分类" v-if="!placementTest" :prop="placementTest?'disciplineTypeId':''">
+                    <el-select :disabled="showType" v-model="newData.disciplineTypeId" placeholder="安全分类" style="width:200px;">
                       <el-option v-for="item in tableList" :key="item.id"
                                  :label="item.disciplineName"
                                  :value="item.id"/>
                     </el-select>
                   </el-form-item>
+                  <el-form-item label="安全分类" v-if="placementTest" :prop="placementTest?'disciplineTypeId':''">
+                    <el-select :disabled="showType" v-model="newData.disciplineTypeId" placeholder="安全分类" style="width:200px;">
+                      <el-option v-for="item in tableList2" :key="item.id"
+                                 :label="item.disciplineName"
+                                 :value="item.id"/>
+                    </el-select>
+                  </el-form-item>
                   <el-form-item label="风险等级" prop="riskLevelId" v-if="placementTest">
                     <el-select :disabled="showType" v-model="newData.riskLevelId" placeholder="请选择" style="width:200px;">
                       <el-option v-for="item in optionRiskLevel" :key="item.levelId" :label="item.titleName"
@@ -719,6 +726,7 @@
         optionListC:[],
         optionExamType: [],
         tableList: [],
+        tableList2: [],
         optionRiskLevel: [],
         scopeList: [],
         userList: [],
@@ -1134,8 +1142,26 @@
           if (self.optionExamType[i].id == self.newData.examTypeId) {
             if (self.optionExamType[i].examTypeCode == 'CLASSIFIED') {
               self.$set(this, 'placementTest', true)
+              let num = 0;
+              for(let o=0;o<self.tableList2.length;o++){
+                if(self.newData.disciplineTypeId == self.tableList2[o].id){
+                  num++
+                }
+              }
+              if(num == 0){
+                self.$set(self.newData,'disciplineTypeId',null);
+              }
             } else {
               self.$set(this, 'placementTest', false)
+              let num = 0;
+              for(let o=0;o<self.tableList.length;o++){
+                if(self.newData.disciplineTypeId == self.tableList[o].id){
+                  num++
+                }
+              }
+              if(num == 0){
+                self.$set(self.newData,'disciplineTypeId',null);
+              }
             }
             if (self.optionExamType[i].examTypeCode == 'yzyh') {
               self.$set(this, 'yzyhTest', true)
@@ -1188,7 +1214,8 @@
         examElDisciplineTypeList({}).then(response => {
           const validCodes = ['CHEMISTRY', 'BIOLOGY', 'RADIATION', 'MECHANICAL_ELECTRICAL', 'OTHER'];
           let list = response.data.filter(item => validCodes.includes(item.disciplineTypeCode));
-          this.$set(this, 'tableList', list)
+          this.$set(this, 'tableList', response.data)
+          this.$set(this, 'tableList2', list)
         })
       },
     }

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

@@ -390,7 +390,7 @@
         margin:20px 20px;
         border-radius:10px;
         overflow: hidden;
-        box-shadow: 0 0 15px rgba(0, 0, 0, 0.4);
+        box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
         border:1px solid #dedede;
       }
       .right-max-big-box{

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

@@ -290,7 +290,7 @@
         margin:20px 20px;
         border-radius:10px;
         overflow: hidden;
-        box-shadow: 0 0 15px rgba(0, 0, 0, 0.4);
+        box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
         border:1px solid #dedede;
       }
       .right-max-big-box{

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

@@ -447,7 +447,7 @@
               margin:20px 0 0 20px;
               border-radius:6px;
               overflow: hidden;
-              box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
+              box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
               position: relative;
               img{
                 display: inline-block;

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

@@ -285,7 +285,7 @@
           margin:0 0 20px 20px;
           border-radius:6px;
           overflow: hidden;
-          box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
           position: relative;
           img{
             display: inline-block;

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

@@ -340,7 +340,7 @@
           margin:10px 0 10px 20px;
           border-radius:10px;
           overflow: hidden;
-          box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
           position: relative;
           padding:20px;
           .top-box{

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

@@ -368,7 +368,7 @@
           margin:10px 0 10px 20px;
           border-radius:10px;
           overflow: hidden;
-          box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
           position: relative;
           padding:20px;
           .title-p{

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

@@ -439,7 +439,7 @@
           margin:10px 0 10px 20px;
           border-radius:10px;
           overflow: hidden;
-          box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
           position: relative;
           padding:20px;
           .top-box{

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

@@ -375,7 +375,7 @@
               margin:0 0 20px 20px;
               border-radius:10px;
               overflow: hidden;
-              box-shadow: 4px 4px 4px 4px rgba(0,0,0,0.1);
+              box-shadow: 0 2px 8px rgba(37, 50, 74, 0.12);
               position: relative;
               border:1px solid rgba(222,222,222,0.4);
               background-color: rgba(222,222,222,0.2);

src/views/safetyEducationExaminationNew/workbench/ResourceCard.vue

@@ -37,7 +37,7 @@
         <div class="right-resource-box">
           <div class="resource-title-box">
             <p class="el-icon-edit-outline"></p>
-            <p>学习资料</p>
+            <p>题库</p>
             <p @click="goPage(2)">查看更多</p>
           </div>
           <p class="text-null-p" v-if="!topRightList[0]">暂无数据</p>

src/views/safetyEducationExaminationNew/workbench/TaskCard.vue

@@ -61,7 +61,7 @@
           <p>模拟练习</p>
           <p>刷题进度和正确率</p>
         </div>
-        <div class="bottom-content-box scrollbar-box">
+        <div class="bottom-content-box scrollbar-box" style="cursor: pointer;" @click="goPracticeQuestions()">
           <div class="bottom-big-box-6">
             <p>{{summaryData.completedCount}} / {{summaryData.totalCount}}</p>
             <p >已完成题目数 / 题库总数</p>