v1

config.js

@@ -4,8 +4,8 @@
 
 // 服务地址
 // const IP = 'https://www.easy-mock.com/mock/5b70ec93ad23a1570071a34e/Interview'; // easymock
-const IP = 'http://192.168.0.116:8077';
-const WS = '192.168.0.116:8077';
+const IP = 'http://192.168.0.112:8077';
+const WS = '192.168.0.112:8077';
 
 
 // 请求目标服务器域名配置

src/components/dial/newApply.vue

@@ -59,8 +59,11 @@ export default {
                 techId: b
             }
             this.$server.postMidify(obj).then(res => {
-                console.log('postMidify',res.data);
+                console.log('postMidify',res);
                 this.$emit('on-close');
+                console.log(this.$parent)
+                this.$emit('on-project');
+
             }).catch(err => {
                 console.log(err)
                 this.$message.error('请求失败')

src/views/labSystem.vue

 <!-- XClab系统页面 -->
-
 <template>
     <div class="labsystem">
         <div class="labContent">
@@ -14,8 +13,7 @@
                     <div class="themeOne-context">
                         <el-row :gutter="24">
                             <el-col :offset="1" :span="11">
-
-                                <div>项目路径： <span @click="openAnother(path)">{{path}}</span></div>
+                                <div>项目路径： <span class="themeOne-pint" @click="openAnother(path)"> <i>{{path}}</i> </span></div>
                             </el-col>
                             <el-col :offset="1" :span="11">
                                 <div>gitlab地址： <span>{{gitPath}}</span> </div>
@@ -116,15 +114,12 @@
                     <div class="themeFour-context">
                         <!--<div v-if="logData.length === 0" class="logNone">暂无数据</div>-->
                         <div class="logData">
-                            <el-scrollbar ref="elscroll" style="height:100%;">
-                                <!--<div ref="logDiv" id="logDiv">-->
-                                <!--<ul ref="logUl">-->
-                                    <!--<li class="logLi" v-for="(item,index) in logData" :key="index">{{item}}</li>-->
-                                    <!--<li>{{logData}}</li>-->
-                                <!--</ul>-->
-                                <textarea name="" id="" cols="30" rows="10">{{logData}}</textarea>
-                                <!--</div>-->
-                            </el-scrollbar>
+                            <!--<el-scrollbar ref="myScrollbar" class="myScrollbar"  style="height: 38vh">-->
+                                <textarea  ref="myScrollbar"  class="logTextarea">
+                                    {{logData}}
+                                </textarea>
+                            <!--</el-scrollbar>-->
+
                         </div>
 
                     </div>
@@ -133,7 +128,7 @@
         </div>
         <!--重新申请弹窗-->
         <el-dialog :visible.sync="applyModal" width="0%" >
-            <newApply :val="applyMessage" :applyId="applyId"  @on-close="reset()"></newApply>
+            <newApply :val="applyMessage" :applyId="applyId" @on-project="newProject()" @on-close="reset()"></newApply>
             <img src="../assets/img/close.png" class="closeModel" @click="reset()">
         </el-dialog>
 
@@ -246,8 +241,8 @@ export default {
         },
         // 打开项目路径链接新页面
         openAnother(val) {
-            console.log(val)
-            window.open(this.val, '_blank').location;
+            // console.log(val)
+            window.open(val, '_blank').location;
         },
         // 部署
         deploy() {
@@ -261,6 +256,7 @@ export default {
         },
         // websocket
         copyWebsocket(val) {
+            var that = this;
             // Create WebSocket connection.
             // console.log('this.jenkinsName2121',this.jenkinsName)
             // const socket = new WebSocket('ws://' + baseUrl.WS_CONT + '/webServer/${this.jenkinsName}');
@@ -272,10 +268,18 @@ export default {
             // Listen for messages
             socket.addEventListener('message', function (event) {
                 // console.log('Message from server ', event.data);
-                this.logData = event.data
-                // logData: event.data
-                console.log('this.logData', this.logData)
+                that.logData += event.data
+                // console.log('this.logData777', that.logData)
             });
+        },
+        scrollDown() {  // 滚动条置低
+            // this.$refs['myScrollbar'].wrap.scrollTop = this.$refs['myScrollbar'].wrap.scrollHeight
+            let t = document.getElementsByTagName("textarea")[0];
+            t.scrollTop = t.scrollHeight;
+        },
+        newProject(){
+            console.log(1)
+            this.getProject();
         }
     },
     // 监听属性 类似于data概念
@@ -296,7 +300,9 @@ export default {
     // 生命周期 - 更新之前
     beforeUpdate () {},
     // 生命周期 - 更新之后
-    updated () {},
+    updated () {
+        this.scrollDown()
+    },
     // 生命周期 - 销毁之前
     beforeDestroy () {},
     // 生命周期 - 销毁完成
@@ -316,6 +322,7 @@ export default {
     .labContent {
         width: 100%;
         background: #fff;
+        height: 163vh;
     }
     .labContent-title p {
         font-size: 24px;
@@ -407,6 +414,16 @@ export default {
         content: url("../assets/img/refreshh.png");
     }
     /* 二级标题样式可以重复使用 */
+
+    .themeOne-pint {
+        cursor: pointer;
+        color: blue !important;
+    }
+    .themeOne-pint  i {
+        display: inline-block;
+        height: 30px;
+        border-bottom: 1px solid blue;
+    }
     .themeOne >>> div span {
         color: #333;
         display: inline-block;
@@ -502,8 +519,9 @@ export default {
         color: #4877e6;
     }
     .logData{
+        width: 100%;
         margin: 0 10px;
-        height: 24vh;
+        height: 39vh;
         overflow-y: auto;
     }
     .logLi{
@@ -514,4 +532,33 @@ export default {
         border-bottom: 3px dotted rgba(3,110,183, 0.2);
         word-wrap:break-word;
     }
+    .el-textarea {
+        width: 95%;
+    }
+    .themeFour-context {
+        padding: 8px 2px 0 10px;
+        height: 40vh;
+    }
+    .myScrollbar {
+        /*overflow-x: auto;*/
+        /*width: 98%;*/
+    }
+    .el-scrollbar__wrap {overflow-x:hidden;}
+
+    .myScrollbar >>> .el-scrollbar__wrap { overflow: scroll; width: 101%; height: 120%; }
+
+    .logTextarea {
+        width: 99%;
+        height: 38vh;
+        overflow-x: hidden;
+        border: none;
+        resize:none;
+
+    }
+    .logTextarea:focus {
+        outline: none;
+    }
+    .logData >>> textarea {
+        Scrollbar-Arrow-Color: red;
+    }
 </style>
\ No newline at end of file