mirror of
https://github.com/apache/skywalking-booster-ui.git
synced 2025-07-18 14:05:25 +00:00
remove total from logs
This commit is contained in:
parent
140f851c2d
commit
1fe0de361a
@ -54,7 +54,6 @@ export const QueryServiceLogs = {
|
|||||||
value
|
value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
total
|
|
||||||
}`,
|
}`,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@ interface LogState {
|
|||||||
selectorStore: any;
|
selectorStore: any;
|
||||||
supportQueryLogsByKeywords: boolean;
|
supportQueryLogsByKeywords: boolean;
|
||||||
logs: any[];
|
logs: any[];
|
||||||
logsTotal: number;
|
|
||||||
loadLogs: boolean;
|
loadLogs: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +47,6 @@ export const logStore = defineStore({
|
|||||||
supportQueryLogsByKeywords: true,
|
supportQueryLogsByKeywords: true,
|
||||||
selectorStore: useSelectorStore(),
|
selectorStore: useSelectorStore(),
|
||||||
logs: [],
|
logs: [],
|
||||||
logsTotal: 0,
|
|
||||||
loadLogs: false,
|
loadLogs: false,
|
||||||
}),
|
}),
|
||||||
actions: {
|
actions: {
|
||||||
@ -131,7 +129,6 @@ export const logStore = defineStore({
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.logs = res.data.data.queryLogs.logs;
|
this.logs = res.data.data.queryLogs.logs;
|
||||||
this.logsTotal = res.data.data.queryLogs.total;
|
|
||||||
return res.data;
|
return res.data;
|
||||||
},
|
},
|
||||||
async getBrowserLogs() {
|
async getBrowserLogs() {
|
||||||
@ -145,7 +142,6 @@ export const logStore = defineStore({
|
|||||||
return res.data;
|
return res.data;
|
||||||
}
|
}
|
||||||
this.logs = res.data.data.queryBrowserErrorLogs.logs;
|
this.logs = res.data.data.queryBrowserErrorLogs.logs;
|
||||||
this.logsTotal = res.data.data.queryBrowserErrorLogs.total;
|
|
||||||
return res.data;
|
return res.data;
|
||||||
},
|
},
|
||||||
async getLogTagKeys() {
|
async getLogTagKeys() {
|
||||||
|
@ -32,7 +32,6 @@ interface TraceState {
|
|||||||
currentTrace: Trace | any;
|
currentTrace: Trace | any;
|
||||||
conditions: any;
|
conditions: any;
|
||||||
traceSpanLogs: any[];
|
traceSpanLogs: any[];
|
||||||
traceSpanLogsTotal: number;
|
|
||||||
selectorStore: any;
|
selectorStore: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -52,7 +51,6 @@ export const traceStore = defineStore({
|
|||||||
paging: { pageNum: 1, pageSize: 20 },
|
paging: { pageNum: 1, pageSize: 20 },
|
||||||
},
|
},
|
||||||
traceSpanLogs: [],
|
traceSpanLogs: [],
|
||||||
traceSpanLogsTotal: 0,
|
|
||||||
selectorStore: useSelectorStore(),
|
selectorStore: useSelectorStore(),
|
||||||
}),
|
}),
|
||||||
actions: {
|
actions: {
|
||||||
@ -144,11 +142,9 @@ export const traceStore = defineStore({
|
|||||||
.params(params);
|
.params(params);
|
||||||
if (res.data.errors) {
|
if (res.data.errors) {
|
||||||
this.traceSpanLogs = [];
|
this.traceSpanLogs = [];
|
||||||
this.traceSpanLogsTotal = 0;
|
|
||||||
return res.data;
|
return res.data;
|
||||||
}
|
}
|
||||||
this.traceSpanLogs = res.data.data.queryLogs.logs || [];
|
this.traceSpanLogs = res.data.data.queryLogs.logs || [];
|
||||||
this.traceSpanLogsTotal = res.data.data.queryLogs.total;
|
|
||||||
return res.data;
|
return res.data;
|
||||||
},
|
},
|
||||||
async getTagKeys() {
|
async getTagKeys() {
|
||||||
|
@ -94,6 +94,8 @@ function setCurrentLog(log: any) {
|
|||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-bottom: 1px solid #eee;
|
border-bottom: 1px solid #eee;
|
||||||
|
width: 100%;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.log-header {
|
.log-header {
|
||||||
|
@ -26,8 +26,10 @@ limitations under the License. -->
|
|||||||
<el-pagination
|
<el-pagination
|
||||||
v-model:currentPage="logStore.conditions.paging.pageNum"
|
v-model:currentPage="logStore.conditions.paging.pageNum"
|
||||||
v-model:page-size="pageSize"
|
v-model:page-size="pageSize"
|
||||||
layout="prev, pager, next, jumper"
|
:small="true"
|
||||||
:total="logStore.logsTotal"
|
layout="prev, pager, next"
|
||||||
|
:pager-count="5"
|
||||||
|
:total="total"
|
||||||
@current-change="updatePage"
|
@current-change="updatePage"
|
||||||
:style="`float: right`"
|
:style="`float: right`"
|
||||||
/>
|
/>
|
||||||
@ -35,7 +37,7 @@ limitations under the License. -->
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { ref } from "vue";
|
import { ref, computed } from "vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
import LogTable from "@/views/dashboard/related/components/LogTable/Index.vue";
|
import LogTable from "@/views/dashboard/related/components/LogTable/Index.vue";
|
||||||
import { useLogStore } from "@/store/modules/log";
|
import { useLogStore } from "@/store/modules/log";
|
||||||
@ -49,6 +51,11 @@ const type = ref<string>(
|
|||||||
dashboardStore.layerId === "BROWSER" ? "browser" : "service"
|
dashboardStore.layerId === "BROWSER" ? "browser" : "service"
|
||||||
);
|
);
|
||||||
const pageSize = ref<number>(15);
|
const pageSize = ref<number>(15);
|
||||||
|
const total = computed(() =>
|
||||||
|
logStore.logs.length === pageSize.value
|
||||||
|
? pageSize.value * logStore.conditions.paging.pageNum + 1
|
||||||
|
: pageSize.value * logStore.conditions.paging.pageNum
|
||||||
|
);
|
||||||
function updatePage(p: number) {
|
function updatePage(p: number) {
|
||||||
logStore.setLogCondition({
|
logStore.setLogCondition({
|
||||||
paging: { pageNum: p, pageSize: pageSize.value },
|
paging: { pageNum: p, pageSize: pageSize.value },
|
||||||
|
@ -44,7 +44,9 @@ limitations under the License. -->
|
|||||||
v-model:currentPage="pageNum"
|
v-model:currentPage="pageNum"
|
||||||
v-model:page-size="pageSize"
|
v-model:page-size="pageSize"
|
||||||
:small="true"
|
:small="true"
|
||||||
:total="traceStore.traceSpanLogsTotal"
|
layout="prev, pager, next"
|
||||||
|
:pager-count="5"
|
||||||
|
:total="total"
|
||||||
@current-change="turnLogsPage"
|
@current-change="turnLogsPage"
|
||||||
/>
|
/>
|
||||||
<LogTable
|
<LogTable
|
||||||
@ -146,7 +148,7 @@ limitations under the License. -->
|
|||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { ref, defineComponent } from "vue";
|
import { ref, defineComponent, computed } from "vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
import { useTraceStore } from "@/store/modules/trace";
|
import { useTraceStore } from "@/store/modules/trace";
|
||||||
import { Option } from "@/types/app";
|
import { Option } from "@/types/app";
|
||||||
@ -171,6 +173,11 @@ export default defineComponent({
|
|||||||
const displayMode = ref<string>("List");
|
const displayMode = ref<string>("List");
|
||||||
const pageNum = ref<number>(1);
|
const pageNum = ref<number>(1);
|
||||||
const pageSize = 10;
|
const pageSize = 10;
|
||||||
|
const total = computed(() =>
|
||||||
|
traceStore.traceList.length === pageSize
|
||||||
|
? pageSize * pageNum.value + 1
|
||||||
|
: pageSize * pageNum.value
|
||||||
|
);
|
||||||
const dateFormat = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") =>
|
const dateFormat = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") =>
|
||||||
dayjs(date).format(pattern);
|
dayjs(date).format(pattern);
|
||||||
const showTraceLogs = ref<boolean>(false);
|
const showTraceLogs = ref<boolean>(false);
|
||||||
@ -227,6 +234,7 @@ export default defineComponent({
|
|||||||
pageSize,
|
pageSize,
|
||||||
pageNum,
|
pageNum,
|
||||||
loading,
|
loading,
|
||||||
|
total,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
@ -91,7 +91,9 @@ limitations under the License. -->
|
|||||||
v-model:currentPage="pageNum"
|
v-model:currentPage="pageNum"
|
||||||
v-model:page-size="pageSize"
|
v-model:page-size="pageSize"
|
||||||
:small="true"
|
:small="true"
|
||||||
:total="traceStore.traceSpanLogsTotal"
|
layout="prev, pager, next"
|
||||||
|
:pager-count="5"
|
||||||
|
:total="total"
|
||||||
@current-change="turnPage"
|
@current-change="turnPage"
|
||||||
/>
|
/>
|
||||||
<LogTable
|
<LogTable
|
||||||
@ -106,7 +108,7 @@ limitations under the License. -->
|
|||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { ref } from "vue";
|
import { ref, computed } from "vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
import type { PropType } from "vue";
|
import type { PropType } from "vue";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
@ -124,6 +126,11 @@ const traceStore = useTraceStore();
|
|||||||
const pageNum = ref<number>(1);
|
const pageNum = ref<number>(1);
|
||||||
const showRelatedLogs = ref<boolean>(false);
|
const showRelatedLogs = ref<boolean>(false);
|
||||||
const pageSize = 10;
|
const pageSize = 10;
|
||||||
|
const total = computed(() =>
|
||||||
|
traceStore.traceList.length === pageSize
|
||||||
|
? pageSize * pageNum.value + 1
|
||||||
|
: pageSize * pageNum.value
|
||||||
|
);
|
||||||
const dateFormat = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") =>
|
const dateFormat = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") =>
|
||||||
dayjs(date).format(pattern);
|
dayjs(date).format(pattern);
|
||||||
async function getTaceLogs() {
|
async function getTaceLogs() {
|
||||||
|
Loading…
Reference in New Issue
Block a user