修改目录结构
This commit is contained in:
parent
d16839ec68
commit
5ca19b55f8
|
@ -18,10 +18,10 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import MsTopMenus from "./components/HeaderTopMenus";
|
||||
import MsView from "./components/router/View";
|
||||
import MsUser from "./components/HeaderUser";
|
||||
import MsWebSocket from "./components/websocket/WebSocket";
|
||||
import MsTopMenus from "./components/common/head/HeaderTopMenus";
|
||||
import MsView from "./components/common/router/View";
|
||||
import MsUser from "./components/common/head/HeaderUser";
|
||||
import MsWebSocket from "./components/common/websocket/WebSocket";
|
||||
|
||||
export default {
|
||||
name: 'app',
|
|
@ -60,13 +60,13 @@
|
|||
|
||||
<script>
|
||||
|
||||
import PerformanceRecentTestPlan from "./testPlan/PerformanceRecentTestPlan";
|
||||
import FunctionalRecentTestPlan from "./testPlan/FunctionalRecentTestPlan";
|
||||
import PerformanceRecentProject from "./project/PerformanceRecentProject";
|
||||
import FunctionalRecentProject from "./project/FunctionalRecentProject";
|
||||
import PerformanceRecentReport from "./report/PerformanceRecentReport";
|
||||
import FunctionalRecentReport from "./report/FunctionalRecentReport";
|
||||
import {checkoutCurrentWorkspace} from "../../common/utils";
|
||||
import PerformanceRecentTestPlan from "../../performance/testPlan/PerformanceRecentTestPlan";
|
||||
import FunctionalRecentTestPlan from "../../functional/testPlan/FunctionalRecentTestPlan";
|
||||
import PerformanceRecentProject from "../../performance/project/PerformanceRecentProject";
|
||||
import FunctionalRecentProject from "../../functional/project/FunctionalRecentProject";
|
||||
import PerformanceRecentReport from "../../performance/report/PerformanceRecentReport";
|
||||
import FunctionalRecentReport from "../../functional/report/FunctionalRecentReport";
|
||||
import {checkoutCurrentWorkspace} from "../../../../common/utils";
|
||||
|
||||
export default {
|
||||
name: "MsMenus",
|
|
@ -42,8 +42,8 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {ROLE_ORG_ADMIN, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER, TokenKey} from '../../common/constants';
|
||||
import {hasRoles} from "../../common/utils";
|
||||
import {ROLE_ORG_ADMIN, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER, TokenKey} from '../../../../common/constants';
|
||||
import {hasRoles} from "../../../../common/utils";
|
||||
|
||||
export default {
|
||||
name: "MsUser",
|
|
@ -1,28 +1,28 @@
|
|||
import Vue from "vue";
|
||||
import VueRouter from 'vue-router'
|
||||
import RouterSidebar from "./RouterSidebar";
|
||||
import Setting from "../settings/Setting";
|
||||
import User from "../settings/system/User";
|
||||
import EditPerformanceTestPlan from "../testPlan/EditPerformanceTestPlan";
|
||||
import PerformanceTestPlan from "../testPlan/PerformanceTestPlan";
|
||||
import Organization from "../settings/system/Organization";
|
||||
import OrganizationMember from "../settings/organization/OrganizationMember";
|
||||
import Member from "../settings/workspace/WorkspaceMember";
|
||||
import TestResourcePool from "../settings/system/TestResourcePool";
|
||||
import MsProject from "../project/MsProject";
|
||||
import OrganizationWorkspace from "../settings/organization/OrganizationWorkspace";
|
||||
import PersonSetting from "../settings/personal/PersonSetting";
|
||||
import SystemWorkspace from "../settings/system/SystemWorkspace";
|
||||
import PerformanceChart from "../project/PerformanceChart";
|
||||
import PerformanceTestReport from "../report/PerformanceTestReport";
|
||||
import FunctionalTestReport from "../report/FunctionalTestReport";
|
||||
import FunctionalTest from "../testPlan/FunctionalTest";
|
||||
import PerformanceTest from "../testPlan/PerformanceTest";
|
||||
import EditFunctionalTestPlan from "../testPlan/EditFunctionalTestPlan";
|
||||
import PerformanceTestHome from "../testPlan/PerformanceTestHome";
|
||||
import FunctionalTestPlan from "../testPlan/FunctionalTestPlan";
|
||||
import FunctionalTestHome from "../testPlan/FunctionalTestHome";
|
||||
import PerformanceReportView from "../report/PerformanceReportView";
|
||||
import Setting from "../../settings/Setting";
|
||||
import User from "../../settings/system/User";
|
||||
import EditPerformanceTestPlan from "../../performance/testPlan/EditPerformanceTestPlan";
|
||||
import PerformanceTestPlan from "../../performance/testPlan/PerformanceTestPlan";
|
||||
import Organization from "../../settings/system/Organization";
|
||||
import OrganizationMember from "../../settings/organization/OrganizationMember";
|
||||
import Member from "../../settings/workspace/WorkspaceMember";
|
||||
import TestResourcePool from "../../settings/system/TestResourcePool";
|
||||
import MsProject from "../../project/MsProject";
|
||||
import OrganizationWorkspace from "../../settings/organization/OrganizationWorkspace";
|
||||
import PersonSetting from "../../settings/personal/PersonSetting";
|
||||
import SystemWorkspace from "../../settings/system/SystemWorkspace";
|
||||
import PerformanceChart from "../../performance/report/components/PerformanceChart";
|
||||
import PerformanceTestReport from "../../performance/report/PerformanceTestReport";
|
||||
import FunctionalTestReport from "../../functional/report/FunctionalTestReport";
|
||||
import FunctionalTest from "../../functional/FunctionalTest";
|
||||
import PerformanceTest from "../../performance/PerformanceTest";
|
||||
import EditFunctionalTestPlan from "../../functional/testPlan/EditFunctionalTestPlan";
|
||||
import PerformanceTestHome from "../../performance/home/PerformanceTestHome";
|
||||
import FunctionalTestPlan from "../../functional/testPlan/FunctionalTestPlan";
|
||||
import FunctionalTestHome from "../../functional/home/FunctionalTestHome";
|
||||
import PerformanceReportView from "../../performance/report/PerformanceReportView";
|
||||
|
||||
Vue.use(VueRouter);
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
</template>
|
||||
<script>
|
||||
|
||||
import HeaderMenus from "../HeaderMenus";
|
||||
import HeaderMenus from "../common/head/HeaderMenus";
|
||||
|
||||
export default {
|
||||
name: "FunctionalTest",
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
<script>
|
||||
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
|
||||
import {hasRoles} from "../../../common/utils";
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
|
||||
import {hasRoles} from "../../../../common/utils";
|
||||
|
||||
export default {
|
||||
name: "FunctionalRecentProject",
|
|
@ -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",
|
|
@ -11,8 +11,8 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
|
||||
import {hasRoles} from "../../../common/utils";
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
|
||||
import {hasRoles} from "../../../../common/utils";
|
||||
|
||||
export default {
|
||||
name: "PerformanceRecentTestPlan",
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<script>
|
||||
|
||||
import HeaderMenus from "../HeaderMenus";
|
||||
import HeaderMenus from "../common/head/HeaderMenus";
|
||||
|
||||
export default {
|
||||
name: "PerformanceTest",
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
<script>
|
||||
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
|
||||
import {hasRoles} from "../../../common/utils";
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
|
||||
import {hasRoles} from "../../../../common/utils";
|
||||
|
||||
export default {
|
||||
name: "PerformanceRecentProject",
|
|
@ -12,8 +12,8 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../common/constants";
|
||||
import {hasRoles} from "../../../common/utils";
|
||||
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "../../../../common/constants";
|
||||
import {hasRoles} from "../../../../common/utils";
|
||||
|
||||
export default {
|
||||
name: "PerformanceRecentReport",
|
|
@ -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",
|
|
@ -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');
|
||||
}
|
|
@ -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";
|
|
@ -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
|
|
@ -12,9 +12,9 @@ module.exports = {
|
|||
}
|
||||
},
|
||||
pages: {
|
||||
performance: {
|
||||
entry: "src/performance/main.js",
|
||||
template: "src/performance/index.html",
|
||||
business: {
|
||||
entry: "src/business/main.js",
|
||||
template: "src/business/index.html",
|
||||
filename: "index.html"
|
||||
},
|
||||
login: {
|
||||
|
|
Loading…
Reference in New Issue