对接大数据应用平台页面

page/bigData/html/medical.html

@@ -65,7 +65,7 @@
						<div class="menJiZhen contentBox2 flex f_x_sb mb20">
							<div class="left">
								<p class="mb10  tr">门诊人次</p>
								<p class="yellow_number pl15 mb25">{{leftData.HC_04_1050}} <span class="sub">人次</span></p>
								<p class="yellow_number pl15 mb25">{{leftData.HC_04_1050 || ""}} <span class="sub">人次</span></p>
								<p class="pl10 mb10">门急诊总费用</p>
								<p class="yellow_number pl15">{{leftData.HC_05_1001}} <span class="sub">元</span></p>
							</div>

page/bigData/js/medical.js

@@ -24,7 +24,8 @@ new Vue({
		firstDayYear: "", //本年第一天
		lastDayYear: "", //本年最后一天
		halfYearStartDate: "", //近半年开始时间
		halfYearEndDate: "" //近半年结束时间
		halfYearEndDate: "", //近半年结束时间
		yesterdayDate:""
	},
	mounted: function() {
		this.initData();
@@ -41,21 +42,25 @@ new Vue({
				}
			})
			var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
			if(vm.cityVal) {
			if(vm.cityVal!="0") {
				linkageFilter1 += "town=" + vm.cityVal + ";";
			}
			var linkageFilter2 = "quotaDate >= '" + vm.firstDayYear + "' and quotaDate <= '" + vm.lastDayYear + "';";
			if(vm.cityVal) {
			if(vm.cityVal!="0") {
				linkageFilter2 += "town=" + vm.cityVal + ";";
			}
			var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
			if(vm.cityVal) {
			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"}},
						  {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}},//门诊人次月趋势
@@ -65,7 +70,6 @@ new Vue({
						  {url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}}//上饶地图经纬度数据
						  ];
			httpRequest.getReqPromises(reqUrl).then(function(datas) {
				debugger
				vm.town = [{
					"name": "上饶市",
					"id": "0"
@@ -181,7 +185,7 @@ new Vue({
			var resData = [];
			_.map(data4.obj.VIEW_14_0013, function(item, index) {
				if(item.firstColumn != "合计") {
					item.month = parseInt(item.month.substring(5, 7));
					item.month = parseInt(item.month.substring(5, 7))+"月";
					resData.push(item)
				}
			})
@@ -191,7 +195,7 @@ new Vue({
			var resData = [];
			_.map(data5.obj.VIEW_14_0014, function(item, index) {
				if(item.firstColumn != "合计") {
					item.month = parseInt(item.month.substring(5, 7));
					item.month = parseInt(item.month.substring(5, 7))+"月";
					resData.push(item)
				}
			})
@@ -207,16 +211,18 @@ new Vue({
		},
		setFormater: function(obj) {
			for(var c in obj) {
				obj[c] = toThousands(obj[c])
				if(obj[c].indexOf(",") == -1){//不存在,，说明要格式化
					obj[c] = toThousands(obj[c])
				}
			}
		},
		formatDate: function() {
			//获取上个月第一天
			var firstdate = new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1);
			var firstdate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, 1);
			//获取上个月最后一天
			var date = new Date();
			var day = new Date(date.getFullYear(), date.getMonth(), 0).getDate();
			var enddate = new Date(new Date().getFullYear(), new Date().getMonth() - 1, day);
			var day = new Date(date.getFullYear()-1, date.getMonth(), 0).getDate();
			var enddate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, day);
			//获取本年第一天和最后一天
			var firstYearDate = new Date();
			firstYearDate.setDate(1);
@@ -231,9 +237,22 @@ new Vue({
			this.firstDay = firstdate.format("yyyy-MM-dd");
			this.lastDay = enddate.format("yyyy-MM-dd");
			this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = new Date().getFullYear() + "-12-31";
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast();
			this.yesterdayDate = this.getYesterday(-1, '-');
		},
		getYesterday:function(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()-1;
		    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;
		},
		getCurrentMonthLast: function() {
			var date = new Date();

page/bigData/js/medicalCharts.js

@@ -258,7 +258,6 @@ leftChart2DataFormat = function(options){
	return option;
},
rightChart1DataFormat = function(options){
	debugger
	var xAxisData = _.map(options.xAxis[0].data, function(item, idx) {
		item = parseInt(item.substring(5, 7)) + "月";
		return item;