Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-web

src/views/gasManage3_0/manage/labCenterPerson/labCenterPersonAdd.vue

@@ -93,7 +93,7 @@ export default {
           console.log(_this.laboratoryOptions[i].nickName)
           _this.dynamicTags.push(_this.laboratoryOptions[i].nickName);
           let item=_this.laboratoryOptions[i]
-          _this.flowDetailList.push({'userNumber':item.userName,'userIds':item.userId,'userName':item.nickName,'userTelephone':item.phonenumber,'deptIds':item.deptId,'deptNames':item. deptName,})
+          _this.flowDetailList.push({'userNumber':item.userName,'userId':item.userId,'userName':item.nickName,'userTelephone':item.phonenumber,'deptId':item.deptId,'deptName':item. deptName,})
         }
       }
     },

src/views/safetyEducationExam/safeLearning/safeLearning/assessInfo.vue

@@ -75,200 +75,204 @@
 </template>
 
 <script>
-  import { assessDetail } from "@/api/exam/el_course";
-  export default {
-    name: 'assessInfo',
-    props:{
-      paperId:{},
-      cateTitle:{},
-      assessName:{},
-      correctNum:0,
-      mistakeNum:0,
-    },
-    data() {
-      return {
-        newData:{
-          name:"考核名称",
-          title:"章节名称章节名称章节名称章节名称章节名称章节名称",
-          total:10,
-          single:5,
-          multiple:2,
-          judge:3,
-          type:1,
-        }
+import { assessDetail } from "@/api/exam/el_course";
+export default {
+  name: 'assessInfo',
+  props:{
+    paperId:{},
+    cateTitle:{},
+    assessName:{},
+    correctNum:0,
+    mistakeNum:0,
+  },
+  data() {
+    return {
+      newData:{
+        name:"考核名称",
+        title:"章节名称章节名称章节名称章节名称章节名称章节名称",
+        total:10,
+        single:5,
+        multiple:2,
+        judge:3,
+        type:1,
       }
-    },
-    created(){
+    }
+  },
+  created(){
 
+  },
+  mounted(){
+    this.getInfo();
+  },
+  methods:{
+    //返回
+    backPage(){
+      this.$parent.offMinPage();
     },
-    mounted(){
-      this.getInfo();
-    },
-    methods:{
-      //返回
-      backPage(){
-        this.$parent.offMinPage();
-      },
-      getInfo(){
-        this.loading = true;
-        assessDetail(this.paperId).then( response => {
-          this.newData =  response.data;
-          let correct = 0;
-          let mistake = 0;
-          for(let i=0;i<response.data.radioList.length;i++){
-            if(response.data.radioList[i].isRight == 1){
-              correct ++;
-            }else{
-              mistake ++;
-            }
+    getInfo(){
+      this.loading = true;
+      assessDetail(this.paperId).then( response => {
+        this.newData =  response.data;
+        let correct = 0;
+        let mistake = 0;
+        for(let i=0;i<response.data.radioList.length;i++){
+          if(response.data.radioList[i].isRight == 1){
+            correct ++;
+          }else{
+            mistake ++;
           }
-          for(let i=0;i<response.data.multiList.length;i++){
-            if(response.data.multiList[i].isRight == 1){
-              correct ++;
-            }else{
-              mistake ++;
-            }
+        }
+        for(let i=0;i<response.data.multiList.length;i++){
+          if(response.data.multiList[i].isRight == 1){
+            correct ++;
+          }else{
+            mistake ++;
           }
-          for(let i=0;i<response.data.judgeList.length;i++){
-            if(response.data.judgeList[i].isRight == 1){
-              correct ++;
-            }else{
-              mistake ++;
-            }
+        }
+        for(let i=0;i<response.data.judgeList.length;i++){
+          if(response.data.judgeList[i].isRight == 1){
+            correct ++;
+          }else{
+            mistake ++;
           }
-          this.correctNum = correct;
-          this.mistakeNum = mistake;
-          this.loading = false;
-        });
-      },
-    }
+        }
+        this.correctNum = correct;
+        this.mistakeNum = mistake;
+        this.loading = false;
+      });
+    },
   }
+}
 </script>
 
 <style scoped lang="scss">
-  .assessInfo{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    *{
-      margin:0;
-      padding:0;
-      font-weight:500;
+.assessInfo{
+  flex:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  *{
+    margin:0;
+    padding:0;
+    font-weight:500;
+  }
+  .top-name-max-box{
+    padding:20px 20px 0;
+    .top-name-box{
+      font-size:18px;
+      line-height:40px;
+      font-weight:700;
     }
-    .top-name-max-box{
-      padding:20px 20px 0;
-      .top-name-box{
-        font-size:18px;
-        line-height:40px;
-        font-weight:700;
+    .top-title-box{
+      font-size:18px;
+      line-height:40px;
+    }
+    .top-num-max-box{
+      display: flex;
+      margin:10px 0;
+      div{
+        background: #f0f0f0;
+        padding:15px 20px;
+        font-size:14px;
       }
-      .top-title-box{
+    }
+    .top-text-box{
+      font-size:16px;
+      line-height:40px;
+      padding-bottom:10px;
+      border-bottom:2px dashed #dedede;
+    }
+    .top-text-box-color-a{
+      color:#14AE10;
+    }
+    .top-text-box-color-b{
+      color:#FF6666;
+    }
+  }
+  .center-info-box{
+    flex:1;
+    overflow-y: scroll;
+    padding:0 20px 20px;
+    .for-max-box{
+      padding-top:20px;
+      .for-title-p{
         font-size:18px;
-        line-height:40px;
+        font-weight:700;
       }
-      .top-num-max-box{
-        display: flex;
-        margin:10px 0;
-        div{
-          background: #f0f0f0;
-          padding:15px 20px;
-          font-size:14px;
+      .for-box{
+        margin-top:20px;
+        .for-name-box{
+          display: flex;
+          p:nth-child(1){
+            font-size:12px;
+            line-height:20px;
+            width:40px;
+            height: 20px;
+            background: #0E9EED;
+            margin:1px 10px;
+            color:#fff;
+            text-align: center;
+            border-radius:4px;
+          }
+          p:nth-child(2){
+            flex: 1;
+            font-size:18px;
+            font-weight:700;
+            line-height: 18px;
+          }
         }
-      }
-      .top-text-box{
-        font-size:16px;
-        line-height:40px;
-        padding-bottom:10px;
-        border-bottom:2px dashed #dedede;
-      }
-      .top-text-box-color-a{
-        color:#14AE10;
-      }
-      .top-text-box-color-b{
-        color:#FF6666;
-      }
-    }
-    .center-info-box{
-      flex:1;
-      overflow-y: scroll;
-      padding:0 20px 20px;
-      .for-max-box{
-        padding-top:20px;
-        .for-title-p{
-          font-size:18px;
-          font-weight:700;
+        .for-min-p{
+          margin:20px 0 0 60px;
+          display: flex;
+          img{
+            margin-right:20px;
+            width: 20px;
+            height: 20px;
+          }
+          p{
+            line-height:20px;
+          }
         }
-        .for-box{
-          margin-top:20px;
-          .for-name-box{
-            display: flex;
-            p:nth-child(1){
-              font-size:12px;
-              line-height:16px;
-              width:40px;
-              background: #0E9EED;
-              margin:1px 10px;
-              color:#fff;
-              text-align: center;
-              border-radius:4px;
-            }
-            p:nth-child(2){
-              font-size:18px;
-              font-weight:700;
-              line-height: 18px;
-            }
+        .for-bottom-text-box{
+          margin:20px 60px;
+          display: flex;
+          width:400px;
+          padding:15px 20px;
+          border:1px solid #dedede;
+          p{
+            font-size:16px;
+            text-align: center;
           }
-          .for-min-p{
-            margin:20px 0 0 50px;
-            display: flex;
-            img{
-              margin-right:20px;
-            }
-            p{
-              line-height:20px;
-            }
+          p:nth-child(1){
+            font-size:16px;
+            width:80px;
+            margin-right:20px;
+            font-weight:700;
           }
-          .for-bottom-text-box{
-            margin:20px 50px;
-            display: flex;
-            width:400px;
-            padding:15px 20px;
-            border:1px solid #dedede;
-            p{
-              font-size:16px;
-              text-align: center;
-            }
-            p:nth-child(1){
-              font-size:16px;
-              width:80px;
-              margin-right:20px;
-              font-weight:700;
-            }
-            p:nth-child(2){
-              font-size:16px;
-              span{
-                margin-right:10px;
-              }
-            }
-            .p-color-a{
-              color:#FF4E00;
-            }
-            .p-color-b{
-              color:#0183FA
+          p:nth-child(2){
+            font-size:16px;
+            span{
+              margin-right:10px;
             }
           }
+          .p-color-a{
+            color:#FF4E00;
+          }
+          .p-color-b{
+            color:#0183FA
+          }
         }
       }
     }
-    .bottom-button-box{
-      height:100px;
-      .bottom-button-p{
-        width:200px;
-        line-height:40px;
-        font-size:18px;
-        margin:30px auto;
-      }
+  }
+  .bottom-button-box{
+    height:100px;
+    .bottom-button-p{
+      width:200px;
+      line-height:40px;
+      font-size:18px;
+      margin:30px auto;
     }
   }
+}
 </style>