From e055d2d93b516985fbc2df0f6f5a135f3230cccf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:13:47 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/deviceLog/LogInfo.vue | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogInfo.vue b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
index 58000dd..9ccf664 100644
--- a/src/views/mdc/base/modules/deviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -174,7 +174,7 @@
import { getAction } from '@/api/manage'
// import {mapActions} from 'vuex'
export default {
- components: {
+ components: {
LogList,
WorkLogList,
AlarmLogList,
@@ -332,28 +332,21 @@
},
searchQuery() {
// console.log(this.queryParams.collectTime)
- if (this.queryParams.collectTime != undefined) {
- this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
- if (!this.queryParams.equipmentId || !this.queryParams.equipmentName) {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨璁惧'
- })
- return false
- }
- this.queryChart()
- } else {
- // this.$message.warning("璇烽�夋嫨鏃堕棿")
- console.log('瑙﹀彂鎻愮ず')
+ this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
+ if (!this.queryParams.equipmentId || !this.queryParams.equipmentName) {
this.$notification.warning({
message: '娑堟伅',
- description: '璇烽�夋嫨鏃堕棿'
+ description: '璇烽�夋嫨璁惧'
})
+ return false
}
+ this.queryChart()
// this.queryList()
},
searchReset() {
- this.queryParams = {}
+ this.queryParams = {
+ collectTime : moment()
+ }
// this.queryList()
this.equipment = {}
this.queryChart()
--
Gitblit v1.9.3