diff options
Diffstat (limited to 'test-scheduler/ui/src/components')
-rw-r--r-- | test-scheduler/ui/src/components/test_result.vue | 21 | ||||
-rw-r--r-- | test-scheduler/ui/src/components/testcase.vue | 12 | ||||
-rw-r--r-- | test-scheduler/ui/src/components/testcase_content.vue | 11 | ||||
-rw-r--r-- | test-scheduler/ui/src/components/testsuite.vue | 12 |
4 files changed, 45 insertions, 11 deletions
diff --git a/test-scheduler/ui/src/components/test_result.vue b/test-scheduler/ui/src/components/test_result.vue new file mode 100644 index 00000000..37bbc4da --- /dev/null +++ b/test-scheduler/ui/src/components/test_result.vue @@ -0,0 +1,21 @@ +<template> + <div> + <iframe style='min-height: 700px;' height='100%' width='100%' + v-bind:src='frameSrc'> + </iframe> + </div> +</template> + +<script> + +export default { + data: function() { + return { + frameSrc: this.global.GRAFANA_ADDR + } + } +} +</script> + +<style scoped> +</style> diff --git a/test-scheduler/ui/src/components/testcase.vue b/test-scheduler/ui/src/components/testcase.vue index 9c8ef85e..875089ef 100644 --- a/test-scheduler/ui/src/components/testcase.vue +++ b/test-scheduler/ui/src/components/testcase.vue @@ -1,7 +1,7 @@ <template> <div class="wrapper wrapper-content animated fadeIn"> <div class="row" style="margin-bottom: 20px;"> - <div class="col-md-8"> + <div class="col-md-12"> <ol class="breadcrumb" style="padding-left: 20px; font-size: 17px;"> <li> <router-link to="/" >root</router-link> @@ -13,7 +13,7 @@ </div> </div> <div id="page-content" style="" class="row"> - <div class="col-lg-8"> + <div class="col-lg-12"> <div class="ibox"> <div class="ibox-title"> <h5 style="font-size:26px;margin-top: -3px;">Test Case</h5> @@ -55,7 +55,7 @@ </div> </div> <hr /> - <div class="row"> + <div class="row" v-show="runYet"> <div class="col-lg-12"> <div class="ibox"> <div class="ibox-title"> @@ -126,7 +126,8 @@ export default { selected: [], curRunningId: 0, runTestcases: [], - wfComplete: false + wfComplete: false, + runYet: false } }, created: function() { @@ -243,6 +244,9 @@ export default { runMultiTestcase: function() { var self = this; var msgTitle = "RUN -- TESTCASES"; + if(!self.runYet) { + self.runYet = true; + } self.runTestcases = []; if(self.selected.length == 0) { showMessage("warning", msgTitle, "please select one!"); diff --git a/test-scheduler/ui/src/components/testcase_content.vue b/test-scheduler/ui/src/components/testcase_content.vue index 49169cee..a9ea78e7 100644 --- a/test-scheduler/ui/src/components/testcase_content.vue +++ b/test-scheduler/ui/src/components/testcase_content.vue @@ -1,7 +1,7 @@ <template> <div class="wrapper wrapper-content animated fadeIn"> <div class="row" style="margin-bottom: 20px;"> - <div class="col-md-8"> + <div class="col-md-12"> <ol class="breadcrumb" style="padding-left: 20px; font-size: 17px;"> <li> <router-link to="/" >root</router-link> @@ -57,7 +57,7 @@ </div> </div> <hr /> - <div class="row"> + <div class="row" v-show="runYet"> <div class="col-lg-12"> <div class="ibox"> <div class="ibox-title"> @@ -98,7 +98,9 @@ export default { workflowId: '', wfloading: false, wfJson: '', - saveSignal: false + wfComplete: false, + saveSignal: false, + runYet: false, } }, created: function() { @@ -121,6 +123,9 @@ export default { runTestcase: function(){ var self = this; var msgTitle = "RUN -- TESTCASE"; + if(!self.runYet) { + self.runYet = true; + } $.ajax({ url: this.global.SERVER_ADDR + "execute/testcase", method: "POST", diff --git a/test-scheduler/ui/src/components/testsuite.vue b/test-scheduler/ui/src/components/testsuite.vue index 5bdcbcc1..c6bb5a70 100644 --- a/test-scheduler/ui/src/components/testsuite.vue +++ b/test-scheduler/ui/src/components/testsuite.vue @@ -1,7 +1,7 @@ <template> <div class="wrapper wrapper-content animated fadeIn"> <div class="row" style="margin-bottom: 20px;"> - <div class="col-md-8"> + <div class="col-md-12"> <ol class="breadcrumb" style="padding-left: 20px; font-size: 17px;"> <li> <router-link to="/" >root</router-link> @@ -10,7 +10,7 @@ </div> </div> <div id="page-content" class="row"> - <div class="col-lg-8"> + <div class="col-lg-12"> <div class="ibox"> <div class="ibox-title"> <h5 style="font-size:26px;margin-top: -3px;">Test Suite</h5> @@ -52,7 +52,7 @@ </div> </div> <hr /> - <div class="row"> + <div class="row" v-show="runYet"> <div class="col-lg-12"> <div class="ibox"> <div class="ibox-title"> @@ -126,7 +126,8 @@ export default { caseName: "" }, curRunningId: 0, - wfComplete: false + wfComplete: false, + runYet: false } }, created: function() { @@ -239,6 +240,9 @@ export default { runTestsuites: function() { var self = this; var msgTitle = "RUN -- TESTSUITE"; + if(!self.runYet) { + self.runYet = true; + } if(self.selected.length == 0) { showMessage("warning", msgTitle, "please select one!"); return; |