选择框精确到日
This commit is contained in:
@ -17,7 +17,7 @@
|
|||||||
<el-form-item label="时间选择">
|
<el-form-item label="时间选择">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
type="datetimerange"
|
type="daterange"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始时间"
|
start-placeholder="开始时间"
|
||||||
:picker-options="pickerOptions"
|
:picker-options="pickerOptions"
|
||||||
@ -112,8 +112,8 @@ export default {
|
|||||||
{name:'类型三',id:3},
|
{name:'类型三',id:3},
|
||||||
],
|
],
|
||||||
gjdjOptions:[
|
gjdjOptions:[
|
||||||
{name:'严重',id:1},
|
{name:'等级一',id:1},
|
||||||
{name:'普通',id:2},
|
{name:'等级二',id:2},
|
||||||
],
|
],
|
||||||
tableData:[
|
tableData:[
|
||||||
{name:'告警一',gjdj:'等级一',gjnr:'设备一温度过高',startTime:'2025/06/20 18:09:40',finishTime:'2025/06/20 20:07:01',status:1},
|
{name:'告警一',gjdj:'等级一',gjnr:'设备一温度过高',startTime:'2025/06/20 18:09:40',finishTime:'2025/06/20 20:07:01',status:1},
|
||||||
@ -151,7 +151,6 @@ export default {
|
|||||||
const now = new Date();
|
const now = new Date();
|
||||||
const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
|
const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
|
||||||
this.defaultDateRange = [lastMonth, now];
|
this.defaultDateRange = [lastMonth, now];
|
||||||
// this.dateRange = [lastMonth, now];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -7,15 +7,10 @@
|
|||||||
<!-- 搜索栏-->
|
<!-- 搜索栏-->
|
||||||
<div class="select-container">
|
<div class="select-container">
|
||||||
<el-form :inline="true">
|
<el-form :inline="true">
|
||||||
<el-form-item label="设备类型">
|
|
||||||
<el-select v-model="sjwd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
|
|
||||||
<el-option :label="item.name" :value="item.id" v-for="(item,index) in sjwdOptions" :key="index+'syzbSjwdOptions'"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="时间选择">
|
<el-form-item label="时间选择">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
type="datetimerange"
|
type="daterange"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始时间"
|
start-placeholder="开始时间"
|
||||||
:picker-options="pickerOptions"
|
:picker-options="pickerOptions"
|
||||||
@ -55,11 +50,6 @@ export default {
|
|||||||
},
|
},
|
||||||
defaultDateRange:[],//默认展示的时间
|
defaultDateRange:[],//默认展示的时间
|
||||||
dateRange:[],
|
dateRange:[],
|
||||||
sjwd:'',
|
|
||||||
sjwdOptions:[
|
|
||||||
{name:'时间一',id:1},
|
|
||||||
{name:'时间二',id:2},
|
|
||||||
],
|
|
||||||
loading:false,
|
loading:false,
|
||||||
chart: null
|
chart: null
|
||||||
|
|
||||||
@ -73,7 +63,6 @@ export default {
|
|||||||
// 重置
|
// 重置
|
||||||
onReset(){
|
onReset(){
|
||||||
this.dateRange=[]
|
this.dateRange=[]
|
||||||
this.sjwd=''
|
|
||||||
this.getData()
|
this.getData()
|
||||||
},
|
},
|
||||||
getData(){
|
getData(){
|
||||||
@ -102,9 +91,12 @@ export default {
|
|||||||
dataset:{
|
dataset:{
|
||||||
// source
|
// source
|
||||||
source:[//格式
|
source:[//格式
|
||||||
['product','收益1','收益2'],
|
['product','充电量','放电量'],
|
||||||
['今天',10,20],
|
['6/10',101,220],
|
||||||
['昨天',20,30],
|
['6/11',210,390],
|
||||||
|
['6/12',220,360],
|
||||||
|
['6/13',520,340],
|
||||||
|
['6/14',270,430],
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
series: [
|
series: [
|
||||||
@ -113,7 +105,7 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'bar',//柱状图
|
type: 'bar',//柱状图
|
||||||
}
|
},
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -7,15 +7,10 @@
|
|||||||
<!-- 搜索栏-->
|
<!-- 搜索栏-->
|
||||||
<div class="select-container">
|
<div class="select-container">
|
||||||
<el-form :inline="true">
|
<el-form :inline="true">
|
||||||
<el-form-item label="设备类型">
|
|
||||||
<el-select v-model="sjwd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
|
|
||||||
<el-option :label="item.name" :value="item.id" v-for="(item,index) in sjwdOptions" :key="index+'syzbSjwdOptions'"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="时间选择">
|
<el-form-item label="时间选择">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
type="datetimerange"
|
type="daterange"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始时间"
|
start-placeholder="开始时间"
|
||||||
:picker-options="pickerOptions"
|
:picker-options="pickerOptions"
|
||||||
@ -53,11 +48,6 @@ export default {
|
|||||||
},
|
},
|
||||||
defaultDateRange:[],//默认展示的时间
|
defaultDateRange:[],//默认展示的时间
|
||||||
dateRange:[],
|
dateRange:[],
|
||||||
sjwd:'',
|
|
||||||
sjwdOptions:[
|
|
||||||
{name:'时间一',id:1},
|
|
||||||
{name:'时间二',id:2},
|
|
||||||
],
|
|
||||||
loading:false,
|
loading:false,
|
||||||
chart: null
|
chart: null
|
||||||
|
|
||||||
@ -71,7 +61,6 @@ export default {
|
|||||||
// 重置
|
// 重置
|
||||||
onReset(){
|
onReset(){
|
||||||
this.dateRange=[]
|
this.dateRange=[]
|
||||||
this.sjwd=''
|
|
||||||
this.getData()
|
this.getData()
|
||||||
},
|
},
|
||||||
getData(){
|
getData(){
|
||||||
@ -100,9 +89,12 @@ export default {
|
|||||||
dataset:{
|
dataset:{
|
||||||
// source
|
// source
|
||||||
source:[//格式
|
source:[//格式
|
||||||
['product','收益1','收益2'],
|
['product','收入','支出'],
|
||||||
['今天',10,20],
|
['6/10',10,20],
|
||||||
['昨天',20,30],
|
['6/11',20,30],
|
||||||
|
['6/12',20,34],
|
||||||
|
['6/13',20,90],
|
||||||
|
['6/14',20,3],
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
series: [
|
series: [
|
||||||
|
Reference in New Issue
Block a user