修改目录结构

frontend/src/business/App.vue

@@ -18,10 +18,10 @@
 </template>
 
 <script>
-  import MsTopMenus from "./components/HeaderTopMenus";
+  import MsTopMenus from "./components/common/head/HeaderTopMenus";
-  import MsView from "./components/router/View";
+  import MsView from "./components/common/router/View";
-  import MsUser from "./components/HeaderUser";
+  import MsUser from "./components/common/head/HeaderUser";
-  import MsWebSocket from "./components/websocket/WebSocket";
+  import MsWebSocket from "./components/common/websocket/WebSocket";
 
   export default {
     name: 'app',

frontend/src/business/components/common/head/HeaderMenus.vue

@@ -60,13 +60,13 @@
 
 <script>
 
-  import PerformanceRecentTestPlan from "./testPlan/PerformanceRecentTestPlan";
+  import PerformanceRecentTestPlan from "../../performance/testPlan/PerformanceRecentTestPlan";
-  import FunctionalRecentTestPlan from "./testPlan/FunctionalRecentTestPlan";
+  import FunctionalRecentTestPlan from "../../functional/testPlan/FunctionalRecentTestPlan";
-  import PerformanceRecentProject from "./project/PerformanceRecentProject";
+  import PerformanceRecentProject from "../../performance/project/PerformanceRecentProject";
-  import FunctionalRecentProject from "./project/FunctionalRecentProject";
+  import FunctionalRecentProject from "../../functional/project/FunctionalRecentProject";
-  import PerformanceRecentReport from "./report/PerformanceRecentReport";
+  import PerformanceRecentReport from "../../performance/report/PerformanceRecentReport";
-  import FunctionalRecentReport from "./report/FunctionalRecentReport";
+  import FunctionalRecentReport from "../../functional/report/FunctionalRecentReport";
-  import {checkoutCurrentWorkspace} from "../../common/utils";
+  import {checkoutCurrentWorkspace} from "../../../../common/utils";
 
   export default {
     name: "MsMenus",

frontend/src/business/components/common/head/HeaderUser.vue

@@ -42,8 +42,8 @@
 </template>
 
 <script>
-  import {ROLE_ORG_ADMIN, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER, TokenKey} from '../../common/constants';
+  import {ROLE_ORG_ADMIN, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER, TokenKey} from '../../../../common/constants';
-  import {hasRoles} from "../../common/utils";
+  import {hasRoles} from "../../../../common/utils";
 
   export default {
     name: "MsUser",

frontend/src/business/components/common/router/router.js

@@ -1,28 +1,28 @@
 import Vue from "vue";
 import VueRouter from 'vue-router'
 import RouterSidebar from "./RouterSidebar";
-import Setting from "../settings/Setting";
+import Setting from "../../settings/Setting";
-import User from "../settings/system/User";
+import User from "../../settings/system/User";
-import EditPerformanceTestPlan from "../testPlan/EditPerformanceTestPlan";
+import EditPerformanceTestPlan from "../../performance/testPlan/EditPerformanceTestPlan";
-import PerformanceTestPlan from "../testPlan/PerformanceTestPlan";
+import PerformanceTestPlan from "../../performance/testPlan/PerformanceTestPlan";
-import Organization from "../settings/system/Organization";
+import Organization from "../../settings/system/Organization";
-import OrganizationMember from "../settings/organization/OrganizationMember";
+import OrganizationMember from "../../settings/organization/OrganizationMember";
-import Member from "../settings/workspace/WorkspaceMember";
+import Member from "../../settings/workspace/WorkspaceMember";
-import TestResourcePool from "../settings/system/TestResourcePool";
+import TestResourcePool from "../../settings/system/TestResourcePool";
-import MsProject from "../project/MsProject";
+import MsProject from "../../project/MsProject";
-import OrganizationWorkspace from "../settings/organization/OrganizationWorkspace";
+import OrganizationWorkspace from "../../settings/organization/OrganizationWorkspace";
-import PersonSetting from "../settings/personal/PersonSetting";
+import PersonSetting from "../../settings/personal/PersonSetting";
-import SystemWorkspace from "../settings/system/SystemWorkspace";
+import SystemWorkspace from "../../settings/system/SystemWorkspace";
-import PerformanceChart from "../project/PerformanceChart";
+import PerformanceChart from "../../performance/report/components/PerformanceChart";
-import PerformanceTestReport from "../report/PerformanceTestReport";
+import PerformanceTestReport from "../../performance/report/PerformanceTestReport";
-import FunctionalTestReport from "../report/FunctionalTestReport";
+import FunctionalTestReport from "../../functional/report/FunctionalTestReport";
-import FunctionalTest from "../testPlan/FunctionalTest";
+import FunctionalTest from "../../functional/FunctionalTest";
-import PerformanceTest from "../testPlan/PerformanceTest";
+import PerformanceTest from "../../performance/PerformanceTest";
-import EditFunctionalTestPlan from "../testPlan/EditFunctionalTestPlan";
+import EditFunctionalTestPlan from "../../functional/testPlan/EditFunctionalTestPlan";
-import PerformanceTestHome from "../testPlan/PerformanceTestHome";
+import PerformanceTestHome from "../../performance/home/PerformanceTestHome";
-import FunctionalTestPlan from "../testPlan/FunctionalTestPlan";
+import FunctionalTestPlan from "../../functional/testPlan/FunctionalTestPlan";
-import FunctionalTestHome from "../testPlan/FunctionalTestHome";
+import FunctionalTestHome from "../../functional/home/FunctionalTestHome";
-import PerformanceReportView from "../report/PerformanceReportView";
+import PerformanceReportView from "../../performance/report/PerformanceReportView";
 
 Vue.use(VueRouter);
 

frontend/src/business/components/functional/FunctionalTest.vue

@@ -12,7 +12,7 @@
 </template>
 <script>
 
-  import HeaderMenus from "../HeaderMenus";
+  import HeaderMenus from "../common/head/HeaderMenus";
 
   export default {
     name: "FunctionalTest",

frontend/src/business/components/functional/project/FunctionalRecentProject.vue

@@ -14,8 +14,8 @@
 
 <script>
 
-  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
-  import {hasRoles} from "../../../common/utils";
+  import {hasRoles} from "../../../../common/utils";
 
   export default {
     name: "FunctionalRecentProject",

frontend/src/business/components/functional/report/FunctionalRecentReport.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
 
   export default {
     name: "PerformanceRecentReport",

frontend/src/business/components/functional/testPlan/FunctionalRecentTestPlan.vue

@@ -11,8 +11,8 @@
 </template>
 
 <script>
-  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
-  import {hasRoles} from "../../../common/utils";
+  import {hasRoles} from "../../../../common/utils";
 
   export default {
     name: "PerformanceRecentTestPlan",

frontend/src/business/components/performance/PerformanceTest.vue

@@ -13,7 +13,7 @@
 
 <script>
 
-  import HeaderMenus from "../HeaderMenus";
+  import HeaderMenus from "../common/head/HeaderMenus";
 
   export default {
     name: "PerformanceTest",

frontend/src/business/components/performance/project/PerformanceRecentProject.vue

@@ -14,8 +14,8 @@
 
 <script>
 
-  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
-  import {hasRoles} from "../../../common/utils";
+  import {hasRoles} from "../../../../common/utils";
 
   export default {
     name: "PerformanceRecentProject",

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

@@ -12,8 +12,8 @@
 </template>
 
 <script>
-  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
-  import {hasRoles} from "../../../common/utils";
+  import {hasRoles} from "../../../../common/utils";
 
   export default {
     name: "PerformanceRecentReport",

frontend/src/business/components/performance/testPlan/PerformanceRecentTestPlan.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
 
   export default {
     name: "PerformanceRecentTestPlan",

frontend/src/business/components/project/MsProject.vue

@@ -96,7 +96,8 @@
       }
     },
     mounted() {
-      if (this.$route.path.split('/')[3] === 'create') {
+      if (this.$route.path.split('/')[2] === 'project' &&
+        this.$route.path.split('/')[3] === 'create') {
         this.create();
         this.$router.push( '/' + this.beaseUrl + '/project/all');
       }
@@ -104,7 +105,8 @@
     },
     watch: {
       '$route'(to) {
-        if (to.path.split('/')[3] === 'create') {
+        if (this.$route.path.split('/')[2] === 'project' &&
+          to.path.split('/')[3] === 'create') {
           this.create();
           this.$router.push('/' + this.beaseUrl + '/project/all');
         }

frontend/src/business/main.js

@@ -5,7 +5,7 @@ import icon from "../common/icon";
 import filters from "../common/filter";
 import ajax from "../common/ajax";
 import App from './App.vue';
-import router from "./components/router/router";
+import router from "./components/common/router/router";
 import './permission' // permission control
 import i18n from "../i18n/i18n";
 import store from "./store";

frontend/src/business/permission.js

@@ -1,4 +1,4 @@
-import router from './components/router/router'
+import router from './components/common/router/router'
 import {TokenKey} from '../common/constants';
 
 const whiteList = ['/login']; // no redirect whitelist

frontend/vue.config.js

@@ -12,9 +12,9 @@ module.exports = {
         }
     },
     pages: {
-        performance: {
+        business: {
-            entry: "src/performance/main.js",
+            entry: "src/business/main.js",
-            template: "src/performance/index.html",
+            template: "src/business/index.html",
             filename: "index.html"
         },
         login: {