Merge branch 'tag' into 'master'

其他服务增加tag显示



See merge request !19

src/filters/index.js

@@ -42,6 +42,7 @@ export function toThousandFilter(num) {
 }
 export function formatStatus(tsatus) {
   switch (tsatus) {
+    case 'Active':
     case 'Normal':
       return '正常'
     case 'Abnormal' :
@@ -62,3 +63,8 @@ export function formatImages(images) {
   return images.replace('ccr.ccs.tencentyun.com/qa-base/', '')
 }
 
+export function filterTag(image) {
+  const arr = image.split(':')
+  return (arr && arr[1]) || ''
+}
+

src/views/docker/envDetail.vue

@@ -46,14 +46,14 @@
         </el-table-column>
         <el-table-column
           prop="image"
-          label="镜像版本">
+          label="镜像">
           <template slot-scope="scope">
             {{ scope.row.image | formatImages }}
           </template>
         </el-table-column>
         <el-table-column
           prop="createdAt"
-          label="日期"
+          label="创建时间"
         />
         <el-table-column
           prop="status"
@@ -103,8 +103,17 @@
             <span class="link-type" @click="handleDetail(scope.row)">{{ scope.row.serviceName }}</span>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="image"
+          label="镜像"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.image | filterTag }}
+          </template>
+        </el-table-column>
         <el-table-column
           prop="createdAt"
+          width="100"
           label="创建时间"
         />
         <el-table-column

src/views/docker/runingEnv.vue

@@ -25,11 +25,16 @@
         </el-table-column>
         <el-table-column
           prop="createdAt"
-          label="日期"
+          label="创建时间"
         />
         <el-table-column
           prop="status"
-          label="运行状态"/>
+          label="运行状态"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.status | formatStatus }}
+          </template>
+        </el-table-column>
         <el-table-column
           prop="description"
           label="描述信息"/>