修改弹框地区参数

page/bigData/component/death-cause.js

@@ -22,7 +22,7 @@
							</div>\
						</div>\
					</div>',
		props: ["data"],
		props: ["data","city","cityVal"],
		data: function() {
			return {
				causeData: [],
@@ -54,6 +54,7 @@
		},
		methods: {
			detailClick:function(){
				var vm = this;
				var width = (0.7604 * window.screen.width) + 'px';
				var height = (0.41875 * window.screen.width) + 'px';
				top.layer.open({
@@ -64,7 +65,7 @@
				    shade: 0.5,
				    shadeClose: true,
				    area:  [width, height],
				    content: httpRequest.alertUrl+'/page/bigData/html/alert5.html'
				    content: httpRequest.alertUrl+'/page/bigData/html/alert5.html?town='+vm.city+"&cityVal="+vm.cityVal
				});
			},
			initData:function(){//死亡原因

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

@@ -34,7 +34,7 @@
                        </div>\
						<div id="div-gaofa-disease-chart" v-show="hasData"></div>\
					</div>',
		props: ["data"],
		props: ["data","city","cityVal"],
		data: function() {
			return {
				index1:0,
@@ -64,6 +64,7 @@
		},
		methods: {
			detailClick:function(){
				var vm = this;
				var width = (0.7604 * window.screen.width) + 'px';
				var height = (0.41875 * window.screen.width) + 'px';
				top.layer.open({
@@ -74,7 +75,7 @@
				    shade: 0.5,
				    shadeClose: true,
				    area:  [width, height],
				    content: httpRequest.alertUrl+'/page/bigData/html/alert6.html'
				    content: httpRequest.alertUrl+'/page/bigData/html/alert6.html?town='+vm.city+"&cityVal="+vm.cityVal
				});
			},
			btnClick1:function(idx){

page/bigData/html/home.html

@@ -80,7 +80,7 @@
				</div>
				<div class="right-panel">
					<!-- 本月高发疾病排行 -->
					<high-incidence-disease :data="gaoFaData"></high-incidence-disease>
					<high-incidence-disease :data="gaoFaData" :city="city" :city-val="cityVal"></high-incidence-disease>
				</div>
			</div>
			
@@ -91,7 +91,7 @@
				</div>
				<div class="bottom-right-panel">
					<!-- 死亡原因 -->
					<death-cause :data="siWangData"></death-cause>
					<death-cause :data="siWangData" :city="city" :city-val="cityVal"></death-cause>
				</div>
			</div>
			<div class="div-bottom"></div>

page/bigData/js/medical.js

@@ -82,6 +82,7 @@ new Vue({
						  {url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}},//上饶地图经纬度数据
						  ];
			httpRequest.getReqPromises(reqUrl).then(function(datas) {
				debugger
				vm.town = [{
					"name": "上饶市",
					"id": "0"
@@ -261,7 +262,11 @@ new Vue({
		},
		setFormater: function(obj) {
			for(var c in obj) {
				if(obj[c].indexOf(",") == -1){//不存在,，说明要格式化
				if(obj[c].toString().indexOf(",") == -1){//不存在,，说明要格式化
					var re = /^[0-9]+.?[0-9]*/;//判断字符串是否为数字//判断正整数/[1−9]+[0−9]∗]∗/ 
					if (!re.test(obj[c])) { //不是数字，则不格式化
						continue;
					} 
					if(obj[c]>100000){
						obj[c] = (obj[c]/10000).toFixed(2)+"万"
					}else{