大屏接口对接

js/api/bigData-api.js

@@ -5,11 +5,15 @@
		},
		getTemplateData: function(data) {
            return httpRequest.get("/gov/report/getNoChartTemplateData",{data: data})
        },
        getViewCodeTemplateData: function(data) {
            return httpRequest.get("/gov/report/getTemplateDataByViewCode",{data: data})
        },
		getNoChartTemplateData: "/gov/report/getNoChartTemplateData",
		getTemplateDataByViewCode:"/gov/report/getTemplateDataByViewCode",
		getCityArea: "/gov/report/getCityArea",
		getMapJingWeiDuInfo:"/gov/front/js/lib/plugins/echarts/map/json/china-main-city/361100.json",
		getMoreNoChartTemplateData:"/gov/report/getMoreNoChartTemplateData"
	}
	
	exports.bigDataAPI = bigDataAPI;

js/util.js

@@ -76,6 +76,7 @@ var nowDay = now.getDate(); //当前日
var nowMonth = now.getMonth(); //当前月 
var nowYear = now.getYear(); //当前年 
nowYear += (nowYear < 2000) ? 1900 : 0; //
nowYear = nowYear-1;//由于2018年没数据，故查询2017年数据（测试）
var lastMonthDate = new Date(); //上月日期 
lastMonthDate.setDate(1);
lastMonthDate.setMonth(lastMonthDate.getMonth() - 1);
@@ -170,19 +171,15 @@ function getQuarterEndDate() {
}
//获得本年的开始日期
function getYearStartDate() {
    //获得当前年份4位年
    var currentYear=new Date().getFullYear();
    //本年第一天
    var currentYearFirstDate=new Date(currentYear,0,1);
    var currentYearFirstDate=new Date(nowYear,0,1);
    return formatDate(currentYearFirstDate);
}
//获得本年的结束日期
function getYearEndDate() {
    //获得当前年份4位年
    var currentYear=new Date().getFullYear();
    //本年最后
    var currentYearLastDate=new Date(currentYear,11,31);
    var currentYearLastDate=new Date(nowYear,11,31);
    return formatDate(currentYearLastDate);
}
@@ -195,7 +192,7 @@ function getYearEndDate() {
function getHalfYearStartDate(){
	var date = new Date();
	date.setMonth(date.getMonth() - 6);
	var year = date.getFullYear();
	var year = nowYear;
	var month = date.getMonth() + 1;
	month = (month < 10 ? "0" + month : month);
	return year.toString() + '-' + month.toString() + "-01";
@@ -206,20 +203,61 @@ function getHalfYearEndDate(){
	var date = new Date();
	var currentMonth = date.getMonth();
	var nextMonth = ++currentMonth;
	var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth-1, 1);
	var nextMonthFirstDay = new Date(nowYear, nextMonth-1, 1);
	var oneDay = 1000 * 60 * 60 * 24;
	return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
}
//获取过去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++) {
    	data.setMonth(data.getMonth()-1);//每次循环一次 月份值减1
    	month = (data.getMonth()+1)<10?"0"+(data.getMonth()+1):data.getMonth()+1;
    	if(i==11){//过去第12个月
    		dataArr.push(data.getFullYear()+"-"+month+"-01")
    	}else if(i==0){//本月
    		var day = getDaysInMonth(data.getFullYear(),data.getMonth()+1);
    		dataArr.push(data.getFullYear()+"-"+month+"-"+day)
    	}else{
    		dataArr.push(data.getFullYear()+"-"+month)
    	}
    }
    return dataArr;
}
//根据年月实现获得当月天数
function getDaysInMonth(year,month){
	month = parseInt(month,10);  //parseInt(number,type)这个函数后面如果不跟第2个参数来表示进制的话，默认是10进制。
	var temp = new Date(year,month,0);
	return temp.getDate();
}
//获取昨天日期
function getYesterday(num, str){
	var today = new Date();
    var nowTime = today.getTime();
    var ms = 24*3600*1000*num;
    today.setTime(parseInt(nowTime + ms));
    var oYear = today.getFullYear();
    var oYear = nowYear;
    var oMoth = (today.getMonth() + 1).toString();
    if (oMoth.length <= 1) oMoth = '0' + oMoth;
    var oDay = today.getDate().toString();
    if (oDay.length <= 1) oDay = '0' + oDay;
    return oYear + str + oMoth + str + oDay;
}
//获取过去6个月的开始时间
function getLastHalfMonthArray(dateStr){//格式：2018-07
	var dataArr = [],day,month,halfDate;
    var data=new Date();
    var year=dateStr.substring(0,4);
    data.setMonth(parseInt(dateStr.substring(5,7)))//获取到当前月份,设置月份
    data.setMonth(data.getMonth()-6);//往前推半年，月份值减6
    month = (data.getMonth()+1)<10?"0"+(data.getMonth()+1):data.getMonth()+1;
    halfDate = data.getFullYear()+"-"+month+"-01"
    return halfDate;
}

page/bigData/component/death-cause.js

@@ -3,7 +3,13 @@
	Vue.component('death-cause', {
		template: '<div style="height: 100%;">\
						<h4 class="c-b5e1fc c-f16 c-t-center div-common-title">死亡原因</h4>\
						<div class="" style="height: 85%;">\
						<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" style="height: 85%;">\
							<div id="div-shiwang-echart" class="ml10"></div>\
							<div class="div-siwang-type" v-if="causeData.length>0">\
								<div class="div-webkit-box" v-for="(cause, idx) in causeData">\
@@ -19,7 +25,9 @@
		props: ["data"],
		data: function() {
			return {
				causeData: []
				causeData: [],
				hasData:true,
				newData:null
			}
		},
		mounted: function() {
@@ -27,8 +35,15 @@
		},
		watch:{
			data:function(data){
				this.data = data;
				this.initData();
				if(data){
					this.newData = data.successFlg?data.obj.viewInfos&&JSON.parse(data.obj.viewInfos[0].options[0].option):{};
					if(this.newData.series&&this.newData.series[0].data){
						this.hasData = true;
						this.initData();
					}else{
						this.hasData = false;
					}
				}
			}
		},
		filters:{
@@ -39,7 +54,7 @@
		},
		methods: {
			initData:function(){//死亡原因
				this.causeData = this.data["死亡原因"].series[0].data;
				this.causeData = this.newData.series[0].data;
				var myChart = echarts.init(document.getElementById('div-shiwang-echart'));
				var option = {
					//      "title": {

page/bigData/component/disease-crowd.js

@@ -11,7 +11,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">总人数</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["高血压人群"].总人数 | formatData}}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data1.totalNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</div>\
					</div>\
@@ -20,7 +20,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">上月新增</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["高血压人群"].上月新增 | formatData}}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data1.addNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</div>\
					</div>\
@@ -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">{{data["高血压人群"].环比}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data1.ringRatio}}</span>\
						</div>\
					</div>\
				</div>\
@@ -44,7 +44,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">总人数</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["糖尿病人群"].总人数 | formatData}}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data2.totalNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</div>\
					</div>\
@@ -53,7 +53,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">上月新增</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["糖尿病人群"].上月新增 | formatData}}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data2.addNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</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">{{data["糖尿病人群"].环比}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data2.ringRatio}}</span>\
						</div>\
					</div>\
				</div>\
@@ -76,7 +76,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">总人数</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["孕产妇人群"].总人数 | formatData}}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data3.totalNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</div>\
					</div>\
@@ -85,7 +85,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">上月新增</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["孕产妇人群"].上月新增 | formatData}}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data3.addNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</div>\
					</div>\
@@ -95,7 +95,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">{{data["孕产妇人群"].环比}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data3.ringRatio}}</span>\
						</div>\
					</div>\
				</div>\
@@ -108,7 +108,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">总人数</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["65岁以上老年人人数"].总人数 }}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data4.totalNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</div>\
					</div>\
@@ -117,7 +117,7 @@
							<p class="c-b5e1fc c-f12">\
								<span class="c-b5e1fc c-f16">上月新增</span>\
							</p>\
							<span class="c-fff71a c-f26 c-bold">{{data["65岁以上老年人人数"].上月新增}}</span>\
							<span class="c-fff71a c-f26 c-bold">{{data4.addNumber}}</span>\
							<span class="c-b5e1fc c-f16">人</span>\
						</div>\
					</div>\
@@ -127,17 +127,21 @@
								<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">{{data["65岁以上老年人人数"].环比}}</span>\
							<span class="c-b5e1fc c-f26 ml20 c-bold">{{data4.ringRatio}}</span>\
						</div>\
					</div>\
				</div>\
			</div>\
		</div>',
		props: ["data"],
		props: ["data","town"],
		data: function() {
			return {
				activeIndex:0,
				cacheActiveIndex:0
				cacheActiveIndex:0,
				data1:{},//高血压
				data2:{},//糖尿病
				data3:{},//孕产妇人群
				data4:{},//65岁以上老年人人数
			}
		},
		mounted: function() {
@@ -149,6 +153,60 @@
			}
		},
		methods: {
			initData:function(){
				var data1 = this.data[0].successFlg?this.data[0].detailModelList:[];
				var data2 = this.data[1].successFlg?this.data[1].detailModelList:[];
				var data3 = this.data[2].successFlg?this.data[2].detailModelList:[];
				var data4 = this.data[3].successFlg?this.data[3].detailModelList:[];
				this.gxyformatData(data1);
				this.tnbformatData(data2);
				this.ycfformatData(data3);
				this.lnrformatData(data4);
			},
			gxyformatData:function(data){//高血压数据
				var vm = this,idx;
				_.map(data[0].VIEW_13_0013,function(item,index){
					if(vm.town=="上饶市" && item.firstColumn=="合计"){//上饶市
						idx = index;
					}else if(item.firstColumn==vm.town){
						idx = index;
					}
				})
				vm.data1 = {totalNumber:data[0].VIEW_13_0013[idx].HC_13_0021,addNumber:data[1].VIEW_13_0036[idx].HC_13_0021,ringRatio:(data[2].VIEW_13_0037[idx]&&data[2].VIEW_13_0037[idx].HC_13_0023 || "0")};
			},
			tnbformatData:function(data){//糖尿病数据
				var vm = this,idx;
				_.map(data[0].VIEW_13_0026,function(item,index){
					if(vm.town=="上饶市" && item.firstColumn=="合计"){//上饶市
						idx = index;
					}else if(item.firstColumn==vm.town){
						idx = index;
					}
				})
				vm.data2 = {totalNumber:data[0].VIEW_13_0026[idx].HC_13_0017,addNumber:data[1].VIEW_13_0034[idx].HC_13_0017,ringRatio:(data[2].VIEW_13_0027[idx]&&data[2].VIEW_13_0027[idx].HC_13_0017 || "0")};
			},
			ycfformatData:function(data){//孕产妇数据
				var vm = this,idx;
//				_.map(data[0].VIEW_16_0001,function(item,index){
//					if(vm.town=="上饶市" && item.firstColumn=="合计"){//上饶市
//						idx = index;
//					}else if(item.firstColumn==vm.town){
//						idx = index;
//					}
//				})
//				vm.data3 = {totalNumber:data[0].VIEW_16_0001[idx].HC_15_1006,addNumber:data[1].VIEW_16_0002[idx].HC_15_1006,ringRatio:data[2].VIEW_16_0003[idx].HC_15_1009};
			},
			lnrformatData:function(data){//老年人数据
				var vm = this,idx;
				_.map(data[0].VIEW_15_0001,function(item,index){
					if(vm.town=="上饶市" && item.firstColumn=="合计"){//上饶市
						idx = index;
					}else if(item.firstColumn==vm.town){
						idx = index;
					}
				})
				vm.data4 = {totalNumber:data[0].VIEW_15_0001[idx].HC_15_1006,addNumber:data[1].VIEW_15_0011[idx].HC_15_1006,ringRatio:data[2].VIEW_15_0008[idx].HC_15_1009};
			},
			diseaseClick:function(type){
				this.activeIndex = type;
				this.cacheActiveIndex = type;
@@ -160,8 +218,17 @@
			diseaseMouseOut:function(){
				this.activeIndex = this.cacheActiveIndex;
			},
			detailClick:function(type){//type:0高血压 1糖尿病
				var height = (0.42 * window.screen.width) + 'px';
			detailClick:function(type){//type:0高血压 1糖尿病,2孕产妇3老年人
				var height = (0.42 * window.screen.width) + 'px',url="";
				if(type==0){
					url = '../../../page/bigData/html/alert1.html?type='+type;
				}else if(type==1){
					url = '../../../page/bigData/html/alert2.html?type='+type;
				}else if(type==2){
					url = '../../../page/bigData/html/alert3.html?type='+type;
				}else if(type==3){
					url = '../../../page/bigData/html/alert4.html?type='+type;
				}
				top.layer.open({
					id: 'LAY_layuipro', //设定一个id，防止重复弹出
				    type: 2,
@@ -170,13 +237,16 @@
				    shade: 0.5,
				    shadeClose: true,
				    area:  ['7.604rem', '4.1875rem'],
				    content: '../../../page/bigData/html/alert.html?type='+type
				    content: url
				});
			}
		},
		watch:{
			data:function(data){
				this.data = data;
				if(data&&data.length>0){
					this.data = data;
					this.initData();
				}
			}
		}
		

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

@@ -1,9 +1,18 @@
(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>\
						<div data-toggle="buttons" class="btn-group">\
						<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">\
							<label class="btn btn-default" :class="{active: index1 == 0}" @click="btnClick1(0)">\
								<input type="radio">全部\
							</label>\
@@ -14,18 +23,15 @@
								<input type="radio">门诊\
							</label>\
						</div>\
						<div data-toggle="buttons" class="btn-group fr mr20" style="margin-left: 0;">\
						<div data-toggle="buttons" class="btn-group fr mr20" style="margin-left: 0;" v-show="hasData">\
							<label class="btn btn-default" :class="{active: index2 == 0}" @click="btnClick2(0)">\
								<input type="radio">本月\
							</label>\
							<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 id="div-gaofa-disease-chart" class=""></div>\
						<div id="div-gaofa-disease-chart" v-show="hasData"></div>\
					</div>',
		props: ["data"],
		data: function() {
@@ -36,8 +42,9 @@
				isInit:true,
				fontSize: 0.007 * window.screen.width,
				linkageFilter:"",
				firstDay:"",//本月第一天
				lastDay:"",//本月最后一天
				hasData:true,
				monthData:null,
				yearMonth:null,
			}
		},
		mounted: function() {
@@ -45,103 +52,48 @@
		},
		watch:{
			data:function(data){
				this.data = data;
				this.formatData(); 
				this.refreshData();
				if(data){
					this.monthData = data[0];
					this.yearData = data[1];
					this.initData();
				}
			}
		},
		methods: {
			getData:function(){
				if(this.index2==0){//本月
					this.linkageFilter = "quotaDate >= '" + getMonthStartDate() + "' and quotaDate <= '" + getMonthEndDate() + "';";
				}else if(this.index2==1){//本季
					this.linkageFilter = "quotaDate >= '" + getQuarterStartDate() + "' and quotaDate <= '" + getQuarterEndDate() + "';";
				}else if(this.index2==2){//本年
					this.linkageFilter = "quotaDate >= '" + getYearStartDate() + "' and quotaDate <= '" + getYearEndDate() + "';";
				}
				bigDataAPI.getTemplateData({viewCodeStr: "VIEW_13_0007",linkageFilter:this.linkageFilter})
			},
			btnClick1:function(idx){
				this.index1 = idx;
				this.refreshData();
				this.initData();
			},
			btnClick2:function(idx){
				this.index2 = idx;
				this.refreshData();
			},
			formatData:function(){
				//全部.本月
				this.data["本月高发疾病排行"].全部.本月.xAxis[0].data = (this.data["本月高发疾病排行"].全部.本月.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].全部.本月.series[0].data = (this.data["本月高发疾病排行"].全部.本月.series[0].data).reverse();
				this.data["本月高发疾病排行"].全部.本月.series[1].data = (this.data["本月高发疾病排行"].全部.本月.series[1].data).reverse();
				//全部.本季
				this.data["本月高发疾病排行"].全部.本季.xAxis[0].data = (this.data["本月高发疾病排行"].全部.本季.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].全部.本季.series[0].data = (this.data["本月高发疾病排行"].全部.本季.series[0].data).reverse();
				this.data["本月高发疾病排行"].全部.本季.series[1].data = (this.data["本月高发疾病排行"].全部.本季.series[1].data).reverse();
				//全部.本年
				this.data["本月高发疾病排行"].全部.本年.xAxis[0].data = (this.data["本月高发疾病排行"].全部.本年.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].全部.本年.series[0].data = (this.data["本月高发疾病排行"].全部.本年.series[0].data).reverse();
				this.data["本月高发疾病排行"].全部.本年.series[1].data = (this.data["本月高发疾病排行"].全部.本年.series[1].data).reverse();
				//住院.本月
				this.data["本月高发疾病排行"].住院[0].本月.xAxis[0].data = (this.data["本月高发疾病排行"].住院[0].本月.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].住院[0].本月.series[0].data = (this.data["本月高发疾病排行"].住院[0].本月.series[0].data).reverse();
				//住院.本季
				this.data["本月高发疾病排行"].住院[1].本季.xAxis[0].data = (this.data["本月高发疾病排行"].住院[1].本季.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].住院[1].本季.series[0].data = (this.data["本月高发疾病排行"].住院[1].本季.series[0].data).reverse();
				//住院.本年
				this.data["本月高发疾病排行"].住院[2].本年.xAxis[0].data = (this.data["本月高发疾病排行"].住院[2].本年.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].住院[2].本年.series[0].data = (this.data["本月高发疾病排行"].住院[2].本年.series[0].data).reverse();
				//门诊.本月
				this.data["本月高发疾病排行"].门诊[0].本月.xAxis[0].data = (this.data["本月高发疾病排行"].门诊[0].本月.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].门诊[0].本月.series[0].data = (this.data["本月高发疾病排行"].门诊[0].本月.series[0].data).reverse();
				//门诊.本季
				this.data["本月高发疾病排行"].门诊[1].本季.xAxis[0].data = (this.data["本月高发疾病排行"].门诊[1].本季.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].门诊[1].本季.series[0].data = (this.data["本月高发疾病排行"].门诊[1].本季.series[0].data).reverse();
				//门诊.本年
				this.data["本月高发疾病排行"].门诊[2].本年.xAxis[0].data = (this.data["本月高发疾病排行"].门诊[2].本年.xAxis[0].data).reverse();
				this.data["本月高发疾病排行"].门诊[2].本年.series[0].data = (this.data["本月高发疾病排行"].门诊[2].本年.series[0].data).reverse();
			},
			refreshData:function(){
				if(this.index1==0){//全部
					if(this.index2==0){//本月
						this.gaoBingFaData = this.data["本月高发疾病排行"].全部.本月;
					}else if(this.index2==1){//本季
						this.gaoBingFaData = this.data["本月高发疾病排行"].全部.本季;
					}else if(this.index2==2){//本年
						this.gaoBingFaData = this.data["本月高发疾病排行"].全部.本年;
					}
				}else if(this.index1==1){//住院
					if(this.index2==0){//本月
						this.gaoBingFaData = this.data["本月高发疾病排行"].住院[0].本月;
					}else if(this.index2==1){//本季
						this.gaoBingFaData = this.data["本月高发疾病排行"].住院[1].本季;
					}else if(this.index2==2){//本年
						this.gaoBingFaData = this.data["本月高发疾病排行"].住院[2].本年;
					}
				}else if(this.index1==2){//门诊
					if(this.index2==0){//本月
						this.gaoBingFaData = this.data["本月高发疾病排行"].门诊[0].本月;
					}else if(this.index2==1){//本季
						this.gaoBingFaData = this.data["本月高发疾病排行"].门诊[1].本季;
					}else if(this.index2==2){//本年
						this.gaoBingFaData = this.data["本月高发疾病排行"].门诊[2].本年;
					}
				}
				this.initData();
			},
			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==2){//本年
					this.gaoBingFaData = this.yearData.successFlg?this.yearData.obj.viewInfos&&JSON.parse(this.yearData.obj.viewInfos[0].options[0].option):{};
				}
				if(this.gaoBingFaData.xAxis[0].data){
					this.hasData = true;
				}else{
					this.hasData = false;
					return false;
				}
				var zhuYuanData = [],zhuYuanTitle = "";
				var xAxisData = this.gaoBingFaData.xAxis[0].data;
				var menZhenData = this.gaoBingFaData.series[0].data;
				var menZhenTitle = this.gaoBingFaData.series[0].name;
				if(this.index1==0){//全部,显示门诊/住院数据叠加
					 zhuYuanData = this.gaoBingFaData.series[1].data;
				var xAxisData = (this.gaoBingFaData.xAxis[0].data).reverse()||[];
				var menZhenData = (this.gaoBingFaData.series[0].data).reverse()||[];
				var menZhenTitle = this.gaoBingFaData.series[0].name||"";
				if(this.index1==0){//全部（显示门诊/住院数据叠加)
					 zhuYuanData = (this.gaoBingFaData.series[1].data).reverse();
					 zhuYuanTitle = this.gaoBingFaData.series[1].name;
					this.geoFaMainFun(xAxisData,menZhenData,zhuYuanData,menZhenTitle,zhuYuanTitle)
				}
				else if(this.index1==1 || this.index1==2){//住院或门诊时,显示单个柱状图
					this.geoFaMainFun(xAxisData,menZhenData,zhuYuanData,menZhenTitle,zhuYuanTitle)
				}else if(this.index1==1){//住院(显示单个柱状图)
					 menZhenData = (this.gaoBingFaData.series[1].data).reverse();
					 menZhenTitle = this.gaoBingFaData.series[1].name;
					 zhuYuanData = [];
					 zhuYuanTitle = "";
				}
				this.geoFaMainFun(xAxisData,menZhenData,zhuYuanData,menZhenTitle,zhuYuanTitle)
			},
			geoFaMainFun:function(xAxisData,menZhenData,zhuYuanData,menZhenTitle,zhuYuanTitle){
				var vm = this;
@@ -169,8 +121,16 @@
						axisLabel: {
							color: '#b5e1fc',
							fontSize:vm.fontSize,
							interval: 0,
						    formatter: function(value) {
							    if (value.length > 8) {
							      return value.substring(0, 8) + "...";
							    } else {
							      return value;
							    }
							 }
						},
						nameTextStyle:{color: '#b5e1fc'}
						nameTextStyle:{color: '#b5e1fc'},
					}],
					"xAxis": [{
						"type": "value",

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

@@ -1,20 +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 data-toggle="buttons" class="btn-group fr mr40 mt0" style="position: absolute;right: 0.208rem;top: 0.05rem;z-index: 99999;">\
						<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;">\
							<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 id="div-zhongidan-echart" class="ml30"></div>\
						<div id="div-zhongidan-echart" class="ml30" v-show="hasData"></div>\
					</div>',
		props: ["data"],
		data: function() {
@@ -22,37 +27,43 @@
				keyServiceData:null,
				activeIndex:0,
				fontSize: 0.007 * window.screen.width,
				hasData:true,
				monthData:null,
				yearData:null
			}
		},
		mounted: function() {
			var vm = this;
			setTimeout(function(){
				vm.initData();
			},50)
			
		},
		watch:{
			data:function(data){
				this.data = data;
				this.initData();
			data:function(newData){
				this.data = newData;
				if(this.data && this.data.length>0){
					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.initData();
					this.hasData = true;
				}else{
					this.hasData = false;
				}
			}
		},
		methods: {
			initData:function(){//重点人群
				this.activeIndex = 0;
				this.keyServiceData = this.data["重点服务人群增加趋势"].本月;
				this.changeData();
				this.chartMainFun();
			},
			changeData:function(){
				if(this.activeIndex==0){//月
					this.keyServiceData = this.monthData;
				}else if(this.activeIndex==2){//年
					this.keyServiceData = this.yearData;
				}
			},
			btnClick:function(type){
				this.activeIndex = type;
				if(type==0){//本月
					this.keyServiceData = this.data["重点服务人群增加趋势"].本月;
				}
				if(type==1){//本季
					this.keyServiceData = this.data["重点服务人群增加趋势"].本季;
				}
				if(type==2){//本年
					this.keyServiceData = this.data["重点服务人群增加趋势"].本年;
				}
				this.changeData();
				this.chartMainFun();
			},
			chartMainFun:function(){
@@ -71,7 +82,7 @@
				    },
					grid: {top: 50, bottom: 30, left: 30,right:80},
				    legend: {
				        data:['平均床日数','环比'],
				        data:['新增人数','环比'],
						textStyle: {
							color: '#b5e1fc'
						}
@@ -100,7 +111,7 @@
				    yAxis: [
				        {
				            type: 'value',
				            name: '平均床日数',
				            name: '新增人数',
							nameTextStyle: {
								color: '#b5e1fc' // 坐标轴名称颜色
							},
@@ -140,7 +151,7 @@
				    ],
				    series: [
				        {
				            name:'平均床日数',
				            name:'新增人数',
				            type:'bar',
				            data:pjcrsData,
				            barWidth: 20,
@@ -167,7 +178,9 @@
				        }
				    ]
				};
				
				if(zhongdianChart){
					zhongdianChart.clear();
				}
				zhongdianChart.setOption(zhongdianOption);
			},
		

page/bigData/css/home.css

@@ -523,3 +523,20 @@ h4 {
.sk-spinner-fading-circle .sk-circle:before{
	background-color:white;
}
.no-result-img{
    width: 0.5rem;
    margin: 0 auto;
    object-fit: fill;
    padding-top: 0.3125rem;
}
.no-result-img>img{
    width: 100%;
    height: 100%;
}
.no-result-text{
    text-align: center;
    margin-top: 0.1rem;
    font-size: 0.08rem;
    color: #b5e1fc;
}

page/bigData/html/home.html

@@ -55,11 +55,11 @@
			<div class="content">
				<div class="right-panel">
					<!-- 本月高发疾病排行 -->
					<high-incidence-disease :data="jsonData"></high-incidence-disease>
					<high-incidence-disease :data="gaoFaData"></high-incidence-disease>
				</div>
				<div class="left-panel">
					<!-- 疾病人群 -->
					<disease-crowd :data="jsonData"></disease-crowd>
					<disease-crowd :data="diseaseData" :town="city"></disease-crowd>
				</div>
				<div class="center-panel" v-cloak>
					<!-- 地图 -->
@@ -84,11 +84,11 @@
				</div>
				<div class="bottom-left-panel">
					<!-- 重点服务人群 -->
					<key-service-population :data="jsonData"></key-service-population>
					<key-service-population :data="zhongDianData"></key-service-population>
				</div>
				<div class="bottom-right-panel">
					<!-- 死亡原因 -->
					<death-cause :data="jsonData"></death-cause>
					<death-cause :data="siWangData"></death-cause>
				</div>
			</div>
			<div class="div-bottom"></div>

page/bigData/js/home.js

@@ -7,49 +7,133 @@ toastr.options = {
new Vue({
	el: '#main',
	data: {
		type:0,//0:高血压 1:糖尿病 2:孕产妇 3:65岁以上老年人人数
		jsonUrl:"../../../dataJson/jumingHealthJson/高血压人群.json",
		jsonData:null,
        city: '上饶市',
		town: [],
		cityVal:"0",
        diseaseData:[],
        mapData:null,
        zhongDianData:[],
        gaoFaData:null,
        siWangData:[],
		skipShow:0,
		lineHeightIndex:null,
	},
	mounted: function() {
	  this.bindEvents();
	  this.initData();
      this.getJsonData();
//    this.getJsonData();
    },
    methods: {
    	initData:function(){
    		var vm = this;
    		$(".div-mask-layer").hide();
    		var reqUrl = [{url: bigDataAPI.getCityArea,reqType: 'get',data: {}},
    		{url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}},//上饶地图经纬度数据
    		{url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_13_0026"}},//地图数据
    		{url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_13_0027"}},//按月环比糖尿病患者人数
    		var vm = this,townStr="",viewMapJsonGXY = null,viewMapJsonTNB = null,viewMapJsonYCF = null,viewMapJsonGL = null,zhongDianViewCodeMonth="",zhongDianViewCodeYear="";
    		$(".div-mask-layer").show();
    		//封装参数
    		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 gaoFaLinkageFilterMonth = "quotaDate >= '" + getMonthStartDate() + "' and quotaDate <= '" + getMonthEndDate() + "';";//高发疾病参数（本月数据）
//			var gaoFaLinkageFilterYear = "quotaDate >= '" + getYearStartDate() + "' and quotaDate <= '" + getYearEndDate() + "';";//高发疾病参数（本年数据）
			var gaoFaLinkageFilterMonth = "quotaDate >= '2017-06-01' and quotaDate <= '2017-06-30';";//高发疾病参数（本月数据）
			var gaoFaLinkageFilterYear = "quotaDate >= '2017-01-01' and quotaDate <= '2017-12-31';";//高发疾病参数（本年数据）
    		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};//糖尿病
    		viewMapJsonYCF = {VIEW_16_0001:townStr,VIEW_16_0002:townStr+diseaseLinkAgeFliter,VIEW_16_0003:townStr+diseaseLinkAgeFliter};//孕产妇
    		viewMapJsonGL = {VIEW_15_0001:townStr,VIEW_15_0011:townStr+diseaseLinkAgeFliter,VIEW_15_0008:townStr+diseaseLinkAgeFliter};//65岁以上
    		if(vm.type==0){//高血压
    			zhongDianViewCodeMonth = "VIEW_13_0017";//重点人群+按月
    			zhongDianViewCodeYear = "VIEW_13_0022";//重点人群+按年
    		}else if(vm.type==1){//糖尿病
    			zhongDianViewCodeMonth = "VIEW_13_0028";//重点人群+按月
    			zhongDianViewCodeYear = "VIEW_13_0029";//重点人群+按年
    		}else if(vm.type==2){//孕产妇
    			zhongDianViewCodeMonth = "VIEW_16_0004";//重点人群+按月
    			zhongDianViewCodeYear = "VIEW_16_0005";//重点人群+按年
    		}else if(vm.type==3){//65岁以上
    			zhongDianViewCodeMonth = "VIEW_15_0009";//重点人群+按月
    			zhongDianViewCodeYear = "VIEW_15_0010";//重点人群+按年
    		}
    		//整理请求参数集合
    		var 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: 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: "VIEW_13_0008",linkageFilter:townStr}},//死亡原因
    		];
    		httpRequest.getReqPromises(reqUrl).then(function(datas) {
    			debugger
    			vm.town = [{
					"name": "上饶市",
					"id": "0"
				}].concat(datas[0]);
    			vm.town = [{"name": "上饶市","id": "0"}].concat(datas[0]);
				echarts.registerMap('上饶',datas[1]);
				vm.setMapData(datas[2]);
				vm.diseaseData.push(datas[2]);
				vm.diseaseData.push(datas[3]);
				vm.diseaseData.push(datas[4]);
				vm.diseaseData.push(datas[5]);
				if(vm.type==0){//高血压
	    			vm.setMapData(datas[2]);
	    		}else if(vm.type==1){//糖尿病
	    			vm.setMapData(datas[3]);
	    		}else if(vm.type==2){//孕产妇
	    			vm.setMapData(datas[4]);
	    		}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];//死亡原因
				$(".div-mask-layer").hide();
    		})
    	},
    	setMapData: function(data) {
			var optionData = [];
			_.map(data.obj.VIEW_13_0026, function(item) {
				if(item.firstColumn != "合计") {
					optionData.push({
						name: item.townName,
						value: parseInt(item.HC_13_0017)
					})
				}
			})
			var optionData = [],vm=this;
			if(vm.type==0){//高血压
    			data = data.successFlg?data.detailModelList&&data.detailModelList[1].VIEW_13_0036 || []:[];
    			_.map(data, function(item) {
					if(item.firstColumn != "合计") {
						optionData.push({
							name: item.townName,
							value: parseInt(item.HC_13_0021)
						})
					}
				})
    		}else if(vm.type==1){//糖尿病
    			data = data.successFlg?data.detailModelList&&data.detailModelList[1].VIEW_13_0034 || []:[];
    			_.map(data, function(item) {
					if(item.firstColumn != "合计") {
						optionData.push({
							name: item.townName,
							value: parseInt(item.HC_13_0017)
						})
					}
				})
    		}else if(vm.type==2){//孕产妇
    			data = data.successFlg?data.detailModelList&&data.detailModelList[1].VIEW_15_0011 || []:[];
    			_.map(data, function(item) {
					if(item.firstColumn != "合计") {
						optionData.push({
							name: item.townName,
							value: parseInt(item.HC_15_1006)
						})
					}
				})
    		}else if(vm.type==3){//65岁以上
    			data = data.successFlg?data.detailModelList&&data.detailModelList[1].VIEW_15_0011 || []:[];
    			_.map(data, function(item) {
					if(item.firstColumn != "合计") {
						optionData.push({
							name: item.townName,
							value: parseInt(item.HC_15_1006)
						})
					}
				})
    		}
			var options = optionData;
			this.mapData = {
				data: options,
@@ -70,17 +154,8 @@ new Vue({
    	bindEvents:function(){
    		var vm = this;
    		EventBus.$on("refresh-json-data", function(arg) {
				var type = arg.type;//0:高血压 1糖尿病 2孕产妇 365岁以上老年人人数
				if(type==0){
					vm.jsonUrl = "../../../dataJson/jumingHealthJson/高血压人群.json";
				}else if(type==1){
					vm.jsonUrl = "../../../dataJson/jumingHealthJson/糖尿病人群.json";
				}else if(type==2){
					vm.jsonUrl = "../../../dataJson/jumingHealthJson/孕产妇人群.json";
				}else if(type==3){
					vm.jsonUrl = "../../../dataJson/jumingHealthJson/65岁以上老年人人数.json";
				}
				vm.getJsonData();
				vm.type = arg.type;//0:高血压 1:糖尿病 2:孕产妇 3:65岁以上老年人人数
				vm.initData();
			});
    	},
        setCity(item){
@@ -114,18 +189,14 @@ new Vue({
    		this.jsonData = data;
		},
		city:function(value){
			var that =this;
			that.lineHeightIndex =value;
			// debugger
            this.town.map(function(v,i){
                if(v.townName == value) {
					that.refreshAllData(v.result);
                  
                  
			var vm =this;
			vm.lineHeightIndex =value;
			this.town.map(function(v,i){
                if(v.name == value) {
					vm.cityVal = v.id;
                }
            })
		
			vm.initData();
		}
    }
});

page/bigData/js/medical.js

@@ -25,85 +25,12 @@ new Vue({
		hasData4:true,
		hasData5:true,
		hasData6:true,
		firstDay: "", //上月第一天
		lastDay: "", //上月最后一天
		firstDayYear: "", //本年第一天
		lastDayYear: "", //本年最后一天
		halfYearStartDate: "", //近半年开始时间
		halfYearEndDate: "", //近半年结束时间
		yesterdayDate:""//昨天
	},
	mounted: function() {
//		this.formatDate2017(); //格式化时间
		this.initDataNew();
		this.initData();
	},
	methods: {
		initData: function() {
			$(".div-mask-layer").show();
			var vm = this,data1, data2, data3, data4, data5, data6, data7, data8;
			this.town.map(function(v, i) {
				if(v.name == vm.city) {
					vm.cityVal = v.id;
				}
			})
			var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
			if(vm.cityVal!="0") {
				linkageFilter1 += "town=" + vm.cityVal + ";";
			}
			var linkageFilter2 = "quotaDate >= '" + vm.firstDayYear + "' and quotaDate <= '" + vm.lastDayYear + "';";
			if(vm.cityVal!="0") {
				linkageFilter2 += "town=" + vm.cityVal + ";";
			}
			var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
			if(vm.cityVal!="0") {
				linkageFilter3 += "town=" + vm.cityVal + ";";
			}
			var linkageFilter4 = "quotaDate >= '" + vm.yesterdayDate + "' and quotaDate <= '" + vm.yesterdayDate + "';";
			if(vm.cityVal!="0") {
				linkageFilter4 += "town=" + vm.cityVal + ";";
			}
			var reqUrl = [{url: bigDataAPI.getCityArea,reqType: 'get',data: {}},
						  {url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_14_0011",linkageFilter:linkageFilter1}},//左上角-上月 
						  {url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_14_0011",linkageFilter:linkageFilter2}},//左上角-本年
						  {url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_14_0012",linkageFilter:linkageFilter4}},
						  {url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_14_0013",linkageFilter:linkageFilter3}},//
						  {url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_14_0014",linkageFilter:linkageFilter3}},//
						  {url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_14_0015",linkageFilter:linkageFilter3}},//门诊人次月趋势
						  {url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_14_0016",linkageFilter:linkageFilter3}},//住院人次月趋势
						  {url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_14_0017",linkageFilter:linkageFilter3}},//门诊分类别月趋势
						  {url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_14_0018",linkageFilter:linkageFilter3}},//住院平均日数月趋势
						  {url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}}//上饶地图经纬度数据
						  ];
			httpRequest.getReqPromises(reqUrl).then(function(datas) {
				vm.town = [{
					"name": "上饶市",
					"id": "0"
				}].concat(datas[0]);
				vm.leftData1 = datas[1];
				vm.leftData2 = datas[2];
				data3 = datas[3];
				data4 = datas[4];
				data5 = datas[5];
				data6 = datas[6];
				data7 = datas[7];
				data8 = datas[8];
				data9 = datas[9];
				data10 = datas[10];
				
				vm.setLeftChart1(data6);
				vm.setLeftChart2(data7);
				vm.setRightChart1(data8);
				vm.setRightChart2(data9);
				vm.setTable1(data4);
				vm.setTable2(data5);
				vm.setleftData1();
				echarts.registerMap('上饶',data10);
				vm.setMapData(data3);
				vm.setYesterDay(data3);
				$(".div-mask-layer").hide();
			})
		},
		initDataNew: function() {
			$(".div-mask-layer").show();
			var vm = this,data1, data2, data3, data4, data5, data6, data7, data8;
			this.town.map(function(v, i) {
@@ -127,7 +54,7 @@ new Vue({
			if(vm.cityVal!="0") {
				linkageFilter4 += "town=" + vm.cityVal + ";";
			}
			var ob = {VIEW_04_0009:"town=361102;quotaDate >= '2017-01-01' and quotaDate <= '2017-06-30';",VIEW_04_00010:"town=361102;quotaDate >= '2017-01-01' and quotaDate <= '2017-06-30';"};
			
			
			var reqUrl = [{url: bigDataAPI.getCityArea,reqType: 'get',data: {}},
						  {url: bigDataAPI.getNoChartTemplateData,reqType: 'get',data: {viewCodeStr: "VIEW_14_0011",linkageFilter:linkageFilter1}},//左上角-上月 
@@ -140,7 +67,6 @@ new Vue({
						  {url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_14_0017",linkageFilter:linkageFilter3}},//门诊分类别月趋势
						  {url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_14_0018",linkageFilter:linkageFilter3}},//住院平均日数月趋势
						  {url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}},//上饶地图经纬度数据
//						   {url:"/gov/report/getMoreNoChartTemplateData",reqType: 'get',data:{viewMapJson:JSON.stringify(ob)}}
						  ];
			httpRequest.getReqPromises(reqUrl).then(function(datas) {
				vm.town = [{
@@ -214,19 +140,19 @@ new Vue({
		},
		setLeftChart1: function(data6) {
			var options = null;
			var options = data6.successFlg?JSON.parse(data6.obj.viewInfos[0].options[0].option):{};
			if(options.series && options.series[0].data && options.series[1].data){
			var options = data6.successFlg?data6.obj.viewInfos&&JSON.parse(data6.obj.viewInfos[0].options[0].option):{};
			if(options&&options.series && options.series[0].data && options.series[1].data){
				options = leftChart1DataFormat(options);
				this.leftChart1 = options;
				this.hasData1 = true;
			}else{
				this.hasData2 = false;
				this.hasData1 = false;
			}
		},
		setLeftChart2: function(data7) {
			var options = null;
			var options = data7.successFlg?JSON.parse(data7.obj.viewInfos[0].options[0].option):{};
			if(options.series && options.series[0].data && options.series[1].data){
			var options = data7.successFlg?data7.obj.viewInfos&&JSON.parse(data7.obj.viewInfos[0].options[0].option):{};
			if(options&&options.series && options.series[0].data && options.series[1].data){
				options = leftChart2DataFormat(options);
				this.leftChart2 = options;
				this.hasData2 = true;
@@ -251,9 +177,10 @@ new Vue({
			};
		},
		setRightChart1: function(data8) {
			debugger
			var options = null;
			var options = data8.successFlg?JSON.parse(data8.obj.viewInfos[0].options[0].option):{};
			if(options.series && options.series[0].data && options.series[1].data && options.series[2].data && options.series[3].data){
			var options = data8.successFlg?data8.obj.viewInfos&&JSON.parse(data8.obj.viewInfos[0].options[0].option):{};
			if(options&&options.series && options.series[0].data && options.series[1].data && options.series[2].data && options.series[3].data){
				options = rightChart1DataFormat(options);
				this.rightChart1 = options
				this.hasData4 = true;
@@ -265,8 +192,8 @@ new Vue({
		},
		setRightChart2: function(data9) {
			var options = null;
			var options = data9.successFlg?JSON.parse(data9.obj.viewInfos[0].options[0].option):{};
			if(options.series && options.series[0].data && options.series[1].data){
			var options = data9.successFlg?data9.obj.viewInfos&&JSON.parse(data9.obj.viewInfos[0].options[0].option):{};
			if(options&&options.series && options.series[0].data && options.series[1].data){
				options = rightChart2DataFormat(options);
				this.rightChart2 = options
				this.hasData6 = true;

page/bigData/js/medicalCharts.js

@@ -1,4 +1,5 @@
var leftChart1DataFormat = function(options) {
	debugger
	var xAxisData = _.map(options.xAxis[0].data, function(item, idx) {
		item = parseInt(item.substring(5, 7)) + "月";
		return item;
@@ -78,8 +79,6 @@ var leftChart1DataFormat = function(options) {
			{
				type: 'value',
				name: '环比',
				min: 0,
				max: 4,
				nameTextStyle: {
					color: '#b5e1fc' // 坐标轴名称颜色
				},
@@ -207,8 +206,6 @@ leftChart2DataFormat = function(options){
			{
				type: 'value',
				name: '环比',
				min: 0,
				max: 4,
				nameTextStyle: {
					color: '#b5e1fc' // 坐标轴名称颜色
				},
@@ -341,8 +338,6 @@ rightChart1DataFormat = function(options){
			{
				type: 'value',
				name: '环比',
				min: 0,
				max: 4,
				nameTextStyle: {
					color: '#b5e1fc' // 坐标轴名称颜色
				},
@@ -500,8 +495,6 @@ rightChart2DataFormat = function(options){
			{
				type: 'value',
				name: '环比',
				min: 0,
				max: 4,
				nameTextStyle: {
					color: '#b5e1fc' // 坐标轴名称颜色
				},