File tree 2 files changed +8
-0
lines changed
2 files changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -298,6 +298,7 @@ export default class JehMaker extends Vue {
298
298
}
299
299
300
300
exportUrl () {
301
+ let json = { fee: this .fee , phases: this .phases , taux: this .taux }
301
302
this .$router .push ({ name: ' phases' , params: { phases: utf8ToB64 (JSON .stringify (json )) } })
302
303
this .url = window .location .href
303
304
this .$copyText (this .url )
@@ -312,12 +313,14 @@ export default class JehMaker extends Vue {
312
313
let jsonImported = JSON .parse (b64ToUtf8 (b64 ))
313
314
this .fee = jsonImported .fee
314
315
this .phases = jsonImported .phases
316
+ this .taux = jsonImported .taux
315
317
}
316
318
317
319
importUrl () {
318
320
let urlSplit = this .urlImport .split (' /' )
319
321
if (urlSplit .length > 2 && urlSplit [urlSplit .length - 2 ] === ' p' ) {
320
322
this .importFromB64 (urlSplit [urlSplit .length - 1 ])
323
+ this .calculate ()
321
324
}
322
325
}
323
326
}
Original file line number Diff line number Diff line change 14
14
</thead >
15
15
<tbody >
16
16
<tr v-for =" label in Object.keys(content)" v-bind:key =" label" >
17
+ <<<<<<< HEAD
17
18
<td >{{description[label]}}</td >
18
19
<td ><sui-input class =" w-100" v-model =" content[label]" @input =" handleInput" type =" text" /></td >
20
+ =======
21
+ <td >{{label}}</td >
22
+ <td ><sui-input class =" w-100" v-model =" content[label]" @input =" handleInput" type =" number" /></td >
23
+ >>>>>>> b4d972e (Save and restore taux URL)
19
24
</tr >
20
25
</tbody >
21
26
</table >
You can’t perform that action at this time.
0 commit comments