zc

src/assets/styles/index.scss

@@ -269,12 +269,12 @@ aside {
 .el-drawer__body::-webkit-scrollbar-thumb{
   border-radius: 5px;
   -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarB;
-  background: $acquiesceThemeScrollbarA;
+  background: $acquiesceThemeScrollbarB;
 }
 .el-drawer__body::-webkit-scrollbar-track{
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarA;
   border-radius: 0;
-  background: rgba(255,255,255,0);
+  background: $acquiesceThemeScrollbarA;
 }
 //提示弹窗按钮(包含登录失效)
 .el-message-box__btns{
@@ -401,12 +401,12 @@ aside {
 .w-e-text::-webkit-scrollbar-thumb{
   border-radius: 5px;
   -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarB;
-  background: $acquiesceThemeScrollbarA;
+  background: $acquiesceThemeScrollbarB;
 }
 .w-e-text::-webkit-scrollbar-track{
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarA;
   border-radius: 0;
-  background: rgba(255,255,255,0);
+  background: $acquiesceThemeScrollbarA;
 }
 //EUditor富文本编辑器
 .edui-default .edui-editor{
@@ -426,15 +426,13 @@ aside {
 }
 .scrollbar-box::-webkit-scrollbar-thumb{
   border-radius: 5px;
-  //-webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarB;
-  //background: $acquiesceThemeScrollbarA;
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
-  background: rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarB;
+  background: $acquiesceThemeScrollbarB;
 }
 .scrollbar-box::-webkit-scrollbar-track{
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarA;
   border-radius: 0;
-  background: rgba(255,255,255,0);
+  background: $acquiesceThemeScrollbarA;
 }
 //横向
 .scrollbar-x-box{
@@ -448,15 +446,13 @@ aside {
 }
 .scrollbar-x-box::-webkit-scrollbar-thumb{
   border-radius: 5px;
-  //-webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarB;
-  //background: $acquiesceThemeScrollbarA;
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
-  background: rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarB;
+  background: $acquiesceThemeScrollbarB;
 }
 .scrollbar-x-box::-webkit-scrollbar-track{
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarA;
   border-radius: 0;
-  background: rgba(255,255,255,0);
+  background: $acquiesceThemeScrollbarA;
 }
 //textarea输入框滚动条
 .el-textarea__inner{
@@ -468,13 +464,13 @@ aside {
 }
 .el-textarea__inner::-webkit-scrollbar-thumb{
   border-radius: 5px;
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
-  background: rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarB;
+  background: $acquiesceThemeScrollbarB;
 }
 .el-textarea__inner::-webkit-scrollbar-track{
-  -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
+  -webkit-box-shadow: inset 0 0 5px $acquiesceThemeScrollbarA;
   border-radius: 0;
-  background: rgba(255,255,255,0);
+  background: $acquiesceThemeScrollbarA;
 }
 
 //监控视频

src/views/safetyEducationExam/safeLearning/el_course/assessmentPreview.vue

@@ -126,7 +126,7 @@ import { examElChapterQueryChapterQu } from "@/api/safetyEducationExam/index";
     flex:1;
     display: flex;
     flex-direction: column;
-    overflow-y: scroll;
+    overflow: hidden;
     *{
       margin:0;
       padding:0;
@@ -134,6 +134,9 @@ import { examElChapterQueryChapterQu } from "@/api/safetyEducationExam/index";
       color:#333;
     }
     .course-info{
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
       .name-p{
         color:#333;
         font-size:18px;
@@ -177,7 +180,6 @@ import { examElChapterQueryChapterQu } from "@/api/safetyEducationExam/index";
     }
     .center-info-box{
       flex:1;
-      overflow-y: scroll;
       padding:20px;
       .for-max-box{
         margin-top:40px;

src/views/safetyEducationExam/safeLearning/el_course/edit.vue

@@ -118,14 +118,14 @@
                             v-if="chapterData.chapterData">
                 <el-switch
                   v-model="chapterData.isAssess"
-                  :active-value="1"
-                  :inactive-value="0">
+                  :active-value="true"
+                  :inactive-value="false">
                 </el-switch>
               </el-form-item>
               <p style="flex:1;"></p>
               <el-button type="primary" style="margin:20px 20px 0 20px;" @click="edit_el_chapterClick">保存</el-button>
             </div>
-            <div class="exercise-title-max-box" v-if="chapterData.isAssess == 1">
+            <div class="exercise-title-max-box" v-if="chapterData.isAssess">
               <el-form-item label="考核名称" prop="assessName" label-width="100px">
                 <el-input
                   style="width:300px;"
@@ -837,7 +837,7 @@
         } else if (this.chapterData.type == 5) {
           this.getRichText()
         }
-        if (this.chapterData.isAssess == 1) {
+        if (this.chapterData.isAssess) {
           this.getQueryChapterQu(this.chapterData.id)
         }
         this.countTheNumberOfQuestions()
@@ -904,16 +904,16 @@
         this.$refs['chapterForm'].validate(valid => {
           if (valid) {
             if (this.chapterData.chapterData) {
-              if (self.chapterData.isAssess == 1 && !self.chapterData.exerciseList) {
+              if (self.chapterData.isAssess && !self.chapterData.exerciseList) {
                 this.msgError('请添加题目或关闭课后考核')
                 return
               }
-              if (self.chapterData.isAssess == 1 && !self.chapterData.exerciseList[0]) {
+              if (self.chapterData.isAssess && !self.chapterData.exerciseList[0]) {
                 this.msgError('请添加题目或关闭课后考核')
                 return
               }
               let list = []
-              if (self.chapterData.isAssess == 1 && self.chapterData.exerciseList) {
+              if (self.chapterData.isAssess && self.chapterData.exerciseList) {
                 for (let i = 0; i < self.chapterData.exerciseList.length; i++) {
                   let minObj = {
                     quId: self.chapterData.exerciseList[i].quId