|
|
@@ -3,7 +3,19 @@
|
|
|
<!-- 查询区域 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
- <a-row :gutter="24"> </a-row>
|
|
|
+ <a-row :gutter="24">
|
|
|
+ <a-col :xl="7" :lg="11" :md="12" :sm="24">
|
|
|
+ <a-form-item label="统计时间">
|
|
|
+ <a-range-picker date-format="YYYY-MM-DD HH:mm:ss" :show-time="true" v-model="queryParam.date" @change="onChangeDate" style="width:100%;"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
+ <span class="table-page-search-submitButtons table-operator">
|
|
|
+ <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
|
|
|
+ <a-button type="primary" icon="reload" @click="searchReset">重置</a-button>
|
|
|
+ </span>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
</a-form>
|
|
|
</div>
|
|
|
<!-- 查询区域-END -->
|
|
|
@@ -22,7 +34,7 @@
|
|
|
<a-button type="primary" icon="import">导入</a-button>
|
|
|
</a-upload> -->
|
|
|
<!-- 高级查询区域 -->
|
|
|
- <j-super-query
|
|
|
+ <!-- <j-super-query
|
|
|
:fieldList="superFieldList"
|
|
|
ref="superQueryModal"
|
|
|
@handleSuperQuery="handleSuperQuery"
|
|
|
@@ -32,7 +44,7 @@
|
|
|
<a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
|
|
|
</a-menu>
|
|
|
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
|
|
|
- </a-dropdown>
|
|
|
+ </a-dropdown> -->
|
|
|
</div>
|
|
|
|
|
|
<!-- table区域-begin -->
|
|
|
@@ -49,7 +61,7 @@
|
|
|
size="middle"
|
|
|
:scroll="{ x: true }"
|
|
|
bordered
|
|
|
- rowKey="id"
|
|
|
+ rowKey="equipmentcode"
|
|
|
:columns="columns"
|
|
|
:dataSource="dataSource"
|
|
|
:loading="loading"
|
|
|
@@ -172,6 +184,11 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
+ onChangeDate(date, dateString){
|
|
|
+ console.log(date, dateString);
|
|
|
+ this.queryParam.beginTime= dateString[0]
|
|
|
+ this.queryParam.endTime= dateString[1]
|
|
|
+ },
|
|
|
// 后端好了需要删掉
|
|
|
getTest() {
|
|
|
this.dataSource = emsdata.meterreadData
|
wyh