diff --git a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
index 840bea814d..6a1a5e2704 100644
--- a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
+++ b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
@@ -49,6 +49,13 @@ public class WorkspaceController {
         return PageUtils.setPageInfo(page, workspaceService.getWorkspaceList(request));
     }
 
+    @PostMapping("list/all/{goPage}/{pageSize}")
+    @RequiresRoles(RoleConstants.ORG_ADMIN)
+    public Pager<List<Workspace>> getAllWorkspaceList(@PathVariable int goPage, @PathVariable int pageSize) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, workspaceService.getAllWorkspaceList());
+    }
+
     @GetMapping("/list/userworkspace/{userId}")
     public List<Workspace> getWorkspaceListByUserId(@PathVariable String userId) {
         return workspaceService.getWorkspaceListByUserId(userId);
diff --git a/backend/src/main/java/io/metersphere/service/WorkspaceService.java b/backend/src/main/java/io/metersphere/service/WorkspaceService.java
index 9ac36e13b6..b3a70a1a8c 100644
--- a/backend/src/main/java/io/metersphere/service/WorkspaceService.java
+++ b/backend/src/main/java/io/metersphere/service/WorkspaceService.java
@@ -69,6 +69,10 @@ public class WorkspaceService {
         return workspaceMapper.selectByExample(example);
     }
 
+    public List<Workspace> getAllWorkspaceList() {
+        return workspaceMapper.selectByExample(null);
+    }
+
     public void deleteWorkspace(String workspaceId) {
         workspaceMapper.deleteByPrimaryKey(workspaceId);
     }
diff --git a/frontend/src/performance/components/router/router.js b/frontend/src/performance/components/router/router.js
index 259d936a3f..8739d34a96 100644
--- a/frontend/src/performance/components/router/router.js
+++ b/frontend/src/performance/components/router/router.js
@@ -13,6 +13,7 @@ import TestResourcePool from "../settings/TestResourcePool";
 import MsProject from "../project/MsProject";
 import OrganizationWorkspace from "../settings/OrganizationWorkspace";
 import PersonSetting from "../settings/PersonSetting";
+import SystemWorkspace from "../settings/SystemWorkspace";
 
 Vue.use(VueRouter);
 
@@ -67,6 +68,10 @@ const router = new VueRouter({
           path: 'member',
           component: Member
         },
+        {
+          path: 'systemworkspace',
+          component: SystemWorkspace
+        },
         {
           path: 'testresourcepool',
           component: TestResourcePool
diff --git a/frontend/src/performance/components/settings/SettingMenu.vue b/frontend/src/performance/components/settings/SettingMenu.vue
index b390c93bca..7189b03b76 100644
--- a/frontend/src/performance/components/settings/SettingMenu.vue
+++ b/frontend/src/performance/components/settings/SettingMenu.vue
@@ -7,7 +7,7 @@
       </template>
       <el-menu-item index="/setting/user" v-permission="['admin']">用户</el-menu-item>
       <el-menu-item index="/setting/organization" v-permission="['admin']">组织</el-menu-item>
-      <el-menu-item index="/setting/workspace" v-permission="['org_admin']">工作空间</el-menu-item>
+      <el-menu-item index="/setting/systemworkspace" v-permission="['org_admin']">工作空间</el-menu-item>
       <el-menu-item index="/setting/testresourcepool">测试资源池</el-menu-item>
     </el-submenu>
 
diff --git a/frontend/src/performance/components/settings/SystemWorkspace.vue b/frontend/src/performance/components/settings/SystemWorkspace.vue
new file mode 100644
index 0000000000..593435b76e
--- /dev/null
+++ b/frontend/src/performance/components/settings/SystemWorkspace.vue
@@ -0,0 +1,183 @@
+<template>
+  <div>
+    <el-card v-loading="result.loading">
+      <div slot="header">
+        <el-row type="flex" justify="space-between" align="middle">
+          <span class="title">
+            {{$t('commons.workspace')}}
+            <ms-create-box :tips="btnTips" :exec="create"/>
+          </span>
+          <span class="search">
+                    <el-input type="text" size="small" :placeholder="$t('workspace.search_by_name')"
+                              prefix-icon="el-icon-search"
+                              maxlength="60" v-model="condition" clearable/>
+                </span>
+        </el-row>
+      </div>
+      <el-table :data="items" style="width: 100%">
+        <el-table-column prop="name" :label="$t('commons.name')"/>
+        <el-table-column prop="description" :label="$t('commons.description')"/>
+        <el-table-column>
+          <template slot-scope="scope">
+            <el-button @click="edit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
+            <el-button @click="del(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-row>
+          <el-col :span="22" :offset="1">
+            <div class="table-page">
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page.sync="currentPage"
+                :page-sizes="[5, 10, 20, 50, 100]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="total">
+              </el-pagination>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </el-card>
+
+    <el-dialog :title="$t('workspace.create')" :visible.sync="createVisible" width="30%">
+      <el-form :model="form" :rules="rules" ref="form" label-position="left" label-width="100px" size="small">
+        <el-form-item :label="$t('commons.name')" prop="name">
+          <el-input v-model="form.name" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item :label="$t('commons.description')">
+          <el-input type="textarea" v-model="form.description"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit('form')" size="medium">{{$t('commons.save')}}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import MsCreateBox from "./CreateBox";
+  import {Message} from "element-ui";
+
+  export default {
+    name: "MsWorkspace",
+    components: {MsCreateBox},
+    mounted() {
+      this.list();
+    },
+    methods: {
+      create() {
+        this.createVisible = true;
+        this.form = {};
+      },
+      submit(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let saveType = 'add';
+            if (this.form.id) {
+              saveType = 'update'
+            }
+            this.$post("/workspace/" + saveType, this.form, () => {
+              this.createVisible = false;
+              this.list();
+              Message.success(this.$t('commons.save_success'));
+            });
+          } else {
+            return false;
+          }
+        });
+      },
+      edit(row) {
+        this.createVisible = true;
+        // copy user
+        this.form = Object.assign({}, row);
+
+        // let self = this;
+        // let getUser1 = this.$get("/test/user");
+        // let getUser2 = this.$get("/test/sleep");
+        // this.$all([getUser1, getUser2], function (r1, r2) {
+        //   window.console.log(r1.data.data, r2.data.data);
+        //   self.loading = false;
+        // });
+      },
+      del(row) {
+        this.$confirm(this.$t('workspace.delete_confirm'), this.$t('commons.prompt'), {
+          confirmButtonText: this.$t('commons.confirm'),
+          cancelButtonText: this.$t('commons.cancel'),
+          type: 'warning'
+        }).then(() => {
+          this.$get('/workspace/delete/' + row.id, () => {
+            Message.success(this.$t('commons.delete_success'));
+            this.list();
+          });
+        }).catch(() => {
+
+        });
+      },
+      list() {
+        let url = '/workspace/list/all/' + this.currentPage + '/' + this.pageSize;
+        this.result = this.$post(url, {name: this.condition}, response => {
+          let data = response.data;
+          this.items = data.listObject;
+          this.total = data.itemCount;
+        });
+      },
+      handleSizeChange(size) {
+        this.pageSize = size;
+        this.list();
+      },
+      handleCurrentChange(current) {
+        this.currentPage = current;
+        this.list();
+      },
+    },
+    data() {
+      return {
+        result: {},
+        loading: false,
+        createVisible: false,
+        btnTips: this.$t('workspace.add'),
+        condition: "",
+        items: [],
+        currentPage: 1,
+        pageSize: 5,
+        total: 0,
+        form: {
+          // name: "",
+          // description: ""
+        },
+        rules: {
+          name: [
+            {required: true, message: this.$t('workspace.input_name'), trigger: 'blur'},
+            {min: 2, max: 50, message: this.$t('workspace.input_name_2_50'), trigger: 'blur'}
+          ]
+        },
+      }
+    }
+  }
+</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;
+  }
+</style>
+