This commit is contained in:
2020-06-16 22:17:25 +00:00
parent 76bb170c08
commit 95c7792d57
2 changed files with 63 additions and 71 deletions

View File

@@ -4,14 +4,15 @@
<v-form ref="form"> <v-form ref="form">
<v-row> <v-row>
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-col cols="12" offset-md="3">
<v-col cols="12"> <v-col cols="12">
<div class="text-h4 text-md-h2 mb-2">{{ $ay.t("Welcome") }}</div> <div class="text-h4 text-md-h2 mb-2">{{ $ay.t("Welcome") }}</div>
</v-col> </v-col>
<v-col cols="12"> <v-col cols="12">
<v-btn @click="helpEvaluate()" class="my-8 mr-4">{{ <v-btn @click="helpEvaluate()" class="my-8 mr-16">{{
$ay.t("EvaluationGuide") $ay.t("EvaluationGuide")
}}</v-btn> }}</v-btn>
<v-btn :href="supportLink()" target="blank" class="my-8 mr-4">{{ <v-btn :href="supportLink()" target="blank" class="my-8 mr-12">{{
$ay.t("HelpTechSupport") $ay.t("HelpTechSupport")
}}</v-btn> }}</v-btn>
</v-col> </v-col>
@@ -64,6 +65,7 @@
> >
</v-col> </v-col>
</v-col> </v-col>
</v-col>
</v-row> </v-row>
</v-form> </v-form>
</v-col> </v-col>
@@ -213,7 +215,7 @@ export default {
//get status //get status
while (vm.seedingJobActive == true) { while (vm.seedingJobActive == true) {
await window.$gz.util.sleepAsync(5000); await window.$gz.util.sleepAsync(1000);
//check if done //check if done
jobStatus = await window.$gz.api.get( jobStatus = await window.$gz.api.get(
`job-operations/status/${jobId}` `job-operations/status/${jobId}`

View File

@@ -21,7 +21,7 @@
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
</v-col> </v-col>
<v-col cols="12" md="7" v-if="serverStatus == 1"> <v-col cols="12" md="7" v-if="showEvalUsers == true">
<v-select <v-select
v-model="selectedTrialUserId" v-model="selectedTrialUserId"
:items="selectLists.trialUsers" :items="selectLists.trialUsers"
@@ -97,7 +97,7 @@ export default {
errorBadCreds: false, errorBadCreds: false,
reveal: false, reveal: false,
formState: { errorBoxMessage: null }, formState: { errorBoxMessage: null },
serverStatus: 0, showEvalUsers: false,
selectedTrialUserId: 1, selectedTrialUserId: 1,
selectLists: { selectLists: {
trialUsers: [ trialUsers: [
@@ -226,17 +226,7 @@ export default {
.get("notify/hello") .get("notify/hello")
.then(res => { .then(res => {
if (res.data != null) { if (res.data != null) {
/**public enum LicenseStatus vm.showEvalUsers = res.data;
{
NONE = 0,
ActiveTrial = 1,
ExpiredTrial = 2,
ActivePurchased = 3,
ExpiredPurchased = 4,
Revoked = 5
} */
vm.serverStatus = res.data;
} }
}) })
.catch(function handleGetTrialModeError(error) { .catch(function handleGetTrialModeError(error) {