提交总体分析功能

html/home/html/admin.html

@@ -56,27 +56,27 @@
						</div>
						<div class="clearfix ">
							<ul class="l-qytj-barner">
								<li>
									<div id="zcjmAmount" class="l-qytj-val l-data c-f20 c-17b3ec">0</div>
								<li data-index="0">
									<div id="zcjmAmount" class="l-qytj-val l-data c-f20 c-17b3ec">0<span class="c-f12">人</span></div>
									<div class="l-qytj-name c-f12">注册居民></div>
								</li>
								<li>
									<div id="jmzxlAmount" class="l-qytj-val l-data c-f20 c-17b3ec">0</div>
								<li data-index="1">
									<div id="jmzxlAmount" class="l-qytj-val l-data c-f20 c-17b3ec">0<span class="c-f12">次</span></div>
									<div class="l-qytj-name c-f12">居民咨询量></div>
								</li>
							</ul>
							
							<ul class="l-qytj-barner">
								<li>
									<div id="jmgzAmount" class="l-qytj-val l-data c-f20 c-06bf04">0</div>
								<li data-index="3">
									<div id="jmgzAmount" class="l-qytj-val l-data c-f20 c-06bf04">0<span class="c-f12">人</span></div>
									<div class="l-qytj-name c-f12">居民关注></div>
								</li>
								<li>
									<div id="jkjyAmount" class="l-qytj-val l-data c-f20 c-ffd429">0</div>
								<li data-index="2">
									<div id="jkjyAmount" class="l-qytj-val l-data c-f20 c-ffd429">0<span class="c-f12">次</span></div>
									<div class="l-qytj-name c-f12">健康教育></div>
								</li>
								<li>
									<div id="jkzdAmount" class="l-qytj-val l-data c-f20 c-ffa54b">0</div>
								<li data-index="2">
									<div id="jkzdAmount" class="l-qytj-val l-data c-f20 c-ffa54b">0<span class="c-f12">次</span></div>
									<div class="l-qytj-name c-f12">健康指导></div>
								</li>
							</ul>

html/home/js/admin.js

@@ -9,6 +9,7 @@ var $docPhoto = $("#doc_photo"),//头像
mui.plusReady(function() {
    plus.nativeUI.showWaiting();
    window.addEventListener("refreshData", function() {
       getAlalysisData();
       getJieZhiTime()
    });
    initQiehuanDom();//切换角色事件
@@ -108,6 +109,7 @@ function initScroll() {
                var self = this;
                setTimeout(function() {
                    getJieZhiTime();
                    getAlalysisData();
                    self.endPullDownToRefresh();
                }, 1000);
            }
@@ -194,6 +196,7 @@ function bindEvents(){
        }
        
        getJieZhiTime();
        getAlalysisData();
        mui('#middlePopover').popover('hide');
        //保存默认的角色权限信息
        var selectedRole = JSON.stringify(userRole[index]);
@@ -239,6 +242,11 @@ function bindEvents(){
           });
        }
    });
    
    $(".l-qytj-barner").on('tap',"li", function(){
    	var index = $(this).attr("data-index");
    	openWebview("../../manager/html/comprehensive-analysis.html", {index: index});
    });	
}

html/manager/css/common.css

@@ -341,3 +341,7 @@
    text-align: center;
    margin-top: -10px;
}
.add-qushi-date-text{
	display: inline-block;height: 25px;line-height: 25px;text-align: center;font-size: 14px;margin-left: 5px;padding: 0 2px;color: #17b3ec;
}

html/manager/html/comprehensive-analysis.html

@@ -21,9 +21,9 @@
                <h1>总体分析
                    <img src="../images/yiwen_icon.png" class="info-icon" width="20">
                </h1>
                <a class="header-link">
                <!--<a class="header-link">
                    <img src="../images/hanbaobao_icon.png" width="25" class="mt10">
                </a>
                </a>-->
            </div>
        </div>
        <div class="mui-scroll-wrapper" style="top: 46px">
@@ -47,20 +47,32 @@
                <!-- 位置信息 end -->
                <div id='textTj' style="" class="clearfix ">
                    <ul class="l-banner">
                    	<li data-index='4'>
                            <div id="index_4" class="c-f18">0</div>
                    	<li class="active" data-index='2'>
                            <div id="index_2">
                            	<span class="c-f18 span-account">0</span>
                            	<span class="c-f12">人</span>
                            </div>
                            <div class="mt5 c-f14 l-name">注册居民</div>
                        </li>
                        <li class="active" data-index='3'>
                            <div id="index_3" class="c-f18">0</div>
                        <li data-index='3'>
                            <div id="index_3">
                            	<span class="c-f18 span-account">0</span>
                            	<span class="c-f12">次</span>
                            </div>
                            <div class="mt5 c-f14 l-name">居民咨询量</div>
                        </li>
                        <li data-index='5'>
                            <div id="index_5" class="c-f18">0</div>
                            <div id="index_5">
                            	<span class="c-f18 span-account">0</span>
                            	<span class="c-f12">次</span>
                            </div>
                            <div class="mt5 c-f14 l-name">健康教育</div>
                        </li>
                         <li data-index='21'>
                            <div id="index_21" class="c-f18">0</div>
                         <li data-index='6'>
                            <div id="index_6">
                            	<span class="c-f18 span-account">0</span>
                            	<span class="c-f12">人</span>
                            </div>
                            <div class="mt5 c-f14 l-name">居民关注</div>
                        </li>
                    </ul>
@@ -91,7 +103,7 @@
                    <div class="ui-grid ui-grid-middle plr10 c-border-b">
                        <div class="ui-col-0">
                            <img src="../images/jiaofeiqushi_icon.png" width="22">
                            <span class="c-323232 c-f16 ml5"><span id="tagName">咨询量</span>新增趋势</span>
                            <span class="c-323232 c-f16 ml5 qushi-span"><span id="tagName">居民</span>新增趋势</span>
                        </div>
                        <div class="ui-col-1 c-t-right ptb5">
                            <span class="date-tag active" data-type="1">日</span><!--
@@ -100,12 +112,17 @@
                        </div>
                    </div>
                    <div class="clearfix mt5 plr10">
                        <div class="fl c-f12 c-909090"><span id="startValue"></span> ~ <span id="endValue"></span>数据</div>
                        <div class="fl c-f12 c-909090">
                        	<img class="zuoJiao-img" src="../images/jiantou_zuo01_icon.png" width="8" height="18" style="opacity: 0.6;margin-top: 2px;" />
                        	<span class="add-qushi-date-text"></span><span class="c-f14 c-17b3ec mr5">年</span>
                        	<img class="youJiao-img" src="../images/jiantou_you02_icon.png" width="8" height="18" style="opacity: 0.6;margin-top: 2px;"/>
                        	<!--<span id="startValue"></span> ~ <span id="endValue"></span>数据-->
                        </div>
                        <div class="fr c-f12 c-909090">单位：人</div>
                    </div>
                    <div class="line-chart" id="lineChart" style="height: 200px; width: 100%;"></div>
                </div>
                <!--微信绑定再显示统计数据-->
                <!--注册居民再显示统计数据-->
                <div class="c-border-t bgc-fff c-hide" id="pieChartsPanel2">
                    <div class="plr10 ptb10 c-border-b">
                        <span class="blue-column mr5"></span>
@@ -114,26 +131,25 @@
                    <div class="ui-grid ui-grid-middle ptb10">
                        <div class="ui-col-0 c-t-center c-17b3ec plr10 c-w-33">
                            <div class="c-f20 jf-num"></div>
                            <div class="c-f12">已缴费人数</div>
                            <div class="c-f12">关注平台人数</div>
                        </div>
                        <div class="ui-col-1 c-position-r">
                            <div class="blur-cycle-box">
                                <div class="c-f16 c-fff num mt10"></div>
                                <div class="c-f12 c-fff mt5">绑定率</div>
                                <div class="c-f12 c-fff mt5">注册率</div>
                            </div>
                            <div id="pieChart2" style="width: 100%; height:110px;"></div>
                        </div>
                        <div class="ui-col-0 c-t-center c-909090 plr10 c-w-33">
                            <div class="c-f20 wjf-num"></div>
                            <div class="c-f12">未缴费人数</div>
                            <div class="c-f12">注册人数</div>
                        </div>
                    </div>
                </div>
                <div class="area-panel">
                    <div class="area-tab-panel">
                        <div class="area-tab active" data-val="4"><span>各区</span><i class="border-line-right"></i></div>
                        <div class="area-tab" data-val="3"><span>社区</span><i class="border-line-right"></i></div>
                        <div class="area-tab c-hide" data-val="2"><span>团队</span></div>
                        <div class="area-tab" data-val="3"><span>科室</span><i class="border-line-right"></i></div>
                        <div class="area-tab c-hide" data-val="2"><span>医生</span></div>
                    </div>
                    <table class="bottom-list-table mb20" id="listTable">
                    </table>
@@ -163,8 +179,9 @@
                    <th>咨询量</th>
                    <th>未回复</th>
                    {{/if}}
                    {{if index == '4'}}
                    <th>随访量</th>
                    {{if index == '6'}}
                     <th>关注人次</th>
                    <th>关注居民数</th>
                    {{/if}}
                    {{if index == '5'}}
                    <th>总推送量</th>
@@ -207,14 +224,19 @@
                        <td>{{v.weChatAmount1}}</td>
                        <td>{{v.weChatAmount0}}</td>
                    {{else}}
                        <td>{{v.amount}}</td>
                        {{if index == '3'}}
                         <td>{{v.amount}}</td>
                        <td>{{v.noAmount}}</td>
                        {{/if}}
                        {{if index == '5'}}
                         <td>{{v.amount}}</td>
                        <td>{{v.readNum}}</td>
                        <td>{{v.readRate}}</td>
                        {{/if}}
                        {{if index == '6'}}
                         <td>{{v.noAmount}}</td>
                         <td>{{v.amount}}</td>
                        {{/if}}
                    {{/if}}
                    {{if level>2 && lowLevel != 1}}
                    <td><i class="fa fa-angle-right"></i></td>

html/manager/js/comprehensive-analysis.js

@@ -7,13 +7,16 @@ var selfwv,
    level, 
    areaCode, 
    areaTitle,
    index = "3", // 顶部tab对应的指标的index
    index = "2", // 顶部tab对应的指标的index
    selectedDateType = 1, //折线图中选择的时间类型。 1-日，2-周， 3-月
    indexs = ['3', '4', '5', '27', '21', '20'], //对应顶部tab的index值
    indexs = ['2','3', '5', '6'], //对应顶部tab的index值
    endDate,
    startDate,
    nowYear = new Date().getYear(),
    quShiStartDate,
    quShiEndDate,
    lowLevel,
    indexName = {'index_3': '咨询量', 'index_4': '随访量', 'index_5': '健康指导','index_27':'代预约量','index_21': '绑定微信','index_20': '绑定设备', 'index_83': "健康文章"};
    indexName = {'index_2': '活跃居民','index_3': '居民咨询量', 'index_5': '健康指导','index_6':'关注人次','index_1':'有效关注', 'index_4': '注册居民','index_83': "健康文章"};
var initTabOffsetTop = 0; //初始化时，底部tab距离顶部的位置
var index_5, index_83; //标记健康教育中健康文章和健康指导的值
@@ -30,21 +33,24 @@ if(now.getMonth() >= 6){
}
var information = {
    "3":"咨询量为签约年度（当年7月1日至次年6月30日）居民咨询的次数，点击右上角可切换查看不同年份数据",
    "4":"随访量为签约年度（当年7月1日至次年6月30日）随访次数，点击右上角可切换查看不同年份数据",
    "5":"健康教育量为签约年度（当年7月1日至次年6月30日）发送健康指导及健康文章数量的总和，点击右上角可切换查看不同年份数据",
    "27":"代预约量为签约年度（当年7月1日至次年6月30日）代居民预约挂号的次数，点击右上角可切换查看不同年份数据",
    "21":"绑定微信量为签约年度签约居民（含未缴费）已关注微信号的数量统计，点击右上角可以切换查看不同年份数据",
    "20":"绑定设备量为签约年度签约居民（含未缴费）已绑定的设备数量统计，点击右上角可以切换查看不同年份数据"
	"2":"注册居民数为当前(截止最新时间)累计注册i健康的居民数量总和。",
    "3":"居民咨询量为当前(截止最新时间)居民咨询的次数。",
    "5":"健康教育为当前(截止最新时间)发送健康指导及健康文章数量的总和。",
    "6":"关注公众号和注册i健康平台的统计分析"
};
mui.plusReady(function(){
    selfwv = plus.webview.currentWebview();
    userRole = JSON.parse(plus.storage.getItem("selectedRole"));
    initLevel = level = userRole.code == '350200'  ? 4 : userRole.code.length==6 ? 3 : 2;
    initAreaCode = areaCode = userRole.code;
    initLevel = level = 3;//因为总体分析只能看到科室和医生，所以3代表科室级别，2代表医生级别
    initAreaCode = areaCode = srOrgCode;//默认是上饶机构code，值在common_http.js文件中
    initTitle = areaTitle = userRole.name;
    
    //处理点击首页的tap默认触发本页面的顶部tap
    if(selfwv.index){
    	 $(".l-banner li").removeClass("active");
    	 selfwv.index==0?index='2':selfwv.index==1?index='3':selfwv.index==2?index=5:selfwv.index==3?index=6:index=2;
    	$(".l-banner li").eq(selfwv.index).addClass("active");
    }
    $("#areaTitle").text(areaTitle);
    $("#infoText").text(information[index]);
    $(".choose-label").text(chooseYear + '年');
@@ -65,30 +71,16 @@ mui.plusReady(function(){
    initTabOffsetTop = $(".area-tab-panel").offset().top;
    
    showBottomTab();
    shaixuanInit(selfwv);
    bindEvents();
});
initScroller();
function getTopReqParams(index1){
    var url = "statistics/total",
        data = {
            index: index1 == '5' ? '5,83' : index1,
            level: level, 
            area: areaCode, 
            year: chooseYear,
            endDate: endDate, 
            startDate: startDate
        };
    if(index1 == 20 || index1 == 21){
        url = "statistics/index_all";
    }
    if(index1 == '5'){
        url = "/statistics/article_total";
    }
function getTopReqParams(){
    var url = "/statistics/getIndexTotal",
        data = {endDate:getDateFromNow(),area:areaCode,level:3};
    return {
        url: url,
        reqType: 'POST',
        reqType: 'GET',
        data: data
    };
}
@@ -97,59 +89,65 @@ function initReqParams(){
    //初始化开始时间和结束时间
    startDate = getStartDate();
    endDate = getEndDate();
    quShiStartDate = formatDate(new Date(nowYear,0,1));
    quShiEndDate = formatDate(new Date(nowYear,11,31));
    $(".add-qushi-date-text").html(nowYear.toString())
    
    //增量（咨询量3、随访量4、健康教育5、代预约量27），到达量（绑定微信21、绑定设备20）
    var url2 = "statistics/interval",
        url3 = "statistics/lowlevel_total";
    if(index == 20 || index == 21){
        url2 = "statistics/interval_total";
        url3 = "statistics/lowlevel_all";
    }else if(index == 3){
        url3 = "statistics/lowlevel_total_mesh";
    //增量（注册居民2、居民咨询量3、健康教育5、）到达量（居民关注6）
    var url2 = "/statistics/interval",//默认注册居民
    url3 = '/statistics/registerRange';;//默认注册居民
    if(index=='3' || index == '6'){
    	url3 = "/statistics/lowlevel_total_mesh"
    }else if(index == '5'){
        url3 = '/statistics/article_lowlevel_total';
    }else if(index=='6'){
    	url2 = "/statistics/interval_total";
    }
    reqParam = [{
        url: url2,
        reqType: 'POST',
        data:{
            index: index == 5 ? '5,83' : index,
            level: level, 
            area: areaCode, 
            startDate: startDate, 
            endDate: endDate,
            interval: selectedDateType
        }
    },{
        url: url3,
        reqType: 'POST',
        data: {
            index: (index == 3) ? "3,22" : index,
            level: level,
            area: areaCode, 
            sort: 1, 
            year: chooseYear
        }
    },{
        //如果是微信绑定，则增加置顶展示当面层级的总绑定率及已缴费 未缴费居民数.只针对微信绑定时使用
        url: '/statistics/getLevelTotalSingle',
        reqType: 'POST',
        data: {
            date: endDate, 
            level: level, 
            area: areaCode
        }
    }];
    
    if(index == 20 || index == 21){
        reqParam[1].data.date = endDate;
    }else{
        reqParam[1].data.endDate = endDate;
    }
    
    if(lowLevel){
        reqParam[1].data.lowLevel = lowLevel;
    if(index==2){//注册居民
    	 reqParam = [{//请求中间部分
	        url: url2,
	        reqType: 'POST',
	        data:{
	            index: '2,4',
	            level: level, //等级（1 团队,2 科室,3 机构,4 区）
	            area: areaCode, //默认是49229004X
	            startDate: quShiStartDate, 
	            endDate: quShiEndDate,
	            interval: selectedDateType
	        }
	    },{ //如果是注册居民，则增加置顶展示当面层级的注册率及关注平台人数、 注册人数.只针对注册居民时使用
	        url: url3,
	        reqType: 'POST',
	        data: {}
	    }];
    }else{//居民咨询量3、健康教育5、居民关注6
    	 reqParam = [{//请求中间部分
	        url: url2,
	        reqType: 'POST',
	        data:{
	            index: index == 5 ? '5,83' : (index==6)?"1,6":index,
	            level: level, //等级（1 团队,2 科室,3 机构,4 区）
	            area: areaCode, //默认是49229004X
	            startDate: quShiStartDate, 
	            endDate: quShiEndDate,
	            interval: selectedDateType
	        }
	    },{//请求底部部分
	        url: url3,
	        reqType: 'POST',
	        data: {
	            index: (index == 3) ? "3,22" : (index==6)?"1,6":index,
	            endDate: endDate,
	            level: level,
	            area: areaCode, 
	            sort: 1
	        }
	    }];
	    if(lowLevel){
	       reqParam[1].data.lowLevel = lowLevel;
	    }
    }
  
}
/*
@@ -159,15 +157,13 @@ function initReqParams(){
function loadData(loadArr){
    plus.nativeUI.showWaiting();
    getJieZhiTime();
    
    var reqPromise = [],
        newArr = []; //记录非顶部请求的请求数组
    if(loadArr.indexOf(0) > -1){
        //请求加载了头部的内容
        var reqs = [];
        for(i=0; i<indexs.length; i++){
            reqs.push(getTopReqParams(indexs[i]));
        }
        var url = "/statistics/getIndexTotal",
        data = {endDate:getDateFromNow(),area:areaCode,level:level};
        var reqs = [{url: url,reqType: 'GET',data: data}];
        getReqPromises(reqs, true).then(function(ress){
            handleTopPanelData(ress);
        }).then(function(){
@@ -201,13 +197,12 @@ function loadData(loadArr){
            newArr.push(loadArr[i]);
        }
    }
    if(index == '21'){
        reqPromise.push(reqParam[2]);
        newArr.push(3);
        $(".area-panel").addClass("bgc-fff");
    if(index == '2'){//注册居民
    	 $("#pieChartsPanel2").show();
        $(".area-panel").addClass("bgc-fff").hide();
    }else{
        $("#pieChartsPanel2").hide();
        $(".area-panel").removeClass("bgc-fff");
        $(".area-panel").removeClass("bgc-fff").show();
    }
    
    if(index == '5' ){
@@ -234,7 +229,7 @@ function loadData(loadArr){
    
    if(reqPromise.length > 0){
        getReqPromises(reqPromise, true).then(function(ress){
            var res2, res3, res4;
            var res2, res3;
        
            for(var i=0; i<newArr.length; i++){
                var j = newArr[i] + 1;
@@ -244,10 +239,6 @@ function loadData(loadArr){
                if(j == 3){
                    res3 = ress[i];
                }
                //微信绑定时，多获取一个请求数据
                if(j == 4){
                    res4 = ress[i];
                }
            }
            if(res2){
                if(res2.status == 200){
@@ -258,21 +249,22 @@ function loadData(loadArr){
                
            }
            if(res3){
                if(res3.status == 200){
                    listHandle(res3.data);
                }else{
                    $("#listTable").empty();
                    mui.toast(res3.msg);
                }
            }
            if(res4){
                if(res4.status == 200){
                    $("#pieChartsPanel2").show();
                    handleWXBindData(res4.data);
                }else{
                    $("#pieChartsPanel2").hide();
                    mui.toast(res4.msg);
                }
            	if(index=='2'){//注册居民
            		if(res3.status == 200){
	                    $("#pieChartsPanel2").show();
	                    handleZCGKData(res3.data);
	                }else{
	                    $("#pieChartsPanel2").hide();
	                    mui.toast(res3.msg);
	                }
            	}else{
            		 if(res3.status == 200){
	                    listHandle(res3.data);
	                }else{
	                    $("#listTable").empty();
	                    mui.toast(res3.msg);
	                }
            	}
            }
            plus.nativeUI.closeWaiting();
        }).catch(function(e){
@@ -299,24 +291,18 @@ function getJieZhiTime(){
 * 处理顶部各tab的值
 */
function handleTopPanelData(ress){
    for(i=0; i<ress.length; i++){
        var res = ress[i];
        if(res.status == 200){
            for(key in res.data){
                if(key == 'index_5'){
                    index_5 = res.data[key];
                }else if(key == 'index_83'){
                    index_83 = res.data[key];
                }else{
                    $("#"+key).text(res.data[key]);
                }
            }
        }else{
            mui.toast(res.msg);
        }
	if(ress[0].status==200){
    	var data = ress[0].data;
    	$("#index_2 .span-account").html(data.reginNum);
    	$("#index_3 .span-account").html(data.consultNum);
    	$("#index_5 .span-account").html(parseInt(data.educateNum)+parseInt(data.guideNum));
    	$("#index_6 .span-account").html(data.concernNum);
    	index_83 = data.educateNum;
    	index_5 = data.guideNum;
	}else{
    	mui.toast(ress[0].msg);
    }
    var jy_total = parseInt(index_5) + parseInt(index_83);
    $("#index_5").text(jy_total);
	 
}
/*
@@ -330,21 +316,12 @@ function handleSecondPanelData(data){
        colors = ['#12b7f5', '#cd67fd'];
    for(var p in data){
        names.push(indexName[p]);
        if(p == 'index_21' || p == 'index_20'){
            var xData = _.map(data[p].data, function(o){
                return o.range;
            });
            var yData = _.map(data[p].data, function(o){
                return o.amount;
            });
        }else{
            var xData = _.map(data[p], function(o){
                return o.range;
            });
            var yData = _.map(data[p], function(o){
                return o.amount;
            });
        }
        var xData = _.map(data[p], function(o){
            return o.range;
        });
        var yData = _.map(data[p], function(o){
            return o.amount;
        });
        
        xDatas.push(xData);
        yDatas.push(yData);
@@ -369,7 +346,7 @@ function handleSecondPanelData(data){
}
/*
 * 处理底部区，社区，团队的数据
 * 处理底部科室、医生的数据
 */
function listHandle(data){
    for(var k in data){
@@ -382,13 +359,17 @@ function listHandle(data){
            }
        }
        
        var topArr = [];
        if(index == "21"){
            topArr = soreRank(amountArr(list, 'bindRate'))
        }else{
            topArr = soreRank(amountArr(list, 'amount'));
         if(index=="6"){//关注居民
            for(var i=0;i<list.length;i++){
                var amount = list[i].amount.split(",");
                list[i].amount = amount[0];//关注居民数
                list[i].noAmount = amount[1];//关注人次
            }
        }
        
        var topArr = [];
        topArr = soreRank(amountArr(list, 'amount'));
        
        for(var j in list){
            list[j].top = topArr[j];
        }
@@ -404,29 +385,19 @@ function listHandle(data){
}
/*
 * 处理微信绑定统计的数据
 * 处理注册居民-注册率概况的数据
 */
function handleWXBindData(data){
    switch(level){
        case 4: 
            $("#pieChartsPanel2 .title").text("全市概况");
            break;
        case 3: 
            $("#pieChartsPanel2 .title").text("全区概况");
            break;
        case 2: 
            $("#pieChartsPanel2 .title").text("全社区概况");
            break;
    }
    $(".jf-num").text(data.weChatAmount1);
    $(".wjf-num").text(data.weChatAmount0);
    $(".num").text((data.bindRate || 0)+"%");
function handleZCGKData(data){
    $("#pieChartsPanel2 .title").text("注册率概况");
    $(".jf-num").text(data.wxUser);
    $(".wjf-num").text(data.reginNum);
    $(".num").text((data.registeRange || 0)+"%");
    var arr = [{
        name: '已缴费人数',
        value: data.weChatAmount1
        name: '关注平台人数',
        value: data.wxUser
    },{
        name: '未缴费人数',
        value: data.weChatAmount0
        name: '注册人数',
        value: data.reginNum
    }];
    drawPie('pieChart2', arr, ['#17b3ec', '#909090']);
}
@@ -485,7 +456,15 @@ function bindEvents(){
        
        $("#infoText").text(information[index]);
        var tagName = index == '5' ? '推送量' : indexName['index_'+index];
        $("#tagName").text(tagName);
        if(index=='6'){//居民关注
        	 $(".qushi-span").text("居民关注趋势");
        }else{
        	 $(".qushi-span").text(tagName+"新增趋势");
        }
        //初始化趋势图时间
        nowYear = new Date().getYear()
		nowYear += (nowYear < 2000) ? 1900 : 0;
		//加载数据
        initReqParams();
        loadData([1,2]);
        //记录返回链接信息
@@ -525,9 +504,7 @@ function bindEvents(){
        $(".area-tab").removeClass("active");
        $this.addClass("active");
        
        if(type == "4"){
            lowLevel = '';
        }else if(type == "3"){
        if(type == "3"){
            lowLevel = 2;
        }else{
            lowLevel = 1;
@@ -630,28 +607,40 @@ function bindEvents(){
        });
        loadData([0,1,2]);
    })
    
    //中间趋势图左箭头事件
    $(".zuoJiao-img").on("tap",function(){
    	nowYear = nowYear - 1;
    	quShiStartDate = formatDate(new Date(nowYear,0,1));
    	quShiEndDate = formatDate(new Date(nowYear,11,31));
    	$(".add-qushi-date-text").html(nowYear.toString());
    	initReqParams();
        loadData([1]);
    })
    //中间趋势图又箭头事件
     $(".youJiao-img").on("tap",function(){
    	nowYear = nowYear + 1;
    	quShiStartDate = formatDate(new Date(nowYear,0,1));
    	quShiEndDate = formatDate(new Date(nowYear,11,31));
    	$(".add-qushi-date-text").html(nowYear.toString());
    	initReqParams();
        loadData([1]);
    })
}
/*
 * 控制底部各区，社区，团队的显示
 * 控制底部科室，医生
 */
function showBottomTab(){
    $(".area-tab").removeClass("active");
    switch(level){
        case 4:
        case 3:
            $(".area-tab").eq(0).addClass("active").show();
            $(".area-tab").eq(1).show();
            $(".area-tab").eq(2).hide();
            break;
        case 3:
            $(".area-tab").eq(0).hide();
            $(".area-tab").eq(1).addClass("active").show();
            $(".area-tab").eq(2).show();
            break;
        case 2:
            $(".area-tab").eq(0).hide();
            $(".area-tab").eq(1).hide();
            $(".area-tab").eq(2).addClass("active").show();
            $(".area-tab").eq(1).addClass("active").show();
            break;
    }
}
@@ -680,45 +669,7 @@ function initScroller(){
        }
    });
}
/**
 * 初始化筛选事件
 */
function shaixuanInit(main){
    var shaixuan = plus.webview.getWebviewById('shaixuan2.html');
    if(!shaixuan){
        shaixuan = mui.createWindow({
                id: 'shaixuan2.html',
                url: 'shaixuan2.html',
                styles: {
                    top: 0,
                    bottom: 0,
                    left: '20%',
                    width: '80%',
                    scorllIndicator: "none"
                },
                show:{
                  aniShow: "slide-in-right",
                  duration: "400"
                },
                extras:{
                }
           });
    }
    window.addEventListener("hideShaiXuan",function(){
        console.log("hideShaiXuan");
        main.setStyle({mask:"none"});
        shaixuan.hide();
    }, false);
    
    window.addEventListener("showShaiXuan", function() {
        shaixuan.show();
        main.setStyle({mask:"rgba(0,0,0,0.5)"});
        main.addEventListener("maskClick",function(){
            main.setStyle({mask:"none"});
            shaixuan.hide();
        }, false);
    });
}
/*
 * 绘制折线图
@@ -925,6 +876,30 @@ function getEndDate(){
    }
}
//获取当前时间
function getDateFromNow(days) {
	if(!days) {
		return new Date().format("yyyy-MM-dd")
	}
	var now = new Date().getTime()
	var diff = 24 * 3600 * 1000 * days
	return new Date(now + diff).format("yyyy-MM-dd")
}
//格局化日期：yyyy-MM-dd 
function formatDate(date) {
	var myyear = date.getFullYear();
	var mymonth = date.getMonth() + 1;
	var myweekday = date.getDate();
	if(mymonth < 10) {
		mymonth = "0" + mymonth;
	}
	if(myweekday < 10) {
		myweekday = "0" + myweekday;
	}
	return(myyear + "-" + mymonth + "-" + myweekday);
}
//返回事件 
var old_back = mui.back;
mui.back = function(){

html/tuandui/html/gongzuobaogao.html

@@ -125,7 +125,7 @@
	<script src="../../../js/template.js" type="text/javascript" charset="utf-8"></script>
	<script src="../../js/common.js" type="text/javascript" charset="utf-8"></script>
	<script src="../../js/templateHelp.js" type="text/javascript" charset="utf-8"></script>
	<script src="../../../widget/echarts/echarts.js" type="text/javascript" charset="utf-8"></script>
	<script src="../../manager/js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
	<script src="../js/init-charts.js" type="text/javascript"></script>
	<script src="../js/get-date.js" type="text/javascript"></script>
	<script src="../js/gzbg-helper.js" type="text/javascript"></script>

html/tuandui/js/gongzuobaogao.js

@@ -242,7 +242,7 @@ $(function() {
            total = zxtj.totalCount, 
            replay = parseInt(total) - parseInt(unreplay); //已回复咨询数
        	$("#totalCount").text(total);//总咨询数
			debugger
			Promise.all([
				//咨询统计
				$ic.init({
@@ -254,7 +254,8 @@ $(function() {
						name: '已回复咨询',
						value: replay || zx
					}],
					chartsType: 2
					chartsType: 2,
					seriesName:"咨询数量"
				}),
				//机构内服务
				$ic.init({

html/tuandui/js/init-charts.js

@@ -14,6 +14,7 @@
				o.color = op.color || '';
				o.cb = op.cb || ''; //图形
				o.grid = op.grid || null;
				o.seriesName = op.seriesName;
				return this.createECharts(o);
			},
			//			折线图
@@ -69,16 +70,16 @@
				return options;
			},
			//			饼状图
			initBZChartsOptions: function( seriesData, c) {
			initBZChartsOptions: function( seriesData, c,seriesName) {
				var options = {
			        tooltip : {
			            trigger: 'item',
			            formatter: "{a} <br/>{b} : {c} ({d}%)"
			        },
			        color: c || ['#17b3ec', '#FF774F'],
			        color: c || ["#17b3ec", "#FF774F"],
			        series : [
			            {
//			                name: seriesName,
			                name: seriesName,
			                type: 'pie',
			                radius: '55%',
			                center: ['50%', '60%'],
@@ -89,7 +90,7 @@
			                hoverAnimation: false
			            }
			        ]
			    };
			   };
				return options;
			},
			//			柱状
@@ -164,38 +165,23 @@
			createECharts: function(o) {
				var me = this;
				return new Promise(function(resolve, reject) {
					// 路径配置
					require.config({
						paths: {
							echarts: 'http://echarts.baidu.com/build/dist'
						}
					});
					require(['echarts',
							'echarts/chart/line',
							'echarts/chart/pie',
							'echarts/chart/bar'
						] // 使用柱状图就加载bar模块，按需加载]
						,
						function(echarts) {
							var myCharts = echarts.init(o.el);
							switch(o.chartsType) {
								case 1:
									myCharts.setOption(me.setZXChartsOptions(o.xAxisData, o.seriesData, o.legend));
									break;
								case 2:
									myCharts.setOption(me.initBZChartsOptions( o.seriesData, o.color));
									break;
								case 3:
									var ecConfig = require('echarts/config');
									myCharts.setOption(me.initZZChartsOptions(o.xAxisData, o.seriesData, o.color, o.grid));
									o.cb && (function() {
										myCharts.on(ecConfig.EVENT.CLICK, o.cb);
									})();
									break;
							}
							resolve(myCharts);
						});
					var myCharts = echarts.init(o.el);
					switch(o.chartsType) {
						case 1:
							myCharts.setOption(me.setZXChartsOptions(o.xAxisData, o.seriesData, o.legend));
							break;
						case 2:
							myCharts.setOption(me.initBZChartsOptions( o.seriesData, o.color,o.seriesName));
							break;
						case 3:
//							var ecConfig = require('echarts/config');
							myCharts.setOption(me.initZZChartsOptions(o.xAxisData, o.seriesData, o.color, o.grid));
//							o.cb && (function() {
//								myCharts.on(ecConfig.EVENT.CLICK, o.cb);
//							})();
							break;
					}
					resolve(myCharts);
				})
			}
		};