解决chrome17不兼容的问题

app/login/login.js

@@ -119,6 +119,7 @@ function login(data) {
            }))
            //将用户的角色信息单独存储在localstorage中
            localStorage.setItem("userRole", JSON.stringify(docInfo.userRole));
            sessionStorage.setItem("userRole", JSON.stringify(docInfo.userRole));
            window.location.href = "../home/html/index.html";
        }else{
            tip(res.msg);

app/rehabilitation/css/service_item_content.css

@@ -1,23 +1,32 @@
[v-cloak]{display: none;}
			.flex-box{display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */         /* OLD - Firefox 19- (buggy but mostly works) */
	  display: -ms-flexbox;      /* TWEENER - IE 10 */     /* NEW - Chrome */
	  display: flex;             /* NEW, Spec - Opera 12.1, Firefox 20+ */
	  -webkit-box-pack: center;
	  -ms-flex-pack: center;
	  justify-content: center;
	  -webkit-box-align: center;
	  -ms-flex-align: center;
	  align-items: center;
	  -ms-flex-wrap: wrap;
	      flex-wrap: wrap;
	  }
.flex-box-item{-webkit-box-flex: 1;      /* OLD - iOS 6-, Safari 3.1-6 */
	  -moz-box-flex: 1;         /* OLD - Firefox 19- */
	  -webkit-flex: 1;          /* Chrome */
	  -ms-flex: 1;              /* IE 10 */
	  width: 50%;               /* For old syntax, otherwise collapses. */
	  flex: 1;                  /* NEW, Spec - Opera 12.1, Firefox 20+ */
	 position: relative;}
#app{
    width: 970px;
    margin: 0 auto;
    border-left: 1px solid #e1e1e1;
    border-right: 1px solid #e1e1e1;
}
.flex-box{
    display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */         /* OLD - Firefox 19- (buggy but mostly works) */
    display: -ms-flexbox;      /* TWEENER - IE 10 */     /* NEW - Chrome */
    display: flex;             /* NEW, Spec - Opera 12.1, Firefox 20+ */
    -webkit-box-pack: center;
    -ms-flex-pack: center;
    justify-content: center;
    -webkit-box-align: center;
    -ms-flex-align: center;
    align-items: center;
    -ms-flex-wrap: wrap;
    flex-wrap: wrap;
}
.flex-box-item{
    -webkit-box-flex: 1;      /* OLD - iOS 6-, Safari 3.1-6 */
	-moz-box-flex: 1;         /* OLD - Firefox 19- */
	-webkit-flex: 1;          /* Chrome */
	-ms-flex: 1;              /* IE 10 */
	width: 50%;               /* For old syntax, otherwise collapses. */
	flex: 1;                  /* NEW, Spec - Opera 12.1, Firefox 20+ */
    position: relative;
}
.icon{width: 12px;height: 12px;vertical-align: middle;background-size: 100% auto;background-repeat: no-repeat;display: inline-block;background-position: center center;}
.icon-arrow-down{background-image: url(../images/icon/tiaozhuan_xia_icon.png);}
.active .icon-arrow-down{transform: rotateZ(180deg);}

app/statistics/css/common.css

@@ -367,6 +367,7 @@ ul {
.l-banner li {
	-webkit-box-flex: 0;
	width: 33.3%;
	width: calc(100% / 3);
}
@@ -668,10 +669,11 @@ a {
	will-change: initial !important;
	width: 400px !important;
	padding-right: 3px !important;
}
	margin-left: -200px;
	padding: 0 !important;}
.vuedal header {
	padding-right: 20px !important;
	padding: 10px 20px 0 20px;
}
.vuedal header .title {

app/statistics/css/resident-analysis.css

@@ -50,13 +50,13 @@
}
.div-qingkuang-left {
	margin: 20px 18px 0px 10px;
	width: calc(50% - 32px);
	;
	/*margin: 20px 18px 0px 10px;*/
	width: 48%;
	/*width: calc(50% - 32px);*/
	height: 180px;
	border: 1px solid rgb(220, 220, 220);
	border-radius: 10px;
	float: left;
	/*float: left;*/
}
.div-header-block {
@@ -91,32 +91,33 @@
}
.div-qingkuang-right {
	margin: 20px 10px 0px 18px;
	width: calc(50% - 32px);
	/*margin: 20px 10px 0px 18px;*/
	/*width: calc(50% - 32px);*/
	width: 48%;
	height: 180px;
	border: 1px solid rgb(220, 220, 220);
	border-radius: 10px;
	float: right;
	/*float: right;*/
}
.div-service-kuang {
	margin: 20px 18px 0px 10px;
	width: 100%;
	width: calc(100% - 32px);
	;
	height: 180px;
	border: 1px solid rgb(220, 220, 220);
	border-radius: 10px;
	float: left;
	/*float: left;*/
}
.ui-grid {
/*.ui-grid {
	position: absolute;
	top: 50%;
	-webkit-transform: translateY(-50%);
    -o-transform: translateY(-50%);
    transform: translateY(-50%);
	right: 10px;
}
}*/
.c-row .c-33 {
	text-align: center;
@@ -191,8 +192,9 @@ a {
.vuedal {
	will-change: initial !important;
	width: 400px !important;
	width: 550px !important;
	padding-right: 3px !important;
	margin-left: -275px;
}
.vuedal header {

app/statistics/html/comprehensive-analysis.html

@@ -42,12 +42,12 @@
        align-items: baseline;
    }
    .c-w-33{
        height: 191.6px;
        /*height: 191.6px;*/
    }
    .shadow{
        position: absolute;
        left: 103%;
        top:27px;
        left: 70%;
        top:44px;
       background-color: rgba(50, 50, 50, 0.701961);
       border-color: rgb(51, 51, 51);
       color: rgb(255, 255, 255);
@@ -60,7 +60,7 @@
    z-index: 99999;
    }
    .shadowr{
        left: -197%;
        left: -70%;
    }
        </style>
    </head>
@@ -120,15 +120,15 @@
                        <!-- <div class="c-f20 wz-num">{{topDatas['index_83']}}</div>
                        <div class="c-f12">健康文章推送量</div> -->
                        <div class="c-f14 health-title" style="padding-bottom: 10px;">健康文章</div>
                        <div class="flex-box" style="margin-top: 47px;">
                            <div style="position: relative;">
                        <div class="ui-grid" style="margin-top: 47px;">
                            <div class="ui-col-1 c-position-r">
                                <div class="c-f16 black">{{topDatas['index_83']}}</div>
                                <div class="c-f12 visible-xs-inline-block health-count black"style="margin-top: 5px;">触达人数</div><img @mouseenter="jumpTip(1)" @mouseleave="leaveTip(1)"class="tip"width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="c-f12 visible-xs-inline-block health-count black"style="margin-top: 5px;">触达人数</div><img @mouseenter="jumpTip(1)" @mouseleave="leaveTip(1)"class="tip" data-val="1"  width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="shadow" id="shadow1">以微信绑定账号+家庭成员为统计口径</div>
                            </div>
                            <div style="position: relative;">
                            <div class="ui-col-1 c-position-r">
                                <div class="c-f16 black">{{topDatas['index_103']}}</div>
                                <div class="visible-xs-inline-block c-f12 health-count black" style="margin-bottom: 33px;margin-top: 5px;">推送人数</div><img @mouseenter="jumpTip(2)" @mouseleave="leaveTip(2)" class="tip"width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="visible-xs-inline-block c-f12 health-count black" style="margin-bottom: 33px;margin-top: 5px;">推送人数</div><img @mouseenter="jumpTip(2)" @mouseleave="leaveTip(2)" class="tip" data-val="2" width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="shadow" id="shadow2">以微信绑定账号为统计口径</div>
                            </div>
                        </div>
@@ -142,15 +142,15 @@
                        <!-- <div class="c-f20 zd-num">{{topDatas['index_5']}}</div>
                        <div class="c-f12">健康指导推送量</div> -->
                        <div class="c-f14 health-title" style="padding-bottom: 10px;">健康指导</div>
                        <div class="flex-box" style="margin-top: 47px;">
                            <div style="position: relative;">
                        <div class="ui-grid" style="margin-top: 47px;">
                            <div class="ui-col-1 c-position-r">
                                <div class="c-f16 black">{{topDatas['index_5']}}</div>
                                <div class="visible-xs-inline-block c-f12 health-count black" style="margin-top: 5px;">触达人数</div><img @mouseenter="jumpTip(3)" @mouseleave="leaveTip(3)"class="tip"width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="visible-xs-inline-block c-f12 health-count black" style="margin-top: 5px;">触达人数</div><img @mouseenter="jumpTip(3)" @mouseleave="leaveTip(3)" class="tip" data-val="3" width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="shadow" id="shadow3">以微信绑定账号+家庭成员为统计口径</div>
                            </div>
                            <div style="position: relative;">
                            <div class="ui-col-1 c-position-r">
                                <div class="c-f16 black">{{topDatas['index_106']}}</div>
                                <div class="visible-xs-inline-block c-f12 health-count black" style="margin-bottom: 33px;margin-top: 5px;">推送人数</div><img @mouseenter="jumpTip(4)" @mouseleave="leaveTip(4)"class="tip"width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="visible-xs-inline-block c-f12 health-count black" style="margin-bottom: 33px;margin-top: 5px;">推送人数</div><img @mouseenter="jumpTip(4)" @mouseleave="leaveTip(4)" class="tip" data-val="4" width="12" src="../../../images/icon_wenhao.png" alt="">
                                <div class="shadow shadowr" id="shadow4">以微信绑定账号为统计口径</div>
                            </div>
                        </div>
@@ -161,7 +161,7 @@
            </div>
            <!-- 微信绑定统计 -->
            <div v-show="index=='21'" class="mt20 c-border bgc-fff">
                <div class="c-border-b plr10 ptb10 c-f16 c-333">{{wxTotal.label}}</div>
                <div class="c-border-b plr10 ptb20 c-f16 c-333">{{wxTotal.label}}</div>
                <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 wz-num">{{wxTotal.amount1}}</div>

app/statistics/html/prescription-analysis.html

@@ -16,6 +16,7 @@
        <link rel="stylesheet" type="text/css" href="../css/common.css"/>
        <style>
            .chart-center-text{position: absolute; width: 100%; top: 50%; margin-top: -17px;}
            .el-input__inner{line-height: 0;}
        </style>
    </head>
    <body>
@@ -73,13 +74,13 @@
            </div>
            <div v-show="sumType==2" class="payment-tag-panel">
                <ul class="l-banner">
                    <li style="width:calc(100% / 2)">
                    <li style="width:50%;">
                        <div class="tag" :class="{'active': tagCode==1}" @click="changeTagCode(1)" style="width: 60%">
                            <div class="c-f18">{{paymentData.sum}}</div>
                            <div class="mt5 c-f14 l-name">费用总计</div>
                        </div>
                    </li>
                    <li style="width:calc(100% / 2)">
                    <li style="width:50%;">
                        <div class="tag" :class="{'active': tagCode==2}" @click="changeTagCode(2)" style="width: 60%">
                            <div class="c-f18">{{paymentData.avg}}</div>
                            <div class="mt5 c-f14 l-name">人均费用</div>

app/statistics/html/resident-analysis.html

@@ -28,7 +28,7 @@
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/jquery-2.2.4.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/underscore-1.9.1.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/echarts/3.8.5/echarts.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/event-bus.js"></script>

app/statistics/html/two-rate-analysis.html

@@ -22,14 +22,14 @@
			<!--市管、区管-->
			<div class="clearfix" v-show="level>2">
				<ul class="l-banner">
					<li class="active" style="width: calc(100% / 2);">
					<li class="active" style="width: 50%;">
						<div class="tag" :class="{'active': index==18}" @click="changeTag(18)">
							<div id="index_18" class="c-f18">{{topDatas.sanShiRate}}</div>
							<div class="c-f18 mt5">{{topDatas.sanShiData}}</div>
							<div class="mt5 c-f14 l-name">三师转签率</div>
						</div>
					</li>
					<li style="width: calc(100% / 2);">
					<li style="width: 50%;">
						<div class="tag" :class="{'active': index==19}" @click="changeTag(19)">
							<div id="index_19" class="c-f18">{{topDatas.gaoWeiRate}}</div>
							<div class="c-f18 mt5">{{topDatas.gaoWeiData}}</div>

app/statistics/js/comprehensive-analysis.js

@@ -64,6 +64,7 @@ new Vue({
            loadData([1], this);
        },
        jumpTip:function(tab){
            console.log("mouseenter");
            $('#shadow'+tab).attr("style","visibility:visible")
        },
        leaveTip:function(tab){
@@ -97,6 +98,16 @@ new Vue({
        }
    },
    mounted: function(){
        $(".tip").on('mouseenter', function(){
            console.log("mouse enter");
            var val = $(this).attr("data-val");
            $('#shadow'+val).attr("style","visibility:visible")
        })
        $(".tip").on('mouseleave', function(){
            console.log("mouse leave");
            var val = $(this).attr("data-val");
            $('#shadow'+val).attr("style","visibility:hidden")
        })
        //初始化数据
        initData(this);
        

app/statistics/js/renew-progress.js

@@ -124,7 +124,7 @@ new Vue({
				title: '条件筛选',
				onClose: function(data) {
					vm.lowCode = data.lowCode;
					vm.contentHtml = data.contentHtml;
					vm.analysisName = data.name;
					//请求参数重置，页面类型重新开始
					vm.level = vm.userRole.code == '350200' ? 4 : vm.userRole.code.length == 6 ? 3 : 2;
@@ -161,7 +161,8 @@ new Vue({
				},
				component: 'renew-progress-filter',
				props: {
					contentHtml: vm.contentHtml
					lowCode: vm.lowCode,
					analysisName: vm.analysisName
				}
			});
		});

app/statistics/js/resident-analysis-charts.js

@@ -90,7 +90,7 @@ function healthData(jkrqdata, hbrqdata, gwrqdata, hfqrqdata, wbzdata) {
//			hoverAnimation: false,
			avoidLabelOverlap: false,
			radius: ['50%', '70%'],
			center: ['25%', '50%'], //饼图的位置 
            center: ['50%', '50%'], //饼图的位置 
			labelLine: {
                normal: {
                    show: false

app/statistics/js/sign-progress.js

@@ -129,8 +129,10 @@ new Vue({
					vm.startDate = getStartDate(vm.chooseYear);
					vm.endDate = getEndDate(vm.chooseYear);
					vm.lowCode = data.lowCode;
					vm.yearHtml = data.yearHtml;
					vm.contentHtml = data.contentHtml;
					vm.analysisType = data.id;
					vm.analysisName = data.name;
//					vm.yearHtml = data.yearHtml;
//					vm.contentHtml = data.contentHtml;
					//请求参数重置，页面类型重新开始
					vm.level = vm.userRole.code == '350200' ? 4 : vm.userRole.code.length == 6 ? 3 : 2;
@@ -169,8 +171,12 @@ new Vue({
				},
				component: 'sign-progress-filter',
				props: {
					yearHtml: vm.yearHtml,
					contentHtml: vm.contentHtml
				    chooseYear: vm.chooseYear,
				    analysisType: vm.analysisType,
				    lowCode: vm.lowCode,
				    analysisName: vm.analysisName
//					yearHtml: vm.yearHtml,
//					contentHtml: vm.contentHtml
				}
			});
		});

component/common/pagination.js

@@ -42,13 +42,13 @@ var pageComponent = Vue.extend({
            default: false
        }
    },
    data(){
    data: function(){
        return{
            curPage:1
        }
    },
    computed: {
        showPageBtn() {
        showPageBtn: function() {
            let pageNum = this.pages;
            let index = this.curPage;
            let arr = [];
@@ -66,7 +66,7 @@ var pageComponent = Vue.extend({
        }
    },
    methods: {
        goPage(page) {
        goPage: function(page) {
            if (page != this.curPage) {
                console.log(page);
                this.curPage = page;

component/statistics/line-chart.js

@@ -49,7 +49,7 @@
                pickerOptions2: {
                    shortcuts: [{
                        text: '最近一周',
                        onClick(picker) {
                        onClick: function(picker) {
                          var end = new Date();
                          var start = new Date();
                          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
@@ -57,7 +57,7 @@
                        }
                    }, {
                        text: '最近一个月',
                        onClick(picker) {
                        onClick: function(picker) {
                          var end = new Date();
                          var start = new Date();
                          start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -65,7 +65,7 @@
                        }
                    }, {
                        text: '最近三个月',
                        onClick(picker) {
                        onClick: function(picker) {
                          var end = new Date();
                          var start = new Date();
                          start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);

component/statistics/renew-progress-filter.js

@@ -2,20 +2,20 @@
    Vue.component('renew-progress-filter',{
        template:'<div style="height: 400px;overflow: auto;margin-bottom: 50px;">\
				<div class="ml10 filter-title">统计维度</div>\
				<div class="div-content" @click="contentClick">\
					<div class="mt20 div-group-btn c-row ml40">\
						<div class="div-btn c-33 active" data-lowCode="">\
				<div class="div-content">\
					<div class="mt20 div-group-btn c-row ml40 mr10">\
						<div class="div-btn c-33" :class="{\'active\': lowCode==\'\'}" @click="contentClick(\'\', \'所有居民\')">\
							<a href="#" class="f-fs14">所有居民</a>\
						</div>\
						<div class="div-btn c-33" data-lowCode="3">\
						<div class="div-btn c-33" :class="{\'active\': lowCode==3}" @click="contentClick(3, \'65岁以上签约\')">\
							<a href="#" class="f-fs14">65岁以上签约</a>\
						</div>\
						<div class="div-btn c-33" data-lowCode="1">\
						<div class="div-btn c-33" :class="{\'active\': lowCode==1}" @click="contentClick(1, \'高血压\')">\
							<a href="#" class="f-fs14">高血压</a>\
						</div>\
					</div>\
					<div class="mt20 div-group-btn c-row ml40">\
						<div class="div-btn c-33" data-lowCode="2">\
					<div class="mt20 div-group-btn c-row ml40 mr10">\
						<div class="div-btn c-33" :class="{\'active\': lowCode==2}" @click="contentClick(2, \'糖尿病\')">\
							<a href="#" class="f-fs14">糖尿病</a>\
						</div>\
					</div>\
@@ -31,33 +31,26 @@
					</div>\
				</div>\
			</div>',
        props:['contentHtml'],
        props:['lowCode', 'analysisName'],
        data: function(){
            return {
                
            }
        },
        methods: {
	         contentClick:function(){
	         	$(".div-content").find(".div-btn").removeClass('active');
	         	$(event.target.closest("div")).addClass('active');
	         contentClick:function(val, name){
	         	this.lowCode = val;
	         	this.analysisName = name;
	         },
	         resetClick:function(){
				$(".div-content").find(".c-33").removeClass("active");
				$(".div-content").find(".c-33").eq(0).addClass("active");
				this.lowCode = "";
	         },
	         confirmClick:function(){
	         	var vm = this;
	         	var $type = $(".div-content .div-btn.active"),
                    typeCode = $type.attr("data-val"),
                    lowCode = $type.attr("data-lowCode"),
                    name = $type.find("a").html();
	         	console.log("lowCode:"+lowCode)
	         	console.log("name:"+name)
				//触发刷新
				this.$emit('vuedals:close', {
					lowCode: lowCode,
					name: name,
					lowCode: vm.lowCode,
					name: vm.analysisName,
					contentHtml:$(".div-content").html()
				});
	         }

component/statistics/resident-analysis-filter.js

@@ -64,13 +64,13 @@
				});
          },
          yearClick:function(){
          	$(event.target.closest("div")).addClass('active').siblings().removeClass('active')
          	$(event.target.parentNode).addClass('active').siblings().removeClass('active')
          },
          divBtnClick:function(){
			var vm = this;
			if(event.target.nodeName === 'A') {
				vm.curCode = $(event.target.closest("div")).attr("data-id");
				var item = $(event.target.closest(".div-item"));
				vm.curCode = $(event.target.parentNode).attr("data-id");
				var item = $(event.target.parentNode.parentNode.parentNode);
				var dataLevel = item.attr("data-level");
				if(dataLevel == 4) {
					$(".div-content .div-item[data-level='4'] .div-btn").removeClass("active");
@@ -87,14 +87,14 @@
					$(".div-content .div-item[data-level='2'] .div-btn").removeClass("active");
					vm.curLevel = 2;
				}
				$(event.target.closest(".div-btn")).addClass("active");
				$(event.target.parentNode).addClass("active");
				if(vm.curCode != "" && dataLevel != 2) {
					vm.resultCode = vm.curCode;
				} else {
					vm.resultCode = vm.curCode;
				}
				if(vm.curCode) {
					vm.curName = $(event.target.closest(".div-btn")).find("a").html();
					vm.curName = $(event.target.parentNode).find("a").html();
				} else {
					vm.curName = item.find(".div-title").html();
				}

component/statistics/resident-analysis.js

@@ -1,29 +1,31 @@
Vue.component('resident-analysis', {
	template: '<div>\
	            <div class="ui-grid plr10 mt20">\
				<div class="div-qingkuang-left">\
					<div class="div-header-block">\
						<div class="div-analysis-title">缴费情况</div>\
					</div>\
					<div class="c-position-r height-140">\
						<div class="div-right-info">\
					<div class="ui-grid ui-grid-middle height-140">\
					    <div class="ui-col-1 c-t-center c-ffc800">\
                            <div class="y-amount c-f16">{{weiJiaoFeiData}}</div>\
                            <div class="y-rate c-f14 mt5">{{weiJiaoFeiPer}}</div>\
                            <div class="y-title c-f12 mt10">未缴费人数</div>\
                        </div>\
                        <div id="jiaoFeiChart" class="height-140 ui-col-0" style="width: 40%"></div>\
						<div class="ui-col-1 c-t-center c-12b7f5">\
							<div class="y-amount c-f16">{{yiJiaoFeiData}}</div>\
							<div class="y-rate c-f14 mt5">{{yiJiaoFeiPer}}</div>\
							<div class="y-title c-f12 mt10">已缴费人数</div>\
						</div>\
						<div class="div-left-info">\
							<div class="y-amount c-f16">{{weiJiaoFeiData}}</div>\
							<div class="y-rate c-f14 mt5">{{weiJiaoFeiPer}}</div>\
							<div class="y-title c-f12 mt10">未缴费人数</div>\
						</div>\
						<div id="jiaoFeiChart" class="height-140"></div>\
					</div>\
				</div>\
				<div class="ui-col-1"></div>\
				<div class="div-qingkuang-right">\
					<div class="div-header-block">\
						<div class="div-analysis-title">健康分布</div>\
					</div>\
					<div class="c-position-r height-140">\
						<div id="healthChart" class="height-140"></div>\
					<div class="ui-grid ui-grid-middle height-140">\
						<div id="healthChart" class="height-140 c-t-center" style="width: 40%"></div>\
						<div class="ui-col-1 ui-grid ui-grid-vertical">\
							<div id="jkCatalogs">\
								<div class="ui-col-1">\
@@ -55,12 +57,15 @@ Vue.component('resident-analysis', {
						</div>\
					</div>\
				</div>\
				</div>\
				<div class="ui-grid plr10 mt20">\
				<div class="div-qingkuang-left">\
					<div class="div-header-block">\
						<div class="div-analysis-title">服务分布比例</div>\
					</div>\
					<div id="serviceChart" class="height-140"></div>\
				</div>\
				<div class="ui-col-1"></div>\
				<div class="div-qingkuang-right">\
					<div class="div-header-block">\
						<div class="div-analysis-title">性别情况</div>\
@@ -79,6 +84,7 @@ Vue.component('resident-analysis', {
						<div id="sexChart" class="height-140"></div>\
					</div>\
				</div>\
				</div>\
				<div class="div-service-kuang">\
					<div class="div-header-block">\
						<div class="div-analysis-title">年龄分布</div>\
@@ -334,4 +340,4 @@ function initData(vm) {
			ageData(amountArr);
		}
	})
}
}

component/statistics/sign-progress-filter.js

@@ -2,26 +2,27 @@
    Vue.component('sign-progress-filter',{
        template:'<div style="height: 400px;overflow: auto;margin-bottom: 50px;">\
				<div class="mt10 ml10 filter-title">统计年份</div>\
				<div class="c-row mt20 ml40" id="signYear" v-html="yearHtml" @click="yearClick">\
				<div class="c-row mt20 ml40 mr10" id="signYear">\
				    <div v-for="year in years" class="c-33" :class="{\'active\': year==chooseYear}" @click="yearClick(year)"><a>{{year}}</a></div>\
				</div>\
				<div class="mt20 ml10 filter-title">统计维度</div>\
				<div class="div-content" @click="contentClick">\
					<div class="mt20 div-group-btn c-row ml40">\
						<div class="div-btn c-33 active" data-val="1">\
				<div class="div-content">\
					<div class="mt20 div-group-btn c-row ml40 mr10">\
						<div class="div-btn c-33" :class="{\'active\': analysisType==1}" @click="contentClick(1, \'\', \'按任务\')">\
							<a href="#" class="f-fs14">按任务</a>\
						</div>\
						<div class="div-btn c-33" data-val="2">\
						<div class="div-btn c-33" :class="{\'active\': analysisType==2}" @click="contentClick(2, \'\', \'按人口\')">\
							<a href="#" class="f-fs14">按人口</a>\
						</div>\
						<div class="div-btn c-33" data-val="5" data-lowCode="3">\
						<div class="div-btn c-33" :class="{\'active\': analysisType==5}" @click="contentClick(5, 3, \'65岁以上签约\')">\
							<a href="#" class="f-fs14">65岁以上签约</a>\
						</div>\
					</div>\
					<div class="mt20 div-group-btn c-row ml40">\
						<div class="div-btn c-33" data-val="3" data-lowCode="1">\
						<div class="div-btn c-33" :class="{\'active\': analysisType==3}" @click="contentClick(3, 1, \'高血压\')">\
							<a href="#" class="f-fs14">高血压</a>\
						</div>\
						<div class="div-btn c-33" data-val="4" data-lowCode="2">\
						<div class="div-btn c-33" :class="{\'active\': analysisType==4}" @click="contentClick(4, 2, \'糖尿病\')">\
							<a href="#" class="f-fs14">糖尿病</a>\
						</div>\
					</div>\
@@ -37,71 +38,47 @@
					</div>\
				</div>\
			</div>',
        props:['yearHtml','contentHtml'],
        props:['chooseYear','analysisType', 'lowCode', 'analysisName],
        data: function(){
            return {
                
                years: [],
            }
        },
        mounted: function(){
            var now = new Date(),
                year = now.getFullYear();
            if(now.getMonth() < 6){
                year --;
            }
            for(i=year; i>=2016; i--){
                this.years.push(i);
            }
        },
        methods: {
        	 yearClick:function(){
	          	$(event.target.closest("div")).addClass('active').siblings().removeClass('active');
        	 yearClick:function(val){
	          this.chooseYear = val;
	         },
	         contentClick:function(){
	         	$(".div-content").find(".div-btn").removeClass('active');
	         	$(event.target.closest("div")).addClass('active');
	         contentClick:function(type, lowCode, name){
	         	this.analysisType = type;
	         	this.lowCode = lowCode;
	         	this.analysisName = name;
	         },
	         resetClick:function(){
				$("#signYear").find(".c-33").removeClass("active");
				$("#signYear").find(".c-33").eq(0).addClass("active");
				$(".div-content").find(".c-33").removeClass("active");
				$(".div-content").find(".c-33").eq(0).addClass("active");
				this.analysisType = 1;
                this.lowCode = '';
                this.analysisName = '按任务';
	         },
	         confirmClick:function(){
	         	var vm = this;
	         	var year = $("#signYear .c-33.active").attr("data-val"),
	         		$type = $(".div-content .div-btn.active"),
                    typeCode = $type.attr("data-val"),
                    lowCode = $type.attr("data-lowCode"),
                    name = $type.find("a").html();
	         	console.log("year:"+$("#signYear .c-33.active").attr("data-val"))
	         	console.log("id:"+typeCode)
	         	console.log("lowCode:"+lowCode)
	         	console.log("name:"+name)
	         	
				//触发刷新
				this.$emit('vuedals:close', {
					chooseYear: year,
					id: typeCode,
					lowCode: lowCode,
					name: name,
					yearHtml:$("#signYear").html(),
					contentHtml:$(".div-content").html()
					chooseYear: vm.chooseYear,
					id: vm.analysisType,
					lowCode: vm.lowCode,
					name: vm.analysisName
				});
	         },
        	formatYearData: function () {     
        		//显示年份最低是2016年
				var now = new Date(),
				    year = now.getFullYear();
				var yearHtml = "";
				if(now.getMonth() >= 6){
				    yearHtml += '<div class="c-33 active" data-val="'+year+'"><a>'+year+"</a></div>";
				}
				for(i=year-1; i>=2016; i--){
				    if(i == (year-1) && now.getMonth() < 6){
				        yearHtml += '<div class="c-33 active" data-val="'+i+'"><a>'+i+"</a></div>";
				    }else{
				        yearHtml += '<div class="c-33" data-val="'+i+'"><a>'+i+"</a></div>";
				    }
				}
                  this.yearHtml = yearHtml;
           },
        },
        mounted: function(){
        	if(this.contentHtml){
        		$(".div-content").html(this.contentHtml);
        	}else{
        		this.formatYearData();
        	}
        }
    });
    

component/statistics/year-filter.js

@@ -2,7 +2,7 @@
    Vue.component('year-filter', {
        template: '<div style="height: 400px;overflow: auto;">\
            <div class="mt10 ml10 filter-title">统计年份</div>\
            <div class="c-row mt20 ml40">\
            <div class="c-row mt20 ml40 mr10">\
                <div v-for="year in years" class="c-33" :class="{\'active\': year==selectedYear}" @click="chooseYear(year)"><a>{{year}}</a></div>\
            </div>\
            <div id="footer">\