应用调试

package.json

@@ -31,7 +31,10 @@
     "vue-i18n": "^8.17.7",
     "vue-resource": "^1.5.1",
     "vue-router": "^3.0.2",
-    "vuex": "^3.1.0"
+    "vuex": "^3.1.0",
+    "xterm": "^4.7.0",
+    "xterm-addon-fit": "^0.4.0",
+    "yaml2json": "^1.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.4.0",

src/components/apass-dialog.vue

@@ -34,6 +34,7 @@
           type="primary"
           size="mini"
           v-text="sunbmitText || '确定'"
+          :disabled="submitDisable"
           @click="dialogSubmit"
         >
         </el-button>
@@ -66,6 +67,10 @@ export default {
       type: String,
       default: () => "",
     },
+    submitDisable: {
+      type: Boolean,
+      default: () => false,
+    },
     submit: {
       type: Function,
       default: () => null,

src/components/apass-table.vue

 <template>
   <div class="apass_table">
-    <el-table :data="data" :height="height">
+    <el-table :data="data">
       <el-table-column v-if="paddingLeft > 10" :width="paddingLeft - 10"></el-table-column>
       <el-table-column
         v-for="(item, index) in header"
@@ -44,7 +44,10 @@
             ></a>
           </div>
           <div v-else-if="item.type === 'icon'">
-            <img src="../assets/imgs/btn_off_hov.png" alt="" v-if="scope.row[item.prop]==1" style="width:100%;height:100%;">
+            <img src="../assets/imgs/ic_true.png" alt="" v-if="scope.row[item.prop]==1" style="width:100%;height:100%;">
+            <img src="../assets/imgs/ic_yiwancheng.png" alt="" v-if="scope.row[item.prop]==2" style="width:100%;height:100%;">
+            <img src="../assets/imgs/ic_restart.png" alt="" v-if="scope.row[item.prop]==3" style="width:100%;height:100%;">
+            <img src="../assets/imgs/ic_failed.png" alt="" v-if="scope.row[item.prop]==4" style="width:100%;height:100%;">
           </div>
           <div v-else-if="item.type === 'tag'" class="table_tag">
             <el-tag
@@ -52,8 +55,8 @@
               :key="index+5515">
               {{ item }}
             </el-tag>
-            <div class="tagclo" v-if="tag_flag_arr[scope.$index]==0&&scope.row[item.prop].length>2" @click="change_tag(scope.$index,1)">下</div>
-            <div class="tagclo" v-if="tag_flag_arr[scope.$index]==1&&scope.row[item.prop].length>2" @click="change_tag(scope.$index,0)">上</div>
+            <div class="tagclo btn_down" v-if="tag_flag_arr[scope.$index]==0&&scope.row[item.prop].length>2" @click="change_tag(scope.$index,1)"></div>
+            <div class="tagclo btn_up" v-if="tag_flag_arr[scope.$index]==1&&scope.row[item.prop].length>2" @click="change_tag(scope.$index,0)"></div>
           </div>
           <div v-else-if="item.type === 'chart'" class="charts">
             <sparkline :indicatorStyles="spIndicatorStyles1">
@@ -174,6 +177,14 @@ export default {
   text-align: center;
   line-height: 22px;
   cursor: pointer;
+  background-size: contain;
+  margin-top: -3px;
+}
+.btn_down{
+  background-image: url('../assets/imgs/btn_expand.png');
+}
+.btn_up{
+  background-image: url('../assets/imgs/btn_fold.png');
 }
 .charts{
   position: relative;

src/components/service-header.vue

 <template>
   <div class="info_logo">
     <div class="logo">
-      <img :src="data.url" alt="">
+      <img :src="data.url" alt="" />
     </div>
     <div class="info">
       <p class="info_title">
         <span>{{ data.name }}</span>
-        <span class="bs" v-if="data.aqdetail" @click="subevent(0)">一键部署</span>
-        <span class="info_fix" v-if="data.fxdetail" @click="subevent(1)">我要编辑</span>
-        <span class="info_fix" v-if="data.yydebugger" @click="subevent(5)">应用调试</span>
-        <span class="right gap" v-if="data.yydetail||data.xxdetail||data.yydev">|</span>
-        <span class="right underline" v-if="data.xxdetail" @click="subevent(2)" title="申请下线至开发者应用">{{data.xxdetail}}</span>
-        <span class="right undersell" v-if="data.yydetail" @click="subevent(3)">{{data.yydetail}}</span>
-        <span class="right undersell undermy" v-if="data.bsdetail" @click="subevent(4)">申请密钥</span>
-        <span class="info_fix" v-if="data.fixed" @click="goto_page(data.fixedurl)">我要修改</span>
-        <span class="info_fix" v-if="data.yydev" @click="subevent(6)">应用开发</span>
+        <span class="bs" v-if="data.aqdetail" @click="subevent(0)"
+          >一键部署</span
+        >
+        <span class="info_fix" v-if="data.fxdetail" @click="subevent(1)"
+          >我要编辑</span
+        >
+        <span class="info_fix" v-if="data.yydebugger" @click="subevent(5)"
+          >应用调试</span
+        >
+        <span
+          class="right gap"
+          v-if="data.yydetail || data.xxdetail || data.yydev"
+          >|</span
+        >
+        <span
+          class="right underline"
+          v-if="data.xxdetail"
+          @click="subevent(2)"
+          title="申请下线至开发者应用"
+          >{{ data.xxdetail }}</span
+        >
+        <span
+          class="right undersell"
+          v-if="data.yydetail"
+          @click="subevent(3)"
+          >{{ data.yydetail }}</span
+        >
+        <span
+          class="right undersell undermy"
+          v-if="data.bsdetail"
+          @click="subevent(4)"
+          >申请密钥</span
+        >
+        <span
+          class="info_fix"
+          v-if="data.fixed"
+          @click="goto_page(data.fixedurl)"
+          >我要修改</span
+        >
+        <span class="info_fix" v-if="data.yydev" @click="subevent(6)"
+          >应用开发</span
+        >
       </p>
       <div class="info_detail">
         <p>
@@ -35,7 +68,9 @@
               :href="item.text"
               >{{ item.text }}</a
             >
-            <span v-else  :style="item.color ? { color: item.color } : {}">{{ item.text }}</span>
+            <span v-else :style="item.color ? { color: item.color } : {}">{{
+              item.text
+            }}</span>
           </label>
         </p>
       </div>
@@ -73,7 +108,7 @@ export default {
               this.$emit('applymy')
           }else if(val == 5){
               // /yygl/:level/:type/appdebugger/:deploy_id
-              this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/appdebugger/111`)
+              this.$emit('debuggerfunc')
           }else if(val == 6){
               this.$emit('applymy')
           }
@@ -100,7 +135,7 @@ export default {
   background-size: cover;
   text-align: center;
 }
-.logo img{
+.logo img {
   width: 100%;
 }
 .info {
@@ -128,7 +163,7 @@ export default {
   cursor: pointer;
   float: right;
 }
-.bs{
+.bs {
   display: inline-block;
   width: 76px;
   height: 32px;
@@ -143,12 +178,12 @@ export default {
   border: solid 2px #a5afd6;
   color: #0f2683;
 }
-.gap{
+.gap {
   color: #b4c0f5;
   margin: 0 10px;
   line-height: 30px;
 }
-.underline{
+.underline {
   width: 76px;
   height: 32px;
   background-color: #f6f7fb;
@@ -161,7 +196,7 @@ export default {
   text-align: center;
   margin-left: 10px;
 }
-.undersell{
+.undersell {
   width: 76px;
   height: 32px;
   background-color: #0f2683;
@@ -173,7 +208,7 @@ export default {
   cursor: pointer;
   text-align: center;
 }
-.undermy{
+.undermy {
   background-color: #515fe7;
   color: #e6ebfe;
 }
@@ -193,7 +228,7 @@ export default {
   font-weight: 600;
   margin-right: 48px;
 }
-.right{
+.right {
   float: right;
 }
 </style>

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -5,7 +5,7 @@
       <span>应用详情</span>
     </p> 
     <div class="info_contain">
-      <service-header :data="service_header_arr" ></service-header>
+      <service-header :data="service_header_arr" @debuggerfunc="debuggerfunc"></service-header>
       <div class="type_box">
         <div class="type_title">
           <div
@@ -234,6 +234,7 @@ export default {
       oldpag_name: "镜像文件002.rar",
       imgList: [],
       imgList1: [],
+      header_data:"",
       service_list_arr:[
         {
           service:'cemplat-api1',
@@ -635,6 +636,9 @@ export default {
     online(val) {
       console.log(val);
     },
+    debuggerfunc(){
+      this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/appdebugger?namespace=${this.header_data.namespace}&app=${this.header_data.deploy_name}`)
+    },
     getImageInfo() {
       this.$http
         .get("./static/deployappdetail.json")
@@ -735,6 +739,7 @@ export default {
         .get(`/apaas/hubApi/market/deployInfo/${this.$route.params.deploy_id}`)
         .then(response => {
           let data = response.data.data;
+          this.header_data = data
           this.$set(
             this.service_header_arr,
             "name",

src/router/index.js

@@ -98,11 +98,17 @@ export default new Router({
                 import("@/pages/workbench/yygl/deploy_app_detail"),
             },
             {
-              path: "/yygl/:level/:type/appdebugger/:deploy_id", // 我部署的应用详情-应用调试
+              path: "/yygl/:level/:type/appdebugger", // 我部署的应用详情-应用调试
               name: "app_debugger",
               component: () =>
                 import("@/pages/workbench/yygl/app_debugger"),
             },
+            {
+              path: "/yygl/:level/:type/appdebuggerdetail/:deploy_id", // 我部署的应用详情-应用调试-详情
+              name: "app_debugger_detail",
+              component: () =>
+                import("@/pages/workbench/yygl/app_debugger_detail"),
+            },
             {
               path: "/yygl/:level/:type/applydetail/:id/:app_id", // 我申请的应用详情
               name: "apply_app_detail",