Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/examSystem-Anxin

src/app/ui/collection-tools-examinee/examinationQuestions.ts

@@ -29,6 +29,13 @@ export class examinationQuestionsExaminee {
         item.children = this.processingData(allFireElements,realData)
       }) :null
       this.renderData = data
+
+      //阻止 滚轮滚动事件穿透
+      window.setTimeout(()=>{
+        (document.getElementById('nodeTree') as any).onmousewheel = (e)=>{
+          e.stopPropagation();
+        }
+      }, 0)
     }
     //处理数据 将消防要素模板与真实素材结合
     processingData(allFireElements,realData){

src/app/ui/collection-tools-read/examinationQuestions.ts

@@ -29,6 +29,13 @@ export class examinationQuestionsRead {
         item.children = this.processingData(allFireElements,realData)
       }) :null
       this.renderData = data
+
+      //阻止 滚轮滚动事件穿透
+      window.setTimeout(()=>{
+        (document.getElementById('nodeTree') as any).onmousewheel = (e)=>{
+          e.stopPropagation();
+        }
+      }, 0)
     }
     //处理数据 将消防要素模板与真实素材结合
     processingData(allFireElements,realData){

src/app/ui/collection-tools/examinationQuestions.ts

@@ -55,6 +55,13 @@ export class examinationQuestions {
         })
       }
     })
+
+    //阻止 滚轮滚动事件穿透
+    window.setTimeout(()=>{
+      (document.getElementById('nodeTree') as any).onmousewheel = (e)=>{
+        e.stopPropagation();
+      }
+    }, 0)
   }