From 98c9bbb9459806760d74867cdcb3eba00f02252a Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Fri, 17 Jul 2020 14:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/authority/role/addroles.vue         |  2 +-
 src/pages/authority/user/organizationuser.vue | 10 +++++-----
 src/pages/workbench/fwgl/serviceDetail.vue    |  2 +-
 src/pages/workbench/fwgl/serviceEdit.vue      | 13 +++++++------
 src/pages/workbench/workPlace.vue             |  6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/pages/authority/role/addroles.vue b/src/pages/authority/role/addroles.vue
index 53abe0a..984d754 100644
--- a/src/pages/authority/role/addroles.vue
+++ b/src/pages/authority/role/addroles.vue
@@ -84,7 +84,7 @@ export default {
       rules: {
         name: [
           { required: true, message: "请输入角色名称", trigger: "blur" },
-          { max: 8, message: "长度小于8个字符", trigger: "blur" },
+          { max: 8, message: "长度应小于8个字符", trigger: "blur" },
         ],
         desc: [
           { required: true, message: "请输入角色描述", trigger: "blur" },
diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue
index 66dd034..c502407 100644
--- a/src/pages/authority/user/organizationuser.vue
+++ b/src/pages/authority/user/organizationuser.vue
@@ -261,26 +261,26 @@ export default {
       rules: {
         account: [
           { required: true, message: "请输入账号", trigger: "blur" },
-          { max: 8, message: "长度小于8个字符", trigger: "blur" },
+          { max: 8, message: "长度应小于8个字符", trigger: "blur" },
         ],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
-          { max: 20, message: "长度小于20个字符", trigger: "blur" },
+          { max: 20, message: "长度应小于20个字符", trigger: "blur" },
         ],
         nickname: [
           { required: true, message: "请输入昵称", trigger: "blur" },
-          { max: 8, message: "长度小于8个字符", trigger: "blur" },
+          { max: 8, message: "长度应小于8个字符", trigger: "blur" },
         ],
         type: [
           { required: true, message: "请选择用户类型", trigger: "change" },
         ],
         systemname: [
           { required: true, message: "请输入系统名称", trigger: "blur" },
-          { max: 16, message: "长度小于16个字符", trigger: "blur" },
+          { max: 16, message: "长度应小于16个字符", trigger: "blur" },
         ],
         contact: [
           { required: true, message: "请输入联系人", trigger: "blur" },
-          { max: 6, message: "长度小于6个字符", trigger: "blur" },
+          { max: 6, message: "长度应小于6个字符", trigger: "blur" },
         ],
         phone: [
           { required: true, message: "请输入电话号码", trigger: "blur" },
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index bcec062..7a6b21e 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="detail_contain">
     <p class="now_page_title">
-      我的服务 / 注册发布的服务 /
+      我的服务 / {{now_user==0||now_user==4?'注册发布的服务':now_user==1?'组织服务管理':'平台服务管理'}} /
       <span>服务详情</span>
     </p>
     <div class="info_contain">
diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue
index e0c210f..1749174 100644
--- a/src/pages/workbench/fwgl/serviceEdit.vue
+++ b/src/pages/workbench/fwgl/serviceEdit.vue
@@ -177,23 +177,23 @@ export default {
         now_edit:0,//信息和安全切换
         now_safe:0,//切换安全
         imgList: [],
-        timevalue:1,
+        timevalue:'',
         timeoptions:[
           {
             label:'day(天)',
-            value:0,
+            value:3,
           },
           {
             label:'hour(小时)',
-            value:1,
+            value:2,
           },
           {
             label:'min(分钟)',
-            value:2,
+            value:1,
           },
           {
             label:'second(秒)',
-            value:3,
+            value:0,
           },
         ],
         safe_arr:['熔断管理','速率限制','TLS加密','敏感字段追踪'],
@@ -319,7 +319,8 @@ export default {
         }
       }
       if(this.open1){
-        if(this.maxline1&&this.usetime1&&(this.timevalue||this.timevalue==0)){
+        debugger
+        if(this.maxline1&&this.usetime1&&(this.timevalue!=='')){
 
         }else{
           this.$message.error('请输入所需参数')
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 9eaaf84..b08f24a 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}}核</span></p>
+                  <p><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}}GB</span></p>
+                  <p><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}}</span></p>
+                  <p><span>剩余量</span><span>{{pod_data.remaining.toFixed(2)}}</span></p>
                 </div>
               </div>
             </div>
-- 
2.26.0