Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev

frontend/src/business/components/performance/report/components/TestOverview.vue

@@ -305,9 +305,9 @@
         const max = Math.max(...arr);
         return Math.ceil(max / 4.5) * 5;
       },
-      _unique(arr){
+      _unique(arr) {
-    return Array.from(new Set(arr));
+        return Array.from(new Set(arr));
-  }
+      }
     },
     watch: {
       status() {

frontend/src/business/components/settings/organization/OrganizationMember.vue

@@ -246,11 +246,6 @@
 </script>
 
 <style scoped>
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
 
   .org-member-name {
     float: left;

frontend/src/business/components/settings/organization/OrganizationWorkspace.vue

@@ -419,33 +419,16 @@
 </script>
 
 <style scoped>
-  .search {
-    width: 240px;
-  }
-
-  .edit {
-    opacity: 0;
-  }
 
   .el-table__row:hover .edit {
     opacity: 1;
   }
 
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
-
   .member-size {
     text-decoration: underline;
     cursor: pointer;
   }
 
-  .member-title {
-    margin-bottom: 30px;
-  }
-
   .select-width {
     width: 100%;
   }

frontend/src/business/components/settings/system/Organization.vue

@@ -435,15 +435,6 @@
 </script>
 
 <style scoped>
-  .search {
-    width: 240px;
-  }
-
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
 
   .member-size {
     text-decoration: underline;
@@ -464,7 +455,4 @@
     width: 100%;
   }
 
-  .member-title {
-    margin-bottom: 30px;
-  }
 </style>

frontend/src/business/components/settings/system/SystemWorkspace.vue

@@ -458,24 +458,11 @@
 </script>
 
 <style scoped>
-  .search {
-    width: 240px;
-  }
-
-  .edit {
-    opacity: 0;
-  }
 
   .el-table__row:hover .edit {
     opacity: 1;
   }
 
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
-
   .member-size {
     text-decoration: underline;
     cursor: pointer;
@@ -495,9 +482,5 @@
     width: 100%;
   }
 
-  .member-title {
-    margin-bottom: 30px;
-  }
-
 </style>
 

frontend/src/business/components/settings/system/TestResourcePool.vue

@@ -422,19 +422,6 @@
 </script>
 
 <style scoped>
-  .search {
-    width: 240px;
-  }
-
-  .form-input {
-    height: 32px !important;
-  }
-
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
 
   .op {
     float: left;

frontend/src/business/components/settings/system/User.vue

@@ -244,13 +244,5 @@
 </script>
 
 <style scoped>
-  .search {
-    width: 240px;
-  }
 
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
 </style>

frontend/src/business/components/settings/workspace/WorkspaceMember.vue

@@ -255,20 +255,11 @@
 </script>
 
 <style scoped>
-  .search {
-    width: 240px;
-  }
 
   .el-table__row:hover .edit {
     opacity: 1;
   }
 
-  .table-page {
-    padding-top: 20px;
-    margin-right: -9px;
-    float: right;
-  }
-
   .select-width {
     width: 100%;
   }