From c78ca4c8825dfb579ec3f1ab0bea86582d65b232 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Tue, 14 Jul 2020 17:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app-list/app-card.vue              | 15 +++++++++------
 .../organization-list/organization-card.vue       |  3 ++-
 src/pages/workbench/yygl/yyglList.vue             |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/app-list/app-card.vue b/src/components/app-list/app-card.vue
index ef20ea2..f0fbdd7 100644
--- a/src/components/app-list/app-card.vue
+++ b/src/components/app-list/app-card.vue
@@ -3,7 +3,7 @@
     <a class="remove_btn" @click.prevent="deleteAction">
       <i class="el-icon-close"></i>
     </a>
-    <div class="app_card-icon">
+    <div class="app_card-icon" @click="intoDetail">
       <el-avatar shape="square" :size="56" fit="cover" :src="data.logo" />
     </div>
     <div class="app_card-info">
@@ -27,15 +27,14 @@
         <i class="el-icon-time"></i>
         <span>上线时间：</span>
       </span>
-      <span
-        class="text_clip"
-        v-text="data.created && data.created.substring(0, 10)"
-      ></span>
+      <span class="text_clip" v-text="getTimeText(data.created || '')"></span>
     </p>
   </div>
 </template>
 
 <script>
+import helper from "@/services/helper.js";
+
 export default {
   props: {
     data: {
@@ -52,6 +51,9 @@ export default {
     },
   },
   methods: {
+    getTimeText(time) {
+      return helper.dateStringTransform(time);
+    },
     deploymentAction() {
       this.$emit("deployment-action", this.data);
     },
@@ -62,7 +64,7 @@ export default {
       this.$router.push(
         `${this.detailsUrl}${
           this.cardType == 0
-            ? this.data.app_id+`?source=${this.data.source}`
+            ? this.data.app_id + `?source=${this.data.source}`
             : this.data.deploy_id + `?app_id=${this.data.app_id}`
         }`
       );
@@ -97,6 +99,7 @@ export default {
 }
 .app_card > .app_card-icon {
   margin-right: 18px;
+  cursor: pointer;
 }
 .app_card > .app_card-info {
   width: calc(100% - 56px - 20px);
diff --git a/src/components/organization-list/organization-card.vue b/src/components/organization-list/organization-card.vue
index 3381adf..a95dab7 100644
--- a/src/components/organization-list/organization-card.vue
+++ b/src/components/organization-list/organization-card.vue
@@ -3,7 +3,7 @@
     <a class="remove_btn" @click.prevent="deleteAction" v-if="!hideDelete">
       <i class="el-icon-close"></i>
     </a>
-    <div class="organization_card-icon">
+    <div class="organization_card-icon" @click="intoDetail">
       <el-avatar
         shape="square"
         :size="56"
@@ -100,6 +100,7 @@ export default {
 }
 .organization_card > .organization_card-icon {
   margin-right: 18px;
+  cursor: pointer;
 }
 .organization_card > .organization_card-info {
   width: calc(100% - 56px - 20px);
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index 5a582c8..c865eb1 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -915,7 +915,7 @@ export default {
         ];
         this.otherFilter1 = [
           {
-            name: "在线状态",
+            name: "在线区域",
             prop: "online_state",
             data: [
               {
-- 
2.26.0