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 @@
工位号: - + 消息来源: @@ -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