This commit is contained in:
2020-04-10 19:48:35 +00:00
parent 65e927f3be
commit 38393d2915
2 changed files with 39 additions and 8 deletions

View File

@@ -449,7 +449,7 @@ export default new Router({
import(/* webpackChunkName: "ay-common" */ "./views/ay-review.vue")
},
{
path: "/history/:ayatype/:recordid/:useractions?",
path: "/history/:ayatype/:recordid/:userlog?",
name: "ay-history",
component: () =>
import(/* webpackChunkName: "ay-common" */ "./views/ay-history.vue")

View File

@@ -2,6 +2,7 @@
<v-row row v-if="this.formState.ready">
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-col rows="12">
{{ obj }}
<v-timeline>
<v-timeline-item>timeline item</v-timeline-item>
<v-timeline-item class="text-right">timeline item</v-timeline-item>
@@ -26,8 +27,8 @@ export default {
vm.formState.ready = true;
vm.readOnly = true;
window.$gz.eventBus.$on("menu-click", clickHandler);
vm.getDataFromApi(vm.$route.params.recordid);
generateMenu(vm, false);
vm.getDataFromApi();
})
.catch(err => {
vm.formState.ready = true;
@@ -36,10 +37,11 @@ export default {
},
data() {
return {
obj: {},
obj: [],
lastOffset: 0,
formState: {
ready: false,
loading: true,
loading: false,
errorBoxMessage: null,
appError: null,
serverError: {}
@@ -53,10 +55,23 @@ export default {
return;
}
vm.formState.loading = true;
//path: "/history/:ayatype/:recordid/:useractions?"
let url = API_BASE_URL + recordId;
window.$gz.form.deleteAllErrorBoxErrors(vm);
let url = null;
//path: "/history/:ayatype/:recordid/:userlog?"
///EventLog/UserLog?UserId=2&Offset=2&Limit=2
///EventLog/ObjectLog?AyType=2&AyId=2&Offset=2&Limit=2
if (vm.$route.params.userlog) {
url = API_BASE_URL + "UserLog?UserId=" + vm.$route.params.recordid;
} else {
url =
API_BASE_URL +
"ObjectLog?AyType=" +
vm.$route.params.ayatype +
"&AyId=" +
vm.$route.params.recordid;
}
//paging
url += "&Offset=" + vm.lastOffset;
window.$gz.api
.get(url)
.then(res => {
@@ -76,7 +91,23 @@ export default {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
vm.obj = res.data;
let temp = res.data;
let timeZoneName = window.$gz.locale.getBrowserTimeZoneName();
let languageName = window.$gz.locale.getBrowserLanguages();
let hour12 = window.$gz.store.state.locale.hour12;
for (let i = 0; i < temp.length; i++) {
temp[
i
].date = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
temp[i].date,
timeZoneName,
languageName,
hour12
);
}
vm.obj = temp;
//Update the form status
window.$gz.form.setFormState({
vm: vm,