Commit 37766bda authored by xiexingan's avatar xiexingan

日期调整

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