summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjuyinkanglin <14_ykl@tongji.edu.cn>2019-04-24 15:09:06 +0800
committertjuyinkanglin <14_ykl@tongji.edu.cn>2019-04-24 15:25:43 +0800
commitde5d561dcf0791b120087ffb9f7506f41c2cb0e0 (patch)
treeaef01764217cf74bc003b89bfbbc63b55e5cdf9d
parent80edaf3c201bec85fe8a403e03b68899c08df3bb (diff)
Add conductor UI to the result page of test scheduler
Conductor UI is added to the result page of test scheduler so that users can see execution results of test cases. Change-Id: I9d4f35bac88be17be4fadf2830ce5073bd9d3818 Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
-rw-r--r--test-scheduler/ui/src/components/conductor_ui.vue36
-rw-r--r--test-scheduler/ui/src/router/index.js3
2 files changed, 38 insertions, 1 deletions
diff --git a/test-scheduler/ui/src/components/conductor_ui.vue b/test-scheduler/ui/src/components/conductor_ui.vue
new file mode 100644
index 00000000..686596bd
--- /dev/null
+++ b/test-scheduler/ui/src/components/conductor_ui.vue
@@ -0,0 +1,36 @@
+<template>
+ <div>
+ <iframe src='http://0.0.0.0:5000/#/workflow?q=&h=&workflowTypes=&status=&start=0' id="conductor-ui"></iframe>
+ </div>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ }
+ },
+ mounted () {
+ /**
+ * iframe adaptive display
+ */
+ function changeConductorUIfIframe () {
+ const conductorUI = document.getElementById('conductor-ui')
+ const deviceWidth = document.body.clientWidth
+ const deviceHeight = document.body.clientHeight
+ conductorUI.style.width = Number(deviceWidth) + 'px'
+ conductorUI.style.height = Number(deviceHeight) + 'px'
+ }
+
+ changeConductorUIfIframe()
+
+ window.onresize = function () {
+ changeConductorUIfIframe()
+ }
+ }
+ }
+</script>
+
+<style scoped>
+
+</style> \ No newline at end of file
diff --git a/test-scheduler/ui/src/router/index.js b/test-scheduler/ui/src/router/index.js
index 7617eddf..8d957f9c 100644
--- a/test-scheduler/ui/src/router/index.js
+++ b/test-scheduler/ui/src/router/index.js
@@ -5,6 +5,7 @@ import testcase from '@/components/testcase'
import testcase_content from '@/components/testcase_content'
import test_result from '@/components/test_result'
import environment from '@/components/environment'
+import conductorUI from '@/components/conductor_ui'
Vue.use(Router)
const Report = {
@@ -35,7 +36,7 @@ export default new Router({
{
path: '/report',
name: 'report',
- component: Report
+ component: conductorUI
},
{
path: '/environment',