Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

src/views/log/log.vue

@@ -34,7 +34,7 @@
 							   v-model:selectedKeys="selectedKeys" :default-toolbar="defaultToolbar"
 							   :page="dataList.length>0?pageInfo:null" @change="changePage">
 						<template v-slot:toolbar>
-							<lay-button size="sm" @click="_getPageList(false,true)">刷新</lay-button>
+							<lay-button size="sm" @click="_getPageList(true)">刷新</lay-button>
 							<lay-button size="sm" type="normal" @click="downLogs()">导出</lay-button>
 						</template>
 					</lay-table>
@@ -226,7 +226,11 @@
 				this.typeList = await getBasicList(33) || [];
 			},
 			//分页列表
-			async _getPageList() {
+			async _getPageList(isRefresh) {
+				if (isRefresh) {
+					this.pageInfo.current = 1
+				}
+
 				let result= await getLogPageList(this.pageInfo, "OperateLog");
 
 				result.Data.List.map(item => {