From feaf0a9778879ef211c5587a513ba4cbdabb52d0 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 23 六月 2022 17:42:58 +0800
Subject: [PATCH] bug修复

---
 src/pages/syslog/views/pollingLog.vue |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pages/syslog/views/pollingLog.vue b/src/pages/syslog/views/pollingLog.vue
index 01dea06..92bcb10 100644
--- a/src/pages/syslog/views/pollingLog.vue
+++ b/src/pages/syslog/views/pollingLog.vue
@@ -19,7 +19,7 @@
             v-model="fuzzySearch"
             size="small"
             class="input-with-select"
-            @keyup.enter.native="getOperationLog(1)"
+            @keyup.enter.native="getScheduleLog(1)"
           >
             <span
               class="icon iconfont icon_clear"
@@ -31,9 +31,8 @@
             </span>
             <span
               class="icon iconfont icon_search"
-              @click="getOperationLog(1)"
+              @click="getScheduleLog(1)"
               slot="append"
-              v-else
             >
               &#xe714;
             </span>
@@ -96,7 +95,7 @@
         <el-table-column
           :align="'center'"
           sortable
-          prop="procName"
+          prop="info"
           label="鎽勫儚鏈�"
         ></el-table-column>
         <el-table-column
@@ -154,7 +153,7 @@
 export default {
   data() {
     return {
-      png: "",
+      png: require("../../../../public/images/syslog/娌℃暟鎹�.png"),
       loading: false,
       loadingText: "",
       tableData: [],
@@ -220,11 +219,11 @@
   methods: {
     handleSizeChange(val) {
       this.pageSize = val;
-      this.getOperationLog();
+      this.getScheduleLog();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.getOperationLog();
+      this.getScheduleLog();
     },
     cancelShow() {
       this.dialogVisible = false;
@@ -266,19 +265,23 @@
         this.moduleOptions = res.data;
       });
     },
-    getScheduleLog() {
+    getScheduleLog(typ) {
+      if (typ == 1) {
+        this.page = 1;
+      }
+
       const data = {
         timeStart: this.timeStart,
         timeEnd: this.timeEnd,
         page: this.page,
         pageSize: this.pageSize,
+        fuzzySearch: this.fuzzySearch,
         procID: this.procID,
         procName: this.procName,
       };
       queryScheduleLog(data).then((res) => {
         this.tableData = res.data.logs;
         this.total = res.data.total;
-        this.png = require("../../../../public/images/syslog/娌℃暟鎹�.png");
       });
     },
     dateChange(val) {
@@ -302,10 +305,9 @@
     },
     handleSelectionChange() {},
     handleClose() {},
-    getOperationLog() {},
     clearSearch() {
       this.fuzzySearch = "";
-      this.getOperationLog(1);
+      this.getScheduleLog(1);
     },
   },
 };

--
Gitblit v1.8.0