From 225ef21f8cfffa7f6ee5afe04f86e9751fda763f Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Fri, 17 Jul 2020 16:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/service-header.vue          | 2 +-
 src/pages/workbench/fwgl/serviceDetail.vue | 2 +-
 src/pages/workbench/workPlace.vue          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/service-header.vue b/src/components/service-header.vue
index 6500334..874ec94 100644
--- a/src/components/service-header.vue
+++ b/src/components/service-header.vue
@@ -25,7 +25,7 @@
           v-if="data.xxdetail"
           @click="subevent(2,get_strd(data.xxdetail)[0])"
           :style="get_strd(data.xxdetail)[0]?{backgroundColor:'#ccc',color:'#e6ebfe'}:''"
-          title="申请下线至开发者应用"
+          :title="get_strd(data.xxdetail)[1]=='申请下线'?'申请下线至开发者应用':'申请上线至平台应用'"
           >{{ get_strd(data.xxdetail)[1] }}</span
         >
         <span
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 7a6b21e..d4d52a5 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -393,7 +393,7 @@ export default {
         "其他"
       ],
       open_arr: ["共享", "受限", "敏感"],
-      service_state_arr: ["已下架", "已上架", "审核中"],
+      service_state_arr: ["已下架", "已上架", "审核中","审核中"],
       request_arr: ["GET", "POST", "PUT", "DELETE"],
       list_arr: [
         {
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index b08f24a..c6f6e7b 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -82,12 +82,12 @@
                 <div style="width:142px;float:left;height:180px;margin-right:30px;">
                   <dash-board :data="cpu_data" dangerousValue='workplace' style="height:140px;"></dash-board>
                   <p><span>物理总量</span><span>{{cpu_data.all}}核</span></p>
-                  <p><span>剩余量</span><span>{{cpu_data.remaining.toFixed(2)}}核</span></p>
+                  <p v-if="cpu_data.remaining||cpu_data.remaining==0"><span>剩余量</span><span>{{cpu_data.remaining.toFixed(2)}}核</span></p>
                 </div>
                 <div style="width:142px;float:left;height:180px;margin-right:30px;">
                   <dash-board :data="memory_data" dangerousValue='workplace' style="height:140px;"></dash-board>
                   <p><span>物理总量</span><span>{{memory_data.all}}GB</span></p>
-                  <p><span>剩余量</span><span>{{memory_data.remaining.toFixed(2)}}GB</span></p>
+                  <p v-if="memory_data.remaining||memory_data.remaining==0"><span>剩余量</span><span>{{memory_data.remaining.toFixed(2)}}GB</span></p>
                 </div>
                 <div style="width:142px;float:left;height:180px;margin-right:30px;">
                   <dash-board :data="pan_data" dangerousValue='workplace' style="height:140px;"></dash-board>
@@ -97,7 +97,7 @@
                 <div style="width:142px;float:left;height:180px;">
                   <dash-board :data="pod_data" dangerousValue='workplace' style="height:140px;"></dash-board>
                   <p><span>物理总量</span><span>{{pod_data.all}}</span></p>
-                  <p><span>剩余量</span><span>{{pod_data.remaining.toFixed(2)}}</span></p>
+                  <p><span>剩余量</span><span>{{pod_data.remaining}}</span></p>
                 </div>
               </div>
             </div>
-- 
2.26.0