Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/components/service-header.vue

@@ -23,15 +23,17 @@
         <span
           class="right underline"
           v-if="data.xxdetail"
-          @click="subevent(2)"
+          @click="subevent(2,get_strd(data.xxdetail)[0])"
+          :style="get_strd(data.xxdetail)[0]?{backgroundColor:'#ccc',color:'#e6ebfe'}:''"
           title="申请下线至开发者应用"
-          >{{ data.xxdetail }}</span
+          >{{ get_strd(data.xxdetail)[1] }}</span
         >
         <span
           class="right undersell"
           v-if="data.yydetail"
-          @click="subevent(3)"
-          >{{ data.yydetail }}</span
+          :style="get_strd(data.yydetail)[0]?{backgroundColor:'#ccc',color:'#e6ebfe'}:''"
+          @click="subevent(3,get_strd(data.yydetail)[0])"
+          >{{ get_strd(data.yydetail)[1] }}</span
         >
         <span
           class="right undersell undermy"
@@ -92,7 +94,19 @@ export default {
   },
   mounted() {},
   methods: {
-      subevent(val){     
+    get_strd(str){
+      if(str){
+        if(str.indexOf('d')!==-1){
+          return [true,str.substr(0,str.length-1)]
+        }else {
+          return [false,str]
+        }
+      }
+    },
+      subevent(val,flag=false){
+        if(flag){
+          return
+        }     
           if(val == 0){
               // this.$emit('deploy',this.data)
               this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/deployment/${this.$route.params.id}?source=${this.$route.query.source}`)

src/pages/workbench/fwgl/serviceDetail.vue

@@ -542,6 +542,13 @@ export default {
               data.req_url
             );
             this.$set(this.service_header_arr, "url", data.cover);
+            if(this.now_user==1){
+              this.$set(
+              this.service_header_arr,
+              "fixed",
+              false
+            );
+            }
             this.$set(
               this.service_header_arr,
               "fixedurl",

src/pages/workbench/fwgl/serviceEdit.vue

 <template>
   <div class="detail_contain">
     <p class="now_page_title">
-      我的服务 / 注册发布的服务 /
+      我的服务 / {{now_user==0||now_user==4?'注册发布的服务':'平台服务管理'}} /
       <span>服务编辑</span>
     </p>
     <div class="info_contain">

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -108,23 +108,23 @@
               <nor-card title="平均响应时间" class="service_card">
                 <template>
                   <div style="height:115px;" class="service_num">
-                    <p>{{ yx_state.averageTime }}</p>
-                    <p>最大响应时间：{{ yx_state.maxTime }}</p>
+                    <p>{{ yx_state.averageTime }}ms</p>
+                    <p>最大响应时间：{{ yx_state.maxTime }}ms</p>
                   </div>
                 </template>
               </nor-card>
               <nor-card title="吞吐率" class="service_card">
                 <template>
                   <div style="height:115px;" class="service_num">
-                    <p>{{ yx_state.averageTraffic }}</p>
-                    <p>最大吞吐率：{{ yx_state.maxTraffic }}</p>
+                    <p>{{ yx_state.averageTraffic }}dps</p>
+                    <p>最大吞吐率：{{ yx_state.maxTraffic }}dps</p>
                   </div>
                 </template>
               </nor-card>
               <nor-card title="资源使用" class="service_card">
                 <template>
                   <div style="height:115px;padding-top:30px;" class="service_num">
-                    <p>{{ yx_state.memory }}</p>
+                    <p>{{ yx_state.memory }}MB</p>
                   </div>
                 </template>
               </nor-card>
@@ -152,19 +152,19 @@
 
                       <div style="height:115px;" class="service_num service_card_box">
                         <span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">服务平均响应时间</span>
-                        <p>{{ micor_state.averageTime }}</p>
-                        <p>最大响应时间：{{ micor_state.maxTime }}</p>
+                        <p>{{ micor_state.averageTime }}ms</p>
+                        <p>最大响应时间：{{ micor_state.maxTime }}ms</p>
                       </div>
 
                       <div style="height:115px;" class="service_num service_card_box">
                         <span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">吞吐率</span>
-                        <p>{{ micor_state.averageTraffic }}</p>
-                        <p>最大吞吐率：{{ micor_state.maxTraffic }}</p>
+                        <p>{{ micor_state.averageTraffic }}dps</p>
+                        <p>最大吞吐率：{{ micor_state.maxTraffic }}dps</p>
                       </div>
 
                       <div style="height:115px;padding-top:30px;" class="service_num service_card_box">
                         <span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">内存使用</span>
-                        <p>{{ micor_state.memory }}</p>
+                        <p>{{ micor_state.memory }}MB</p>
                       </div>
 
                     </div>
@@ -1191,6 +1191,7 @@ background:khaki;
 .service_num p:nth-of-type(1) {
   font-size: 36px;
   color: #3f4f9c;
+  font-weight: 600;
   margin-bottom: 10px;
 }
 .service_num p:nth-of-type(2) {