Skip to content

E
energyai_vue
Commit edaadba2 authored by xiexingan's avatar xiexingan
Browse files
Options

提交

parent 75a679f7
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 65 deletions
src/pages/analysis/energy/page.vue
View file @ edaadba2
...@@ -19,13 +19,12 @@ ...@@ -19,13 +19,12 @@
</div> </div>
<div> <div>
<el-form :inline="true" size="mini" style="padding-top: 15px"> <el-form :inline="true" size="mini" style="padding-top: 15px">
<!-- <el-form-item label="时间范围："> <el-form-item label="时间范围：">
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
align="right" align="right"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
:picker-options="pickerOptions"
> >
</el-date-picker> </el-date-picker>
<span style="padding: 0 10px">至</span> <span style="padding: 0 10px">至</span>
...@@ -34,15 +33,14 @@ ...@@ -34,15 +33,14 @@
align="right" align="right"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
:picker-options="pickerOptions"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button type="primary" size="mini" icon="el-icon-search" <el-button type="primary" size="mini" icon="el-icon-search"
>查询</el-button >查询</el-button
> --> >
<el-form-item label="时间范围："> <!-- <el-form-item label="时间范围：">
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
...@@ -53,7 +51,7 @@ ...@@ -53,7 +51,7 @@
> >
{{ item.name }} {{ item.name }}
</el-button> </el-button>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
</div> </div>
<div style="height: calc(100% - 70px)"> <div style="height: calc(100% - 70px)">
...@@ -79,6 +77,8 @@ export default { ...@@ -79,6 +77,8 @@ export default {
}, },
data() { data() {
return { return {
startTime: '',
endTime: '',
activetap: '1', activetap: '1',
typeList: [ typeList: [
{ name: '当日', id: 1 }, { name: '当日', id: 1 },
......
src/pages/analysis/fault/index.vue
View file @ edaadba2
...@@ -2,15 +2,29 @@ ...@@ -2,15 +2,29 @@
card-warp(title="故障报警分析", height="45px", showBackground) card-warp(title="故障报警分析", height="45px", showBackground)
div(slot="content") div(slot="content")
el-form(:inline="true", size="mini") el-form(:inline="true", size="mini")
el-form-item(label="时间范围：") //- el-form-item(label="时间范围：")
el-button( //- el-button(
size="mini", //- size="mini",
type="primary", //- type="primary",
@click="handleDate(item.id)", //- @click="handleDate(item.id)",
v-for="(item, index) in dateTypeList", //- v-for="(item, index) in dateTypeList",
:key="index", //- :key="index",
:class="[item.id == currentActive ? 'isActive' : '']" //- :class="[item.id == currentActive ? 'isActive' : '']"
) {{ item.name }} //- ) {{ item.name }}
el-form-item( label="时间范围：")
el-date-picker(
v-model="startTime"
align="right"
type="date"
placeholder="选择日期")
span( style="padding: 0 10px") 至
el-date-picker(
v-model="endTime"
align="right"
type="date"
placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
.echartsWarp(width="100%", flex) .echartsWarp(width="100%", flex)
div div
.title 设备类型故障数量统计 .title 设备类型故障数量统计
......
src/pages/analysis/indoor/index.vue
View file @ edaadba2
...@@ -10,15 +10,28 @@ card-warp(title="室内气象分析", height="45px") ...@@ -10,15 +10,28 @@ card-warp(title="室内气象分析", height="45px")
el-tab-pane(label="候车室区域", name="1") el-tab-pane(label="候车室区域", name="1")
el-tab-pane(label="办公区域", name="2") el-tab-pane(label="办公区域", name="2")
el-form(:inline="true", size="mini") el-form(:inline="true", size="mini")
el-form-item(label="时间范围：") //- el-form-item(label="时间范围：")
el-button( //- el-button(
size="mini", //- size="mini",
type="primary", //- type="primary",
@click="handleDate(item.id)", //- @click="handleDate(item.id)",
v-for="(item, index) in typeList", //- v-for="(item, index) in typeList",
:key="index", //- :key="index",
:class="[item.id == currentActive ? 'isActive' : '']" //- :class="[item.id == currentActive ? 'isActive' : '']"
) {{ item.name }} //- ) {{ item.name }}
el-form-item( label="时间范围：")
el-date-picker(
v-model="startTime"
align="right"
type="date"
placeholder="选择日期")
span( style="padding: 0 10px") 至
el-date-picker(
v-model="endTime"
align="right"
type="date"
placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
.echartsWarp(width="100%", flex) .echartsWarp(width="100%", flex)
div(v-for='item in chartList' :key='item.id') div(v-for='item in chartList' :key='item.id')
chart(:id="item.id", :data="item.data", :title="item.title", :color="item.color") chart(:id="item.id", :data="item.data", :title="item.title", :color="item.color")
...@@ -32,6 +45,8 @@ export default { ...@@ -32,6 +45,8 @@ export default {
}, },
data() { data() {
return { return {
startTime: '',
endTime: '',
activeName: '1', activeName: '1',
typeList: [ typeList: [
{ name: '当日', id: 1 }, { name: '当日', id: 1 },
......
src/pages/kb/indoor/history.vue
View file @ edaadba2
...@@ -5,15 +5,28 @@ ...@@ -5,15 +5,28 @@
el-input(v-model='dataForm.name', placeholder='设备名称' readOnly) el-input(v-model='dataForm.name', placeholder='设备名称' readOnly)
el-form-item(label='设备编号', prop='code') el-form-item(label='设备编号', prop='code')
el-input(v-model='dataForm.code', placeholder='设备编号' readOnly) el-input(v-model='dataForm.code', placeholder='设备编号' readOnly)
el-form-item(label='数据起止阶段', prop='time') //- el-form-item(label='数据起止阶段', prop='time')
el-button( //- el-button(
size="mini", //- size="mini",
type="primary", //- type="primary",
@click="handleDate(item.id)", //- @click="handleDate(item.id)",
v-for="(item, index) in typeList", //- v-for="(item, index) in typeList",
:key="index", //- :key="index",
:class="[item.id == currentActive ? 'isActive' : '']" //- :class="[item.id == currentActive ? 'isActive' : '']"
) {{ item.name }} //- ) {{ item.name }}
el-form-item( label="时间范围：")
el-date-picker(
v-model="startTime"
align="right"
type="date"
placeholder="选择日期")
span( style="padding: 0 10px") 至
el-date-picker(
v-model="endTime"
align="right"
type="date"
placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
span(v-if="type==1") span(v-if="type==1")
el-table( :data='dataList' size="mini" ,style='width: 100%;' :header-cell-style="{ background: '#EEF8FF', color: '#333333' }") el-table( :data='dataList' size="mini" ,style='width: 100%;' :header-cell-style="{ background: '#EEF8FF', color: '#333333' }")
el-table-column( :resizable="false" type='index', header-align='center', align='center', label='序号') el-table-column( :resizable="false" type='index', header-align='center', align='center', label='序号')
...@@ -42,6 +55,8 @@ export default { ...@@ -42,6 +55,8 @@ export default {
}, },
data() { data() {
return { return {
startTime: '',
endTime: '',
typeList: [ typeList: [
{ name: '当日', id: 1 }, { name: '当日', id: 1 },
{ name: '本周', id: 2 }, { name: '本周', id: 2 },
......
src/pages/kb/outdoor/history.vue
View file @ edaadba2
...@@ -19,15 +19,28 @@ el-dialog( ...@@ -19,15 +19,28 @@ el-dialog(
el-input(v-model="dataForm.name", placeholder="设备名称" readOnly) el-input(v-model="dataForm.name", placeholder="设备名称" readOnly)
el-form-item(label="设备编号", prop="code") el-form-item(label="设备编号", prop="code")
el-input(v-model="dataForm.code", placeholder="设备编号" readOnly) el-input(v-model="dataForm.code", placeholder="设备编号" readOnly)
el-form-item(label="数据起止阶段", prop="time") //- el-form-item(label="数据起止阶段", prop="time")
el-button( //- el-button(
size="mini", //- size="mini",
type="primary", //- type="primary",
@click="handleDate(item.id)", //- @click="handleDate(item.id)",
v-for="(item, index) in typeList", //- v-for="(item, index) in typeList",
:key="index", //- :key="index",
:class="[item.id == currentActive ? 'isActive' : '']" //- :class="[item.id == currentActive ? 'isActive' : '']"
) {{ item.name }} //- ) {{ item.name }}
el-form-item( label="时间范围：")
el-date-picker(
v-model="startTime"
align="right"
type="date"
placeholder="选择日期")
span( style="padding: 0 10px") 至
el-date-picker(
v-model="endTime"
align="right"
type="date"
placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
span(v-if="type == 1") span(v-if="type == 1")
el-table( el-table(
:data="dataList", :data="dataList",
...@@ -142,6 +155,8 @@ export default { ...@@ -142,6 +155,8 @@ export default {
}, },
data() { data() {
return { return {
startTime: '',
endTime: '',
type: null, type: null,
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
......
src/pages/kb/power/components/historyDataModal.vue
View file @ edaadba2
...@@ -23,13 +23,16 @@ ...@@ -23,13 +23,16 @@
readOnly readOnly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数据起止阶段："> <el-form-item label="时间范围：">
<!-- <el-date-picker style="width:172px" size="mini" type="date" placeholder=""> <el-date-picker v-model="startTime" style="width:172px" size="mini" type="date" placeholder="选择日期" >
</el-date-picker> </el-date-picker>
<span style="padding:0 10px">至</span> <span style="padding:0 10px">至</span>
<el-date-picker style="width:172px" size="mini" type="date" placeholder=""> <el-date-picker v-model="endTime" style="width:172px" size="mini" type="date" placeholder="选择日期">
</el-date-picker> --> </el-date-picker>
<el-button <el-button type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"
>查询</el-button
>
<!-- <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleDate(item.id)" @click="handleDate(item.id)"
...@@ -37,7 +40,7 @@ ...@@ -37,7 +40,7 @@
:key="index" :key="index"
:class="[item.id == currentActive ? 'isActive' : '']" :class="[item.id == currentActive ? 'isActive' : '']"
>{{ item.name }} >{{ item.name }}
</el-button> </el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<enTable :tableData="historyData" :tableColums="tableColums"></enTable> <enTable :tableData="historyData" :tableColums="tableColums"></enTable>
...@@ -78,6 +81,8 @@ export default { ...@@ -78,6 +81,8 @@ export default {
}, },
data() { data() {
return { return {
startTime: '',
endTime: '',
visible: false, visible: false,
formLabelWidth: '0px', formLabelWidth: '0px',
pageIndex: 1, pageIndex: 1,
......
src/pages/kb/power/components/statisticPicTableModal.vue
View file @ edaadba2
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
:visible.sync="visible" :visible.sync="visible"
:append-to-body="true" :append-to-body="true"
@close="cancelhandlePic" @close="cancelhandlePic"
width="1200px"
> >
<el-form :inline="true" :model="dataForm"> <el-form :inline="true" :model="dataForm">
<el-form-item label="设备名称：" prop="name" style="margin-bottom: 0"> <el-form-item label="设备名称：" prop="name" style="margin-bottom: 0">
...@@ -23,22 +25,8 @@ ...@@ -23,22 +25,8 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数据起止阶段："> <el-form-item label="数据起止阶段：">
<!-- <el-date-picker
style="width:172px" <!-- <el-button
size="mini"
type="date"
placeholder=""
>
</el-date-picker>
<span style="padding: 0 10px">至</span>
<el-date-picker
style="width:172px"
size="mini"
type="date"
placeholder=""
>
</el-date-picker> -->
<el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleDate(item.id)" @click="handleDate(item.id)"
...@@ -46,7 +34,15 @@ ...@@ -46,7 +34,15 @@
:key="index" :key="index"
:class="[item.id == currentActive ? 'isActive' : '']" :class="[item.id == currentActive ? 'isActive' : '']"
>{{ item.name }} >{{ item.name }}
</el-button> </el-button> -->
<el-date-picker v-model="startTime" style="width:172px" size="mini" type="date" placeholder="选择日期">
</el-date-picker>
<span style="padding:0 10px">至</span>
<el-date-picker v-model="endTime" style="width:172px" size="mini" type="date" placeholder="选择日期">
</el-date-picker>
<el-button type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"
>查询</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div v-if="statisticModalVisible" id="categoryId" style="height: 400px"> <div v-if="statisticModalVisible" id="categoryId" style="height: 400px">
...@@ -64,6 +60,8 @@ export default { ...@@ -64,6 +60,8 @@ export default {
}, },
data() { data() {
return { return {
startTime: '',
endTime: '',
formLabelWidth: '120px', formLabelWidth: '120px',
dataForm: {}, dataForm: {},
visible: false, visible: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment