Commit 7b49bbce authored by co_dengxiongwen's avatar co_dengxiongwen

页面调整

parent 4388c431
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
v-model="startTime" v-model="startTime"
align="right" align="right"
type="date" type="date"
@change="startChangeHandle"
:picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -33,6 +35,8 @@ ...@@ -33,6 +35,8 @@
v-model="endTime" v-model="endTime"
align="right" align="right"
type="date" type="date"
@change="endChangeHandle"
:picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -83,6 +87,8 @@ export default { ...@@ -83,6 +87,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
activetap: '1', activetap: '1',
...@@ -154,6 +160,30 @@ export default { ...@@ -154,6 +160,30 @@ export default {
} }
}) })
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
...@@ -16,6 +16,7 @@ card-warp(title="故障报警分析", height="45px", showBackground) ...@@ -16,6 +16,7 @@ card-warp(title="故障报警分析", height="45px", showBackground)
v-model="startTime" v-model="startTime"
align="right" align="right"
type="date" type="date"
@change="startChangeHandle" :picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
span( style="padding: 0 10px") 至 span( style="padding: 0 10px") 至
...@@ -23,6 +24,7 @@ card-warp(title="故障报警分析", height="45px", showBackground) ...@@ -23,6 +24,7 @@ card-warp(title="故障报警分析", height="45px", showBackground)
v-model="endTime" v-model="endTime"
align="right" align="right"
type="date" type="date"
@change="endChangeHandle" :picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getDataList()") 查询 el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getDataList()") 查询
...@@ -46,6 +48,8 @@ export default { ...@@ -46,6 +48,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
dateTypeList: [ dateTypeList: [
...@@ -85,6 +89,30 @@ export default { ...@@ -85,6 +89,30 @@ export default {
tabClick(tab, event) { tabClick(tab, event) {
console.log(tab, event) console.log(tab, event)
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
...@@ -24,6 +24,7 @@ card-warp(title="室内气象分析", height="45px") ...@@ -24,6 +24,7 @@ card-warp(title="室内气象分析", height="45px")
v-model="startTime" v-model="startTime"
align="right" align="right"
type="date" type="date"
@change="startChangeHandle" :picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
span( style="padding: 0 10px") 至 span( style="padding: 0 10px") 至
...@@ -31,6 +32,7 @@ card-warp(title="室内气象分析", height="45px") ...@@ -31,6 +32,7 @@ card-warp(title="室内气象分析", height="45px")
v-model="endTime" v-model="endTime"
align="right" align="right"
type="date" type="date"
@change="endChangeHandle" :picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getDataList()") 查询 el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getDataList()") 查询
...@@ -47,6 +49,8 @@ export default { ...@@ -47,6 +49,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
activeName: '1', activeName: '1',
...@@ -95,6 +99,30 @@ export default { ...@@ -95,6 +99,30 @@ export default {
} }
}) })
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
...@@ -19,12 +19,14 @@ card-warp(title="室外气象分析", height="45px", showBackground) ...@@ -19,12 +19,14 @@ card-warp(title="室外气象分析", height="45px", showBackground)
el-date-picker( el-date-picker(
v-model="startTime" v-model="startTime"
type="date" type="date"
@change="startChangeHandle" :picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="开始日期") placeholder="开始日期")
span &emsp;至&emsp; span &emsp;至&emsp;
el-date-picker( el-date-picker(
v-model="endTime" v-model="endTime"
type="date" type="date"
@change="endChangeHandle" :picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="结束日期") placeholder="结束日期")
el-button(type="primary" size="mini" icon="el-icon-search" @click="getDataList()") 查询 el-button(type="primary" size="mini" icon="el-icon-search" @click="getDataList()") 查询
...@@ -43,6 +45,8 @@ export default { ...@@ -43,6 +45,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
chartList: [ chartList: [
...@@ -91,6 +95,30 @@ export default { ...@@ -91,6 +95,30 @@ export default {
} }
}) })
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
v-model="startTime" v-model="startTime"
align="right" align="right"
type="date" type="date"
@change="startChangeHandle" :picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
span( style="padding: 0 10px") 至 span( style="padding: 0 10px") 至
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
v-model="endTime" v-model="endTime"
align="right" align="right"
type="date" type="date"
@change="endChangeHandle" :picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getList()") 查询 el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getList()") 查询
...@@ -57,6 +59,8 @@ export default { ...@@ -57,6 +59,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
typeList: [ typeList: [
...@@ -147,6 +151,30 @@ export default { ...@@ -147,6 +151,30 @@ export default {
} }
}) })
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
...@@ -33,6 +33,7 @@ el-dialog( ...@@ -33,6 +33,7 @@ el-dialog(
v-model="startTime" v-model="startTime"
align="right" align="right"
type="date" type="date"
@change="startChangeHandle" :picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
span( style="padding: 0 10px") 至 span( style="padding: 0 10px") 至
...@@ -40,6 +41,7 @@ el-dialog( ...@@ -40,6 +41,7 @@ el-dialog(
v-model="endTime" v-model="endTime"
align="right" align="right"
type="date" type="date"
@change="endChangeHandle" :picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期") placeholder="选择日期")
el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getList()") 查询 el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getList()") 查询
...@@ -157,6 +159,8 @@ export default { ...@@ -157,6 +159,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
type: null, type: null,
...@@ -208,6 +212,30 @@ export default { ...@@ -208,6 +212,30 @@ export default {
this.getDataListTb() this.getDataListTb()
} }
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
style="width: 172px" style="width: 172px"
size="mini" size="mini"
type="date" type="date"
@change="startChangeHandle"
:picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -39,6 +41,8 @@ ...@@ -39,6 +41,8 @@
style="width: 172px" style="width: 172px"
size="mini" size="mini"
type="date" type="date"
@change="endChangeHandle"
:picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -100,6 +104,8 @@ export default { ...@@ -100,6 +104,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
visible: false, visible: false,
...@@ -151,6 +157,30 @@ export default { ...@@ -151,6 +157,30 @@ export default {
cancelhandle() { cancelhandle() {
this.visible = false this.visible = false
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
style="width: 172px" style="width: 172px"
size="mini" size="mini"
type="date" type="date"
@change="startChangeHandle"
:picker-options="startPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -48,6 +50,8 @@ ...@@ -48,6 +50,8 @@
style="width: 172px" style="width: 172px"
size="mini" size="mini"
type="date" type="date"
@change="endChangeHandle"
:picker-options="endPickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -82,6 +86,8 @@ export default { ...@@ -82,6 +86,8 @@ export default {
}, },
data() { data() {
return { return {
startPickerOptions: {},
endPickerOptions: {},
startTime: '', startTime: '',
endTime: '', endTime: '',
formLabelWidth: '120px', formLabelWidth: '120px',
...@@ -125,6 +131,30 @@ export default { ...@@ -125,6 +131,30 @@ export default {
cancelhandlePic() { cancelhandlePic() {
this.visible = false this.visible = false
}, },
// 开始时间change事件
startChangeHandle(val) {
if (val) {
this.endPickerOptions = {
disabledDate(time) {
return time.getTime() <= new Date(val) - 8.64e7
}
}
} else {
this.endPickerOptions = {}
}
},
// 结束时间change事件
endChangeHandle(val) {
if (val) {
this.startPickerOptions = {
disabledDate(time) {
return new Date(val) <= time.getTime()
}
}
} else {
this.startPickerOptions = {}
}
},
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
......
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