Merge branch 'sr-1.11.0' of http://192.168.1.220:10080/lulihong0928/bigScreenShow into sr-1.11.0

component/chart/map-chart.js

@@ -55,7 +55,7 @@
                        var piceArr = this.getPiceArr(maxValue)
                        options.visualMap = {
                            text: null,
                            color: ['#62a3ff', '#bdcfe5', '#c5ddff'],
                            color: ['#0046ac', '#005adc', '#277fff','#62a2ff','#c5ddff'],
                            pieces: piceArr,
                            textStyle: {
                                color: '#b5e1fc'

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

@@ -41,7 +41,7 @@
				index2:0,
				gaoBingFaData:null,
				isInit:true,
				fontSize: 0.007 * window.screen.width,
				fontSize: 0,
				linkageFilter:"",
				hasData:true,
				monthData:null,
@@ -50,7 +50,8 @@
			}
		},
		mounted: function() {
			
			var width = window.screen.width>=1920?window.screen.width:1920;
			this.fontSize = 0.007 * width;
		},
		watch:{
			data:function(data){
@@ -235,6 +236,7 @@
								show: true,
								position: "right",
								color: '#b5e1fc',
								fontSize:vm.fontSize,
								formatter:function(param){
									var dataIndex = param.dataIndex,zhuYuanVal;
									 _.map(zhuYuanData,function(item,idx){

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

@@ -27,7 +27,7 @@
			return {
				keyServiceData:null,
				activeIndex:0,
				fontSize: 0.007 * window.screen.width,
				fontSize: 0,
				hasData:true,
				monthData:null,
				jiData:null,
@@ -35,7 +35,8 @@
			}
		},
		mounted: function() {
			
			var width = window.screen.width>=1920?window.screen.width:1920;
			this.fontSize = 0.007 * width;
		},
		watch:{
			data:function(newData){

page/bigData/js/home.js

@@ -74,7 +74,7 @@ new Vue({
		    		{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_0044",linkageFilter:gaoFaLinkageFilterJi+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}},//死亡原因
    		];