|
@@ -1,5 +1,37 @@
|
|
|
<template>
|
|
|
<div class="demand-analysis" :loading="loading">
|
|
|
+ <div class="table-page-search-wrapper search-compoments">
|
|
|
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
+ <a-row :gutter="24">
|
|
|
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
+ <a-form-item label="设备名称">
|
|
|
+ <j-search-select-tag v-model="queryParam.equipmentid" placeholder="请选择设备" dict="tpm_equipment,equipmentname,id" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
+ <a-form-item label="能源参数">
|
|
|
+ <a-select
|
|
|
+ v-model="queryParam.energyitemid"
|
|
|
+ placeholder="请选择能源参数"
|
|
|
+ :options="options">
|
|
|
+ </a-select>
|
|
|
+ <!-- <j-search-select-tag v-model="queryParam.equipmentid" placeholder="请选择能源参数" dict="tpm_equipment,equipmentname,id" /> -->
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :xl="6" :lg="11" :md="12" :sm="24">
|
|
|
+ <a-form-item label="时间">
|
|
|
+ <a-range-picker date-format="YYYY-MM-DD" v-model="queryParam.date" @change="onChangeDate" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
|
+ <a-button type="primary" @click="getList" icon="search">查询</a-button>
|
|
|
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
|
|
+ </span>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
+ </a-form>
|
|
|
+ </div>
|
|
|
<!-- <commonSearch ref="commonSearch" type="daterange" @search="handleSearch"></commonSearch> -->
|
|
|
<div class="item-echarts" ref="echarts" :style="{ height: echartsHeight + 'px' }"></div>
|
|
|
</div>
|
|
@@ -19,18 +51,25 @@ export default {
|
|
|
return {
|
|
|
description: '参数历史查询',
|
|
|
loading: true,
|
|
|
+ queryParam: {},
|
|
|
echartsHeight: window.innerHeight - 84 - 60 - 30,
|
|
|
myChart: null,
|
|
|
url: {
|
|
|
list: '/ems/statistics/demandanalysis',
|
|
|
+ nycsList: '/dataVoltage/dataVoltage/xialaList',
|
|
|
+ list2: '/dataVoltage/dataVoltage/dataList',
|
|
|
},
|
|
|
moniparamData: {},
|
|
|
+ options: []
|
|
|
}
|
|
|
},
|
|
|
- created() {},
|
|
|
+ created() {
|
|
|
+ this.getNycsList()
|
|
|
+ },
|
|
|
mounted() {
|
|
|
this.$nextTick(() => {
|
|
|
setTimeout(() => {
|
|
|
+ // this.getList()
|
|
|
this.getTest()
|
|
|
}, 1000)
|
|
|
// this.getDemandanalysis()
|
|
@@ -42,6 +81,32 @@ export default {
|
|
|
this.moniparamData = emsdata.moniparamData
|
|
|
this.initEcharts()
|
|
|
},
|
|
|
+ // 时间处理
|
|
|
+ onChangeDate(date, dateString){
|
|
|
+ console.log(date, dateString);
|
|
|
+ this.queryParam.logtimebegin= dateString[0]
|
|
|
+ this.queryParam.logtimeend= dateString[1]
|
|
|
+ },
|
|
|
+ getNycsList(){
|
|
|
+ getAction(this.url.nycsList, null).then((res) => {
|
|
|
+ console.log(88888,res)
|
|
|
+ this.options = res.map((item,index )=> {
|
|
|
+ return {
|
|
|
+ id: index,
|
|
|
+ lable: item
|
|
|
+ }
|
|
|
+ })
|
|
|
+ console.log(this.options)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getList() {
|
|
|
+ getAction(this.url.list2, null).then((res) => {
|
|
|
+ console.log(9999,res)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ searchReset(){
|
|
|
+
|
|
|
+ },
|
|
|
async getDemandanalysis() {
|
|
|
this.loading = true
|
|
|
var data = this.$refs.commonSearch.queryParams
|
|
@@ -191,7 +256,7 @@ export default {
|
|
|
<style lang="less" scoped>
|
|
|
.demand-analysis {
|
|
|
min-height: calc(100vh - 84px);
|
|
|
- padding: 10px;
|
|
|
+ padding: 0px 10px 10px 10px;
|
|
|
.search-container {
|
|
|
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
|
|
padding-top: 12px;
|
|
@@ -207,4 +272,11 @@ export default {
|
|
|
background-color: white;
|
|
|
}
|
|
|
}
|
|
|
+.search-compoments {
|
|
|
+ background: #fff;
|
|
|
+ padding-top: 14px;
|
|
|
+ padding-left: 12px;
|
|
|
+ margin-bottom: 10px;
|
|
|
+ box-shadow: 0 2px 10px rgba(153, 153, 153, 0.1);
|
|
|
+}
|
|
|
</style>
|