style: 查询年月日控件改为年月日时分秒
This commit is contained in:
@@ -471,6 +471,8 @@ onMounted(() => {
|
|||||||
v-model:value="queryRangePicker"
|
v-model:value="queryRangePicker"
|
||||||
allow-clear
|
allow-clear
|
||||||
bordered
|
bordered
|
||||||
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
></a-range-picker>
|
></a-range-picker>
|
||||||
|
|||||||
@@ -40,11 +40,11 @@ let rangePicker = reactive<RangePickerType>({
|
|||||||
t('views.monitor.monitor.endTime'),
|
t('views.monitor.monitor.endTime'),
|
||||||
],
|
],
|
||||||
ranges: {
|
ranges: {
|
||||||
[t('views.monitor.monitor.today')]: [
|
[t('views.monitor.monitor.yesterday')]: [
|
||||||
dayjs().subtract(1, 'day').startOf('day'),
|
dayjs().subtract(1, 'day').startOf('day'),
|
||||||
dayjs().subtract(1, 'day').endOf('day'),
|
dayjs().subtract(1, 'day').endOf('day'),
|
||||||
],
|
],
|
||||||
[t('views.monitor.monitor.yesterday')]: [dayjs().startOf('day'), dayjs()],
|
[t('views.monitor.monitor.today')]: [dayjs().startOf('day'), dayjs()],
|
||||||
[t('views.monitor.monitor.week')]: [
|
[t('views.monitor.monitor.week')]: [
|
||||||
dayjs().startOf('week'),
|
dayjs().startOf('week'),
|
||||||
dayjs().endOf('week'),
|
dayjs().endOf('week'),
|
||||||
@@ -66,21 +66,21 @@ let rangePicker = reactive<RangePickerType>({
|
|||||||
function fnGetList() {
|
function fnGetList() {
|
||||||
let startTime = null;
|
let startTime = null;
|
||||||
let endTime = null;
|
let endTime = null;
|
||||||
const dateString = rangePicker.all;
|
const dateNumber = rangePicker.all;
|
||||||
if (dateString[0]) {
|
if (dateNumber[0]) {
|
||||||
startTime = parseStrToDate(dateString[0], YYYY_MM_DD_HH_MM_SS);
|
startTime = dateNumber[0];
|
||||||
endTime = parseStrToDate(dateString[1], YYYY_MM_DD_HH_MM_SS);
|
endTime = dateNumber[1];
|
||||||
} else {
|
} else {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
now.setHours(0, 0, 0, 0);
|
now.setHours(0, 0, 0, 0);
|
||||||
startTime = now;
|
startTime = `${now.getTime()}`;
|
||||||
endTime = new Date();
|
endTime = `${new Date().getTime()}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
getLoad({
|
getLoad({
|
||||||
type: 'all',
|
type: 'all',
|
||||||
startTime: startTime.getTime(),
|
startTime: startTime,
|
||||||
endTime: endTime.getTime(),
|
endTime: endTime,
|
||||||
neType: '#',
|
neType: '#',
|
||||||
neId: '#',
|
neId: '#',
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
@@ -94,10 +94,7 @@ function fnGetList() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// 设置初始时间段
|
// 设置初始时间段
|
||||||
const initRangePicker: [string, string] = [
|
const initRangePicker: [string, string] = [startTime, endTime];
|
||||||
parseDateToStr(startTime, YYYY_MM_DD_HH_MM_SS),
|
|
||||||
parseDateToStr(endTime, YYYY_MM_DD_HH_MM_SS),
|
|
||||||
];
|
|
||||||
rangePicker.all = initRangePicker;
|
rangePicker.all = initRangePicker;
|
||||||
rangePicker.load = initRangePicker;
|
rangePicker.load = initRangePicker;
|
||||||
rangePicker.cpu = initRangePicker;
|
rangePicker.cpu = initRangePicker;
|
||||||
@@ -164,7 +161,7 @@ function fnLoadChart(data: Record<string, any>[]) {
|
|||||||
type: 'value',
|
type: 'value',
|
||||||
name: `${t('views.monitor.monitor.resourceUsage')} ( % )`,
|
name: `${t('views.monitor.monitor.resourceUsage')} ( % )`,
|
||||||
position: 'right',
|
position: 'right',
|
||||||
alignTicks: false
|
alignTicks: false,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
grid: { left: '5%', right: '5%', bottom: '20%' },
|
grid: { left: '5%', right: '5%', bottom: '20%' },
|
||||||
@@ -446,9 +443,9 @@ onMounted(() => {
|
|||||||
v-model:value="rangePicker.all"
|
v-model:value="rangePicker.all"
|
||||||
:allow-clear="false"
|
:allow-clear="false"
|
||||||
bordered
|
bordered
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
show-time
|
value-format="x"
|
||||||
:placeholder="rangePicker.placeholder"
|
:placeholder="rangePicker.placeholder"
|
||||||
:ranges="rangePicker.ranges"
|
:ranges="rangePicker.ranges"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@@ -480,9 +477,9 @@ onMounted(() => {
|
|||||||
v-model:value="rangePicker.load"
|
v-model:value="rangePicker.load"
|
||||||
:allow-clear="false"
|
:allow-clear="false"
|
||||||
bordered
|
bordered
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
show-time
|
value-format="x"
|
||||||
:placeholder="rangePicker.placeholder"
|
:placeholder="rangePicker.placeholder"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@change="(_:any, d:[string,string]) => fnGetQuery('load', d)"
|
@change="(_:any, d:[string,string]) => fnGetQuery('load', d)"
|
||||||
@@ -510,9 +507,9 @@ onMounted(() => {
|
|||||||
v-model:value="rangePicker.cpu"
|
v-model:value="rangePicker.cpu"
|
||||||
:allow-clear="false"
|
:allow-clear="false"
|
||||||
bordered
|
bordered
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
show-time
|
value-format="x"
|
||||||
:placeholder="rangePicker.placeholder"
|
:placeholder="rangePicker.placeholder"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@change="(_:any, d:[string,string]) => fnGetQuery('cpu', d)"
|
@change="(_:any, d:[string,string]) => fnGetQuery('cpu', d)"
|
||||||
@@ -538,9 +535,9 @@ onMounted(() => {
|
|||||||
v-model:value="rangePicker.memory"
|
v-model:value="rangePicker.memory"
|
||||||
:allow-clear="false"
|
:allow-clear="false"
|
||||||
bordered
|
bordered
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
show-time
|
value-format="x"
|
||||||
:placeholder="rangePicker.placeholder"
|
:placeholder="rangePicker.placeholder"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@change="(_:any, d:[string,string]) => fnGetQuery('memory', d)"
|
@change="(_:any, d:[string,string]) => fnGetQuery('memory', d)"
|
||||||
@@ -568,9 +565,9 @@ onMounted(() => {
|
|||||||
v-model:value="rangePicker.io"
|
v-model:value="rangePicker.io"
|
||||||
:allow-clear="false"
|
:allow-clear="false"
|
||||||
bordered
|
bordered
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
show-time
|
value-format="x"
|
||||||
:placeholder="rangePicker.placeholder"
|
:placeholder="rangePicker.placeholder"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@change="fnGetQueryIO"
|
@change="fnGetQueryIO"
|
||||||
@@ -596,9 +593,9 @@ onMounted(() => {
|
|||||||
v-model:value="rangePicker.network"
|
v-model:value="rangePicker.network"
|
||||||
:allow-clear="false"
|
:allow-clear="false"
|
||||||
bordered
|
bordered
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
show-time
|
value-format="x"
|
||||||
:placeholder="rangePicker.placeholder"
|
:placeholder="rangePicker.placeholder"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@change="fnGetQueryNetwork"
|
@change="fnGetQueryNetwork"
|
||||||
|
|||||||
@@ -527,6 +527,8 @@ onMounted(() => {
|
|||||||
v-model:value="queryRangePicker"
|
v-model:value="queryRangePicker"
|
||||||
allow-clear
|
allow-clear
|
||||||
bordered
|
bordered
|
||||||
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
></a-range-picker>
|
></a-range-picker>
|
||||||
|
|||||||
@@ -527,6 +527,8 @@ onMounted(() => {
|
|||||||
v-model:value="queryRangePicker"
|
v-model:value="queryRangePicker"
|
||||||
allow-clear
|
allow-clear
|
||||||
bordered
|
bordered
|
||||||
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
></a-range-picker>
|
></a-range-picker>
|
||||||
|
|||||||
@@ -719,7 +719,11 @@ function fnGetList(pageNum?: number) {
|
|||||||
}
|
}
|
||||||
tablePagination.total = res.total;
|
tablePagination.total = res.total;
|
||||||
tableState.data = res.rows;
|
tableState.data = res.rows;
|
||||||
if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
|
if (
|
||||||
|
tablePagination.total <=
|
||||||
|
(queryParams.pageNum - 1) * tablePagination.pageSize &&
|
||||||
|
queryParams.pageNum !== 1
|
||||||
|
) {
|
||||||
tableState.loading = false;
|
tableState.loading = false;
|
||||||
fnGetList(queryParams.pageNum - 1);
|
fnGetList(queryParams.pageNum - 1);
|
||||||
}
|
}
|
||||||
@@ -791,6 +795,8 @@ onMounted(() => {
|
|||||||
v-model:value="queryRangePicker"
|
v-model:value="queryRangePicker"
|
||||||
allow-clear
|
allow-clear
|
||||||
bordered
|
bordered
|
||||||
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
></a-range-picker>
|
></a-range-picker>
|
||||||
@@ -1019,7 +1025,10 @@ onMounted(() => {
|
|||||||
</a-row>
|
</a-row>
|
||||||
<a-row :gutter="16">
|
<a-row :gutter="16">
|
||||||
<a-col :lg="12" :md="12" :xs="24">
|
<a-col :lg="12" :md="12" :xs="24">
|
||||||
<a-form-item :label="t('views.system.role.roleSort')" name="roleSort">
|
<a-form-item
|
||||||
|
:label="t('views.system.role.roleSort')"
|
||||||
|
name="roleSort"
|
||||||
|
>
|
||||||
{{ modalState.from.roleSort }}
|
{{ modalState.from.roleSort }}
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|||||||
@@ -877,6 +877,8 @@ onMounted(() => {
|
|||||||
v-model:value="queryRangePicker"
|
v-model:value="queryRangePicker"
|
||||||
allow-clear
|
allow-clear
|
||||||
bordered
|
bordered
|
||||||
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
></a-range-picker>
|
></a-range-picker>
|
||||||
|
|||||||
Reference in New Issue
Block a user