Merged in bugfix/PMCORE-3325-A (pull request #8196)
PMCORE-3325 Approved-by: Fabio Guachalla
This commit is contained in:
committed by
Julio Cesar Laura Avendaño
commit
d6e8b53e9f
@@ -60,6 +60,16 @@ export let filters = {
|
|||||||
keys: {},
|
keys: {},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Service to get the process list
|
||||||
|
*/
|
||||||
|
processListPaged(data) {
|
||||||
|
return Api.get({
|
||||||
|
service: "PROCESSES",
|
||||||
|
params: data,
|
||||||
|
keys: {},
|
||||||
|
});
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* Service to get the users list
|
* Service to get the users list
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -233,7 +233,10 @@ export default {
|
|||||||
getProcesses(query) {
|
getProcesses(query) {
|
||||||
let that = this;
|
let that = this;
|
||||||
Api.filters
|
Api.filters
|
||||||
.processList(query || "")
|
.processListPaged({
|
||||||
|
text: query || "",
|
||||||
|
paged: false,
|
||||||
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
that.formatDataProcesses(response.data);
|
that.formatDataProcesses(response.data);
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -126,13 +126,13 @@ export default {
|
|||||||
return {
|
return {
|
||||||
currentSelection: null,
|
currentSelection: null,
|
||||||
dateFrom:
|
dateFrom:
|
||||||
this.data[3] && this.data[3].data.dateFromRisk
|
this.data[3] && this.data[3].data.dateFrom
|
||||||
? this.data[3].data.dateFromRisk
|
? this.data[3].data.dateFrom
|
||||||
: moment().format("YYYY-MM-DD"),
|
: moment().subtract(30, "d").format("YYYY-MM-DD"),
|
||||||
dateTo:
|
dateTo:
|
||||||
this.data[3] && this.data[3].data.dateToRisk
|
this.data[3] && this.data[3].data.dateTo
|
||||||
? this.data[3].data.dateToRisk
|
? this.data[3].data.dateTo
|
||||||
: moment().add(30, "d").format("YYYY-MM-DD"),
|
: moment().format("YYYY-MM-DD"),
|
||||||
dateNow: moment().format("DD/MM/YYYY h:mm:ss a"),
|
dateNow: moment().format("DD/MM/YYYY h:mm:ss a"),
|
||||||
size:
|
size:
|
||||||
this.data[3] && this.data[3].data.size
|
this.data[3] && this.data[3].data.size
|
||||||
@@ -462,11 +462,9 @@ export default {
|
|||||||
name: this.data[2]["name"],
|
name: this.data[2]["name"],
|
||||||
level: 3,
|
level: 3,
|
||||||
data: {
|
data: {
|
||||||
dateFrom: this.data[3].data.dateFrom,
|
dateFrom: this.dateFrom,
|
||||||
dateTo: this.data[3].data.dateTo,
|
dateTo: this.dateTo,
|
||||||
period: this.data[3].data.period,
|
period: this.data[3].data.period,
|
||||||
dateFromRisk: this.dateFrom,
|
|
||||||
dateToRisk: this.dateTo,
|
|
||||||
size: this.size,
|
size: this.size,
|
||||||
riskType: this.riskType,
|
riskType: this.riskType,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -58,8 +58,8 @@
|
|||||||
:options="options"
|
:options="options"
|
||||||
:series="series"
|
:series="series"
|
||||||
></apexchart>
|
></apexchart>
|
||||||
<div class="row">
|
<div class="vp-text-align-center">
|
||||||
<div class="col-sm vp-align-right">
|
<div class="vp-align-right vp-inline-block">
|
||||||
<button
|
<button
|
||||||
@click="onClickDrillDown()"
|
@click="onClickDrillDown()"
|
||||||
type="button"
|
type="button"
|
||||||
@@ -69,7 +69,7 @@
|
|||||||
><span class="vp-padding-l10">{{ $t("ID_DRILL") }}</span>
|
><span class="vp-padding-l10">{{ $t("ID_DRILL") }}</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm">
|
<div class="vp-inline-block">
|
||||||
<button @click="onClickData()" type="button" class="btn btn-primary">
|
<button @click="onClickData()" type="button" class="btn btn-primary">
|
||||||
<i class="fas fa-th"></i
|
<i class="fas fa-th"></i
|
||||||
><span class="vp-padding-l10">{{ $t("ID_DATA") }}</span>
|
><span class="vp-padding-l10">{{ $t("ID_DATA") }}</span>
|
||||||
@@ -100,10 +100,10 @@ export default {
|
|||||||
return {
|
return {
|
||||||
dateFrom: this.data[3]
|
dateFrom: this.data[3]
|
||||||
? this.data[3].data.dateFrom
|
? this.data[3].data.dateFrom
|
||||||
: moment().format("YYYY-MM-DD"),
|
: moment().subtract(30, "d").format("YYYY-MM-DD"),
|
||||||
dateTo: this.data[3]
|
dateTo: this.data[3]
|
||||||
? this.data[3].data.dateTo
|
? this.data[3].data.dateTo
|
||||||
: moment().add(30, "d").format("YYYY-MM-DD"),
|
: moment().format("YYYY-MM-DD"),
|
||||||
period: this.data[3] ? this.data[3].data.period : "day",
|
period: this.data[3] ? this.data[3].data.period : "day",
|
||||||
periodOptions: [
|
periodOptions: [
|
||||||
{ text: this.$t("ID_DAY"), value: "day" },
|
{ text: this.$t("ID_DAY"), value: "day" },
|
||||||
@@ -338,5 +338,9 @@ export default {
|
|||||||
.vp-padding-l20 {
|
.vp-padding-l20 {
|
||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.vp-text-align-center {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
|
<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
|
||||||
Reference in New Issue
Block a user