Merge branch 'jiakewei' into 'master'

添加成功和错误的提示图标



See merge request !25

src/views/docker/envDetail.vue

@@ -36,15 +36,15 @@
           :index="indexMethod"
           type="index"/>
         <el-table-column
-          v-if="serviceName!=='rabbitmq'"
-          label="服务名">
+          prop="serviceName"
+          label="服务名"
+        >
           <template slot-scope="scope">
-            <span v-if="scope.row.serviceName !== 'rabbitmq'">{{ scope.row.serviceName }}</span>
-            <span v-if="scope.row.serviceName === 'rabbitmq'" class="link-type" @click="openRabbitmq(scope.row)">{{ scope.row.serviceName }}</span>
+            <i v-if="scope.row.status == 'Normal'" class="el-icon-success" style="color: #67c23a"/>
+            <i v-else class="el-icon-error" style="color: #f56c6c"/>
+            <span>{{ scope.row.serviceName }}</span>
           </template>
-
         </el-table-column>
-
         <el-table-column
           prop="lanIp"
           label="ip地址"
@@ -54,7 +54,7 @@
           label="服务端口"
           width="300px">
           <template slot-scope="scope">
-            <span v-for="item in scope.row.portMappings" :key="item.port" >{{ item.nodePort }}->{{ item.port }} </span>
+            <span v-for="item in scope.row.portMappings" :key="item.port" class="port">{{ item.nodePort }} -> {{ item.port }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -113,6 +113,8 @@
           label="服务名"
         >
           <template slot-scope="scope">
+            <i v-if="scope.row.status == 'Normal'" class="el-icon-success" style="color: #67c23a"/>
+            <i v-else class="el-icon-error" style="color: #f56c6c"/>
             <span class="link-type" @click="handleDetail(scope.row)">{{ scope.row.serviceName }}</span>
           </template>
         </el-table-column>
@@ -137,14 +139,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="item._id==='java'"
           label="调试">
-          <template slot-scope="scope">
-            <span v-if="scope.row.serviceType==='NodePort'">{{ scope.row.lanIp }}:{{ scope.row.portMappings[1].nodePort }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="控制台" placement="top">
               <el-button type="primary" icon="el-icon-tickets" circle @click="linkShell(scope.row)"/>
@@ -471,11 +466,6 @@ export default {
       //   window.open(`http://${url}/`, '_blank')
       // })
     },
-    openRabbitmq(data) {
-      console.log(data)
-      const port = data.portMappings.filter(item => item.port === 15672)[0].nodePort
-      window.open(`http://${data.lanIp}:${port}/`, '_blank')
-    },
     getServiceDetails(value) {
       fetchServiceDetails({ serviceName: value.serviceName, namespace: this.namespace }).then(res => {
         this.centerDialogVisible = true