|
@@ -8,13 +8,13 @@
|
|
|
</config>
|
|
</config>
|
|
|
<template>
|
|
<template>
|
|
|
<div class="list">
|
|
<div class="list">
|
|
|
- <van-sticky :offset-top="0">
|
|
|
|
|
|
|
+ <!-- <van-sticky :offset-top="0">
|
|
|
<div class="box">
|
|
<div class="box">
|
|
|
<div class="time-box" @click="newShow = true">
|
|
<div class="time-box" @click="newShow = true">
|
|
|
<div class="text">{{ yearMonth ? yearMonth : '请选择时间' }}</div>
|
|
<div class="text">{{ yearMonth ? yearMonth : '请选择时间' }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- </van-sticky>
|
|
|
|
|
|
|
+ </van-sticky> -->
|
|
|
<template v-if="!empty">
|
|
<template v-if="!empty">
|
|
|
<div class="content">
|
|
<div class="content">
|
|
|
<div class="con1">
|
|
<div class="con1">
|
|
@@ -53,6 +53,7 @@ export default {
|
|
|
return {
|
|
return {
|
|
|
newShow: false,
|
|
newShow: false,
|
|
|
yearMonth: '',
|
|
yearMonth: '',
|
|
|
|
|
+ nowDate: '',
|
|
|
list: [],
|
|
list: [],
|
|
|
currentDate: new Date().getTime(),
|
|
currentDate: new Date().getTime(),
|
|
|
// minDate: new Date().getTime(),
|
|
// minDate: new Date().getTime(),
|
|
@@ -65,6 +66,15 @@ export default {
|
|
|
// created() {
|
|
// created() {
|
|
|
// console.log(this.roomInfo, this.ammeterInfo);
|
|
// console.log(this.roomInfo, this.ammeterInfo);
|
|
|
// },
|
|
// },
|
|
|
|
|
+ mounted() {
|
|
|
|
|
+ // this.nowDate = new Date();
|
|
|
|
|
+ // let date = {
|
|
|
|
|
+ // year: this.nowDate.getFullYear(),
|
|
|
|
|
+ // month: this.nowDate.getMonth() + 1
|
|
|
|
|
+ // };
|
|
|
|
|
+ // let systemDate = date.year + '-' + date.month;
|
|
|
|
|
+ // this.yearMonth = systemDate;
|
|
|
|
|
+ },
|
|
|
methods: {
|
|
methods: {
|
|
|
timeFormat(date, fmt) {
|
|
timeFormat(date, fmt) {
|
|
|
var o = {
|
|
var o = {
|