浏览代码

fix: 修复多个页面查询错误的问题

yanglzh 1 年之前
父节点
当前提交
94cd22c77c
共有 3 个文件被更改,包括 7 次插入4 次删除
  1. 1 1
      src/hooks/useCommon.ts
  2. 2 0
      src/views/system/manage/blacklist/index.vue
  3. 4 3
      src/views/system/monitor/plugin/index.vue

+ 1 - 1
src/hooks/useCommon.ts

@@ -40,7 +40,7 @@ export function useSearch<T>(api: any, resKey: string, expandParams?: any) {
   const tableData = ref<T[] | any[]>([])
 
   const getList = async (pageNum?: number) => {
-    // pageNum && (params.pageNum = pageNum);
+    typeof pageNum === 'number' && (params.pageNum = pageNum);
     tableData.value = [];
     loading.value = true;
     params.total = 0;

+ 2 - 0
src/views/system/manage/blacklist/index.vue

@@ -185,6 +185,8 @@ export default defineComponent({
     };
     const typeList = () => {
       state.tableData.loading = true;
+      state.tableData.data = [];
+      state.tableData.total = 0;
       api.blackList.getList(state.tableData.param).then((res: any) => {
         state.tableData.data = res.list;
         state.tableData.total = res.total;

+ 4 - 3
src/views/system/monitor/plugin/index.vue

@@ -4,10 +4,10 @@
 			<div class="system-user-search mb15">
 				<el-form :model="params" ref="queryRef" :inline="true" label-width="68px">
 					<el-form-item label="关键字" prop="keyWord">
-						<el-input v-model="params.keyWord" placeholder="请输入关键字" clearable style="width: 180px" size="default" @keyup.enter="getList" />
+						<el-input v-model="params.keyWord" placeholder="请输入关键字" clearable style="width: 180px" size="default" @keyup.enter="getList(1)" />
 					</el-form-item>
 					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="getList">
+						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
 							<el-icon>
 								<ele-Search />
 							</el-icon>
@@ -58,7 +58,8 @@
 					</template>
 				</el-table-column>
 			</el-table>
-			<pagination :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
+
+	    <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
 		</el-card>
 		<EditForm ref="editFormRef" @getList="getList()"></EditForm>
 	</div>