修改酒店每个房间一个Ha;修改调查问卷

pages/data/data.js

@@ -1563,7 +1563,7 @@ var homeApi_http_port = "8123";
 var homeApi_https = "https://haold.aidsleep.cn";
 const aipushApi = "https://aipush.aidsleep.cn";
 const token_15 = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiN2JlOGE0MDExZjY0NjA2OGUxYjJiZTE4M2Y2NzU0NSIsImlhdCI6MTcxMTYxNDY2NCwiZXhwIjoyMDI2OTc0NjY0fQ.XJ73cXAoEsouTgvgpNVobq9oKdwlJr88TiAFLYlaahE";
-const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlZGVjOWI3YWQ0MTQ0ZTIxYWQ1NTE1Nzc5NTkzNjBjNiIsImlhdCI6MTcxMjEzNTM2MywiZXhwIjoyMDI3NDk1MzYzfQ.IfrvdiaVuhCKsdy69JvUYhJ64bnhMT8MI1hN8R38whc";
+var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlZGVjOWI3YWQ0MTQ0ZTIxYWQ1NTE1Nzc5NTkzNjBjNiIsImlhdCI6MTcxMjEzNTM2MywiZXhwIjoyMDI3NDk1MzYzfQ.IfrvdiaVuhCKsdy69JvUYhJ64bnhMT8MI1hN8R38whc";
 const token_push = "b74fd5754c5ef24cf600c39194abdaeb";
 
 Page({
@@ -1651,6 +1651,10 @@ Page({
 	rin_duration: 0,
 	rawake_duration: 0,
 	
+	rrs_duration: 0,//入睡时长
+	routbed_count_value: 0,//离床次数
+	rsleep_eff_value: '',//睡眠效率
+	
 	rdeep_durationFormat: '',
 	rlight_durationFormat: '',
 	rin_durationFormat: '',
@@ -2049,6 +2053,9 @@ initChart00(canvas, width, height,reportId){
 		  success(res) {
 			try {
 					if(res && res.data && res.data[0]){
+					   that.setData({
+                             roomname: res.data[0].rn
+                           });
 						console.log("res.data=sn="+JSON.stringify(res.data));
 						wx.request({
 					  url: `${aipushApi}`+'/getsingle',
@@ -2146,6 +2153,9 @@ initChart00(canvas, width, height,reportId){
 		  success(res) {
 			try {
 					if(res && res.data && res.data[0]){
+					    that.setData({
+                         roomname: res.data[0].rn
+                       });
 						console.log("res.data=sn="+JSON.stringify(res.data));
 						wx.request({
 					  url: `${aipushApi}`+'/getsingle',
@@ -2212,6 +2222,9 @@ initChart00(canvas, width, height,reportId){
 		  success(res) {
 			try {
 					if(res && res.data && res.data[0]){
+                        that.setData({
+                         roomname: res.data[0].rn
+                       });
 						wx.request({
 						  url: `${aipushApi}`+'/getsingle',
 						  data: {"sn":res.data[0].sn,
@@ -2276,6 +2289,9 @@ initChart00(canvas, width, height,reportId){
 			  success(res) {
 				try {
 						if(res && res.data && res.data[0]){
+						   that.setData({
+                            roomname: res.data[0].rn
+                          });
 							wx.request({
 							  url: `${aipushApi}`+'/getsingle',
 							  data: {"sn":res.data[0].sn,
@@ -2331,6 +2347,9 @@ initChart00(canvas, width, height,reportId){
 		  	  success(res) {
 		  		try {
 		  				if(res && res.data && res.data[0]){
+		  				    that.setData({
+                             roomname: res.data[0].rn
+                           });
 		  					wx.request({
 		  					  url: `${aipushApi}`+'/getsingle',
 		  					  data: {"sn":that.data.rsn?that.data.rsn:res.data[0].sn,
@@ -2397,6 +2416,9 @@ initChart00(canvas, width, height,reportId){
 			  success(res) {
 				try {
 					if(res && res.data && res.data[0]){
+					    that.setData({
+                         roomname: res.data[0].rn
+                       });
 						wx.request({
 						  url: `${aipushApi}`+'/getsingle',
 						  data: {"sn":res.data[0].sn,
@@ -2465,6 +2487,9 @@ initChart00(canvas, width, height,reportId){
 				  method: 'POST',
 				  success(res) {
 					  if(res && res.data && res.data[0]){
+					   that.setData({
+                        roomname: res.data[0].rn
+                      });
 						try {
 							wx.request({
 							  url: `${aipushApi}`+'/getsingle',
@@ -2521,6 +2546,9 @@ initChart00(canvas, width, height,reportId){
 				  success(res) {
 					try {
 							if(res && res.data && res.data[0]){
+							that.setData({
+                                roomname: res.data[0].rn
+                              });
 								wx.request({
 							  url: `${aipushApi}`+'/getsingle',
 							  data: {"sn":res.data[0].sn,
@@ -2577,6 +2605,9 @@ initChart00(canvas, width, height,reportId){
 			  	  success(res) {
 			  		try {
 			  				if(res && res.data && res.data[0]){
+			  				that.setData({
+                                roomname: res.data[0].rn
+                              });
 			  					wx.request({
 			  				  url: `${aipushApi}`+'/getsingle',
 			  				  data: {"sn":that.data.rsn?that.data.rsn:res.data[0].sn,
@@ -2637,6 +2668,9 @@ initChart00(canvas, width, height,reportId){
 					  success(res) {
 						try {
 								if(res && res.data && res.data[0]){
+								that.setData({
+                                    roomname: res.data[0].rn
+                                  });
 									wx.request({
 								  url: `${aipushApi}`+'/getsingle',
 								  data: {"sn":that.data.rsn?that.data.rsn:res.data[0].sn,
@@ -2694,6 +2728,9 @@ initChart00(canvas, width, height,reportId){
 				  	  success(res) {
 				  		try {
 				  				if(res && res.data && res.data[0]){
+				  				that.setData({
+                                    roomname: res.data[0].rn
+                                  });
 				  					wx.request({
 				  				  url: `${aipushApi}`+'/getsingle',
 				  				  data: {"sn":that.data.rsn?that.data.rsn:res.data[0].sn,
@@ -2751,6 +2788,9 @@ initChart00(canvas, width, height,reportId){
 				  	  success(res) {
 				  		try {
 				  				if(res && res.data && res.data[0]){
+				  				that.setData({
+                                    roomname: res.data[0].rn
+                                  });
 				  					wx.request({
 				  				  url: `${aipushApi}`+'/getsingle',
 				  				  data: {"sn":that.data.rsn?that.data.rsn:res.data[0].sn,
@@ -2808,6 +2848,9 @@ initChart00(canvas, width, height,reportId){
 						  success(res) {
 							try {
 									if(res && res.data && res.data[0]){
+									that.setData({
+                                        roomname: res.data[0].rn
+                                      });
 										wx.request({
 									  url: `${aipushApi}`+'/getsingle',
 									  data: {"sn":that.data.rsn?that.data.rsn:res.data[0].sn,
@@ -2903,6 +2946,9 @@ initChart00(canvas, width, height,reportId){
 			  	  success(res) {
 			  		try {
 			  				if(res && res.data && res.data[0]){
+			  				that.setData({
+                                roomname: res.data[0].rn
+                              });
 			  					wx.request({
 			  				  url: `${aipushApi}`+'/getsingle',
 			  				  data: {"sn":res.data[0].sn,
@@ -3167,7 +3213,8 @@ initChart00(canvas, width, height,reportId){
 								console.log("wx.getStorageSync(tvEntityId)=="+wx.getStorageSync('tvEntityId'));
 								wx.request({
 									// url: `${homeApi_http}`+':'+`${homeApi_http_port}`+'/api/services/media_player/play_media', //http 
-									url: `${homeApi_https}`+'/api/services/media_player/play_media',  //https
+									// url: `${homeApi_https}`+'/api/services/media_player/play_media',  //https
+									url: `${homeApi_https}`+'/api/services/media_player/select_source',  //https
 									method: 'POST',
 									 header: {
 											  'content-type': 'application/json', // 默认值
@@ -3175,10 +3222,11 @@ initChart00(canvas, width, height,reportId){
 									  },
 									data:{
 									    "entity_id": wx.getStorageSync('tvEntityId'),
-									    "media_content_id": ress.data.url,
+									//     "media_content_id": ress.data.url,
 										// "media_content_id": 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 										// "media_content_id": 'https://alifei01.cfp.cn/creative/vcg/veer/1600water/veer-368621010.jpg',
-									    "media_content_type": "image/jpeg/png"
+									//     "media_content_type": "image/jpeg/png",
+										"source": "X浏览器"
 									},
 									success(res) {
 									that.setData({
@@ -3241,6 +3289,9 @@ initChart00(canvas, width, height,reportId){
 								  //   airValue: now.aqi //空气指数
 								  // })
 									if(res && res.data && res.data[0]){
+									that.setData({
+                                        roomname: res.data[0].rn
+                                      });
 										console.log("res.data-sn="+JSON.stringify(res.data));
 										wx.request({
 										  url: `${aipushApi}`+'/getsingle',
@@ -3251,7 +3302,7 @@ initChart00(canvas, width, height,reportId){
 										  success(ress) {
 											try {
 												if(ress && ress.data){
-													// console.log('ress.data-getsingle='+JSON.stringify(ress.data.results));
+													console.log('ress.data-getsingle='+JSON.stringify(ress.data.results));
 												  // that.setData({
 												  //   airText: now.category, //空气质量
 												  //   airValue: now.aqi //空气指数
@@ -3455,6 +3506,10 @@ initChart00(canvas, width, height,reportId){
 														rlight_duration_efficiency:rlight_duration_efficiency_temp,
 														rin_duration_efficiency:rin_duration_efficiency_temp,
 														pushReportId:ress.data.results.rdid,
+														
+														rrs_duration:that.convertTimeToHoursAndMinutes(ress.data.results.rrs_duration?ress.data.results.rrs_duration.toString():'0'),
+														routbed_count_value:ress.data.results.routbed_count_value,
+														rsleep_eff_value:ress.data.results.rsleep_eff_value,
 														});
 														
 														that.getDateTimeJsonData(sn?sn:res.data[0].sn);
@@ -3507,7 +3562,7 @@ initChart00(canvas, width, height,reportId){
 								// 	  'Authorization': 'Bearer ' + token // 在头部设置认证信息，例如使用Bearer Token
 								// },
 								data:{
-								     "locations":hotelcode,"token":token_push
+								     "locations":hotelcode,"room":(hotelcode && hotelcode.includes('hotel'))?roomcode:"","token":token_push
 								 },
 							  success(res) {
 								  if(!res || !res.data){
@@ -3529,6 +3584,7 @@ initChart00(canvas, width, height,reportId){
 								}
 								
 								homeApi_https = resData.loc;
+								token = resData.token;
 							  },
 							  fail: function (error) {
 								  console.error('error', error);  
@@ -3576,6 +3632,7 @@ initChart00(canvas, width, height,reportId){
 					  }, 
 	getDateTimeJsonData: function(sn) {
 		var that = this;
+		var sourceFourthTemp = [];  
 		wx.request({
 		  url: `${aipushApi}/getdatefromsn`, //
 		  method: 'POST',
@@ -3590,8 +3647,10 @@ initChart00(canvas, width, height,reportId){
 			  if(!res || !res.data || !res.data.results){
 				  return;
 			  }
-			var sourceFourthTemp = [];  
+			
 			var resDataSn = res.data.results
+			console.log('resDataSn===='+JSON.stringify(resDataSn))
+			var tt = 0;
 			resDataSn.forEach(function(item, index) {  
 			  wx.request({
 				  url: `${aipushApi}/getimefromsn`, //
@@ -3616,7 +3675,8 @@ initChart00(canvas, width, height,reportId){
 					json.text = item.rdate;
 					json.children = resDataItem;
 					sourceFourthTemp.push(json);
-					if (index == resDataSn.length - 1) {
+					console.log('sourceFourthTemp0='+JSON.stringify(sourceFourthTemp));
+					if (tt == (resDataSn.length - 1)) {
 						console.log('sourceFourthTemp='+JSON.stringify(sourceFourthTemp));
 						
 						// 使用 sort 方法进行排序
@@ -3644,7 +3704,9 @@ initChart00(canvas, width, height,reportId){
 							sourceFourth: sourceFourthTemp, 
 							arrayFourth: array,
 						})
+						tt = 0;
 					}
+					tt++
 				  },
 				  fail: function (error) {
 				
@@ -3814,7 +3876,7 @@ onLoad(option){
 	  	  canvasHeight: canvasHeight,
 	  	  hotelcode: hotelcodeTemp,
 	  	  roomcode: roomcodeTemp,
-		  roomname: wx.getStorageSync('roomname'),
+//		  roomname: wx.getStorageSync('roomname'),
 		  
 		  // arrayFourth: array,
 	  	}); 

pages/data/data.wxml

@@ -1,601 +1,602 @@
-<!--pages/data/data.wxml-->
-<view class='container'>
-	<!-- <view class="centered">
-	  <text class="centered-text">舒眠睡眠报告</text>
-	  <text>{{reportDate}}</text>
-	  <text>用户号:12345| SN:{{rsn}}</text>
-	</view> -->
-	
-	<view wx:if="{{isLoading}}" class="loading-container">
-	  <text class="loading-text">数据正在推送，请稍候...</text>  
-	</view>
-	<view class="picker-row">
-		<view class="picker-row_view">
-		  <image class="data-image_c00_0" src="/static/images/report/hotel&room.png" mode="aspectFit"></image>
-		  <text class="data-text_c00_0">{{hotelname?(hotelname+'·'):''}}{{roomname?(roomname+'·'):''}}{{sns[selectedIndex].pos}}床</text>
-	    </view>
-	  <!-- <picker mode="date" bindchange="bindDateChange" class="picker" style="width: 40%;">  
-	    <view class="picker-placeholder">{{reportDate}}</view>  
-	  </picker>  
-	  <picker mode="time" bindchange="bindTimeChange" class="picker" style="width: 40%; margin-left: 4%;">  
-	    <view class="picker-placeholder">{{rgobed_time}}~{{routbed_time}}</view>  
-	  </picker>  -->
-	  <view class="picker_out">
-	  <picker style="margin-left:5rpx;" range="{{arrayFourth}}" value="{{valueFourth}}" range-key="text" mode="multiSelector"
-	  bindchange="bindMultiPickerChange" 
-	  bindcolumnchange="bindMultiPickerColumnChange">
-		<view class="{{reportDate?'picker-placeholder':'picker-placeholder1'}}">{{reportDate?reportDate:'无数据'}}<image class="data-image_c00_01" src="/static/images/report/arrow_new.png" mode="aspectFit"></image></view>
-	  </picker>
-	  <picker style="margin-right:5rpx;" range="{{arrayFourth}}" value="{{valueFourth}}" range-key="text" mode="multiSelector"
-	  bindchange="bindMultiPickerChange" 
-	  bindcolumnchange="bindMultiPickerColumnChange">
-	  	<view class="{{rgobed_time?'picker-placeholder':'picker-placeholder2'}}">{{rgobed_time?rgobed_time:'无数据'}}~{{routbed_time?routbed_time:'无数据'}}<image class="data-image_c00_01" src="/static/images/report/arrow_new.png" mode="aspectFit"></image></view> 
-	  </picker>
-	  </view>
-	</view> 
-	
-	
-  <!-- <view class='canvas5'>
-	  <view class="image-container">  
-	    <image src="/static/images/report/vortex.png" class="background-image" mode="aspectFit" />  
-	     
-	      	    <view class="picker-row">  
-	      	      <picker mode="date" bindchange="bindDateChange" class="picker" style="width: 40%;">  
-	      	        <view class="picker-placeholder">{{reportDate}}</view>  
-	      	      </picker>  
-	      	      <picker mode="time" bindchange="bindTimeChange" class="picker" style="width: 40%; margin-left: 4%;">  
-	      	        <view class="picker-placeholder">{{rgobed_time}}~{{routbed_time}}</view>  
-	      	      </picker>  
-	      	    </view> 
-	      	    <view class="button-group">  
-	      	      <button class="small-button">月报</button>  
-	      	      <button class="small-button">周报</button>  
-	      	      <button class="small-button" bindtap="telScreeProjection">推送电视</button>
-				</view>  
-				
-				<view class="select-group">
-				   <picker class="small-button" mode="selector" range-key="pos" range="{{sns}}" value="{{selectedIndex}}" bindchange="onPickerChange">
-						<view class="picker-view">请选择：{{sns[selectedIndex].pos}}床</view>  
-				   </picker>
-				</view> 
-				
-	    <view class="centered-text">  
-	      <text class="text-line text-line-1">{{rscore_desc}}</text>  
-	      <text class="text-line text-line-2">{{rscore_value}}</text>  
-	      <text class="text-line text-line-3">香睡指数</text>  
-	    </view>  
-	  </view>
-  </view> -->
-  
-  
-  
-  <view class="container_00">  
-    <view class="data-row_c00">  
-      <view class="data-item_c00 left_c00">  
-        <image class="data-image_c00" src="/static/images/report/zhoubao_new.png" mode="aspectFit"></image>  
-        <text class="data-text_c00">周报  </text>
-  		<image class="data-image_c00" src="/static/images/report/yuebao_new.png" mode="aspectFit"></image>
-  		<text class="data-text_c00">月报  </text>
-  		<image class="data-image_c00" src="/static/images/report/tuisong_new.png" mode="aspectFit"></image>
-  		<text class="data-text_c00" bindtap="telScreeProjection">推送电视  </text>
-  		<!-- <text class="data-text_c001">就寝目标23:00</text> -->
-      </view>  
-      <view class="data-item_c00 right_c00">   
-        <picker mode="selector" range-key="pos" range="{{sns}}" value="{{selectedIndex}}" bindchange="onPickerChange">
-  			<view class="data-text_c002">请选择：{{sns[selectedIndex].pos}}床</view>  
-        </picker>  
-      </view>  
-    </view>  
-    <view class="separator_c00"></view>   
-  	 
-  	 <view class="circle-container-yh">
-  	 		  <view class="text-container-yh left-text-yh">  
-  	 			<view class="text-row-yh">
-  	 			  <view class="blue-dot"></view>  
-  	 			  <text class="text-content-yh">睡眠总时长</text>  
-  	 			</view>  
-  	 			<view class="text-row-yh">    
-  	 			  <text class="text-content-yh_1">{{rtotal_duration}}分</text>  
-  	 			</view>   
-  	 		  </view>
-	<view class="echarts-container_c00">
-		<ec-canvas id="mychart-dom-bar00" canvas-id="mychart-bar" ec="{{ ec00 }}"></ec-canvas>
-	</view>
-  	   <view class="text-container-yh right-text-yh">  
-  	     <view class="text-row-yh">
-  	       <view class="blue-dot"></view>   
-  	       <text class="text-content-yh">睡眠时间</text>  
-  	     </view>  
-  	     <view class="text-row-yh">   
-  	       <text class="text-content-yh_1">{{rgobed_time}}~{{routbed_time}}</text>  
-  	     </view>   
-  	   </view>  
-  	 </view> 
-  	 
-	 
-	 <view class="centered-text">
-	   <text class="text-line text-line-3">香睡指数</text>  
-	 </view> 
-	 
-  </view>
-  
-  
-  
-  
-  
-  <!-- <view class="container_1">  
-    <view class="item_c1">  
-      <image class="image_c1" src="/static/images/report/c_11.png" mode="aspectFit"></image>  
-      <view class="text-container_c1">  
-        <view><text class="text-line_c1">睡眠总时长</text></view>
-        <view><text class="text-line_c1">{{rtotal_duration}}分钟</text></view>  
-      </view>  
-    </view>  
-    <view class="item_c1">  
-      <image class="image_c1" src="/static/images/report/c_12.png" mode="aspectFit"></image>  
-      <view class="text-container_c1">  
-        <view><text class="text-line_c1">睡眠时间</text></view>  
-        <view><text class="text-line_c1">{{rgobed_time}}~{{routbed_time}}</text></view>  
-      </view>  
-    </view>  
-  </view> -->
-  
-  <view class="title-container_2">  
-    <text class="big-title_c2">各项睡眠监测数据统计</text>  
-  </view>
-  
-  
- 
- <view class="container_3">  
-   <view class="row_c3">  
-     <view class="cell_c3" style="background-image: url('/static/images/report/shangchuang_shijian_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
-	 <!-- <image class="image_c4" src="/static/images/report/shangchuang_shijian_new.png" /> -->
-       <view class="purple-dot-up"></view>    
-       <view class="cell-text_c3">  
-         <view><text class="text-line_c3">上床时间</text></view> 
-         <view><text class="text-line_c31">{{rgobed_time}}</text></view>  
-       </view>  
-     </view>  
-     <view class="cell_c3" style="background-image: url('/static/images/report/zaichuang_shijian_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
-       <view class="organize-dot-up"></view>
-       <view class="cell-text_c3">  
-         <view><text class="text-line_c3">在床时间</text></view>  
-         <view><text class="text-line_c31">{{rinbed_duration}}分</text></view>  
-       </view>  
-     </view>  
-   </view>  
-   
-	 
<view class="row_c3">  
-     <view class="cell_c3" style="background-image: url('/static/images/report/shenshui_shichang_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
-       <view class="purple-dot-up"></view>     
-       <view class="cell-text_c3">  
-         <view><text class="text-line_c3">深睡时长</text></view> 
-         <view><text class="text-line_c31">{{rdeep_duration}}分</text></view>
-       </view>  
-     </view>  
-     <view class="cell_c3" style="background-image: url('/static/images/report/shuimian_xiaolv_big_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
-       <view class="green-dot-up"></view>   
-       <view class="cell-text_c3">  
-         <view><text class="text-line_c3">睡眠效率</text></view>
-         <view><text class="text-line_c31">{{sleep_efficiency}}</text></view>
-       </view>  
-     </view>  
-   </view>  
-   
-   <view class="row_c3">
-     <view class="cell_c3" style="background-image: url('/static/images/report/pingjun_huxilv_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
-       <view class="organize-dot-up"></view> 
-       <view class="cell-text_c3">  
-         <view><text class="text-line_c3">平均呼吸率</text></view>
-         <view><text class="text-line_c31">{{ravg_hx_value}}次/分</text></view>
-       </view>  
-     </view>  
-     <view class="cell_c3" style="background-image: url('/static/images/report/pingjun_xinlv_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
-       <view class="blue-dot-up"></view>  
-       <view class="cell-text_c3">  
-         <view><text class="text-line_c3">平均心率</text></view>
-         <view><text class="text-line_c31">{{ravg_rh_value}}次/分</text></view>
-       </view>  
-     </view>  
+<!--pages/data/data.wxml-->
+<view class='container'>
+	<!-- <view class="centered">
+	  <text class="centered-text">舒眠睡眠报告</text>
+	  <text>{{reportDate}}</text>
+	  <text>用户号:12345| SN:{{rsn}}</text>
+	</view> -->
+	
+	<view wx:if="{{isLoading}}" class="loading-container">
+	  <text class="loading-text">数据正在推送，请稍候...</text>  
+	</view>
+	<view class="picker-row">
+		<view class="picker-row_view">
+		  <image class="data-image_c00_0" src="/static/images/report/hotel&room.png" mode="aspectFit"></image>
+		  <text class="data-text_c00_0">{{hotelname?(hotelname+'·'):''}}{{roomname?(roomname):''}}</text>
+	    </view>
+	  <!-- <picker mode="date" bindchange="bindDateChange" class="picker" style="width: 40%;">  
+	    <view class="picker-placeholder">{{reportDate}}</view>  
+	  </picker>  
+	  <picker mode="time" bindchange="bindTimeChange" class="picker" style="width: 40%; margin-left: 4%;">  
+	    <view class="picker-placeholder">{{rgobed_time}}~{{routbed_time}}</view>  
+	  </picker>  -->
+	  <view class="picker_out">
+	  <picker style="margin-left:5rpx;" range="{{arrayFourth}}" value="{{valueFourth}}" range-key="text" mode="multiSelector"
+	  bindchange="bindMultiPickerChange" 
+	  bindcolumnchange="bindMultiPickerColumnChange">
+		<view class="{{reportDate?'picker-placeholder':'picker-placeholder1'}}">{{reportDate?reportDate:'无数据'}}<image class="data-image_c00_01" src="/static/images/report/arrow_new.png" mode="aspectFit"></image></view>
+	  </picker>
+	  <picker style="margin-right:5rpx;" range="{{arrayFourth}}" value="{{valueFourth}}" range-key="text" mode="multiSelector"
+	  bindchange="bindMultiPickerChange" 
+	  bindcolumnchange="bindMultiPickerColumnChange">
+	  	<view class="{{rgobed_time?'picker-placeholder':'picker-placeholder2'}}">{{rgobed_time?rgobed_time:'无数据'}}~{{routbed_time?routbed_time:'无数据'}}<image class="data-image_c00_01" src="/static/images/report/arrow_new.png" mode="aspectFit"></image></view> 
+	  </picker>
+	  </view>
+	</view> 
+	
+	
+  <!-- <view class='canvas5'>
+	  <view class="image-container">  
+	    <image src="/static/images/report/vortex.png" class="background-image" mode="aspectFit" />  
+	     
+	      	    <view class="picker-row">  
+	      	      <picker mode="date" bindchange="bindDateChange" class="picker" style="width: 40%;">  
+	      	        <view class="picker-placeholder">{{reportDate}}</view>  
+	      	      </picker>  
+	      	      <picker mode="time" bindchange="bindTimeChange" class="picker" style="width: 40%; margin-left: 4%;">  
+	      	        <view class="picker-placeholder">{{rgobed_time}}~{{routbed_time}}</view>  
+	      	      </picker>  
+	      	    </view> 
+	      	    <view class="button-group">  
+	      	      <button class="small-button">月报</button>  
+	      	      <button class="small-button">周报</button>  
+	      	      <button class="small-button" bindtap="telScreeProjection">推送电视</button>
+				</view>  
+				
+				<view class="select-group">
+				   <picker class="small-button" mode="selector" range-key="pos" range="{{sns}}" value="{{selectedIndex}}" bindchange="onPickerChange">
+						<view class="picker-view">请选择：{{sns[selectedIndex].pos}}床</view>  
+				   </picker>
+				</view> 
+				
+	    <view class="centered-text">  
+	      <text class="text-line text-line-1">{{rscore_desc}}</text>  
+	      <text class="text-line text-line-2">{{rscore_value}}</text>  
+	      <text class="text-line text-line-3">香睡指数</text>  
+	    </view>  
+	  </view>
+  </view> -->
+  
+  
+  
+  <view class="container_00">  
+    <view class="data-row_c00">  
+      <view class="data-item_c00 left_c00">  
+        <image class="data-image_c00" src="/static/images/report/zhoubao_new.png" mode="aspectFit"></image>  
+        <text class="data-text_c00">周报  </text>
+  		<image class="data-image_c00" src="/static/images/report/yuebao_new.png" mode="aspectFit"></image>
+  		<text class="data-text_c00">月报  </text>
+  		<image class="data-image_c00" src="/static/images/report/tuisong_new.png" mode="aspectFit"></image>
+  		<text class="data-text_c00" bindtap="telScreeProjection">推送电视  </text>
+  		<!-- <text class="data-text_c001">就寝目标23:00</text> -->
+      </view>  
+      <view class="data-item_c00 right_c00">   
+        <picker mode="selector" range-key="pos" range="{{sns}}" value="{{selectedIndex}}" bindchange="onPickerChange">
+  			<view class="data-text_c002">请选择：{{sns[selectedIndex].pos}}床</view>  
+        </picker>  
+      </view>  
+    </view>  
+    <view class="separator_c00"></view>   
+  	 
+  	 <view class="circle-container-yh">
+  	 		  <view class="text-container-yh left-text-yh">  
+  	 			<view class="text-row-yh">
+  	 			  <view class="blue-dot"></view>  
+  	 			  <text class="text-content-yh">睡眠总时长</text>  
+  	 			</view>  
+  	 			<view class="text-row-yh">    
+  	 			  <text class="text-content-yh_1">{{rtotal_duration}}分钟</text>  
+  	 			</view>   
+  	 		  </view>
+	<view class="echarts-container_c00">
+		<ec-canvas id="mychart-dom-bar00" canvas-id="mychart-bar" ec="{{ ec00 }}"></ec-canvas>
+	</view>
+  	   <view class="text-container-yh right-text-yh">  
+  	     <view class="text-row-yh">
+  	       <view class="blue-dot"></view>   
+  	       <text class="text-content-yh">睡眠时间</text>  
+  	     </view>  
+  	     <view class="text-row-yh">   
+  	       <text class="text-content-yh_1">{{rgobed_time}}~{{routbed_time}}</text>  
+  	     </view>   
+  	   </view>  
+  	 </view> 
+  	 
+	 
+	 <view class="centered-text">
+	   <text class="text-line text-line-3">香睡指数</text>  
+	 </view> 
+	 
+  </view>
+  
+  
+  
+  
+  
+  <!-- <view class="container_1">  
+    <view class="item_c1">  
+      <image class="image_c1" src="/static/images/report/c_11.png" mode="aspectFit"></image>  
+      <view class="text-container_c1">  
+        <view><text class="text-line_c1">睡眠总时长</text></view>
+        <view><text class="text-line_c1">{{rtotal_duration}}分钟</text></view>  
+      </view>  
+    </view>  
+    <view class="item_c1">  
+      <image class="image_c1" src="/static/images/report/c_12.png" mode="aspectFit"></image>  
+      <view class="text-container_c1">  
+        <view><text class="text-line_c1">睡眠时间</text></view>  
+        <view><text class="text-line_c1">{{rgobed_time}}~{{routbed_time}}</text></view>  
+      </view>  
+    </view>  
+  </view> -->
+  
+  <view class="title-container_2">  
+    <text class="big-title_c2">各项睡眠监测数据统计</text>  
+  </view>
+  
+  
+ 
+ <view class="container_3">  
+   <view class="row_c3">  
+     <view class="cell_c3" style="background-image: url('/static/images/report/shangchuang_shijian_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
+	 <!-- <image class="image_c4" src="/static/images/report/shangchuang_shijian_new.png" /> -->
+       <view class="purple-dot-up"></view>    
+       <view class="cell-text_c3">  
+         <view><text class="text-line_c3">上床时间</text></view> 
+         <view><text class="text-line_c31">{{rgobed_time}}</text></view>  
+       </view>  
+     </view>  
+     <view class="cell_c3" style="background-image: url('/static/images/report/zaichuang_shijian_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
+       <view class="organize-dot-up"></view>
+       <view class="cell-text_c3">  
+         <view><text class="text-line_c3">在床时间</text></view>  
+         <view><text class="text-line_c31">{{rinbed_duration}}分钟</text></view>  
+       </view>  
+     </view>  
    </view>  
- </view>
- 
-  <view class="container_4">  
-    <view class="left-panel_c4"> 
-	 <view class="text-container_c4_top_left">
-	   <text class="text_c4_left_top">温馨提醒</text>  
-	 </view> 
-	  <image class="image_c4" src="/static/images/report/left_background_c4_new.png" />  
-	    <view class="text-container_c4">  
-	      <text class="text_c4">本次睡眠，睡眠报告得分评比描述：<text class="text_c4_1">{{rscore_desc}}</text></text>  
-	    </view> 
-    </view>  
-    <view class="right-panel_c4">  
-      <view class="cell_c4">  
-        <view class="green-dot"></view>  
-        <view class="cell-text_c4">  
-          <text class="text-line_c4" style="float:left">体动次数</text>  
-          <text class="text-line_c41" style="float:right;margin-right:5rpx">{{rmove_arrFrequency}}次</text>  
-        </view>  
-      </view>  
-      <view class="cell_c4">  
-        <view class="organize-dot"></view>   
-        <view class="cell-text_c4">  
-          <text class="text-line_c4" style="float:left">离床次数</text>  
-          <text class="text-line_c41" style="float:right;margin-right:5rpx">{{routbed_arrFrequency}}次</text>  
-        </view>  
-      </view>  
-      <view class="cell_c4">  
-        <view class="blue-dot"></view>    
-        <view class="cell-text_c4">  
-          <text class="text-line_c4" style="float:left">打鼾次数</text>  
-          <text class="text-line_c41" style="float:right;margin-right:5rpx">{{rsnoring_arrFrequency}}次</text>  
-        </view>  
-      </view>  
-    </view>  
-  </view>
-  
-  <view class="container_5">  
-    <view class="header_c5">  
-      <image class="header-image_c5" src="/static/images/report/shuimian_xiguan_new.png" mode="aspectFit"></image>  
-      <text class="header-title_c5">睡眠习惯</text>  
-	  <image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
-    </view>  
-    <!-- <view class="data-row_c5">  
-      <view class="data-item_c5 left_c5">  
-        <image class="data-image_c5" src="/static/images/report/c_52.png" mode="aspectFit"></image>  
-        <text class="data-text_c5">周报  </text>
-		<image class="data-image_c5" src="/static/images/report/c_52.png" mode="aspectFit"></image>
-		<text class="data-text_c5">月报  </text>
-		<image class="data-image_c5" src="/static/images/report/c_52.png" mode="aspectFit"></image>
-		<text class="data-text_c5">推送电视  </text>
-		
-      </view>  
-      <view class="data-item_c5 right_c5">   
-        <picker mode="selector" range-key="pos" range="{{sns}}" value="{{selectedIndex}}" bindchange="onPickerChange">
-			<view>请选择：{{sns[selectedIndex].pos}}床</view>  
-        </picker>  
-      </view>  
-    </view> -->  
-    <view class="separator_c5"></view>
-	  <view class="data-row_c5">
-	    <view class="data-item_c5 left_c5">  
-	      <view class="dot_c51"></view>  
-	      <text class="data-text_c5">上床时间 </text>
-	  	<text class="data-text_c51">就寝目标21:30</text>
-	    </view>  
-	    <view class="data-item_c5 right_c5">   
-	      <text class="data-text_c5">{{rgobed_time}}</text>  
-	    </view>  
-	  </view> 
-    <view class="data-row_c5_down">  
-      <view class="data-item_c5 left_c5">  
-        <view class="dot_c51_1"></view>  
-        <text class="data-text_c5">起床时间 </text>
-		<text class="data-text_c51_1">起床时间8:30</text>
-      </view>  
-      <view class="data-item_c5 right_c5">   
-        <text class="data-text_c5">{{routbed_time}}</text>  
-      </view>  
-    </view> 
-	 
-	 <view class="title-row_c6">
-	   <view class="title-left_c6">  
-	     <image class="title-image_c6" src="/static/images/report/shuimian_xiaolv_new.png" mode="aspectFit"></image>  
-	     <text class="title-text_c6">睡眠效率</text> 
-	 	 <image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>  
-	   </view>  
-	   <view class="title-right_c6">  
-	     <text class="title-text-right_c6">{{sleep_efficiency}}</text>  
-	   </view>  
-	 </view>
-	 
-	 <view class="title-row_c6">
-	   <view class="title-left_c6">  
-	     <image class="title-image_c6" src="/static/images/report/anwendu_new.png" mode="aspectFit"></image>  
-	     <text class="title-text_c6">安稳度</text>
-	 	<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
-	   </view>  
-	   <view class="title-right_c6">  
-	     <!-- <text class="title-text-right_c6">右侧文本</text>  -->
-		 <text class="title-text-right_c6_1">入睡时长</text>  
-		 <text class="title-text-right_c6">{{sleep_durationCountA}}分</text>  
-	   </view>  
-	 </view>
-	 
-	 <!-- <view class="circle-container-yh">
-	 		  <view class="text-container-yh left-text-yh">  
-	 			<view class="text-row-yh">
-	 			  <view class="blue-dot"></view>  
-	 			  <text class="text-content-yh">睡眠总时长</text>  
-	 			</view>  
-	 			<view class="text-row-yh">  
-	 			  <image class="icon-yh" src="/static/images/report/c_11.png" mode="aspectFit"></image>  
-	 			  <text class="text-content-yh">8小时30分</text>  
-	 			</view>   
-	 		  </view>
-	<canvas canvas-id="myCanvas" style="width: 350rpx; height: 350rpx;margin-top:20rpx;"></canvas>
-	   <view class="text-container-yh right-text-yh">  
-	     <view class="text-row-yh">
-	       <view class="blue-dot"></view>   
-	       <text class="text-content-yh">睡眠时间</text>  
-	     </view>  
-	     <view class="text-row-yh">  
-	       <image class="icon-yh" src="/static/images/report/c_11.png" mode="aspectFit"></image>  
-	       <text class="text-content-yh">7小时30分</text>  
-	     </view>   
-	   </view>  
-	 </view> --> 
-	 
-  </view>
-  
-  
-  <!-- <view class="container_6">
-    <view class="title-row_c6">  
-      <view class="title-left_c6">  
-        <image class="title-image_c6" src="/static/images/report/c6_sm_1.png" mode="aspectFit"></image>  
-        <text class="title-text_c6">睡眠效率</text> 
-		 <image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>  
-      </view>  
-      <view class="title-right_c6">  
-        <text class="title-text-right_c6">{{sleep_efficiency}}</text>  
-      </view>  
-    </view>
-  </view> -->
-  
-  <view class="container_6">  
-    <view class="title-row_c6">  
-      <view class="title-left_c6">  
-        <image class="title-image_c6" src="/static/images/report/lichuang_cishu_new.png" mode="aspectFit"></image>  
-        <text class="title-text_c6">离床次数</text>
-		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
-      </view>  
-      <view class="title-right_c6">  
-		<text class="title-text-right_c6">{{routbed_arrFrequency}}次</text>
-      </view>  
-    </view>  
-    <!-- <view class="data-row_c6">  
-      <view class="data-item_c6 left_c60">入睡时长</view>  
-      <view class="data-item_c6 right_c6">{{sleep_durationCountA}}分钟</view>  
-    </view>  
-    <view class="separator_c6"></view>  -->
-    <!-- <view class="data-row_c6">  
-      <view class="data-item_c6 left_c61">离床次数</view>  
-      <view class="data-item_c6 right_c6">{{routbed_arrFrequency}}次</view>  
-    </view>  -->
-    <view class="echarts-container_c6">  
-      <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
-      <ec-canvas id="mychart-dom-bar7" canvas-id="mychart-bar" ec="{{ ec7 }}"></ec-canvas>  
-    </view>  
-	
-	<!-- <view class="data-row_c6">
-	  <view class="data-item_c6 left_c61">体动次数</view>  
-	  <view class="data-item_c6 right_c6">{{rmove_arrFrequency}}次</view>  
-	</view>  -->
-	
-	<view class="title-row_c6">
-	  <view class="title-left_c6">  
-	    <image class="title-image_c6" src="/static/images/report/tidong_cishu_new.png" mode="aspectFit"></image>  
-	    <text class="title-text_c6">体动次数</text>
-		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
-	  </view>  
-	  <view class="title-right_c6">  
-		<text class="title-text-right_c6">{{rmove_arrFrequency}}次</text>
-	  </view>  
-	</view>
-	
-	<view class="echarts-container_c6">  
-	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
-	  <ec-canvas id="mychart-dom-bar8" canvas-id="mychart-bar" ec="{{ ec8 }}"></ec-canvas>  
-	</view>  
-	
-  </view>
-
-  <view class="container_6">
-    <view class="title-row_c6">  
-      <view class="title-left_c6">  
-        <image class="title-image_c6" src="/static/images/report/xinzang_xiting_new.png" mode="aspectFit"></image>  
-        <text class="title-text_c6">心脏系统</text>
-		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
-      </view>  
-      <!-- <view class="title-right_c6">  
-        <text class="title-text-right_c6">右侧文本</text>  
-      </view> --> 
-    </view>  
-
-  	<view class="data-row_c6">
-  	  <view class="data-item_c6 left_c61">平均心率</view>  
-  	  <view class="data-item_c6 right_c6">{{ravg_rh_value}}次/分</view>  
-  	</view>  
-  	<view class="echarts-container_c6">  
-  	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
-  	  <ec-canvas id="mychart-dom-bar1" canvas-id="mychart-bar" ec="{{ ec1 }}"></ec-canvas>  
-  	</view>  
-  	
-  </view>
-  
-  
-  <view class="container_6">
-    <view class="title-row_c6">  
-      <view class="title-left_c6">  
-        <image class="title-image_c6" src="/static/images/report/huxi_xitong_new.png" mode="aspectFit"></image>  
-        <text class="title-text_c6">呼吸系统</text>  
-		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
-      </view>  
-      <!-- <view class="title-right_c6">  
-        <text class="title-text-right_c6">右侧文本</text>  
-      </view> --> 
-    </view>  
-  
-  	<view class="data-row_c6">
-  	  <view class="data-item_c6 left_c61">平均呼吸率</view>  
-  	  <view class="data-item_c6 right_c6">{{ravg_hx_value}}次/分</view>  
-  	</view>  
-  	<view class="echarts-container_c6">  
-  	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
-  	  <ec-canvas id="mychart-dom-bar81" canvas-id="mychart-bar" ec="{{ ec81 }}"></ec-canvas>  
-  	</view>  
-  	
-	<view class="data-row_c6">
-	  <view class="data-item_c6 left_c61">打鼾</view>  
-	  <view class="data-item_c6 right_c6">{{rsnoring_arrFrequency}}次</view>  
-	</view>  
-	<view class="echarts-container_c6">  
-	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
-	  <ec-canvas id="mychart-dom-bar9" canvas-id="mychart-bar" ec="{{ ec9 }}"></ec-canvas>  
-	</view>  
-	
-	<view class="data-row_c6">
-	  <view class="data-item_c6 left_c61">呼吸暂停</view>  
-	  <view class="data-item_c6 right_c6">{{rhxstop_arrFrequency}}次</view>  
-	</view>  
-	<view class="echarts-container_c6">  
-	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
-	  <ec-canvas id="mychart-dom-bar10" canvas-id="mychart-bar" ec="{{ ec10 }}"></ec-canvas>  
-	</view>  
-	<view class="data-row_c6">
-	  <view class="data-item_c6 {{(sleepHourSub && rhxstop_arrFrequency>=sleepHourSub*5)?'left_c62_1':'left_c62'}}"><image class="header-image_comma" style="margin-right:10rpx;" src="/static/images/report/fengxian_yujing_new.png" mode="aspectFit"></image>风险预警: {{(sleepHourSub && rhxstop_arrFrequency>=5*sleepHourSub)?'根据呼吸暂停指数（AHI），您的呼吸暂停次数已达到5次/每小时':'无'}}</view>  
-	  <!-- <view class="data-item_c6 right_c6">0次</view>  -->
-	</view>  
-  </view>
-  
-  
-  <view class="container_6">
-    <view class="title-row_c6">  
-      <view class="title-left_c6">  
-        <image class="title-image_c6" src="/static/images/report/shenqian_shuimian_new.png" mode="aspectFit"></image>  
-        <text class="title-text_c6">深浅睡眠</text>  
-		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
-      </view>  
-      <!-- <view class="title-right_c6">  
-        <text class="title-text-right_c6">右侧文本</text>  
-      </view> -->  
-    </view>  
-  <view class="data-row_c6_0">
-  	<view class="data-row_c6_1">
-  	  <view class="data-item_c6 left_c6">清醒</view>  
-  	  <view class="data-item_c6 left_c6">REM({{rin_duration_efficiency}})</view>  
-	  <view class="data-item_c6 left_c6">浅睡({{rlight_duration_efficiency}})</view>
-	  <view class="data-item_c6 left_c6">深睡({{rdeep_duration_efficiency}})</view>
-  	</view>   
-  	<view class="data-row_c6_2">  
-  	  <view class="data-item_c6 left_c6">{{rawake_durationFormat}}</view>  
-  	  <view class="data-item_c6 left_c6">{{rin_durationFormat}}</view>  
-	  <view class="data-item_c6 left_c6">{{rlight_durationFormat}}</view> 
-	  <view class="data-item_c6 left_c6">{{rdeep_durationFormat}}</view> 
-  	</view> 
-	</view>
-  	<view class="echarts-container_c6">  
-  	  <ec-canvas id="mychart-dom-bar11" canvas-id="mychart-bar" ec="{{ ec11 }}"></ec-canvas>  
-  	</view>  
-  	
-  </view>
-
-  <!-- <view class="container1">
-    <button class="{{isButtonClicked ? 'gradient-button gradient-button-clicked' : 'gradient-button'}}" bindtap="telScreeProjection">生成报告并推送到电视</button>  
-  </view> -->
-  
-  
-  <!-- <view class='canvas5'>
-    <ec-canvas id="mychart-dom-line6" canvas-id="mychart-line6" ec="{{ ec6 }}" class="canvas5"></ec-canvas>
-  </view>
-  <view class='container'>
-    <view class='list'>
-      <view style='color:#686868;'>睡眠总时长</view>
-      <view class="content" style='color:#686868;'>{{rtotal_duration}}分钟</view>
-    </view>
-    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-    <view class='list'>
-      <view style='color:#686868;'>在床时长</view>
-      <view class="content" style='color:#686868;'>{{rinbed_duration}}分钟</view>
-    </view>
-    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-    <view class='list'>
-      <view style='color:#686868;'>上床时间</view>
-      <view class="content" style='color:#686868;'>{{rgobed_time}}</view>
-    </view>
-    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-    <view class='list'>
-      <view style='color:#686868;'>离床时间</view>
-      <view class="content" style='color:#686868;'>{{routbed_time}}</view>
-    </view>
-    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>离床次数</view>
-  	  <view class="content" style='color:#686868;'>{{routbed_count_value}}</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>清醒时长</view>
-  	  <view class="content" style='color:#686868;'>{{rawake_duration}}分钟</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>清醒时长</view>
-  	  <view class="content" style='color:#686868;'>{{rawake_duration}}分钟</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>呼吸平均值</view>
-  	  <view class="content" style='color:#686868;'>{{ravg_hx_value}}次</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>呼吸平均值评分描述</view>
-  	  <view class="content" style='color:#686868;'>{{ravg_hx_desc}}</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>心率平均值</view>
-  	  <view class="content" style='color:#686868;'>{{ravg_rh_value}}次</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>心率平均值评分描述</view>
-  	  <view class="content" style='color:#686868;'>{{ravg_rh_desc}}</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>睡眠报告得分值</view>
-  	  <view class="content" style='color:#686868;'>{{rscore_value}}分</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  	<view class='list'>
-  	  <view style='color:#686868;'>睡眠报告得分评比描述</view>
-  	  <view class="content" style='color:#686868;'>{{rscore_desc}}</view>
-  	</view>
-  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
-  	
-  </view>
-  
-  
-  <view class="container1">
-    <button class="{{isButtonClicked ? 'gradient-button gradient-button-clicked' : 'gradient-button'}}" bindtap="telScreeProjection">生成报告并推送到电视</button>  
-  </view>
-  
-  <view class='canvas1' style="margin-top:50rpx;">
-    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec1 }}" class="canvas1"></ec-canvas>
-  </view>
-  <view class='canvas2'>
-    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec2 }}" class="canvas2"></ec-canvas>
-  </view>
-  <view class='canvas3'>
-    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec3 }}" class="canvas3"></ec-canvas>
-  </view>
-  <view class='canvas4'>
-    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec4 }}" class="canvas4"></ec-canvas>
-  </view>
-  <view class='canvas5'>
-    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec5 }}" class="canvas5"></ec-canvas>
-  </view> -->
-  
+   
+	 
+<view class="row_c3">  
+     <view class="cell_c3" style="background-image: url('/static/images/report/shenshui_shichang_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
+       <view class="purple-dot-up"></view>     
+       <view class="cell-text_c3">  
+         <view><text class="text-line_c3">深睡时长</text></view> 
+         <view><text class="text-line_c31">{{rdeep_duration}}分钟</text></view>
+       </view>  
+     </view>  
+     <view class="cell_c3" style="background-image: url('/static/images/report/shuimian_xiaolv_big_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
+       <view class="green-dot-up"></view>   
+       <view class="cell-text_c3">  
+         <view><text class="text-line_c3">睡眠效率</text></view>
+         <view><text class="text-line_c31">{{rsleep_eff_value}}</text></view>
+       </view>  
+     </view>  
+   </view>  
+   
+   <view class="row_c3">
+     <view class="cell_c3" style="background-image: url('/static/images/report/pingjun_huxilv_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
+       <view class="organize-dot-up"></view> 
+       <view class="cell-text_c3">  
+         <view><text class="text-line_c3">平均呼吸率</text></view>
+         <view><text class="text-line_c31">{{ravg_hx_value}}次/分钟</text></view>
+       </view>  
+     </view>  
+     <view class="cell_c3" style="background-image: url('/static/images/report/pingjun_xinlv_new.png');width: 100%; height: 150rpx;background-size: contain;background-repeat: no-repeat;background-position: center;">  
+       <view class="blue-dot-up"></view>  
+       <view class="cell-text_c3">  
+         <view><text class="text-line_c3">平均心率</text></view>
+         <view><text class="text-line_c31">{{ravg_rh_value}}次/分钟</text></view>
+       </view>  
+     </view>  
+   </view>  
+ </view>
+ 
+  <view class="container_4">  
+    <view class="left-panel_c4"> 
+	 <view class="text-container_c4_top_left">
+	   <text class="text_c4_left_top">温馨提醒</text>  
+	 </view> 
+	  <image class="image_c4" src="/static/images/report/left_background_c4_new.png" />  
+	    <view class="text-container_c4">  
+	      <text class="text_c4">本次睡眠，睡眠报告得分评比描述：<text class="text_c4_1">{{rscore_desc}}</text></text>  
+	    </view> 
+    </view>  
+    <view class="right-panel_c4">  
+      <view class="cell_c4">  
+        <view class="green-dot"></view>  
+        <view class="cell-text_c4">  
+          <text class="text-line_c4" style="float:left">体动次数</text>  
+          <text class="text-line_c41" style="float:right;margin-right:5rpx">{{rmove_arrFrequency}}次</text>  
+        </view>  
+      </view>  
+      <view class="cell_c4">  
+        <view class="organize-dot"></view>   
+        <view class="cell-text_c4">  
+          <text class="text-line_c4" style="float:left">离床次数</text>  
+          <text class="text-line_c41" style="float:right;margin-right:5rpx">{{routbed_count_value}}次</text>  
+        </view>  
+      </view>  
+      <view class="cell_c4">  
+        <view class="blue-dot"></view>    
+        <view class="cell-text_c4">  
+          <text class="text-line_c4" style="float:left">打鼾次数</text>  
+          <text class="text-line_c41" style="float:right;margin-right:5rpx">{{rsnoring_arrFrequency}}次</text>  
+        </view>  
+      </view>  
+    </view>  
+  </view>
+  
+  <view class="container_5">  
+    <view class="header_c5">  
+      <image class="header-image_c5" src="/static/images/report/shuimian_xiguan_new.png" mode="aspectFit"></image>  
+      <text class="header-title_c5">睡眠习惯</text>  
+	  <image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
+    </view>  
+    <!-- <view class="data-row_c5">  
+      <view class="data-item_c5 left_c5">  
+        <image class="data-image_c5" src="/static/images/report/c_52.png" mode="aspectFit"></image>  
+        <text class="data-text_c5">周报  </text>
+		<image class="data-image_c5" src="/static/images/report/c_52.png" mode="aspectFit"></image>
+		<text class="data-text_c5">月报  </text>
+		<image class="data-image_c5" src="/static/images/report/c_52.png" mode="aspectFit"></image>
+		<text class="data-text_c5">推送电视  </text>
+		
+      </view>  
+      <view class="data-item_c5 right_c5">   
+        <picker mode="selector" range-key="pos" range="{{sns}}" value="{{selectedIndex}}" bindchange="onPickerChange">
+			<view>请选择：{{sns[selectedIndex].pos}}床</view>  
+        </picker>  
+      </view>  
+    </view> -->  
+    <view class="separator_c5"></view>
+	  <view class="data-row_c5">
+	    <view class="data-item_c5 left_c5">  
+	      <view class="dot_c51"></view>  
+	      <text class="data-text_c5">上床时间 </text>
+	  	<text class="data-text_c51">就寝目标23:00</text>
+	    </view>  
+	    <view class="data-item_c5 right_c5">   
+	      <text class="data-text_c5">{{rgobed_time}}</text>  
+	    </view>  
+	  </view> 
+    <view class="data-row_c5_down">  
+      <view class="data-item_c5 left_c5">  
+        <view class="dot_c51_1"></view>  
+        <text class="data-text_c5">起床时间 </text>
+		<text class="data-text_c51_1">起床时间8:00</text>
+      </view>  
+      <view class="data-item_c5 right_c5">   
+        <text class="data-text_c5">{{routbed_time}}</text>  
+      </view>  
+    </view> 
+	 
+	 <view class="title-row_c6">
+	   <view class="title-left_c6">  
+	     <image class="title-image_c6" src="/static/images/report/shuimian_xiaolv_new.png" mode="aspectFit"></image>  
+	     <text class="title-text_c6">睡眠效率</text> 
+	 	 <image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>  
+	   </view>  
+	   <view class="title-right_c6">  
+	     <text class="title-text-right_c6">{{sleep_efficiency}}</text>  
+	   </view>  
+	 </view>
+	 
+	 <view class="title-row_c6">
+	   <view class="title-left_c6">  
+	     <image class="title-image_c6" src="/static/images/report/anwendu_new.png" mode="aspectFit"></image>  
+	     <text class="title-text_c6">安稳度</text>
+	 	<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
+	   </view>  
+	   <view class="title-right_c6">  
+	     <!-- <text class="title-text-right_c6">右侧文本</text>  -->
+		 <text class="title-text-right_c6_1">入睡时长</text>  
+		 <text class="title-text-right_c6">{{rrs_duration}}分钟</text>  
+	   </view>  
+	 </view>
+	 
+	 <!-- <view class="circle-container-yh">
+	 		  <view class="text-container-yh left-text-yh">  
+	 			<view class="text-row-yh">
+	 			  <view class="blue-dot"></view>  
+	 			  <text class="text-content-yh">睡眠总时长</text>  
+	 			</view>  
+	 			<view class="text-row-yh">  
+	 			  <image class="icon-yh" src="/static/images/report/c_11.png" mode="aspectFit"></image>  
+	 			  <text class="text-content-yh">8小时30分</text>  
+	 			</view>   
+	 		  </view>
+	<canvas canvas-id="myCanvas" style="width: 350rpx; height: 350rpx;margin-top:20rpx;"></canvas>
+	   <view class="text-container-yh right-text-yh">  
+	     <view class="text-row-yh">
+	       <view class="blue-dot"></view>   
+	       <text class="text-content-yh">睡眠时间</text>  
+	     </view>  
+	     <view class="text-row-yh">  
+	       <image class="icon-yh" src="/static/images/report/c_11.png" mode="aspectFit"></image>  
+	       <text class="text-content-yh">7小时30分</text>  
+	     </view>   
+	   </view>  
+	 </view> --> 
+	 
+  </view>
+  
+  
+  <!-- <view class="container_6">
+    <view class="title-row_c6">  
+      <view class="title-left_c6">  
+        <image class="title-image_c6" src="/static/images/report/c6_sm_1.png" mode="aspectFit"></image>  
+        <text class="title-text_c6">睡眠效率</text> 
+		 <image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>  
+      </view>  
+      <view class="title-right_c6">  
+        <text class="title-text-right_c6">{{sleep_efficiency}}</text>  
+      </view>  
+    </view>
+  </view> -->
+  
+  <view class="container_6">  
+    <view class="title-row_c6">  
+      <view class="title-left_c6">  
+        <image class="title-image_c6" src="/static/images/report/lichuang_cishu_new.png" mode="aspectFit"></image>  
+        <text class="title-text_c6">离床次数</text>
+		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
+      </view>  
+      <view class="title-right_c6">  
+		<text class="title-text-right_c6">{{routbed_count_value}}次</text>
+      </view>  
+    </view>  
+    <!-- <view class="data-row_c6">  
+      <view class="data-item_c6 left_c60">入睡时长</view>  
+      <view class="data-item_c6 right_c6">{{sleep_durationCountA}}分钟</view>  
+    </view>  
+    <view class="separator_c6"></view>  -->
+    <!-- <view class="data-row_c6">  
+      <view class="data-item_c6 left_c61">离床次数</view>  
+      <view class="data-item_c6 right_c6">{{routbed_arrFrequency}}次</view>  
+    </view>  -->
+    <view class="echarts-container_c6">  
+      <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
+      <ec-canvas id="mychart-dom-bar7" canvas-id="mychart-bar" ec="{{ ec7 }}"></ec-canvas>  
+    </view>  
+	
+	<!-- <view class="data-row_c6">
+	  <view class="data-item_c6 left_c61">体动次数</view>  
+	  <view class="data-item_c6 right_c6">{{rmove_arrFrequency}}次</view>  
+	</view>  -->
+	
+	<view class="title-row_c6">
+	  <view class="title-left_c6">  
+	    <image class="title-image_c6" src="/static/images/report/tidong_cishu_new.png" mode="aspectFit"></image>  
+	    <text class="title-text_c6">体动次数</text>
+		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
+	  </view>  
+	  <view class="title-right_c6">  
+		<text class="title-text-right_c6">{{rmove_arrFrequency}}次</text>
+	  </view>  
+	</view>
+	
+	<view class="echarts-container_c6">  
+	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
+	  <ec-canvas id="mychart-dom-bar8" canvas-id="mychart-bar" ec="{{ ec8 }}"></ec-canvas>  
+	</view>  
+	
+  </view>
+
+  <view class="container_6">
+    <view class="title-row_c6">  
+      <view class="title-left_c6">  
+        <image class="title-image_c6" src="/static/images/report/xinzang_xiting_new.png" mode="aspectFit"></image>  
+        <text class="title-text_c6">心脏系统</text>
+		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
+      </view>  
+      <!-- <view class="title-right_c6">  
+        <text class="title-text-right_c6">右侧文本</text>  
+      </view> --> 
+    </view>  
+
+  	<view class="data-row_c6">
+  	  <view class="data-item_c6 left_c61">平均心率</view>  
+  	  <view class="data-item_c6 right_c6">{{ravg_rh_value}}次/分</view>  
+  	</view>  
+  	<view class="echarts-container_c6">  
+  	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
+  	  <ec-canvas id="mychart-dom-bar1" canvas-id="mychart-bar" ec="{{ ec1 }}"></ec-canvas>  
+  	</view>  
+  	
+  </view>
+  
+  
+  <view class="container_6">
+    <view class="title-row_c6">  
+      <view class="title-left_c6">  
+        <image class="title-image_c6" src="/static/images/report/huxi_xitong_new.png" mode="aspectFit"></image>  
+        <text class="title-text_c6">呼吸系统</text>  
+		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
+      </view>  
+      <!-- <view class="title-right_c6">  
+        <text class="title-text-right_c6">右侧文本</text>  
+      </view> --> 
+    </view>  
+  
+  	<view class="data-row_c6">
+  	  <view class="data-item_c6 left_c61">平均呼吸率</view>  
+  	  <view class="data-item_c6 right_c6">{{ravg_hx_value}}次/分</view>  
+  	</view>  
+  	<view class="echarts-container_c6">  
+  	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
+  	  <ec-canvas id="mychart-dom-bar81" canvas-id="mychart-bar" ec="{{ ec81 }}"></ec-canvas>  
+  	</view>  
+  	
+	<view class="data-row_c6">
+	  <view class="data-item_c6 left_c61">打鼾</view>  
+	  <view class="data-item_c6 right_c6">{{rsnoring_arrFrequency}}次</view>  
+	</view>  
+	<view class="echarts-container_c6">  
+	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
+	  <ec-canvas id="mychart-dom-bar9" canvas-id="mychart-bar" ec="{{ ec9 }}"></ec-canvas>  
+	</view>  
+	
+	<view class="data-row_c6">
+	  <view class="data-item_c6 left_c61">呼吸暂停</view>  
+	  <view class="data-item_c6 right_c6">{{rhxstop_arrFrequency}}次</view>  
+	</view>  
+	<view class="echarts-container_c6">  
+	  <!-- 在这里使用ec-canvas或canvas组件来承载echarts图表 -->  
+	  <ec-canvas id="mychart-dom-bar10" canvas-id="mychart-bar" ec="{{ ec10 }}"></ec-canvas>  
+	</view>  
+	<view class="data-row_c6">
+	  <view class="data-item_c6 {{(sleepHourSub && rhxstop_arrFrequency>=sleepHourSub*5)?'left_c62_1':'left_c62'}}"><image class="header-image_comma" style="margin-right:10rpx;" src="/static/images/report/fengxian_yujing_new.png" mode="aspectFit"></image>风险预警: {{(sleepHourSub && rhxstop_arrFrequency>=5*sleepHourSub)?'根据呼吸暂停指数（AHI），您的呼吸暂停次数已达到5次/每小时':'无'}}</view>  
+	  <!-- <view class="data-item_c6 right_c6">0次</view>  -->
+	</view>  
+  </view>
+  
+  
+  <view class="container_6">
+    <view class="title-row_c6">  
+      <view class="title-left_c6">  
+        <image class="title-image_c6" src="/static/images/report/shenqian_shuimian_new.png" mode="aspectFit"></image>  
+        <text class="title-text_c6">深浅睡眠</text>  
+		<image class="header-image_comma" src="/static/images/report/comma_new.png" mode="aspectFit"></image>
+      </view>  
+      <!-- <view class="title-right_c6">  
+        <text class="title-text-right_c6">右侧文本</text>  
+      </view> -->  
+    </view>  
+  <view class="data-row_c6_0">
+  	<view class="data-row_c6_1">
+  	  <view class="data-item_c6 left_c6">清醒</view>  
+  	  <view class="data-item_c6 left_c6">REM({{rin_duration_efficiency}})</view>  
+	  <view class="data-item_c6 left_c6">浅睡({{rlight_duration_efficiency}})</view>
+	  <view class="data-item_c6 left_c6">深睡({{rdeep_duration_efficiency}})</view>
+  	</view>   
+  	<view class="data-row_c6_2">  
+  	  <view class="data-item_c6 left_c6">{{rawake_durationFormat}}</view>  
+  	  <view class="data-item_c6 left_c6">{{rin_durationFormat}}</view>  
+	  <view class="data-item_c6 left_c6">{{rlight_durationFormat}}</view> 
+	  <view class="data-item_c6 left_c6">{{rdeep_durationFormat}}</view> 
+  	</view> 
+	</view>
+  	<view class="echarts-container_c6">  
+  	  <ec-canvas id="mychart-dom-bar11" canvas-id="mychart-bar" ec="{{ ec11 }}"></ec-canvas>  
+  	</view>  
+  	
+  </view>
+
+  <!-- <view class="container1">
+    <button class="{{isButtonClicked ? 'gradient-button gradient-button-clicked' : 'gradient-button'}}" bindtap="telScreeProjection">生成报告并推送到电视</button>  
+  </view> -->
+  
+  
+  <!-- <view class='canvas5'>
+    <ec-canvas id="mychart-dom-line6" canvas-id="mychart-line6" ec="{{ ec6 }}" class="canvas5"></ec-canvas>
+  </view>
+  <view class='container'>
+    <view class='list'>
+      <view style='color:#686868;'>睡眠总时长</view>
+      <view class="content" style='color:#686868;'>{{rtotal_duration}}分钟</view>
+    </view>
+    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+    <view class='list'>
+      <view style='color:#686868;'>在床时长</view>
+      <view class="content" style='color:#686868;'>{{rinbed_duration}}分钟</view>
+    </view>
+    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+    <view class='list'>
+      <view style='color:#686868;'>上床时间</view>
+      <view class="content" style='color:#686868;'>{{rgobed_time}}</view>
+    </view>
+    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+    <view class='list'>
+      <view style='color:#686868;'>离床时间</view>
+      <view class="content" style='color:#686868;'>{{routbed_time}}</view>
+    </view>
+    <view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>离床次数</view>
+  	  <view class="content" style='color:#686868;'>{{routbed_count_value}}</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>清醒时长</view>
+  	  <view class="content" style='color:#686868;'>{{rawake_duration}}分钟</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>清醒时长</view>
+  	  <view class="content" style='color:#686868;'>{{rawake_duration}}分钟</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>呼吸平均值</view>
+  	  <view class="content" style='color:#686868;'>{{ravg_hx_value}}次</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>呼吸平均值评分描述</view>
+  	  <view class="content" style='color:#686868;'>{{ravg_hx_desc}}</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>心率平均值</view>
+  	  <view class="content" style='color:#686868;'>{{ravg_rh_value}}次</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>心率平均值评分描述</view>
+  	  <view class="content" style='color:#686868;'>{{ravg_rh_desc}}</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>睡眠报告得分值</view>
+  	  <view class="content" style='color:#686868;'>{{rscore_value}}分</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  	<view class='list'>
+  	  <view style='color:#686868;'>睡眠报告得分评比描述</view>
+  	  <view class="content" style='color:#686868;'>{{rscore_desc}}</view>
+  	</view>
+  	<view style='width: 680rpx;height: 1rpx;background:#62c4d9;'></view>
+  	
+  </view>
+  
+  
+  <view class="container1">
+    <button class="{{isButtonClicked ? 'gradient-button gradient-button-clicked' : 'gradient-button'}}" bindtap="telScreeProjection">生成报告并推送到电视</button>  
+  </view>
+  
+  <view class='canvas1' style="margin-top:50rpx;">
+    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec1 }}" class="canvas1"></ec-canvas>
+  </view>
+  <view class='canvas2'>
+    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec2 }}" class="canvas2"></ec-canvas>
+  </view>
+  <view class='canvas3'>
+    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec3 }}" class="canvas3"></ec-canvas>
+  </view>
+  <view class='canvas4'>
+    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec4 }}" class="canvas4"></ec-canvas>
+  </view>
+  <view class='canvas5'>
+    <ec-canvas id="mychart-dom-line" canvas-id="mychart-line" ec="{{ ec5 }}" class="canvas5"></ec-canvas>
+  </view> -->
+  
 </view>

pages/data/data.wxss

@@ -847,7 +847,7 @@ ec-canvas {
 }  
   
 .title-text_c6, .title-text-right_c6 {  
-  font-size: 38rpx; /* 标题字体大小 */  
+  font-size: 35rpx; /* 标题字体大小 */  
   color: #000;
 }  
 

pages/index/index.js

@@ -55,7 +55,7 @@ var homeApi_https = "https://haold.aidsleep.cn/api";
 var homeApiLater_https = "https://haold.aidsleep.cn";
 var entity = "";
 // const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiN2JlOGE0MDExZjY0NjA2OGUxYjJiZTE4M2Y2NzU0NSIsImlhdCI6MTcxMTYxNDY2NCwiZXhwIjoyMDI2OTc0NjY0fQ.XJ73cXAoEsouTgvgpNVobq9oKdwlJr88TiAFLYlaahE";
-const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlZGVjOWI3YWQ0MTQ0ZTIxYWQ1NTE1Nzc5NTkzNjBjNiIsImlhdCI6MTcxMjEzNTM2MywiZXhwIjoyMDI3NDk1MzYzfQ.IfrvdiaVuhCKsdy69JvUYhJ64bnhMT8MI1hN8R38whc";
+var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJlZGVjOWI3YWQ0MTQ0ZTIxYWQ1NTE1Nzc5NTkzNjBjNiIsImlhdCI6MTcxMjEzNTM2MywiZXhwIjoyMDI3NDk1MzYzfQ.IfrvdiaVuhCKsdy69JvUYhJ64bnhMT8MI1hN8R38whc";
 
 const aipushApi = "https://aipush.aidsleep.cn";
 const token_push = "b74fd5754c5ef24cf600c39194abdaeb";
@@ -568,7 +568,7 @@ Page({
 	],
 	blackList:[
 	  // '指示灯','电视模式','电视音量','空调遥控','智能音箱','电视控制码','传感器模式','开关模式','耗电量','智能音箱会话'
-		'加湿器','空调','音响'
+		'加湿器','空调','音箱','窗帘','纱帘'
 	],
 	temperatureHumidifyName:'温度',
 	isButtonPressedHumidityUp:false,
@@ -2238,7 +2238,7 @@ onSelect_beep1(e) {
 				// 	  'Authorization': 'Bearer ' + token // 在头部设置认证信息，例如使用Bearer Token
 				// },
 				data:{
-				     "locations":hotelcode,"token":token_push
+				     "locations":hotelcode,"room":(hotelcode && hotelcode.includes('hotel'))?roomcode:"","token":token_push
 				 },
 			  success(ress) {
 				  if(!ress || !ress.data){
@@ -2250,6 +2250,7 @@ onSelect_beep1(e) {
 				console.log("resData.loc-=="+JSON.stringify(resData.loc));
 				homeApi_https = resData.loc+"/api";
 				homeApiLater_https = resData.loc;
+				token = resData.token;
 				// console.log('res.data='+JSON.stringify(resData));
 				if (ress.data.code == "400") {
 				  console.error("400错误！");
@@ -2387,7 +2388,7 @@ onSelect_beep1(e) {
 								  }
 							  }
 							  
-							  if((resData[i].state && obj.domain && obj.domain=='cover')
+							  if((resData[i].state && obj.domain && obj.domain=='cover') && that.checkFuzzyMatch(resData[i])
 							  ){
 								  obj.current_position = resData[i].attributes.current_position;
 								  obj.target_position = resData[i].attributes.target_position;
@@ -2475,7 +2476,7 @@ onSelect_beep1(e) {
 									listClimateTemp.push(obj);
 								  }
 							  }
-							  if((resData[i].state && obj.domain && obj.domain=='media_player' && resData[i].attributes.entity_class=='MiotMediaPlayerEntity')
+							  if((resData[i].state && obj.domain && obj.domain=='media_player' && resData[i].attributes.entity_class=='MiotMediaPlayerEntity') && that.checkFuzzyMatch(resData[i])
 							  ){
 								  // obj["speaker.volume"] = resData[i].attribute["speaker.volume"];
 								  obj.repeat = resData[i].attributes.repeat;
@@ -2512,7 +2513,7 @@ onSelect_beep1(e) {
 								//   }
 							 //  }
 							  
-							  if((resData[i].state && obj.domain && obj.domain=='media_player')
+							  if((resData[i].state && obj.domain && obj.domain=='media_player') && that.checkFuzzyMatch(resData[i])
 							  ){
 								  
 								  obj.friendly_name = resData[i].attributes.friendly_name;
@@ -2681,7 +2682,7 @@ onSelect_beep1(e) {
 				// 	  'Authorization': 'Bearer ' + token // 在头部设置认证信息，例如使用Bearer Token
 				// },
 				data:{
-				     "locations":hotelcode,"token":token_push
+				     "locations":hotelcode,"room":(hotelcode && hotelcode.includes('hotel'))?roomcode:"","token":token_push
 				 },
 			  success(ress) {
 				  if(!ress || !ress.data){
@@ -2693,6 +2694,7 @@ onSelect_beep1(e) {
 				console.log("resData.loc-=="+JSON.stringify(resData.loc));
 				homeApi_https = resData.loc+"/api";
 				homeApiLater_https = resData.loc;
+				token = resData.token;
 				// console.log('res.data='+JSON.stringify(resData));
 				if (ress.data.code == "400") {
 				  console.error("400错误！");
@@ -2837,7 +2839,7 @@ onSelect_beep1(e) {
 							  }
 						  }
 						  
-						  if((resData[i].state && obj.domain && obj.domain=='cover')
+						  if((resData[i].state && obj.domain && obj.domain=='cover') && that.checkFuzzyMatch(resData[i])
 						  ){
 							  obj.current_position = resData[i].attributes.current_position;
 							  obj.target_position = resData[i].attributes.target_position;
@@ -2925,7 +2927,7 @@ onSelect_beep1(e) {
 								listClimateTemp.push(obj);
 							  }
 						  }
-						  if((resData[i].state && obj.domain && obj.domain=='media_player' && resData[i].attributes.entity_class=='MiotMediaPlayerEntity')
+						  if((resData[i].state && obj.domain && obj.domain=='media_player' && resData[i].attributes.entity_class=='MiotMediaPlayerEntity') && that.checkFuzzyMatch(resData[i])
 						  ){
 							  // obj["speaker.volume"] = resData[i].attribute["speaker.volume"];
 							  obj.repeat = resData[i].attributes.repeat;
@@ -2962,7 +2964,7 @@ onSelect_beep1(e) {
 							//   }
 						 //  }
 						  
-						  if((resData[i].state && obj.domain && obj.domain=='media_player')
+						  if((resData[i].state && obj.domain && obj.domain=='media_player') && that.checkFuzzyMatch(resData[i])
 						  ){ 
 							  obj.friendly_name = resData[i].attributes.friendly_name;
 							  if(obj.entity_id.includes('teevee') || (obj.friendly_name && obj.friendly_name.includes('电视'))){

pages/testSAS/sas.js

@@ -1,13 +1,14 @@
 const qnaire = [
 	{
+	  "num": 0,
 	  "question": "1.年龄",
 		"type": "radio",
 	  "option": {
 	    "a": "1-12周岁",
-	    "b": "12-15周岁",
-	    "c": "15-49周岁",
-	    "d": "50-69周岁",
-		"e": "70周岁及以上",
+	    "b": "13-25周岁",
+	    "c": "25-59周岁",
+	    "d": "60周岁以上",
+		// "e": "70周岁及以上",
 		  // "f": "30-49周岁",
 		  // "g": "50-59周岁",
 		  // "h": "60周岁-69周岁",
@@ -16,6 +17,7 @@ const qnaire = [
 	  }
 	},
   {
+	"num": 1,
     "question": "2.性别",
 	"type": "radio",
     "option": {
@@ -26,6 +28,7 @@ const qnaire = [
     }
   },
   {
+	"num": 2,
     "question": "3.身高",
   	"question_1": "",
   	"type": "input",
@@ -36,6 +39,7 @@ const qnaire = [
   },
   
   {
+	  "num": 3,
     "question": "4.体重",
   	"question_1": "",
 	"BMI": "",
@@ -56,6 +60,7 @@ const qnaire = [
   //   }
   // },
   {
+	"num": 4,
     "question": "5.您目前的职业？",
   	"question_1": "",
   	"type": "radio",
@@ -66,6 +71,7 @@ const qnaire = [
     }
   },
   {
+	"num": 5,
     "question": "6.	近1个月，晚上上床睡觉",
 	"question_1": "",
 	"type": "input",
@@ -75,6 +81,7 @@ const qnaire = [
     }
   },
   {
+	"num": 6,
     "question": "7.	近1个月,从上床到入睡",
 	"question_1": "",
 	"type": "input",
@@ -84,6 +91,7 @@ const qnaire = [
     }
   },
   {
+	"num": 7,
     "question": "8.	近1个月，早上通常起床时间",
 	"question_1": "",
 	"type": "input",
@@ -93,6 +101,7 @@ const qnaire = [
     }
   },
   {
+	"num": 8,
     "question": "9.	近1个月，每夜通常实际睡眠时间",
 	"question_1": "",
 	"type": "input",
@@ -102,6 +111,7 @@ const qnaire = [
     }
   },
   {
+	"num": 9,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "a.入睡困难（30分钟内不能入睡）",
 	"type": "radio",
@@ -113,6 +123,7 @@ const qnaire = [
     }
   },
   {
+	"num": 10,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "b.夜间易醒或早醒",
 	"type": "radio",
@@ -124,6 +135,7 @@ const qnaire = [
     }
   },
   {
+	"num": 11,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "c.夜间去厕所",
 	"type": "radio",
@@ -135,6 +147,7 @@ const qnaire = [
     }
   },
   {
+	"num": 12,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "d.呼吸不畅",
 	"type": "radio",
@@ -146,6 +159,7 @@ const qnaire = [
     }
   },
   {
+	"num": 13,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "e.大声咳嗽或鼾声高 ",
 	"type": "radio",
@@ -157,6 +171,7 @@ const qnaire = [
     }
   },
   {
+	"num": 14,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "f.感觉冷",
 	"type": "radio",
@@ -168,6 +183,7 @@ const qnaire = [
     }
   },
   {
+	"num": 15,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "g.感觉热",
 	"type": "radio",
@@ -179,6 +195,7 @@ const qnaire = [
     }
   },
   {
+	"num": 16,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "h.做噩梦",
 	"type": "radio",
@@ -190,6 +207,7 @@ const qnaire = [
     }
   },
   {
+	"num": 17,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
 	"question_1": "i.疼痛不适",
 	"type": "radio",
@@ -201,14 +219,28 @@ const qnaire = [
     }
   },
   {
+  	"num": 18,
     "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
-	"question_1": "j.其他",
-	"type": "input",
+  	"question_1": "j.其他",
+  	"type": "radio",
     "option": {
-      "a": "影响睡眠的事情（请写明）",
+      "a": "无",
+      "b": "不足l次/周",
+      "c": "1—2次/周",
+      "d": "3次或以上/周"
     }
   },
+ //  {
+	// "num": 18,
+ //    "question": "10.近一个月，您有没有因下列情况而影响睡眠，请从下列四项中选一项",
+	// "question_1": "j.其他",
+	// "type": "input",
+ //    "option": {
+ //      "a": "影响睡眠的事情（请写明）",
+ //    }
+ //  },
   {
+	"num": 19,
     "question": "11.近1个月您的睡眠质量",
 	"question_1": "",
 	"type": "radio",
@@ -220,6 +252,7 @@ const qnaire = [
     }
   },
   {
+	"num": 20,
     "question": "12.近1个月您是否经常使用催眠药物才能入睡",
 	"question_1": "",
 	"type": "radio",
@@ -231,6 +264,7 @@ const qnaire = [
     }
   },
   {
+	"num": 21,
     "question": "13.近l个月您是否常感到困倦",
 	"question_1": "",
 	"type": "radio",
@@ -242,6 +276,7 @@ const qnaire = [
     }
   },
   {
+	"num": 22,
     "question": "14.近1个月您做事的是否精力不足",
 	"question_1": "",
 	"type": "radio",
@@ -253,6 +288,7 @@ const qnaire = [
     }
   },
   {
+	"num": 23,
     "question": "15.客观环境",
   	"question_1": "1.选择串联类型",
   	"type": "radio",
@@ -264,6 +300,7 @@ const qnaire = [
     }
   },
   {
+	"num": 24,
     "question": "15.客观环境",
   	"question_1": "2.选择卧具类型",
   	"type": "radio",
@@ -274,6 +311,7 @@ const qnaire = [
     }
   },
   {
+	"num": 25,
     "question": "15.客观环境",
   	"question_1": "3.我的卧室的隔音效果",
   	"type": "radio",
@@ -284,6 +322,7 @@ const qnaire = [
     }
   },
   {
+	"num": 26,
     "question": "15.客观环境",
   	"question_1": "4.我睡眠的周边环境安全等级",
   	"type": "radio",

pages/testSAS/testSAS.js

@@ -330,9 +330,10 @@ Page({
 	let value16 = this.resultABCD(answerJson[15].value);//5g
 	let value17 = this.resultABCD(answerJson[16].value);//5h
 	let value18 = this.resultABCD(answerJson[17].value);//5i
+	let value19 = this.resultABCD(answerJson[18].value);//5i
 	
 	let value_b_i = value11+value12+value13+value14+value15
-					+value16+value17+value18
+					+value16+value17+value18+value19
     let total_b_i = 0;//因子5
 	if(value_b_i<1){
 		total_b_i += 0;
@@ -358,7 +359,7 @@ Page({
 		percentAll = '未知'
 	}
 	let promptTextMessageTemp = [];
-	let sleepState = this.sleepState(answerJson[2].value,answerJson[6].value);
+	let sleepState = this.sleepState(answerJson[0].value,answerJson[8].value);
 	promptTextMessageTemp.push('在全人群中，您的个人情况决定了睡眠基础条件的分是（'+totalAllTemp+'）分，您已经超过了全国（'+percentAll+'）%的人群；（纯正态分布，5分，25%；10分，50%；15分75%；20分，位于前20%）');
 	promptTextMessageTemp.push('您需要改进的睡眠问题主要集中在');
 	promptTextMessageTemp.push('1.睡眠时长：您每天的睡眠时间'+sleepState);
@@ -387,7 +388,7 @@ Page({
 		text26 += '适中';
 	}
 	promptTextMessageTemp.push('4.睡眠环境（对应：客观环境）：您的睡眠环境总体来看，（'+text26+'）具有安全、安静和舒适的睡眠环境可以让您的睡眠质量得到显著的改善。');
-    promptTextMessageTemp.push('5.改善意愿：您对改善自己睡眠质量的意愿（不足//适中//充分）。任何的改变都意味着要对以往你熟悉的环境，已经能够接受的不适进行改变甚至颠覆，不知道您愿不愿意为改善自己睡眠多一点付出，承受一点便或者痛苦呢？');
+    promptTextMessageTemp.push('5.改善意愿：您对改善自己睡眠质量的意愿（充分）。任何的改变都意味着要对以往你熟悉的环境，已经能够接受的不适进行改变甚至颠覆，不知道您愿不愿意为改善自己睡眠多一点付出，承受一点便或者痛苦呢？');
     this.setData({
       promptTextMessage: promptTextMessageTemp,
 	  totalAll: totalAllTemp,
@@ -405,7 +406,8 @@ Page({
 	  }
   },
  sleepState:function(a,b){
-	 if(a=='a'){
+	 console.log('a='+a+',b='+b);
+	 if(a=='A'){
 	 	if(b>=1 && b<=9){
 	 		return '不足';
 	 	}else if(b>=10 && b<=12){
@@ -415,7 +417,7 @@ Page({
 	 	}else{
 	 		return '未知';
 	 	}
-	 }else if(a=='b' || a=='c' || a=='d'){
+	 }else if(a=='B'){
 	 	if(b>=1 && b<=9){
 	 		return '不足';
 	 	}else if(b>=10 && b<=12){
@@ -425,7 +427,7 @@ Page({
 	 	}else{
 	 		return '未知';
 	 	}
-	 }else if(a=='e' || a=='f' || a=='g'){
+	 }else if(a=='C'){
 	 	if(b>=1 && b<=9){
 	 		return '不足';
 	 	}else if(b>=10 && b<=12){
@@ -435,7 +437,7 @@ Page({
 	 	}else{
 	 		return '未知';
 	 	}
-	 }else if(a=='h' || a=='i' || a=='j'){
+	 }else if(a=='D'){
 	 	if(b>=1 && b<=9){
 	 		return '不足';
 	 	}else if(b>=10 && b<=12){

pages/testSAS/testSAS.wxml

@@ -53,7 +53,7 @@
           <form bindsubmit='submit'>
             <view class='naire' wx:if="{{item.type == 'radio'}}">
               <view class='question'>{{item.question}}</view>
-	      <view class='question_1' wx:if="{{item.question_1 != ''}}">{{item.question_1}}</view>
+	      <view class='question_1' wx:if="{{item.question_1 != ''}}">{{item.question_1}}  <input name='input' wx:if="{{id==18}}" style="border: none;border-bottom: 1px solid #000000;" class="input-underline" placeholder=""/>  </view>
               <!--view class='border' /-->
               <radio-group class="radio-group-1" name='answer' bindchange='radioChange'>
                 <label class='radio'><radio value="A" color='#fcbe39'  wx:if="{{item.option.a != '' && item.option.a != null}}"/>{{item.option.a}}</label>

pages/testSAS/testSAS.wxss

@@ -26,6 +26,7 @@ page {
   margin-left: 32rpx;
 }
 .question_1 {
+  display: flex; 
   font-size: 30rpx;
   font-weight: 500;
   margin-top: 20rpx;