居民大数据分析添加季度趋势

css/style.min.css

@@ -6853,7 +6853,7 @@ body.skin-3 {
}
::-webkit-scrollbar {
    width: 6px;
    width: 0;/*6px*/
    background-color: #F5F5F5
}

js/util.js

@@ -158,7 +158,6 @@ function getMonthEndDate() {
//获得上月开端时候 
function getLastMonthStartDate() {
	debugger
	var lastMonthStartDate = new Date(nowYear, lastMonth, 1);
	return formatDate(lastMonthStartDate);
}
@@ -221,16 +220,16 @@ function getHalfYearEndDate(){
	return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
}
//获取过去12个月时间
//获取过去12个月时间,不包含本月
function getLastYearMonthArray(){
	var dataArr = [],day,month;
    var data=new Date();
    var year=data.getFullYear()-1;
    data.setMonth(data.getMonth()+1)//获取到当前月份,设置月份
    for (var i = 0; i < 12; i++) {
    for (var i = 0; i <=12; i++) {
    	data.setMonth(data.getMonth()-1);//每次循环一次 月份值减1
    	month = (data.getMonth()+1)<10?"0"+(data.getMonth()+1):data.getMonth()+1;
    	if(i==11){//过去第12个月
    	if(i==12){//过去第12个月
    		dataArr.push(data.getFullYear()+"-"+month+"-01")
    	}else if(i==0){//本月
    		var day = getDaysInMonth(data.getFullYear(),data.getMonth()+1);
@@ -305,6 +304,35 @@ function getThirdJiDate(year,month){
	return resDate;
}
//获取当前时间往前推4个季度
function getFirthJiDate(year,month){
	year = Number(year);
	month = Number(month);
	var t = 14;
	if(month<=3){
		t = t - 3 + month;
	}else if(month>3 && month<=6){
		t = t - 6 + month;
	}else if(month>6 && month<=9){
		t = t - 9 + month;
	}else if(month>9 && month<=12){
		t = t - 12 + month;
	}
	if(t>=month){
		year = year - 1;
		month = 12 + month -t;
	}else{
		month = month - t;
	}
	var resDate;
	if(month<10){
		resDate = year +'-0'+month+'-01';
	}else{
		resDate = year +'-'+month+'-01';
	}
	console.log(resDate)
	return resDate;
}
Date.prototype.Format = function (fmt) { //author: meizz 
	var o = {
	  "M+": this.getMonth() + 1, //月份 

page/bigData/component/disease-crowd.js

@@ -30,7 +30,7 @@
								<span class="c-b5e1fc c-f16">环比</span>\
							</p>\
							<img src="../images/zengzhang.png" class="zengzhang-img"/>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data1.ringRatio}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data1.ringRatio}}%</span>\
						</div>\
					</div>\
				</div>\
@@ -63,7 +63,7 @@
								<span class="c-b5e1fc c-f16">环比</span>\
							</p>\
							<img src="../images/zengzhang.png" class="zengzhang-img"/>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data2.ringRatio}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data2.ringRatio}}%</span>\
						</div>\
					</div>\
				</div>\
@@ -96,7 +96,7 @@
								<span class="c-b5e1fc c-f16">环比</span>\
							</p>\
							<img src="../images/zengzhang.png" class="zengzhang-img"/>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data3.ringRatio}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data3.ringRatio}}%</span>\
						</div>\
					</div>\
				</div>\
@@ -129,7 +129,7 @@
								<span class="c-b5e1fc c-f16">环比</span>\
							</p>\
							<img src="../images/zengzhang.png" class="zengzhang-img"/>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data4.ringRatio}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data4.ringRatio}}%</span>\
						</div>\
					</div>\
				</div>\
@@ -185,7 +185,7 @@
						idx = index;
					}
				})
				vm.data2 = {totalNumber:(data[0].VIEW_13_0026[idx]&&data[0].VIEW_13_0026[idx].HC_15_1006 || "--"),addNumber:(data[1].VIEW_13_0034[idx]&&data[1].VIEW_13_0034[idx].HC_15_1006 || "--"),ringRatio:(data[2].VIEW_13_0027[idx]&&data[2].VIEW_13_0027[idx].HC_15_1007 || "--")};
				vm.data2 = {totalNumber:(data[0].VIEW_13_0026[idx]&&data[0].VIEW_13_0026[idx].HC_13_0017 || "--"),addNumber:(data[1].VIEW_13_0034[idx]&&data[1].VIEW_13_0034[idx].HC_13_0017 || "--"),ringRatio:(data[2].VIEW_13_0027[idx]&&data[2].VIEW_13_0027[idx].HC_13_0026 || "--")};
			},
			ycfformatData:function(data){//孕产妇数据
				var vm = this,idx;
@@ -196,7 +196,7 @@
						idx = index;
					}
				})
				vm.data3 = {totalNumber:(data[0].VIEW_16_0009[idx]&&data[0].VIEW_16_0009[idx].HC_15_1006 || "--"),addNumber:(data[1].VIEW_16_0010[idx]&&data[1].VIEW_16_0010[idx].HC_15_1006 || "--"),ringRatio:(data[2].VIEW_16_0011[idx]&&data[2].VIEW_16_0011[idx].HC_15_1007 || "--")};
				vm.data3 = {totalNumber:(data[0].VIEW_16_0009[idx]&&data[0].VIEW_16_0009[idx].HC_13_0033 || "--"),addNumber:(data[1].VIEW_16_0010[idx]&&data[1].VIEW_16_0010[idx].HC_13_0033 || "--"),ringRatio:(data[2].VIEW_16_0011[idx]&&data[2].VIEW_16_0011[idx].HC_13_0035 || "--")};
			},
			lnrformatData:function(data){//老年人数据
				var vm = this,idx;

page/bigData/component/high-incidence-disease.js

@@ -1,19 +1,9 @@
(function() {
//<img src="../images/icon.png" class="icon-img">
//<label class="btn btn-default" :class="{active: index2 == 1}" @click="btnClick2(1)">
//									<input type="radio">本季
//								</label>
	Vue.component('high-incidence-disease', {
		template: '<div style="height: 100%;">\
						<h4 class="c-b5e1fc c-f16 c-t-center div-common-title">本月高发疾病排行</h4>\
						<img src="../images/icon.png" class="icon-img" @click="detailClick">\
						<div v-show="!hasData" class="no-result-panel">\
                            <div class="no-result-img" style="padding-top:1.09375rem;">\
                                <img src="../images/noData.png">\
                            </div>\
                            <div class="no-result-text">暂无数据！</div>\
                        </div>\
						<div data-toggle="buttons" class="btn-group" v-show="hasData">\
						<div data-toggle="buttons" class="btn-group">\
							<label class="btn btn-default" :class="{active: index1 == 0}" @click="btnClick1(0)">\
								<input type="radio">全部\
							</label>\
@@ -24,14 +14,24 @@
								<input type="radio">门诊\
							</label>\
						</div>\
						<div data-toggle="buttons" class="btn-group fr mr20" style="margin-left: 0;" v-show="hasData">\
						<div data-toggle="buttons" class="btn-group fr mr20" style="margin-left: 0;">\
							<label class="btn btn-default" :class="{active: index2 == 0}" @click="btnClick2(0)">\
								<input type="radio">本月\
							</label>\
							<img src="../images/icon.png" class="icon-img">\
							<label class="btn btn-default" :class="{active: index2 == 1}" @click="btnClick2(1)">\
								<input type="radio">本季\
							</label>\
							<label class="btn btn-default" :class="{active: index2 == 2}" @click="btnClick2(2)">\
								<input type="radio">本年\
							</label>\
						</div>\
						<div v-show="!hasData" class="no-result-panel">\
                            <div class="no-result-img" style="padding-top:1.09375rem;">\
                                <img src="../images/noData.png">\
                            </div>\
                            <div class="no-result-text">暂无数据！</div>\
                        </div>\
						<div id="div-gaofa-disease-chart" v-show="hasData"></div>\
					</div>',
		props: ["data"],
@@ -45,6 +45,7 @@
				linkageFilter:"",
				hasData:true,
				monthData:null,
				jiData:null,
				yearMonth:null,
			}
		},
@@ -56,6 +57,7 @@
				if(data){
					this.monthData = data[0];
					this.yearData = data[1];
					this.jiData = data[2];
					this.initData();
				}
			}
@@ -86,6 +88,8 @@
			initData:function(){//高发疾病
				if(this.index2==0){//本月
					this.gaoBingFaData = this.monthData.successFlg?this.monthData.obj.viewInfos&&JSON.parse(this.monthData.obj.viewInfos[0].options[0].option):{};
				}else if(this.index2==1){//本季
					this.gaoBingFaData = this.jiData.successFlg?this.jiData.obj.viewInfos&&JSON.parse(this.jiData.obj.viewInfos[0].options[0].option):{};
				}else if(this.index2==2){//本年
					this.gaoBingFaData = this.yearData.successFlg?this.yearData.obj.viewInfos&&JSON.parse(this.yearData.obj.viewInfos[0].options[0].option):{};
				}

page/bigData/component/key-service-population.js

@@ -1,24 +1,25 @@
(function() {
//<label class="btn btn-default" :class="{active: activeIndex == 1}" @click="btnClick(1)">
//									<input type="radio">季
//								</label>
	Vue.component('key-service-population', {
		template: '<div style="height: 100%;">\
						<h4 class="c-b5e1fc c-f16 c-t-center div-common-title">重点服务人群增加趋势</h4>\
						<div v-show="!hasData" class="no-result-panel">\
                            <div class="no-result-img">\
                                <img src="../images/noData.png">\
                            </div>\
                            <div class="no-result-text">暂无数据！</div>\
                        </div>\
                    	<div v-show="hasData" data-toggle="buttons" class="btn-group fr mr40 mt0" style="position: absolute;right: 0.208rem;top: 0.05rem;z-index: 99999;">\
                    	<div data-toggle="buttons" class="btn-group fr mr40 mt0" style="position: absolute;right: 0.208rem;top: 0.05rem;z-index: 99999;">\
							<label class="btn btn-default" :class="{active: activeIndex == 0}" @click="btnClick(0)">\
								<input type="radio">月\
							</label>\
							<label class="btn btn-default" :class="{active: activeIndex == 1}" @click="btnClick(1)">\
								<input type="radio">季\
							</label>\
							<label class="btn btn-default" :class="{active: activeIndex == 2}" @click="btnClick(2)">\
								<input type="radio">年\
							</label>\
						</div>\
						<div v-show="!hasData" class="no-result-panel">\
                            <div class="no-result-img">\
                                <img src="../images/noData.png">\
                            </div>\
                            <div class="no-result-text">暂无数据！</div>\
                        </div>\
						<div id="div-zhongidan-echart" class="ml30" v-show="hasData"></div>\
					</div>',
		props: ["data"],
@@ -29,7 +30,8 @@
				fontSize: 0.007 * window.screen.width,
				hasData:true,
				monthData:null,
				yearData:null
				jiData:null,
				yearData:null,
			}
		},
		mounted: function() {
@@ -40,7 +42,8 @@
				this.data = newData;
				if(this.data && JSON.parse(this.data[0].obj.viewInfos[0].options[0].option).series[0].data){
					this.monthData = this.data[0].successFlg?this.data[0].obj.viewInfos&&JSON.parse(this.data[0].obj.viewInfos[0].options[0].option):{};
					this.yearData = this.data[1].successFlg?this.data[1].obj.viewInfos&&JSON.parse(this.data[1].obj.viewInfos[0].options[0].option):{};
					this.jiData = this.data[1].successFlg?this.data[1].obj.viewInfos&&JSON.parse(this.data[1].obj.viewInfos[0].options[0].option):{};
					this.yearData = this.data[2].successFlg?this.data[2].obj.viewInfos&&JSON.parse(this.data[2].obj.viewInfos[0].options[0].option):{};
					this.initData();
					this.hasData = true;
				}else{
@@ -57,6 +60,8 @@
			changeData:function(){
				if(this.activeIndex==0){//月
					this.keyServiceData = this.monthData;
				}else if(this.activeIndex==1){//季度
					this.keyServiceData = this.jiData;
				}else if(this.activeIndex==2){//年
					this.keyServiceData = this.yearData;
				}
@@ -67,10 +72,15 @@
				this.chartMainFun();
			},
			chartMainFun:function(){
				debugger
				var vm = this;
				var xAxisData = this.keyServiceData.xAxis[0].data;
				var pjcrsData = this.keyServiceData.series[0].data;
				var huanbiData = this.keyServiceData.series[1].data;
				huanbiData = _.map(huanbiData,function(item,idx){
					item = item=="--"?0:item;
					return item;
				})
				var zhongdianChart = echarts.init(document.getElementById('div-zhongidan-echart'));
				var zhongdianOption =  {
				    tooltip: {

page/bigData/css/home.css

@@ -26,6 +26,7 @@ body {
	width: 10rem;
	height: 0.2rem;
	background-size: 10rem 0.2rem;
	margin-top: 10px;
}
.div-title {

page/bigData/css/medical.css

@@ -47,7 +47,7 @@ p {
	width: 10rem;
	height: 0.2rem;
	background-size: 10rem 0.2rem;
	margin-top: -43px;
	margin-top: -37px;
}
.div-body {

page/bigData/html/medical.html

@@ -189,7 +189,7 @@
							</div>
							<div class="flex">
								<p class="w100">住院总费用</p>
								<p class="yellow_number pl15 ">{{yesterdayData.HC_05_1003 || "0"}} <span class="sub">元</span></p>
								<p class="yellow_number pl15 ">{{yesterdayData.HC_06_1014 || "0"}} <span class="sub">元</span></p>
							</div>
							<div class="flex">
@@ -232,7 +232,7 @@
										<div>{{item.month}}</div>
									</td>
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="ml10">{{item.HC_05_1001 | formatData}}元</span>
										<span class="ml5">{{item.HC_05_1001 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>
@@ -245,7 +245,7 @@
									</td>
									
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;border-left: 1px solid #019dff;" class="">
										<span class="ml10">{{item.HC_05_1003 | formatData}}元</span>
										<span class="ml5">{{item.HC_05_1003 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>
@@ -298,7 +298,7 @@
										<div>{{item.month}}</div>
									</td>
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="ml10">{{item.HC_06_1014 | formatData}}元</span>
										<span class="ml5">{{item.HC_06_1014 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>
@@ -311,7 +311,7 @@
									</td>
									
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;border-left: 1px solid #019dff;" class="">
										<span class="ml10">{{item.HC_06_1022 | formatData}}元</span>
										<span class="ml5">{{item.HC_06_1022 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>

page/bigData/js/home.js

@@ -20,21 +20,25 @@ new Vue({
        siWangData:[],
		skipShow:0,
		lineHeightIndex:null,
		reqUrl:[],
		isClickMap:true
	},
	mounted: function() {
	  this.bindEvents();
	  this.initData();
//    this.getJsonData();
    },
    methods: {
    	initData:function(){
    		var vm = this,townStr="",viewMapJsonGXY = null,viewMapJsonTNB = null,viewMapJsonYCF = null,viewMapJsonGL = null,zhongDianViewCodeMonth="",zhongDianViewCodeYear="";
    		var vm = this,townStr="",viewMapJsonGXY = null,viewMapJsonTNB = null,viewMapJsonYCF = null,viewMapJsonGL = null,zhongDianViewCodeMonth="",zhongDianViewCodeJi="",zhongDianViewCodeYear="";
    		$(".div-mask-layer").show();
    		var currentDate = new Date();
    		//封装参数
    		vm.cityVal!="0"?townStr = "town="+vm.cityVal+";":townStr = "";//vm.cityVal=0 查询整个市
    		var diseaseLinkAgeFliter = "quotaDate >= '" + getLastMonthStartDate() + "' and quotaDate <= '" + getLastMonthEndDate() + "';";//疾病列表参数（上个月数据）
    		var zhongDianLinkageFilter = "quotaDate >= '" + getLastYearMonthArray()[11] + "' and quotaDate <= '" + getLastYearMonthArray()[0] + "';";//重点人群参数(过去12个月数据)
    		var zhongDianLinkageFilter = "quotaDate >= '" + getLastYearMonthArray()[12] + "' and quotaDate <= '" + getLastMonthEndDate() + "';";//重点人群参数(过去12个月数据)
    		var zhongDianLinkageFilterJi = "quotaDate >= '" + getThirdJiDate(currentDate.getFullYear(),(currentDate.getMonth()+1)) + "' and quotaDate <= '" + getLastMonthEndDate() + "';";
    		var gaoFaLinkageFilterMonth = "quotaDate >= '" + getMonthStartDate() + "' and quotaDate <= '" + getMonthEndDate() + "';";//高发疾病参数（本月数据）
			var gaoFaLinkageFilterJi = "quotaDate >= '" + getQuarterStartDate() + "' and quotaDate <= '" + getQuarterEndDate() + "';";//高发疾病参数（本季数据）
			var gaoFaLinkageFilterYear = "quotaDate >= '" + getYearStartDate() + "' and quotaDate <= '" + getYearEndDate() + "';";//高发疾病参数（本年数据）
    		viewMapJsonGXY = {VIEW_13_0013:townStr,VIEW_13_0036:townStr+diseaseLinkAgeFliter,VIEW_13_0037:townStr+diseaseLinkAgeFliter};//高血压
    		viewMapJsonTNB = {VIEW_13_0026:townStr,VIEW_13_0034:townStr+diseaseLinkAgeFliter,VIEW_13_0027:townStr+diseaseLinkAgeFliter};//糖尿病
@@ -42,18 +46,22 @@ new Vue({
    		viewMapJsonGL = {VIEW_15_0001:townStr,VIEW_15_0011:townStr+diseaseLinkAgeFliter,VIEW_15_0008:townStr+diseaseLinkAgeFliter};//65岁以上
    		if(vm.type==0){//高血压
    			zhongDianViewCodeMonth = "VIEW_13_0017";//重点人群+按月
    			zhongDianViewCodeJi = "VIEW_13_0045";//重点人群+按季度
    			zhongDianViewCodeYear = "VIEW_13_0022";//重点人群+按年
    		}else if(vm.type==1){//糖尿病
    			zhongDianViewCodeMonth = "VIEW_13_0028";//重点人群+按月
    			zhongDianViewCodeJi = "VIEW_13_0046";//重点人群+按季度
    			zhongDianViewCodeYear = "VIEW_13_0029";//重点人群+按年
    		}else if(vm.type==2){//孕产妇
    			zhongDianViewCodeMonth = "VIEW_16_0004";//重点人群+按月
    			zhongDianViewCodeJi = "VIEW_16_0012";//重点人群+按季度
    			zhongDianViewCodeYear = "VIEW_16_0005";//重点人群+按年
    		}else if(vm.type==3){//65岁以上
    			zhongDianViewCodeMonth = "VIEW_15_0009";//重点人群+按月
    			zhongDianViewCodeJi = "VIEW_15_0012";//重点人群+按季度
    			zhongDianViewCodeYear = "VIEW_15_0010";//重点人群+按年
    		}
    		//整理请求参数集合
    		//整理请求参数集合(初始化加载所有)
    		var reqUrl = [
		    		{url: bigDataAPI.getCityArea,reqType: 'get',data: {}},
		    		{url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}},//上饶地图经纬度数据
@@ -62,11 +70,28 @@ new Vue({
		    		{url:bigDataAPI.getMoreNoChartTemplateData,reqType: 'get',data:{viewMapJson:JSON.stringify(viewMapJsonYCF)}},//孕产妇疾病数据+地图
		    		{url:bigDataAPI.getMoreNoChartTemplateData,reqType: 'get',data:{viewMapJson:JSON.stringify(viewMapJsonGL)}},//65岁以上疾病数据+地图
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: zhongDianViewCodeMonth,linkageFilter:zhongDianLinkageFilter+townStr}},//重点人群+按月
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: zhongDianViewCodeYear,linkageFilter:zhongDianLinkageFilter+townStr}},//重点人群+按年
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0007",linkageFilter:gaoFaLinkageFilterMonth+townStr,limitCondition:10}},//高发疾病排行----筛选条件：全部+本月（默认），其他情况数据在组件里请求数据
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0007",linkageFilter:gaoFaLinkageFilterYear+townStr,limitCondition:10}},//高发疾病排行----筛选条件：全部+本年（默认），其他情况数据在组件里请求数据
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: zhongDianViewCodeJi,linkageFilter:zhongDianLinkageFilterJi+townStr}},//重点人群+按季度
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: zhongDianViewCodeYear,linkageFilter:townStr}},//重点人群+按年
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0007",linkageFilter:gaoFaLinkageFilterMonth+townStr,limitCondition:10}},//高发疾病排行----筛选条件：全部+本月
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0007",linkageFilter:gaoFaLinkageFilterYear+townStr,limitCondition:10}},//高发疾病排行----筛选条件：全部+本年
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0024",linkageFilter:gaoFaLinkageFilterYear+townStr,limitCondition:10}},//高发疾病排行----筛选条件：全部+本季度
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0008",linkageFilter:townStr}},//死亡原因
    		];
    		
    		if(!vm.isClickMap){//点击疾病类型，则本月高发和死亡原因数据不变，不用重新请求
    			reqUrl = [
			    		{url: bigDataAPI.getCityArea,reqType: 'get',data: {}},
			    		{url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}},//上饶地图经纬度数据
			    		{url:bigDataAPI.getMoreNoChartTemplateData,reqType: 'get',data:{viewMapJson:JSON.stringify(viewMapJsonGXY)}},//高血压疾病数据+地图
			    		{url:bigDataAPI.getMoreNoChartTemplateData,reqType: 'get',data:{viewMapJson:JSON.stringify(viewMapJsonTNB)}},//糖尿病疾病数据+地图
			    		{url:bigDataAPI.getMoreNoChartTemplateData,reqType: 'get',data:{viewMapJson:JSON.stringify(viewMapJsonYCF)}},//孕产妇疾病数据+地图
			    		{url:bigDataAPI.getMoreNoChartTemplateData,reqType: 'get',data:{viewMapJson:JSON.stringify(viewMapJsonGL)}},//65岁以上疾病数据+地图
			    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: zhongDianViewCodeMonth,linkageFilter:zhongDianLinkageFilter+townStr}},//重点人群+按月
			    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: zhongDianViewCodeJi,linkageFilter:zhongDianLinkageFilter+townStr}},//重点人群+按季度
			    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: zhongDianViewCodeYear,linkageFilter:townStr}},//重点人群+按年
    			];
    		}
    		
    		httpRequest.getReqPromises(reqUrl).then(function(datas) {
    			vm.town = [{"name": "上饶市","id": "0"}].concat(datas[0]);
				echarts.registerMap('上饶',datas[1]);
@@ -83,10 +108,13 @@ new Vue({
	    		}else if(vm.type==3){//65岁以上
	    			vm.setMapData(datas[5]);
	    		}
	    		vm.zhongDianData = [datas[6],datas[7]];//重点人群+按月、重点人群+按年
				vm.gaoFaData = [datas[8],datas[9]];//高发疾病排行----筛选条件：本月（默认）、本年
				vm.siWangData = datas[10];//死亡原因
	    		vm.zhongDianData = [datas[6],datas[7],datas[8]];//重点人群+按月、重点人群+按季度、重点人群+按年
	    		if(vm.isClickMap){//点击地图，则高发和死亡原因数据重新加载
	    			vm.gaoFaData = [datas[9],datas[10],datas[11]];//高发疾病排行----筛选条件：本月（默认）、本年、本季度
					vm.siWangData = datas[12];//死亡原因
	    		}
				$(".div-mask-layer").hide();
				vm.isClickMap = false;
    		})
    	},
    	setMapData: function(data) {
@@ -107,7 +135,7 @@ new Vue({
					if(item.firstColumn != "合计") {
						optionData.push({
							name: item.townName,
							value: parseInt(item.HC_15_1006)
							value: parseInt(item.HC_13_0017)
						})
					}
				})
@@ -117,7 +145,7 @@ new Vue({
					if(item.firstColumn != "合计") {
						optionData.push({
							name: item.townName,
							value: parseInt(item.HC_15_1006)
							value: parseInt(item.HC_13_0033)
						})
					}
				})
@@ -138,20 +166,10 @@ new Vue({
				index: this.lineHeightIndex
			};
		},
    	getJsonData:function(){
    		var vm = this;
    		bigDataAPI.getJsonData(this.jsonUrl).then(function(res){
    			vm.jsonData = res;
    			var options = _.map(res.town,function(item,idx){
    				var it = {name:item.townName,value:item.result}
    				return it;
    			})
    			 vm.mapData ={data:options,zoom:1,index:vm.lineHeightIndex};  
    		})
    	},
    	bindEvents:function(){
    		var vm = this;
    		EventBus.$on("refresh-json-data", function(arg) {
    			vm.isClickMap = false;
				vm.type = arg.type;//0:高血压 1:糖尿病 2:孕产妇 3:65岁以上老年人人数
				vm.initData();
			});
@@ -161,20 +179,6 @@ new Vue({
        },
        clickMap:function(res){
           this.city = res.name;
        },
        refreshAllData:function(cityVal){
        	 var vm = this;
        	 cityVal = parseInt(cityVal)
        	 switch(cityVal){
				case 0: vm.jsonUrl = "../../../dataJson/jumingHealthJson/高血压人群.json"; break;//贵港市
				case 26531: vm.jsonUrl = "../../../dataJson/jumingHealthJson/港北区.json"; break;//港北区
				case 25634: vm.jsonUrl = "../../../dataJson/jumingHealthJson/港南区.json";break;//港南区
				case 113485: vm.jsonUrl = "../../../dataJson/jumingHealthJson/桂平市.json"; break;//桂平市
				case 74128: vm.jsonUrl = "../../../dataJson/jumingHealthJson/平南县.json"; break;//平南县
				case 12587:vm.jsonUrl = "../../../dataJson/jumingHealthJson/覃塘区.json"; break;//覃塘区
				default:break;
			}
           vm.getJsonData();
        },
		skipClick:function(){
			console.log(222)
@@ -182,9 +186,6 @@ new Vue({
		}
    },
    watch:{
    	jsonData:function(data){
    		this.jsonData = data;
		},
		city:function(value){
			var vm =this;
			vm.lineHeightIndex =value;
@@ -193,6 +194,7 @@ new Vue({
					vm.cityVal = v.id;
                }
            })
			vm.isClickMap = true;
			vm.initData();
		}
    }

page/bigData/js/medical.js

@@ -263,7 +263,7 @@ new Vue({
			for(var c in obj) {
				if(obj[c].indexOf(",") == -1){//不存在,，说明要格式化
					if(obj[c]>100000){
						obj[c] = (obj[c]/100000).toFixed(2)+"万"
						obj[c] = (obj[c]/10000).toFixed(2)+"万"
					}else{
						obj[c] = toThousands(obj[c]);
					}

page/bigData/js/medicalCharts.js

@@ -288,7 +288,11 @@ rightChart1DataFormat = function(options){
	var series0data = options.series[0].data || [];
	var series1data = options.series[1].data || [];
	var series2data = options.series[2].data || [];
	var series3data = options.series[3].data || [];
	var series3data = options.series[3].data || []
	series2data = _.map(series2data,function(item,idx){
		return parseFloat(item)
	})
	console.error(JSON.stringify(series2data))
	var option = {
		"title": {
			"text": "门诊分类别月趋势",
@@ -307,7 +311,22 @@ rightChart1DataFormat = function(options){
					color: '#fff'
				}
			},
			formatter: '{b} <br /> {a0}: {c0}<br />{a1}: {c1}' + "%"
			formatter: function(value){
				var resStr = "";
				_.map(value,function(item,idx){
					if(idx==0){
						resStr+=item.axisValue+" <br /> ";
					}
					resStr+=item.seriesName+":"+item.data;
					if(idx==2 || idx==3){//环比值加%
						if(item.data!="--"){
							resStr+="%";
						}
					}
					resStr+=" <br /> ";
				})
				return resStr;
			}
		},
		"grid":{
			top: '80',