test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/metersphere/server

This commit is contained in:
chenjianxing 2020-08-26 13:03:23 +08:00
parent 9ffffe5703 b8bf889e94
commit ec4632be45
5 changed files with 156 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/business/components/api/head/ApiHeaderMenus.vue
View File

@ -88,10 +88,11 @@ export default {
} }
}, },
mounted() { mounted() {
let self = this;
ApiEvent.$on(LIST_CHANGE, () => { ApiEvent.$on(LIST_CHANGE, () => {
this.$refs.projectRecent.recent(); self.$refs.projectRecent.recent();
this.$refs.testRecent.recent(); self.$refs.testRecent.recent();
this.$refs.reportRecent.recent(); self.$refs.reportRecent.recent();
}); });
} }
} }

18
frontend/src/business/components/api/report/ApiReportView.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="container" v-loading="loading" :element-loading-text="$t('api_report.running')"> <ms-container v-loading="loading" :element-loading-text="$t('api_report.running')">
<div class="main-content"> <ms-main-container>
<el-card> <el-card>
<section class="report-container" v-if="this.report.testId"> <section class="report-container" v-if="this.report.testId">
<header class="report-header"> <header class="report-header">
@ -39,8 +39,8 @@
</main> </main>
</section> </section>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
@ -50,13 +50,15 @@
import MsScenarioResult from "./components/ScenarioResult"; import MsScenarioResult from "./components/ScenarioResult";
import MsMetricChart from "./components/MetricChart"; import MsMetricChart from "./components/MetricChart";
import MsScenarioResults from "./components/ScenarioResults"; import MsScenarioResults from "./components/ScenarioResults";
import {Scenario} from "../test/model/ScenarioModel"; import MsContainer from "@/business/components/common/components/MsContainer";
import writer from "file-writer"; import MsMainContainer from "@/business/components/common/components/MsMainContainer";
import ResumeCss from "../../../../common/css/main.css";
export default { export default {
name: "MsApiReportView", name: "MsApiReportView",
components: {MsScenarioResults, MsRequestResultTail, MsMetricChart, MsScenarioResult, MsRequestResult}, components: {
MsMainContainer,
MsContainer, MsScenarioResults, MsRequestResultTail, MsMetricChart, MsScenarioResult, MsRequestResult
},
data() { data() {
return { return {
activeName: "total", activeName: "total",

15
frontend/src/business/components/api/test/ApiTestConfig.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="container"> <ms-container>
<div class="main-content"> <ms-main-container>
<el-card> <el-card>
<el-container class="test-container" v-loading="result.loading"> <el-container class="test-container" v-loading="result.loading">
<el-header> <el-header>
@ -60,8 +60,8 @@
:scenarios="test.scenarioDefinition" :project-id="test.projectId" ref="config"/> :scenarios="test.scenarioDefinition" :project-id="test.projectId" ref="config"/>
</el-container> </el-container>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
@ -74,11 +74,16 @@ import MsScheduleConfig from "../../common/components/MsScheduleConfig";
import ApiImport from "./components/import/ApiImport"; import ApiImport from "./components/import/ApiImport";
import {getUUID} from "../../../../common/js/utils"; import {getUUID} from "../../../../common/js/utils";
import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent"; import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
import MsContainer from "@/business/components/common/components/MsContainer";
import MsMainContainer from "@/business/components/common/components/MsMainContainer";
export default { export default {
name: "MsApiTestConfig", name: "MsApiTestConfig",
components: {ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig}, components: {
MsMainContainer,
MsContainer, ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig
},
props: ["id"], props: ["id"],

8
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -14,10 +14,10 @@
:content="$t('test_track.case.import.import')" @click="importTestCase"/> :content="$t('test_track.case.import.import')" @click="importTestCase"/>
<ms-table-button :is-tester-permission="true" icon="el-icon-upload2" <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
:content="$t('test_track.case.export.export')" @click="handleBatch('export')"/> :content="$t('test_track.case.export.export')" @click="handleBatch('export')"/>
<ms-table-button :is-tester-permission="true" icon="el-icon-right" :content="$t('test_track.case.move')" <!-- <ms-table-button :is-tester-permission="true" icon="el-icon-right" :content="$t('test_track.case.move')"-->
@click="handleBatch('move')"/> <!-- @click="handleBatch('move')"/>-->
<ms-table-button :is-tester-permission="true" icon="el-icon-delete" :content="$t('test_track.case.delete')" <!-- <ms-table-button :is-tester-permission="true" icon="el-icon-delete" :content="$t('test_track.case.delete')"-->
@click="handleBatch('delete')"/> <!-- @click="handleBatch('delete')"/>-->
<!--<test-case-export/>--> <!--<test-case-export/>-->
</template> </template>
</ms-table-header> </ms-table-header>

14
frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
View File

@ -15,13 +15,13 @@
<ms-table-button :is-tester-permission="true" icon="el-icon-connection" <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
:content="$t('test_track.plan_view.relevance_test_case')" :content="$t('test_track.plan_view.relevance_test_case')"
@click="$emit('openTestCaseRelevanceDialog')"/> @click="$emit('openTestCaseRelevanceDialog')"/>
<ms-table-button :is-tester-permission="true" icon="el-icon-unlock" <!-- <ms-table-button :is-tester-permission="true" icon="el-icon-unlock"-->
:content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/> <!-- :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>-->
<ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline" <!-- <ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline"-->
:content="$t('test_track.plan_view.change_execution_results')" <!-- :content="$t('test_track.plan_view.change_execution_results')"-->
@click="handleBatch('status')"/> <!-- @click="handleBatch('status')"/>-->
<ms-table-button :is-tester-permission="true" icon="el-icon-user" <!-- <ms-table-button :is-tester-permission="true" icon="el-icon-user"-->
:content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/> <!-- :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>-->
<ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document" <ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document"
:content="$t('test_track.plan_view.create_report')" @click="openTestReport"/> :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
<ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document" <ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document"