合并分支 'lxq' 到 'master'

src/router/index.js

@@ -13,7 +13,7 @@ const routes = [
         children: [
             {
                 path: '/home',
-                name: 'home',
+                name: 'Home',
                 // route level code-splitting
                 // this generates a separate chunk (about.[hash].js) for this route
                 // which is lazy-loaded when the route is visited.

src/views/labSystem.vue

@@ -128,7 +128,7 @@
         </div>
         <!--重新申请弹窗-->
         <el-dialog :visible.sync="applyModal" width="0%" >
-            <newApply :val="applyMessage" :applyId="applyId" @on-project="newProject()" @on-close="reset()"></newApply>
+            <newApply :val="applyMessage" :applyId="applyId" :osId="osId" @on-project="newProject()" @on-close="reset()"></newApply>
             <img src="../assets/img/close.png" class="closeModel" @click="reset()">
         </el-dialog>
 
@@ -167,7 +167,8 @@ export default {
             pathSuffix: '', // 链接
             jenkinsName: '', // webstock
             logData:'', // 日志
-            data: ''
+            data: '',
+            osId: ''
         };
     },
     // 方法集合
@@ -205,6 +206,7 @@ export default {
                 console.log(res.data);
                 this.applyMessage = res.data
                 this.applyId = this.id
+                this.osId = this.os.id
                 // console.log('77777',this.applyId)
             }).catch(err => {
                 // console.log(err)