This commit is contained in:
wh1te909 2020-05-30 06:17:40 +00:00
parent 18b866d223
commit 14cb693be9
3 changed files with 15 additions and 16 deletions

View File

@ -144,7 +144,7 @@
<q-td v-if="props.row.check_type === 'ping'">
<span
style="cursor:pointer;color:blue;text-decoration:underline"
@click="moreInfo('Ping', props.row.more_info)"
@click="pingInfo(props.row.readable_desc, props.row.more_info)"
>output</span>
</q-td>
<q-td v-else-if="props.row.check_type === 'script'">
@ -224,7 +224,6 @@
:checkpk="checkpk"
/>
</q-dialog>
<!-- refactor below -->
<q-dialog v-model="showScriptOutput">
<ScriptOutput @close="showScriptOutput = false; scriptInfo = {}" :scriptInfo="scriptInfo" />
</q-dialog>
@ -248,7 +247,6 @@ import PingCheck from "@/components/modals/checks/PingCheck";
import WinSvcCheck from "@/components/modals/checks/WinSvcCheck";
import EventLogCheck from "@/components/modals/checks/EventLogCheck";
import ScriptCheck from "@/components/modals/checks/ScriptCheck";
// refactor below
import ScriptOutput from "@/components/modals/checks/ScriptOutput";
import EventLogCheckOutput from "@/components/modals/checks/EventLogCheckOutput";
@ -277,7 +275,6 @@ export default {
showWinSvcCheck: false,
showEventLogCheck: false,
showScriptCheck: false,
// refactor below
showScriptOutput: false,
showEventLogOutput: false,
scriptInfo: {},
@ -364,13 +361,12 @@ export default {
this.$store.dispatch("loadChecks", id);
this.$store.dispatch("loadAutomatedTasks", id);
},
moreInfo(name, output) {
pingInfo(desc, output) {
this.$q.dialog({
title: `${name} output`,
style: "width: 35vw; max-width: 50vw",
title: desc,
style: "width: 50vw; max-width: 60vw",
message: `<pre>${output}</pre>`,
html: true,
dark: true
html: true
});
},
scriptMoreInfo(props) {
@ -387,6 +383,7 @@ export default {
title: "Are you sure?",
message: `Delete ${desc}`,
cancel: true,
ok: { label: "Delete", color: "negative" },
persistent: true
})
.onOk(() => {

View File

@ -6,11 +6,11 @@
<q-space />
<q-btn icon="close" flat round dense v-close-popup />
</div>
<div v-if="evtlogdata.more_info !== null">
<div v-if="evtlogdata.extra_details !== null">
<q-table
dense
class="remote-bg-tbl-sticky"
:data="evtlogdata.more_info.log"
:data="evtlogdata.extra_details.log"
:columns="columns"
:pagination.sync="pagination"
row-key="uid"

View File

@ -1,8 +1,8 @@
<template>
<q-card style="min-width: 700px" class="q-pa-xs">
<q-card style="min-width: 70vw" class="q-pa-xs">
<q-card-section>
<div class="row items-center">
<div class="text-h6">{{ scriptInfo.script.name }}</div>
<div class="text-h6">{{ scriptInfo.readable_desc }}</div>
<q-space />
<q-btn icon="close" flat round dense v-close-popup />
</div>
@ -15,15 +15,17 @@
<code>{{ scriptInfo.retcode }}</code>
<br />
</div>
<br />
<div v-if="scriptInfo.stdout">
Standard Output:
<q-scroll-area style="height: 200px; max-height: 500px;">
Standard Output
<q-separator />
<q-scroll-area style="height: 50vh; max-height: 70vh;">
<pre>{{ scriptInfo.stdout }}</pre>
</q-scroll-area>
</div>
<div v-if="scriptInfo.stderr">
Standard Error:
<q-scroll-area style="height: 200px; max-height: 500px;">
<q-scroll-area style="height: 50vh; max-height: 70vh;">
<pre>{{ scriptInfo.stderr }}</pre>
</q-scroll-area>
</div>