Browse Source

排序康复计划时间key值

linehang 5 years ago
parent
commit
1a861eddb2

+ 3 - 1
app/recover/html/personal-manage.html

@ -533,7 +533,9 @@
			    			showErrorMessage("暂无体征数据");
			    			this.chartData = {
		                		opinion:[],
				                opinionData:[]
				                opinionData:[],
				                recordType: vm.recordType,
				                opinionData2: [],
				            }
			    			return false;
			    		}

+ 27 - 10
app/rehabilitation/js/rehabilitation_management.js

@ -288,6 +288,21 @@
			  this.monDetail();
			  this.calenderPlanDetail();
			},
			daysSort: function(arr) {
				var getArr = JSON.parse(JSON.stringify(arr)),
					returnArr = []
				for(var i = 1; i < 31; i++) {
					for(var j = 0, len = getArr.length; j < len; j++) {
						var stri = i > 9 + '' ? i : '0'+i
						if(getArr[j].day == stri) {
							returnArr.push(getArr[j])
							getArr.splice(j,1)
							break;
						}
					}
				}
				return returnArr
			},
			// 日历有计划数据处理
			planHandleData: function(data, day, mounth) {
				var item = data;
@ -371,31 +386,34 @@
									}
								}
								if(data0.length) {
									var addlen = (data0.length + 1) % 7 ? (data0.length + 1) % 7 : 7
									var dataSort = vm.daysSort(data0)
									var addlen = (dataSort.length + 1) % 7 ? (dataSort.length + 1) % 7 : 7
									for(var i = 0; i < 7 - addlen; i++) {
										data0.push({
										dataSort.push({
											noService:true
										})	
									}
									searchData0.push(data0)
									searchData0.push(dataSort)
								}
								if(data1.length) {
									var addlen = (data1.length + 1) % 7 ? (data1.length + 1) % 7 : 7
									var dataSort = vm.daysSort(data1)
									var addlen = (dataSort.length + 1) % 7 ? (dataSort.length + 1) % 7 : 7
									for(var i = 0; i < 7 - addlen; i++) {
										data1.push({
										dataSort.push({
											noService:true
										})	
									}
									searchData1.push(data1)
									searchData1.push(dataSort)
								}
								if(data2.length) {
									var addlen = (data2.length + 1) % 7 ? (data2.length + 1) % 7 : 7
									var dataSort = vm.daysSort(data2)
									var addlen = (dataSort.length + 1) % 7 ? (dataSort.length + 1) % 7 : 7
									for(var i = 0; i < 7 - addlen; i++) {
										data2.push({
										dataSort.push({
											noService:true
										})	
									}
									searchData2.push(data2)
									searchData2.push(dataSort)
								}
							}
							if(searchData0.length) {vm.searchData.push(searchData0)}
@ -475,7 +493,6 @@
							return o;
						})||[];
					}
					console.log(vm.timeAxisData)
				})
			},
			changeSearch: function(status) {