Skip to content

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

日期调整

parent 1f13c248
Show whitespace changes
Inline Side-by-side
Showing with 437 additions and 437 deletions
src/pages/analysis/energy/page.vue
View file @ 37766bda
...@@ -28,25 +28,32 @@ ...@@ -28,25 +28,32 @@
<div> <div>
<!-- <enTabs :tabList="energyTabList"></enTabs> --> <!-- <enTabs :tabList="energyTabList"></enTabs> -->
<el-tabs class="en-tabs" v-model="activetap"> <el-tabs class="en-tabs" v-model="activetap">
<el-row style="padding-top: 15px"> <el-form :inline="true" size="mini" style='padding-top:15px;'>
<el-col :span="7"> <el-form-item label="时间范围：">
<span>时间范围：</span>
<el-date-picker <el-date-picker
size="mini" v-model="startTime"
type="daterange" align="right"
range-separator="～" type="date"
start-placeholder="开始日期" placeholder="选择日期"
end-placeholder="结束日期" :picker-options="pickerOptions"
v-model="date"
> >
</el-date-picker> </el-date-picker>
</el-col> <span style="padding: 0 10px">至</span>
<el-col :span="2"> <el-date-picker
v-model="endTime"
align="right"
type="date"
placeholder="选择日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</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-col> </el-form>
</el-row>
<el-tab-pane <el-tab-pane
:label="item.label" :label="item.label"
:name="item.value" :name="item.value"
...@@ -77,7 +84,8 @@ export default { ...@@ -77,7 +84,8 @@ export default {
}, },
data() { data() {
return { return {
date: [], startTime: '',
endTime: '',
activeIndex: 1, activeIndex: 1,
activetap: '01', activetap: '01',
dateList: [ dateList: [
......
src/pages/analysis/fault/index.vue
View file @ 37766bda
<template lang='pug'> <template lang='pug'>
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-date-picker( el-date-picker(
size='mini' size="mini",
v-model="dateValue", v-model="startTime",
type="daterange",
align="right", align="right",
unlink-panels, type="date",
range-separator="至", placeholder="选择日期",
start-placeholder="开始日期",
end-placeholder="结束日期",
:picker-options="pickerOptions" :picker-options="pickerOptions"
) )
el-button(size='mini' type='primary') 查询 span(style="padding: 0 10px") 至
el-date-picker(
size="mini",
v-model="endTime",
align="right",
type="date",
placeholder="选择日期",
:picker-options="pickerOptions"
)
el-button(size="mini", type="primary") 查询
.echartsWarp(width="100%", flex) .echartsWarp(width="100%", flex)
//- div //- div
//- .title 设备故障统计 //- .title 设备故障统计
...@@ -44,7 +50,8 @@ export default { ...@@ -44,7 +50,8 @@ export default {
}, },
data() { data() {
return { return {
dateValue: '', startTime: '',
endTime: '',
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
...@@ -53,9 +60,7 @@ export default { ...@@ -53,9 +60,7 @@ export default {
onClick(picker) { onClick(picker) {
const end = new Date() const end = new Date()
const start = new Date() const start = new Date()
start.setTime( start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
start.getTime() - 3600 * 1000 * 24 * 7
)
picker.$emit('pick', [start, end]) picker.$emit('pick', [start, end])
} }
}, },
...@@ -64,9 +69,7 @@ export default { ...@@ -64,9 +69,7 @@ export default {
onClick(picker) { onClick(picker) {
const end = new Date() const end = new Date()
const start = new Date() const start = new Date()
start.setTime( start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
start.getTime() - 3600 * 1000 * 24 * 30
)
picker.$emit('pick', [start, end]) picker.$emit('pick', [start, end])
} }
}, },
...@@ -75,9 +78,7 @@ export default { ...@@ -75,9 +78,7 @@ export default {
onClick(picker) { onClick(picker) {
const end = new Date() const end = new Date()
const start = new Date() const start = new Date()
start.setTime( start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
start.getTime() - 3600 * 1000 * 24 * 90
)
picker.$emit('pick', [start, end]) picker.$emit('pick', [start, end])
} }
} }
......
src/pages/analysis/indoor/index.vue
View file @ 37766bda
<template lang="pug"> <template lang="pug">
card-warp(title="室内气象分析" height='45px' showBackground) card-warp(title="室内气象分析", height="45px", showBackground)
div(slot="right") div(slot="right")
//- span 时间范围： //- span 时间范围：
//- el-date-picker.margin-lr-20( //- el-date-picker.margin-lr-20(
...@@ -14,29 +14,35 @@ card-warp(title="室内气象分析" height='45px' showBackground) ...@@ -14,29 +14,35 @@ card-warp(title="室内气象分析" height='45px' showBackground)
//- :picker-options="pickerOptions" //- :picker-options="pickerOptions"
//- ) //- )
//- el-button(size='mini' type='primary') 查询 //- el-button(size='mini' type='primary') 查询
router-link.margin-lr-20(:to="{name:'kb-indoor'}") router-link.margin-lr-20(:to="{ name: 'kb-indoor' }")
el-button(size='mini' type='primary') 图形 / 列表 el-button(size="mini", type="primary") 图形 / 列表
//- el-button(size='mini' type='primary' icon='el-icon-download') 下载 //- el-button(size='mini' type='primary' icon='el-icon-download') 下载
div(slot="content", style="height: 90%") div(slot="content", style="height: 90%")
el-tabs.myTabs(v-model="activeName", @tab-click="tabClick") el-tabs.myTabs(v-model="activeName", @tab-click="tabClick")
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-date-picker.margin-lr-20( el-date-picker(
size='mini' size="mini",
v-model="dateValue", v-model="startTime",
type="daterange",
align="right", align="right",
unlink-panels, type="date",
range-separator="至", placeholder="选择日期",
start-placeholder="开始日期",
end-placeholder="结束日期",
:picker-options="pickerOptions" :picker-options="pickerOptions"
) )
el-form-item(label='') span(style="padding: 0 10px") 至
el-button(size='mini' type='primary') 查询 el-date-picker(
size="mini",
v-model="endTime",
align="right",
type="date",
placeholder="选择日期",
:picker-options="pickerOptions"
)
el-form-item(label="")
el-button(size="mini", type="primary") 查询
.echartsWarp(width="100%", flex) .echartsWarp(width="100%", flex)
div div
chart chart
...@@ -46,7 +52,6 @@ card-warp(title="室内气象分析" height='45px' showBackground) ...@@ -46,7 +52,6 @@ card-warp(title="室内气象分析" height='45px' showBackground)
chart3 chart3
div div
chart4 chart4
</template> </template>
<script> <script>
...@@ -64,7 +69,8 @@ export default { ...@@ -64,7 +69,8 @@ export default {
data() { data() {
return { return {
activeName: '1', activeName: '1',
dateValue: '', startTime: '',
endTime: '',
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
...@@ -72,9 +78,7 @@ export default { ...@@ -72,9 +78,7 @@ export default {
onClick(picker) { onClick(picker) {
const end = new Date() const end = new Date()
const start = new Date() const start = new Date()
start.setTime( start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
start.getTime() - 3600 * 1000 * 24 * 7
)
picker.$emit('pick', [start, end]) picker.$emit('pick', [start, end])
} }
}, },
...@@ -83,9 +87,7 @@ export default { ...@@ -83,9 +87,7 @@ export default {
onClick(picker) { onClick(picker) {
const end = new Date() const end = new Date()
const start = new Date() const start = new Date()
start.setTime( start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
start.getTime() - 3600 * 1000 * 24 * 30
)
picker.$emit('pick', [start, end]) picker.$emit('pick', [start, end])
} }
}, },
...@@ -94,9 +96,7 @@ export default { ...@@ -94,9 +96,7 @@ export default {
onClick(picker) { onClick(picker) {
const end = new Date() const end = new Date()
const start = new Date() const start = new Date()
start.setTime( start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
start.getTime() - 3600 * 1000 * 24 * 90
)
picker.$emit('pick', [start, end]) picker.$emit('pick', [start, end])
} }
} }
...@@ -108,9 +108,7 @@ export default { ...@@ -108,9 +108,7 @@ export default {
tabClick(tab, event) { tabClick(tab, event) {
console.log(tab, event) console.log(tab, event)
}, },
getDataList() { getDataList() {}
}
} }
} }
</script> </script>
......
src/pages/analysis/outdoor/index.vue
View file @ 37766bda
<template lang="pug"> <template lang="pug">
card-warp(title="室外气象分析" height='45px' showBackground) card-warp(title="室外气象分析", height="45px", showBackground)
div(slot="right") div(slot="right")
//- router-link.margin-lr-20(:to="{name:'kb-indoor'}") //- router-link.margin-lr-20(:to="{name:'kb-indoor'}")
//- el-button(size='mini' type='primary') 图形 / 列表 //- el-button(size='mini' type='primary') 图形 / 列表
div(slot="content", style="height: 90%") div(slot="content", style="height: 90%")
el-form(:inline='true' size="mini" ) el-form(:inline="true", size="mini")
el-form-item(label='设备名称：') el-form-item(label="设备名称：")
el-input(type='primary' size='mini') el-input(type="primary", size="mini")
el-form-item(label='时间范围：') el-form-item(label="时间范围：")
el-date-picker( el-date-picker(
size='mini' size="mini",
v-model="dateValue", v-model="startTime",
type="daterange",
align="right", align="right",
unlink-panels, type="date",
range-separator="至", placeholder="选择日期",
start-placeholder="开始日期",
end-placeholder="结束日期",
:picker-options="pickerOptions" :picker-options="pickerOptions"
) )
el-button(size='mini' type='primary') 查询 span(style="padding: 0 10px") 至
el-date-picker(
size="mini",
v-model="endTime",
align="right",
type="date",
placeholder="选择日期",
:picker-options="pickerOptions"
)
el-button(size="mini", type="primary") 查询
.echartsWarp(width="100%", flex) .echartsWarp(width="100%", flex)
div div
chart chart
...@@ -37,7 +43,6 @@ card-warp(title="室外气象分析" height='45px' showBackground) ...@@ -37,7 +43,6 @@ card-warp(title="室外气象分析" height='45px' showBackground)
chart7 chart7
div div
pie8 pie8
</template> </template>
<script> <script>
...@@ -63,40 +68,33 @@ export default { ...@@ -63,40 +68,33 @@ export default {
data() { data() {
return { return {
activeName: '1', activeName: '1',
dateValue: '', startTime: '',
endTime: '',
pickerOptions: { pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now()
},
shortcuts: [ shortcuts: [
{ {
text: '最近一周', text: '今天',
onClick(picker) { onClick(picker) {
const end = new Date() picker.$emit('pick', new Date())
const start = new Date()
start.setTime(
start.getTime() - 3600 * 1000 * 24 * 7
)
picker.$emit('pick', [start, end])
} }
}, },
{ {
text: '最近一个月', text: '昨天',
onClick(picker) { onClick(picker) {
const end = new Date() const date = new Date()
const start = new Date() date.setTime(date.getTime() - 3600 * 1000 * 24)
start.setTime( picker.$emit('pick', date)
start.getTime() - 3600 * 1000 * 24 * 30
)
picker.$emit('pick', [start, end])
} }
}, },
{ {
text: '最近三个月', text: '一周前',
onClick(picker) { onClick(picker) {
const end = new Date() const date = new Date()
const start = new Date() date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
start.setTime( picker.$emit('pick', date)
start.getTime() - 3600 * 1000 * 24 * 90
)
picker.$emit('pick', [start, end])
} }
} }
] ]
...@@ -104,10 +102,7 @@ export default { ...@@ -104,10 +102,7 @@ export default {
} }
}, },
methods: { methods: {
getDataList() {}
getDataList() {
}
} }
} }
</script> </script>
......
src/pages/eq/hall/page.vue
View file @ 37766bda
...@@ -30,8 +30,10 @@ ...@@ -30,8 +30,10 @@
@click="currentId = item.id" @click="currentId = item.id"
v-for="item in typeList" v-for="item in typeList"
:key="item.id" :key="item.id"
:class="[
:class="[item.id == currentId ? 'isActive' : '' , item.icon]" item.id == currentId ? 'isActive' : '',
item.icon,
]"
> >
<!-- <img :src="item.src" alt="" /> --> <!-- <img :src="item.src" alt="" /> -->
{{ item.name }} {{ item.name }}
...@@ -48,23 +50,28 @@ ...@@ -48,23 +50,28 @@
</el-form-item> </el-form-item>
<el-form-item label="定时功能启止时间："> <el-form-item label="定时功能启止时间：">
<el-date-picker <el-time-select
size="mini" placeholder="起始时间"
style="width: 200px"
type="date"
placeholder=""
v-model="formData.startTime" v-model="formData.startTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '24:00',
}"
> >
</el-date-picker> </el-time-select>
<span style="padding: 0 10px">至</span> <span style="padding: 0 10px">至</span>
<el-date-picker <el-time-select
size="mini" placeholder="结束时间"
style="width: 200px"
type="date"
placeholder=""
v-model="formData.endTime" v-model="formData.endTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '24:00',
minTime: formData.startTime,
}"
> >
</el-date-picker> </el-time-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -162,14 +169,12 @@ export default { ...@@ -162,14 +169,12 @@ export default {
name: '自然通风', name: '自然通风',
src: require('../../home/image/fan_icon.png'), src: require('../../home/image/fan_icon.png'),
icon: 'iconfont icon-feng' icon: 'iconfont icon-feng'
}, },
{ {
id: 2, id: 2,
name: '机械通风', name: '机械通风',
src: require('../../home/image/fan_icon.png'), src: require('../../home/image/fan_icon.png'),
icon: 'iconfont icon-feng2' icon: 'iconfont icon-feng2'
}, },
{ {
id: 3, id: 3,
......
src/pages/kb/power/page.vue
View file @ 37766bda
...@@ -21,33 +21,26 @@ ...@@ -21,33 +21,26 @@
</div> </div>
<div> <div>
<el-form :inline="true"> <el-form :inline="true">
<el-row>
<el-col :span="7">
<el-form-item label="设备名称："> <el-form-item label="设备名称：">
<el-input size="mini" placeholder=""></el-input> <el-input size="mini" placeholder=""></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="设备编号："> <el-form-item label="设备编号：">
<el-input size="mini" placeholder=""></el-input> <el-input size="mini" placeholder=""></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="运行状态："> <el-form-item label="运行状态：">
<el-select size="mini" placeholder=""> <el-select size="mini" placeholder="">
<el-option label="正常" value="shanghai"></el-option> <el-option label="正常" value="shanghai"></el-option>
<el-option label="不正常" value="beijing"></el-option> <el-option label="不正常" value="beijing"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="3">
<el-form-item> <el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" <el-button icon="el-icon-search" size="mini" type="primary"
>查询</el-button >查询</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</div> </div>
......
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