Browse Source

修改bug

lulihong 6 years ago
parent
commit
8a7c5e4df8

+ 1 - 1
html/home/html/admin.html

@ -50,7 +50,7 @@
					<div style="background: #17b3ec; position: absolute; top: 120px; left: 0;height: 60px; width: 100%;z-index: -1;"></div>
					
					<div style="background: #fff;border-radius: 10px;overflow: hidden;padding-top: 0;" class="mlr10 p10">
						<div class="c-909090 c-f12 lh40">
						<div class="c-909090 c-f10 lh40">
							<img src="../images/shujujilu_icon.png" width="18" height="18" class="vam mr5" />
							<span>(数据截止 <span class="jiezhi-time"></span>)</span>
						</div>

+ 4 - 4
html/manager/js/comprehensive-analysis.js

@ -33,10 +33,10 @@ if(now.getMonth() >= 6){
}
var information = {
	"2":"注册居民数为当前(截止最新时间)累计注册i健康的居民数量总和。",
    "3":"居民咨询量为当前(截止最新时间)居民咨询的次数。",
    "5":"健康教育为当前(截止最新时间)发送健康指导及健康文章数量的总和。",
    "6":"关注公众号和注册i健康平台的统计分析"
	"2":"注册居民人数为当前(截止最新时间)累计注册i健康的居民人数总和。",
    "3":"居民咨询量为当前(截止最新时间)累计发起咨询的次数总和。",
    "5":"健康教育量为当前(截止最新时间)累计发送健康指导和健康文章的数量总和。",
    "6":"居民关注数量为当前(截止最新时间)累计关注医生的有效居民人数总和。"
};
mui.plusReady(function(){

+ 8 - 3
html/manager/js/manyidufenxi.js

@ -274,7 +274,9 @@ function clearData(type){
function loadLineData(type, level, area){
	plus.nativeUI.showWaiting();
	var now = new Date();
	var endDate = now.getFullYear()+'-'+(now.getMonth()*1+1)+'-'+(now.getDate());
	var month = (now.getMonth()*1+1)<10?"0"+(now.getMonth()+1):(now.getMonth()+1);
	var date = now.getDate()<10?"0"+now.getDate():now.getDate();
	var endDate = now.getFullYear()+'-'+month+'-'+date;
	monthGap = getMonthByDiff('2017-01-01',endDate);//月份数
	var num = Math.ceil(monthGap/5);//5个月为一模块
	addSlide(num);
@ -321,7 +323,8 @@ function lastDate(date){
			year = year - 1;
		}
		var day = new Date(year,month,0).getDate(); 
		var statDate = year+'-'+month+'-'+day;
		var newMonth = month<10?"0"+month:month;
		var statDate = year+'-'+newMonth+'-'+day;
		return statDate;
}
//5个月前
@ -329,10 +332,12 @@ function fiveMonth(endDate){
	var arr = endDate.split('-');
	var reduce = arr[1]*1-4;
	if(reduce>0){
		reduce = reduce<10?"0"+reduce:reduce;
		var statDate = arr[0]+'-'+reduce+'-01';
		return statDate;
	}else{
		var statDate = arr[0]*1-1+'-'+(12+reduce*1)+'-01';
		var newReduce = (12+reduce*1)<10?"0"+(12+reduce*1):(12+reduce*1);
		var statDate = arr[0]*1-1+'-'+newReduce+'-01';
		return statDate;
	}
} 

+ 0 - 1
html/tuandui/js/gongzuobaogao.js

@ -237,7 +237,6 @@ $(function() {
		    me.loadCharts(qy, zxtj, jgnfw, pjmyd, jmgzqs, gzbhqs);
		},
		loadCharts: function(qy, zxtj, jgnfw, pjmyd, jmgzqs, gzbhqs) {
			debugger
			var me = this,gzbhxAxisData=[],gzbhSeriesData1=[],gzbhSeriesData2=[];
			var count = zxtj.onReyCount + zxtj.totalCount;
			var zx = count == 0 ? (1/2)*100 : 0;