能源中心调整

src/projects/business/views/Other/Energy/Info.vue

@@ -5,7 +5,7 @@
 		<header class="mui-bar mui-bar-nav">
 			<div class="barRight">
 				<i class="mui-icon-extra mui-icon-extra-filter"></i>
-				<a href="#popover" id="openPopover">过滤</a>
+				<a  @click="openPopover" >过滤</a>
 			</div>
 			<h1 class="mui-title">能源中心</h1>
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
@@ -13,14 +13,11 @@
 		<div id="popover" class="mui-popover">
 			<div class="popover-form">
 				<div class="title">查询日期</div>
-				<div class="select">
-					<select>
-					  <option value ="volvo">Volvo</option>
-					  <option value ="saab">Saab</option>
-					  <option value="opel">Opel</option>
-					  <option value="audi">Audi</option>
-					</select>
+				<div class="selectBtn" @click="selectData2" >
+					{{queryDate2}}
+					<i class="mui-icon mui-icon-arrowdown" style=" float: right;"></i>
 				</div>
+				
 				<div class="title">功率</div>
 				<div class="returnCheckbox">
 					<div class="mui-input-row mui-checkbox mui-left">
@@ -73,7 +70,7 @@
 			</div>	
 			<div class="popover-btn">
 				<div class="popover-btn1" @click="init(true)">重置</div>
-				<div class="popover-btn2" @click="setMap(true)">确定</div>
+				<div class="popover-btn2" @click="submitBtn()">确定</div>
 			</div>
 		</div>
 		<div class="mui-content">
@@ -205,6 +202,7 @@
 				nowDate:"",
 				 
 				queryDate:"",
+				queryDate2:"",
 				selectType:"0",
 				energyCenterElectricityObj:{},
 				energyCenterMapObj:{},
@@ -222,13 +220,29 @@
 	
 			this.init()
 			//this.queryDate='2022-06-08'
-			this.getEnergyCenterMap();
-			this.getEnergyCenterElectricity();
+			
  		},
 		methods: {
+			openPopover(){
+				mui('#popover').popover('toggle');
+				mui(".mui-scroll-wrapper").scroll()
+				this.queryDate2=this.queryDate;
+				
+			},
+			submitBtn(){
+				this.queryDate=this.queryDate2;
+				
+				 this.getEnergyCenterMap();
+				 this.getEnergyCenterElectricity();
+				 
+				mui('#popover').popover('toggle');
+				mui(".mui-scroll-wrapper").scroll()
+			},
 			init(bl){
 				this.nowDate=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 				this.queryDate=parseUnixTime(beforeTimeStamp(0), '{y}-{m}-{d}');
+				this.queryDate2=parseUnixTime(beforeTimeStamp(0), '{y}-{m}-{d}');
+				
 				this.showlist1=['总功率','A相功率','B相功率','C相功率'];
 			
 				this.showlist2=['A相电流','B相电流','C相电流'];
@@ -237,6 +251,8 @@
 					mui('#popover').popover('toggle');
 					mui(".mui-scroll-wrapper").scroll()
 				}
+				this.getEnergyCenterMap();
+				this.getEnergyCenterElectricity();
 			},
 			//选择日期
 			selectData() {
@@ -255,6 +271,26 @@
 					picker.dispose();
 				});
 			},
+			//选择日期
+			selectData2() {
+				mui('#popover').popover('toggle');
+				mui(".mui-scroll-wrapper").scroll()
+				var _this = this;
+				var picker = new mui.DtPicker({
+					"type": "date",
+					"beginYear": 2020,
+					"endYear": 2040,
+					"endDate": new Date(),
+					"value": _this.queryDate2
+				});
+				picker.show(function(rs) {
+					_this.queryDate2 = rs.text;
+			
+					mui('#popover').popover('toggle');
+					mui(".mui-scroll-wrapper").scroll()
+					picker.dispose();
+				});
+			},
 			ckDate(bl){
 				 
 				if(bl&&this.queryDate==this.nowDate){
@@ -296,6 +332,7 @@
 				})
 			},
 			setMap(bl){
+				 
 				var list1=[];
 				var list2=[];
 				var list3=[];
@@ -313,10 +350,7 @@
 				this.echarts('aPicture',0,this.showlist2,list2);
 				//获取图表数据
 				this.echarts('vPicture',0,this.showlist3,list3);
-				if(bl){
-					mui('#popover').popover('toggle');
-					mui(".mui-scroll-wrapper").scroll()
-				}
+				
 			
 			},
 			setSz(sz1,sz2,list,energyCenterMapObj,showList){
@@ -456,6 +490,13 @@
 
 
 <style scoped >
+	.selectBtn{
+		    background-color: #f2f5fa;
+		    line-height: 20px;
+		    font-size: 16px;
+		    padding: 5px 5px 5px 15px;
+		    color: #333333;
+	}
 	.popover-form{
 		padding: 20px;
 	}