From 817c65f7e21b675368a384fd7209c7bee573d23c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 21 六月 2024 12:31:25 +0800
Subject: [PATCH] !126 fix: 进入审批页面会多次加载用户列表和部门等接口 进入点击取消之后也会重新加载接口 Merge pull request !126 from 玲娜贝er/dev
---
src/views/monitor/logininfor/index.vue | 207 +++++++++++++++++++++++++++------------------------
1 files changed, 109 insertions(+), 98 deletions(-)
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 8279363..27c0a85 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -1,58 +1,60 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="search" v-show="showSearch">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
- <el-form-item label="鐧诲綍鍦板潃" prop="ipaddr">
- <el-input v-model="queryParams.ipaddr" placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�" clearable style="width: 240px;" @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px;" @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="鐧诲綍鐘舵��" clearable style="width: 240px">
- <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="鐧诲綍鏃堕棿" style="width: 308px">
- <el-date-picker
- v-model="dateRange"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
- ></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div v-show="showSearch" class="mb-[10px]">
+ <el-card shadow="hover">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="鐧诲綍鍦板潃" prop="ipaddr">
+ <el-input v-model="queryParams.ipaddr" placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+ <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="鐧诲綍鐘舵��" clearable >
+ <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐧诲綍鏃堕棿" style="width: 308px">
+ <el-date-picker
+ v-model="dateRange"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
</div>
</transition>
- <el-card shadow="never">
+ <el-card shadow="hover">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['monitor:logininfor:remove']">
+ <el-button v-hasPermi="['monitor:logininfor:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" @click="handleClean" v-hasPermi="['monitor:logininfor:remove']">娓呯┖</el-button>
+ <el-button v-hasPermi="['monitor:logininfor:remove']" type="danger" plain icon="Delete" @click="handleClean">娓呯┖</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" plain icon="Unlock" :disabled="single" @click="handleUnlock" v-hasPermi="['monitor:logininfor:unlock']">
+ <el-button v-hasPermi="['monitor:logininfor:unlock']" type="primary" plain icon="Unlock" :disabled="single" @click="handleUnlock">
瑙ｉ攣
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']">瀵煎嚭</el-button>
+ <el-button v-hasPermi="['monitor:logininfor:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
@@ -60,8 +62,8 @@
ref="loginInfoTableRef"
v-loading="loading"
:data="loginInfoList"
- @selection-change="handleSelectionChange"
:default-sort="defaultSort"
+ @selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<el-table-column type="selection" width="55" align="center" />
@@ -74,6 +76,12 @@
sortable="custom"
:sort-orders="['descending', 'ascending']"
/>
+ <el-table-column label="瀹㈡埛绔�" align="center" prop="clientKey" :show-overflow-tooltip="true" />
+ <el-table-column label="璁惧绫诲瀷" align="center">
+ <template #default="scope">
+ <dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
+ </template>
+ </el-table-column>
<el-table-column label="鍦板潃" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" :show-overflow-tooltip="true" />
@@ -91,19 +99,18 @@
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-card>
</div>
</template>
<script setup name="Logininfor" lang="ts">
-import { list, delLoginInfo, cleanLoginInfo, unlockLoginInfo } from "@/api/monitor/loginInfo";
-import { ComponentInternalInstance } from "vue";
-import { LoginInfoQuery, LoginInfoVO } from "@/api/monitor/loginInfo/types";
-import { DateModelType } from 'element-plus';
+import { list, delLoginInfo, cleanLoginInfo, unlockLoginInfo } from '@/api/monitor/loginInfo';
+import { LoginInfoQuery, LoginInfoVO } from '@/api/monitor/loginInfo/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_common_status } = toRefs<any>(proxy?.useDict("sys_common_status"));
+const { sys_device_type } = toRefs<any>(proxy?.useDict('sys_device_type'));
+const { sys_common_status } = toRefs<any>(proxy?.useDict('sys_common_status'));
const loginInfoList = ref<LoginInfoVO[]>([]);
const loading = ref(true);
@@ -113,85 +120,89 @@
const multiple = ref(true);
const selectName = ref<Array<string>>([]);
const total = ref(0);
-const dateRange = ref<[DateModelType,DateModelType]>(['', '']);
-const defaultSort = ref<any>({ prop: "loginTime", order: "descending" });
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const defaultSort = ref<any>({ prop: 'loginTime', order: 'descending' });
-const queryFormRef = ref(ElForm);
-const loginInfoTableRef = ref(ElTable);
+const queryFormRef = ref<ElFormInstance>();
+const loginInfoTableRef = ref<ElTableInstance>();
// 鏌ヨ鍙傛暟
const queryParams = ref<LoginInfoQuery>({
- pageNum: 1,
- pageSize: 10,
- ipaddr: '',
- userName: '',
- status: '',
- orderByColumn: defaultSort.value.prop,
- isAsc: defaultSort.value.order
+ pageNum: 1,
+ pageSize: 10,
+ ipaddr: '',
+ userName: '',
+ status: '',
+ orderByColumn: defaultSort.value.prop,
+ isAsc: defaultSort.value.order
});
/** 鏌ヨ鐧诲綍鏃ュ織鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await list(proxy?.addDateRange(queryParams.value, dateRange.value));
- loginInfoList.value = res.rows;
- total.value = res.total;
- loading.value = false;
-}
+ loading.value = true;
+ const res = await list(proxy?.addDateRange(queryParams.value, dateRange.value));
+ loginInfoList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
-}
+ queryParams.value.pageNum = 1;
+ getList();
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- dateRange.value = ['', ''];
- queryFormRef.value.resetFields();
- queryParams.value.pageNum = 1;
- loginInfoTableRef.value.sort(defaultSort.value.prop, defaultSort.value.order);
-}
+ dateRange.value = ['', ''];
+ queryFormRef.value?.resetFields();
+ queryParams.value.pageNum = 1;
+ loginInfoTableRef.value?.sort(defaultSort.value.prop, defaultSort.value.order);
+};
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: LoginInfoVO[]) => {
- ids.value = selection.map(item => item.infoId);
- multiple.value = !selection.length;
- single.value = selection.length != 1;
- selectName.value = selection.map(item => item.userName);
-}
+ ids.value = selection.map((item) => item.infoId);
+ multiple.value = !selection.length;
+ single.value = selection.length != 1;
+ selectName.value = selection.map((item) => item.userName);
+};
/** 鎺掑簭瑙﹀彂浜嬩欢 */
const handleSortChange = (column: any) => {
- queryParams.value.orderByColumn = column.prop;
- queryParams.value.isAsc = column.order;
- getList();
-}
+ queryParams.value.orderByColumn = column.prop;
+ queryParams.value.isAsc = column.order;
+ getList();
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: LoginInfoVO) => {
- const infoIds = row?.infoId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎璁块棶缂栧彿涓�"' + infoIds + '"鐨勬暟鎹」?');
- await delLoginInfo(infoIds);
- getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-}
+ const infoIds = row?.infoId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎璁块棶缂栧彿涓�"' + infoIds + '"鐨勬暟鎹」?');
+ await delLoginInfo(infoIds);
+ await getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+};
/** 娓呯┖鎸夐挳鎿嶄綔 */
const handleClean = async () => {
- await proxy?.$modal.confirm("鏄惁纭娓呯┖鎵�鏈夌櫥褰曟棩蹇楁暟鎹」?");
- await cleanLoginInfo();
- getList();
- proxy?.$modal.msgSuccess("娓呯┖鎴愬姛");
-}
+ await proxy?.$modal.confirm('鏄惁纭娓呯┖鎵�鏈夌櫥褰曟棩蹇楁暟鎹」?');
+ await cleanLoginInfo();
+ await getList();
+ proxy?.$modal.msgSuccess('娓呯┖鎴愬姛');
+};
/** 瑙ｉ攣鎸夐挳鎿嶄綔 */
const handleUnlock = async () => {
- const username = selectName.value;
- await proxy?.$modal.confirm('鏄惁纭瑙ｉ攣鐢ㄦ埛"' + username + '"鏁版嵁椤�?');
- await unlockLoginInfo(username);
- proxy?.$modal.msgSuccess("鐢ㄦ埛" + username + "瑙ｉ攣鎴愬姛");
-}
+ const username = selectName.value;
+ await proxy?.$modal.confirm('鏄惁纭瑙ｉ攣鐢ㄦ埛"' + username + '"鏁版嵁椤�?');
+ await unlockLoginInfo(username);
+ proxy?.$modal.msgSuccess('鐢ㄦ埛' + username + '瑙ｉ攣鎴愬姛');
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("monitor/logininfor/export", {
- ...queryParams.value,
- }, `config_${new Date().getTime()}.xlsx`);
-}
+ proxy?.download(
+ 'monitor/logininfor/export',
+ {
+ ...queryParams.value
+ },
+ `config_${new Date().getTime()}.xlsx`
+ );
+};
onMounted(() => {
- getList();
-})
+ getList();
+});
</script>
--
Gitblit v1.9.3