From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +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 | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogInfo.vue b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
index b3140ad..9ccf664 100644
--- a/src/views/mdc/base/modules/deviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="6" :sm="6">
+ <a-col :md="4" :sm="4">
<a-form-item label="璁惧缂栧彿">
<a-input placeholder="璇烽�夋嫨璁惧" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
</a-form-item>
@@ -14,18 +14,24 @@
<a-input placeholder="璇烽�夋嫨璁惧" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
- <a-col :md="6" :sm="6">
+ <a-col :md="4" :sm="4">
<a-form-item label="鏃ユ湡">
<a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" @change="dataChange"
format='YYYY-MM-DD'/>
</a-form-item>
</a-col>
- <a-col :md="3" :sm="3">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- </a-col>
<a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
</a-col>
+ <!--<a-col :md="3" :sm="3">-->
+ <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+ <!--</a-col>-->
+ <!--<a-col :md="2" :sm="2" :xs="2">-->
+ <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
+ <!--</a-col>-->
</a-row>
</a-form>
</div>
@@ -168,7 +174,7 @@
import { getAction } from '@/api/manage'
// import {mapActions} from 'vuex'
export default {
- components: {
+ components: {
LogList,
WorkLogList,
AlarmLogList,
@@ -326,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