Merge remote-tracking branch 'origin/master'

src/views/xjc-integratedmachine/components/head_component.vue

@@ -53,10 +53,8 @@
     function contrastTo(){
       let contrastList = [];
       if(props.headinfo.contrastType === 'major'){
-        console.log("major")
          contrastList = JSON.parse(sessionStorage.getItem('majorList'));
       }else if(props.headinfo.contrastType === 'university'){
-        console.log("university")
          contrastList = JSON.parse(sessionStorage.getItem('contrastList'));
       }
       if(contrastList && contrastList.length <= 2 ){

src/views/xjc-integratedmachine/environment/contrast_university.vue

@@ -793,7 +793,7 @@ p, div {
 
             td:nth-child(3) {
               width: 620px;
-              height: 760px;
+              height: 770px;
               background: #FFFFFF;
               border-radius: 4px 4px 4px 4px;
               border-bottom: 8px solid #E0EEF4;

src/views/xjc-integratedmachine/environment/index.vue

@@ -36,6 +36,7 @@ function setHeadinfo(){
     },
     backUrl : '/index',
     isHome:true,
+    backUrlUse:true,
   }
 }
 
@@ -45,7 +46,6 @@ function jumpTo(path) {
     path: path,
     query: {name: 123}
   })
-  console.log('----')
 }
 onMounted(() => {
   setHeadinfo()