Skip to content

Commit 1e4e553

Browse files
committed
new fix
1 parent 7f81246 commit 1e4e553

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

src/services/province/province.service.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ class ProvinceService extends AbstractService {
3737
"/" +
3838
payload.soglia
3939
)
40-
.then(res => {
41-
var data = res.data ? res.data : {};
40+
.then(data => {
4241
//console.log(data);
4342
return data;
4443
})

src/store/modules/province/runRScript.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const state = {
66
};
77

88
const mutations = {
9-
SET_RETURNSCRIPT(state, returnValueScript) {
10-
state.returnValueScript = returnValueScript;
9+
SET_RETURNSCRIPT(state, returnValue) {
10+
state.returnValueScript = returnValue;
1111
}
1212
};
1313

src/views/catalogue/toponimo/ToponimoList.vue

+10-3
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
Esegui Script
150150
</CButton>
151151
</div>
152-
<div class="col-2" v-if="isRServeOn">
152+
<div class="col-2" v-if="isRServeOn()">
153153
<CBadge color="success">RSERVE Connesso</CBadge>
154154
</div>
155155
<div class="col-2" v-else>
@@ -172,6 +172,7 @@
172172
hover
173173
pagination
174174
clickableRows
175+
@row-clicked="showList"
175176
>
176177
<template #codiciProvincia="{item}">
177178
<td>{{ item.codiciProvincia | dashEmpty }}</td>
@@ -282,7 +283,6 @@ export default {
282283
returnValueScript: "",
283284
intervalId: null,
284285
intervalIdScriptRunning: null,
285-
rServerConnesso: false,
286286
btnLabel: () => "Elenco Province",
287287
filters: [
288288
{
@@ -316,7 +316,7 @@ export default {
316316
computed: {
317317
...mapGetters("coreui", ["isLoading"]),
318318
...mapGetters("toponimo", ["toponimi", "filterTopProvincia"]),
319-
//...mapGetters("valueScript", ["returnValueScript"]),
319+
...mapGetters("valueScript", ["returnValueScript"]),
320320
...mapGetters("scriptRunning", ["isScriptRunning"]),
321321
...mapGetters("elencoProvinceScript", ["provinceScript"]),
322322
...mapGetters("archivio", ["archivioCodes"]),
@@ -460,6 +460,13 @@ export default {
460460
root: true
461461
});
462462
},
463+
showList(logRow) {
464+
this.$store.dispatch(
465+
"tabella/findTabellaByUserAndProc",
466+
logRow.idProcesso
467+
);
468+
this.returnValueScript = this.elencoScript[logRow.index - 1].esito;
469+
},
463470
modalOpen() {
464471
this.warningModal = true;
465472
},

0 commit comments

Comments
 (0)