From a7ed5f86ac17e3b460604a104ceb856deabb1f8a Mon Sep 17 00:00:00 2001
From: XingCheng3 <1773407212@qq.com>
Date: Sun, 31 May 2026 16:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .../BasicData/WorkStationAlarmLog/index.vue   | 19 +++----------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 78a0ead..b143adb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ package-lock.json
 *.ntvs*
 *.njsproj
 *.sln
+dist.zip
diff --git a/src/views/BasicData/WorkStationAlarmLog/index.vue b/src/views/BasicData/WorkStationAlarmLog/index.vue
index 3f598cf..05bb608 100644
--- a/src/views/BasicData/WorkStationAlarmLog/index.vue
+++ b/src/views/BasicData/WorkStationAlarmLog/index.vue
@@ -3,7 +3,7 @@
     <el-card class="topCard">
       <div class="topDiv">
         <span style="margin-left: 10px">工位号：</span>
-        <el-select v-model="stationNumberValue" placeholder="工位号" filterable size="small" style="width:240px">
+        <el-select v-model="stationNumberValue" placeholder="工位号" filterable clearable size="small" style="width:240px">
           <el-option v-for="item in stationNumber" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <span style="margin-left: 10px">消息来源：</span>
@@ -90,7 +90,7 @@ export default {
     }
   },
   created() {
-    this.dateTime = [getBeforeOrAfterTime(-3), getNowShotTime()]
+    this.dateTime = [getBeforeOrAfterTime(-2), getNowShotTime()]
     this.getStationNumber()
   },
   methods: {
@@ -120,23 +120,13 @@ export default {
       param[4] = ['PageCount', '1111', 'int', '1']
       param[5] = ['ItemCount', '1111', 'int', '1']
       param[6] = ['开始日期', this.dateTime[0] + ' ' + '00:00:00']
-      param[7] = ['结束日期', this.dateTime[1] + ' ' + '23:59:59']
+      param[7] = ['结束日期', this.dateTime[1] + ' ' + '00:00:00']
       param[8] = ['内容', this.contentSearchValue]
       param[9] = ['消息来源', this.msgSourceNotLike]
       param[10] = ['消息类型', this.msgTypeValue]
       return param
     },
-    validateSearch() {
-      if (this.stationNumberValue === '') {
-        this.$message.error('请选择工位号')
-        return false
-      }
-      return true
-    },
     searchTable() {
-      if (!this.validateSearch()) {
-        return
-      }
       this.loading = true
       this.tableData = []
       var Data = this.CreateData('11', '日志_工位操作_查询', this.getParam(this.pageCurrent, this.pageSize))
@@ -151,9 +141,6 @@ export default {
       })
     },
     exportExcel() {
-      if (!this.validateSearch()) {
-        return
-      }
       if (this.tableData.length === 0) {
         this.$message.warning('暂无数据')
         return