修复测试bug

component/chart/map-chart.js

@@ -54,13 +54,16 @@
                        })
                        var piceArr = this.getPiceArr(maxValue)
                        options.visualMap = {
                            text: null,
                            color: ['#0046ac', '#005adc', '#277fff','#62a2ff','#c5ddff'],
                            pieces: piceArr,
                            textStyle: {
                    		min: 0,
					        max: maxValue,
					        splitNumber: 5,//分成5等分
					        color: ['#0046ac', '#005adc', '#277fff','#62a2ff','#c5ddff'],
					         textStyle: {
                                color: '#b5e1fc'
                            },
                            left: '50'
//					        pieces: piceArr,
					        left: '50',
					        bottom:'20'
                        }
                        options.series[0].zoom = this.config.zoom || 1.2;
                        options.series[0].data = this.config.data;
@@ -147,7 +150,7 @@
                normal: {
                    label: {
                        show: true,
                        color: '#002f9c'
                        color: '#ffffff'
                    },
                    borderColor: '#fff',
                    shadowColor: '#0355ab',

page/bigData/component/death-cause.js

@@ -43,6 +43,8 @@
					}else{
						this.hasData = false;
					}
				}else{
					this.hasData = false;
				}
			}
		},

page/bigData/component/disease-crowd.js

@@ -192,7 +192,6 @@
				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){//孕产妇数据
				debugger
				var vm = this,idx;
				_.map(data[0].VIEW_16_0009,function(item,index){
					if(vm.town=="上饶市" && item.firstColumn=="合计"){//上饶市
@@ -212,7 +211,7 @@
						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};
				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]&&data[2].VIEW_15_0008[idx].HC_15_1009 || "--")};
			},
			diseaseClick:function(type){
				this.activeIndex = type;

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

@@ -55,11 +55,13 @@
		},
		watch:{
			data:function(data){
				if(data){
				if(data[0] || data[1] || data[2]){
					this.monthData = data[0];
					this.yearData = data[1];
					this.jiData = data[2];
					this.initData();
				}else{
					this.hasData = false;
				}
			}
		},
@@ -144,11 +146,12 @@
			geoFaMainFun:function(xAxisData,menZhenData,zhuYuanData,menZhenTitle,zhuYuanTitle){
				var vm = this;
				var gaoFaChart = echarts.init(document.getElementById('div-gaofa-disease-chart'));
				debugger
				var gaofaOption = {
					"tooltip": {
						"trigger": "axis"
					},
					grid: {top: 40, bottom: 30, left: 140,right:80},
					"grid": {top: 40, bottom: 30, left: 140,right:80},
					"yAxis": [{
						"type": "category",
						"name": "人次",

page/bigData/css/home.css

@@ -337,6 +337,7 @@ h4 {
}
#div-gaofa-disease-chart {
	width: 100%;
	height: calc(100% - 0.53125rem)
}

page/bigData/js/home.js

@@ -21,7 +21,9 @@ new Vue({
		skipShow:0,
		lineHeightIndex:null,
		reqUrl:[],
		isClickMap:true
		isInit:true,
		isClickDisease:true,
		isClickMap:false
	},
	mounted: function() {
	  this.bindEvents();
@@ -29,7 +31,7 @@ new Vue({
    },
    methods: {
    	initData:function(){
    		var vm = this,townStr="",viewMapJsonGXY = null,viewMapJsonTNB = null,viewMapJsonYCF = null,viewMapJsonGL = null,zhongDianViewCodeMonth="",zhongDianViewCodeJi="",zhongDianViewCodeYear="";
    		var vm = this,reqUrl = [],townStr="",viewMapJsonGXY = null,viewMapJsonTNB = null,viewMapJsonYCF = null,viewMapJsonGL = null,zhongDianViewCodeMonth="",zhongDianViewCodeJi="",zhongDianViewCodeYear="";
    		$(".div-mask-layer").show();
    		var currentDate = new Date();
    		//封装参数
@@ -61,8 +63,9 @@ new Vue({
    			zhongDianViewCodeJi = "VIEW_15_0012";//重点人群+按季度
    			zhongDianViewCodeYear = "VIEW_15_0010";//重点人群+按年
    		}
    		//整理请求参数集合(初始化加载所有)
    		var reqUrl = [
    		
    		if(vm.isInit || 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)}},//高血压疾病数据+地图
@@ -76,9 +79,8 @@ new Vue({
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0007",linkageFilter:gaoFaLinkageFilterYear+townStr,limitCondition:10}},//高发疾病排行----筛选条件：全部+本年
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0007",linkageFilter:gaoFaLinkageFilterJi+townStr,limitCondition:10}},//高发疾病排行----筛选条件：全部+本季度
		    		{url: bigDataAPI.getTemplateDataByViewCode,reqType: 'get',data: {viewCode: "VIEW_13_0008",linkageFilter:townStr}},//死亡原因
    		];
    		
    		if(!vm.isClickMap){//点击疾病类型，则本月高发和死亡原因数据不变，不用重新请求
    			];
    		}else{//点击疾病类型，则本月高发和死亡原因数据不变，不用重新请求
    			reqUrl = [
			    		{url: bigDataAPI.getCityArea,reqType: 'get',data: {}},
			    		{url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}},//上饶地图经纬度数据
@@ -91,7 +93,6 @@ new Vue({
			    		{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]);
@@ -99,22 +100,24 @@ new Vue({
				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]);
	    		}
				if(vm.isClickDisease){//点击疾病类型，则地图数据重新加载
					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],datas[8]];//重点人群+按月、重点人群+按季度、重点人群+按年
	    		if(vm.isClickMap){//点击地图，则高发和死亡原因数据重新加载
	    		if(vm.isClickMap ||  vm.isInit){//点击地图或初始化，则高发和死亡原因数据重新加载
	    			vm.gaoFaData = [datas[9],datas[10],datas[11]];//高发疾病排行----筛选条件：本月（默认）、本年、本季度
					vm.siWangData = datas[12];//死亡原因
	    		}
	    		vm.isInit = false;
				$(".div-mask-layer").hide();
				vm.isClickMap = false;
    		})
    	},
    	setMapData: function(data) {
@@ -170,6 +173,7 @@ new Vue({
    		var vm = this;
    		EventBus.$on("refresh-json-data", function(arg) {
    			vm.isClickMap = false;
    			vm.isClickDisease = true;
				vm.type = arg.type;//0:高血压 1:糖尿病 2:孕产妇 3:65岁以上老年人人数
				vm.initData();
			});
@@ -178,6 +182,8 @@ new Vue({
        	this.city = item.name;
        },
        clickMap:function(res){
          this.isClickMap = true;
    	  this.isClickDisease = false;
           this.city = res.name;
        },
		skipClick:function(){
@@ -195,6 +201,7 @@ new Vue({
                }
            })
			vm.isClickMap = true;
    		vm.isClickDisease = false;
			vm.initData();
		}
    }

page/bigData/js/medical.js

@@ -35,7 +35,7 @@ new Vue({
	filters:{
		formatData:function(value){
			if(value>100000){
				return (value/100000).toFixed(2)+"万"
				return (value/10000).toFixed(2)+"万"
			}else{
				return value
			}