zhanghaoyu 6 years ago
parent
commit
35fe047faa

+ 26 - 17
js/util.js

@ -158,6 +158,7 @@ function getMonthEndDate() {
//获得上月开端时候 
function getLastMonthStartDate() {
	debugger
	var lastMonthStartDate = new Date(nowYear, lastMonth, 1);
	return formatDate(lastMonthStartDate);
}
@ -275,27 +276,35 @@ function getLastHalfMonthArray(dateStr){//格式:2018-07
}
//获取当前时间往前推3个季度
function getThirdJiDate(){
	var startMonth =  getQuarterStartMonth()+1;//本季度开端月份
	var endMonth = getQuarterStartMonth() + 3;//本季度停止月份
	var curMonth = new Date().getMonth()+1;//当前月份
	var nowDate = new Date();
function getThirdJiDate(year,month){
	year = Number(year);
	month = Number(month);
	var t = 11;
	if(month<=3){
		t = t - 3 + month;
	}else if(month>3 && month<=6){
		t = t - 6 + month;
	}else if(month>6 && month<=9){
		t = t - 9 + month;
	}else if(month>9 && month<=12){
		t = t - 12 + month;
	}
	if(t>=month){
		year = year - 1;
		month = 12 + month -t;
	}else{
		month = month - t;
	}
	var resDate;
	if(curMonth==startMonth){//往前推9个月
		nowDate.setMonth(nowDate.getMonth() - 9);
		resDate = new Date(nowDate.getFullYear(), nowDate.getMonth(), nowDay);
	}else if(curMonth>startMonth && curMonth<endMonth){//往前推10个月
		resDate = new Date(nowDate.getFullYear(), curMonth, nowDay);
		nowDate.setMonth(nowDate.getMonth() - 10);
	}else{//往前推11个月
		nowDate.setMonth(nowDate.getMonth() - 11);
		resDate = new Date(nowDate.getFullYear(), nowDate.getMonth()-2, nowDay);
	if(month<10){
		resDate = year +'-0'+month+'-01';
	}else{
		resDate = year +'-'+month+'-01';
	}
	return formatDate(resDate);
	console.log(resDate)
	return resDate;
}
Date.prototype.Format = function (fmt) { //author: meizz 
	var o = {
	  "M+": this.getMonth() + 1, //月份 

+ 4 - 4
page/bigData/html/alert1.html

@ -76,12 +76,12 @@
                <div>
                    <span>门诊人次</span>
                    <span>{{alertData3}}</span>
                    <span>人</span>
                    <span>人次</span>
                </div>
                <div>
                    <span>住院人次</span>
                    <span>{{alertData4}}</span>
                    <span>人</span>
                    <span>人次</span>
                </div>
            </div>
            <div class="alert_chart flex f_x_sb">
@ -108,9 +108,9 @@
							<label class="btn btn-default" :class="{active: alertTime == 0}" @click = "alertChart(0)">
								<input type="radio">月
							</label>
							<!-- <label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
							<label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
								<input type="radio">季
							</label> -->
							</label>
							<label class="btn btn-default" :class="{active: alertTime == 1}" @click = "alertChart(1)">
								<input type="radio">年
							</label>

+ 4 - 4
page/bigData/html/alert2.html

@ -76,12 +76,12 @@
                <div>
                    <span>门诊人次</span>
                    <span>{{alertData3}}</span>
                    <span>人</span>
                    <span>人次</span>
                </div>
                <div>
                    <span>住院人次</span>
                    <span>{{alertData4}}</span>
                    <span>人</span>
                    <span>人次</span>
                </div>
            </div>
            <div class="alert_chart flex f_x_sb">
@ -108,9 +108,9 @@
							<label class="btn btn-default" :class="{active: alertTime == 0}" @click = "alertChart(0)">
								<input type="radio">月
							</label>
							<!-- <label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
							<label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
								<input type="radio">季
							</label> -->
							</label>
							<label class="btn btn-default" :class="{active: alertTime == 1}" @click = "alertChart(1)">
								<input type="radio">年
							</label>

+ 2 - 2
page/bigData/html/alert3.html

@ -86,9 +86,9 @@
							<label class="btn btn-default" :class="{active: alertTime == 0}" @click = "alertChart(0)">
								<input type="radio">月
							</label>
							<!-- <label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
							<label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
								<input type="radio">季
							</label> -->
							</label>
							<label class="btn btn-default" :class="{active: alertTime == 1}" @click = "alertChart(1)">
								<input type="radio">年
							</label>

+ 2 - 2
page/bigData/html/alert4.html

@ -105,9 +105,9 @@
							<label class="btn btn-default" :class="{active: alertTime == 0}" @click = "alertChart(0)">
								<input type="radio">月
							</label>
							<!-- <label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
							<label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
								<input type="radio">季
							</label> -->
							</label>
							<label class="btn btn-default" :class="{active: alertTime == 1}" @click = "alertChart(1)">
								<input type="radio">年
							</label>

+ 2 - 2
page/bigData/html/alert5.html

@ -93,9 +93,9 @@
							<label class="btn btn-default" :class="{active: alertTime == 0}" @click = "alertChart(0)">
								<input type="radio">月
							</label>
							<!-- <label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
							<label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
								<input type="radio">季
							</label> -->
							</label>
							<label class="btn btn-default" :class="{active: alertTime == 1}" @click = "alertChart(1)">
								<input type="radio">年
							</label>

+ 2 - 2
page/bigData/html/alert6.html

@ -93,9 +93,9 @@
							<label class="btn btn-default" :class="{active: alertTime == 0}" @click = "alertChart(0)">
								<input type="radio">月
							</label>
							<!-- <label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
							<label class="btn btn-default" :class="{active: alertTime == 2}" @click = "alertChart(2)">
								<input type="radio">季
							</label> -->
							</label>
							<label class="btn btn-default" :class="{active: alertTime == 1}" @click = "alertChart(1)">
								<input type="radio">年
							</label>

+ 23 - 89
page/bigData/js/alert1.js

@ -26,6 +26,7 @@ new Vue({
            'VIEW_13_0017',//就诊月趋势
            'VIEW_13_0022',//就诊年趋势
            'VIEW_13_0010',//年龄分布
            'VIEW_13_0045',//季趋势
        ],
        qushiMonth:'',
        qushiYear:'',
@ -34,7 +35,9 @@ new Vue({
		halfYearStartDate: "", //近半年开始时间
		halfYearEndDate: "", //近半年结束时间
        yesterdayDate:"",//昨天
        type:0
        type:0,
        thirdJiDate:"",//三个季度前
        qushiSeason:"",//季度趋势
	},
	mounted: function() {
        var vm = this;
@ -77,6 +80,7 @@ new Vue({
                }
                vm.halfYearStartDate = getLastHalfMonthArray(endDate.year+'-'+endDate.month)
                vm.halfYearEndDate = vm.lastDay;
                vm.thirdJiDate = getThirdJiDate(endDate.year,endDate.month)
                vm.initData(vm.type);
                vm.alertTime = 0;
              }
@ -96,6 +100,7 @@ new Vue({
                event_type = 0;//门诊
            }
            var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter2 = "quotaDate >= '" + vm.thirdJiDate + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
            console.log(linkageFilter1)
            var code = this.code;
@ -104,13 +109,14 @@ new Vue({
            var reqUrl = [
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[0]}},//总人数
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[0],linkageFilter:linkageFilter1}},//新增人数
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[1],linkageFilter:linkageFilter1+'eventType=0'}},//门诊,住院人次
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[1],linkageFilter:linkageFilter1}},//门诊,住院人次
                {url:urlChart,reqType: 'get',data: {viewCode:code[2],linkageFilter:linkageFilter1+'eventType='+event_type}},//区县分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[3],linkageFilter:linkageFilter1+'eventType='+event_type}},//性别分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[4],linkageFilter:linkageFilter1+'eventType='+event_type}},//疾病前五
                {url:urlChart,reqType: 'get',data: {viewCode:code[5],linkageFilter:linkageFilter3+'eventType='+event_type}},//老年人就诊趋势-月
                {url:urlChart,reqType: 'get',data: {viewCode:code[6],linkageFilter:'eventType='+event_type}},//老年人就诊趋势-年
                {url:urlChart,reqType: 'get',data: {viewCode:code[7],linkageFilter:linkageFilter1+'eventType='+event_type}},//年龄分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[8],linkageFilter:linkageFilter2+'eventType='+event_type}},//老年人就诊趋势-季
            ]
            $(".div-mask-layer").show();
            httpRequest.getReqPromises(reqUrl).then(function(datas) {
@ -125,8 +131,10 @@ new Vue({
                var chart4 = datas[6].obj.viewInfos[0].options[0].option;
                var chart5 = datas[7].obj.viewInfos[0].options[0].option;
                var chart6 = datas[8].obj.viewInfos[0].options[0].option;
                var chart7 = datas[9].obj.viewInfos[0].options[0].option;
                vm.qushiMonth = chart4;
                vm.qushiYear = chart5;
                vm.qushiSeason = chart7;
                vm.setAlertChart1(chart1);
                vm.setAlertChart2(chart6);
                vm.setAlertChart3(chart2);
@ -220,6 +228,8 @@ new Vue({
                vm.setAlertChart5(vm.qushiMonth);
            }else if(time == 1){
                vm.setAlertChart5(vm.qushiYear);
            }else if(time == 2){
                vm.setAlertChart5(vm.qushiSeason);
            }
        },
        closeAlertClick:function(){
@ -243,95 +253,19 @@ new Vue({
			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 firstYearDate = new Date();
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            //格式化结果
            var year = date.getFullYear();
            debugger
            this.thirdJiDate = getThirdJiDate(year,lastMonth+1);
            this.firstDay = getLastMonthStartDate();
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastDay = getLastMonthEndDate();
            this.lastMonth = enddate.format("yyyy-MM");
            this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getCurrentMonthLast: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
		},
		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();
		    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;
		},
        formatDate2017: function() {
			//获取上个月第一天
			var firstdate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, 1);
			//获取上个月最后一天
			var date = new Date();
			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.setFullYear(new Date().getFullYear()-1)
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastMonth = enddate.format("yyyy-MM");
			this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getYesterday2017: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;
		},
		getCurrentMonthLast2017: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear() - 1, nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
            this.firstDayYear = getYearStartDate();
			this.lastDayYear = getYearEndDate();
			this.halfYearStartDate = getHalfYearStartDate();
			this.halfYearEndDate = getHalfYearEndDate();
			this.yesterdayDate = getYearEndDate();
        },
        getLastDay(year, month) {
            var new_year = year; //取当前的年份

+ 23 - 89
page/bigData/js/alert2.js

@ -26,6 +26,7 @@ new Vue({
            'VIEW_13_0028',//就诊月趋势
            'VIEW_13_0029',//就诊年趋势
            'VIEW_13_0031',//年龄分布
            'VIEW_13_0046',//就诊季趋势
        ],
        qushiMonth:'',
        qushiYear:'',
@ -34,7 +35,9 @@ new Vue({
		halfYearStartDate: "", //近半年开始时间
		halfYearEndDate: "", //近半年结束时间
        yesterdayDate:"",//昨天
        type:0
        type:0,
        thirdJiDate:"",//三个季度前
        qushiSeason:"",//季度趋势
	},
	mounted: function() {
        var vm = this;
@ -77,6 +80,7 @@ new Vue({
                }
                vm.halfYearStartDate = getLastHalfMonthArray(endDate.year+'-'+endDate.month)
                vm.halfYearEndDate = vm.lastDay;
                vm.thirdJiDate = getThirdJiDate(endDate.year,endDate.month)
                vm.initData(vm.type);
                vm.alertTime = 0;
              }
@ -96,6 +100,7 @@ new Vue({
                event_type = 0;//门诊
            }
            var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter2 = "quotaDate >= '" + vm.thirdJiDate + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
            console.log(linkageFilter1)
            var code = this.code;
@ -104,13 +109,14 @@ new Vue({
            var reqUrl = [
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[0]}},//总人数
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[0],linkageFilter:linkageFilter1}},//新增人数
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[1],linkageFilter:linkageFilter1+'eventType=0'}},//门诊,住院人次
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[1],linkageFilter:linkageFilter1}},//门诊,住院人次
                {url:urlChart,reqType: 'get',data: {viewCode:code[2],linkageFilter:linkageFilter1+'eventType='+event_type}},//区县分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[3],linkageFilter:linkageFilter1+'eventType='+event_type}},//性别分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[4],linkageFilter:linkageFilter1+'eventType='+event_type}},//疾病前五
                {url:urlChart,reqType: 'get',data: {viewCode:code[5],linkageFilter:linkageFilter3+'eventType='+event_type}},//老年人就诊趋势-月
                {url:urlChart,reqType: 'get',data: {viewCode:code[6],linkageFilter:'eventType='+event_type}},//老年人就诊趋势-年
                {url:urlChart,reqType: 'get',data: {viewCode:code[7],linkageFilter:linkageFilter1+'eventType='+event_type}},//年龄分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[8],linkageFilter:linkageFilter2+'eventType='+event_type}},//老年人就诊趋势-月
            ]
            $(".div-mask-layer").show();
            httpRequest.getReqPromises(reqUrl).then(function(datas) {          
@ -125,8 +131,10 @@ new Vue({
                var chart4 = datas[6].obj.viewInfos[0].options[0].option;
                var chart5 = datas[7].obj.viewInfos[0].options[0].option;
                var chart6 = datas[8].obj.viewInfos[0].options[0].option;
                var chart7 = datas[9].obj.viewInfos[0].options[0].option;
                vm.qushiMonth = chart4;
                vm.qushiYear = chart5;
                vm.qushiSeason = chart7;
                vm.setAlertChart1(chart1);
                vm.setAlertChart2(chart6);
                vm.setAlertChart3(chart2);
@ -223,6 +231,8 @@ new Vue({
                vm.setAlertChart5(vm.qushiMonth);
            }else if(time == 1){
                vm.setAlertChart5(vm.qushiYear);
            }else if(time == 2){
                vm.setAlertChart5(vm.qushiSeason);
            }
        },
        closeAlertClick:function(){
@ -246,95 +256,19 @@ new Vue({
			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 firstYearDate = new Date();
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            //格式化结果
            var year = date.getFullYear();
            debugger
            this.thirdJiDate = getThirdJiDate(year,lastMonth+1);
            this.firstDay = getLastMonthStartDate();
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastDay = getLastMonthEndDate();
            this.lastMonth = enddate.format("yyyy-MM");
            this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getCurrentMonthLast: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
		},
		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();
		    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;
		},
        formatDate2017: function() {
			//获取上个月第一天
			var firstdate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, 1);
			//获取上个月最后一天
			var date = new Date();
			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.setFullYear(new Date().getFullYear()-1)
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastMonth = enddate.format("yyyy-MM");
			this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getYesterday2017: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;
		},
		getCurrentMonthLast2017: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear() - 1, nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
            this.firstDayYear = getYearStartDate();
			this.lastDayYear = getYearEndDate();
			this.halfYearStartDate = getHalfYearStartDate();
			this.halfYearEndDate = getHalfYearEndDate();
			this.yesterdayDate = getYearEndDate();
        },
        getLastDay(year, month) {
            var new_year = year; //取当前的年份

+ 22 - 88
page/bigData/js/alert3.js

@ -25,6 +25,7 @@ new Vue({
            'VIEW_16_0008',//疾病前五
            'VIEW_16_0004',//就诊月趋势
            'VIEW_16_0005',//就诊年趋势
            'VIEW_16_0012',//就诊季趋势
        ],
        qushiMonth:'',
        qushiYear:'',
@ -34,7 +35,9 @@ new Vue({
		halfYearEndDate: "", //近半年结束时间
        yesterdayDate:"",//昨天
        type:0,
        time:''//42天前
        time:'',//42天前
        thirdJiDate:"",//三个季度前
        qushiSeason:"",//季度趋势
	},
	mounted: function() {
        var vm = this;
@ -83,6 +86,7 @@ new Vue({
                }
                vm.halfYearStartDate = getLastHalfMonthArray(endDate.year+'-'+endDate.month)
                vm.halfYearEndDate = vm.lastDay;
                vm.thirdJiDate = getThirdJiDate(endDate.year,endDate.month);
                vm.initData(vm.type);
                vm.alertTime = 0;
              }
@ -104,6 +108,7 @@ new Vue({
            var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter2 = "quotaDate >= '" + vm.time + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
            var linkageFilter4 = "quotaDate >= '" + vm.thirdJiDate + "' and quotaDate <= '" + vm.lastDay + "';";
            console.log(linkageFilter1)
            var code = this.code;
            var urlNumber = '/gov/report/getNoChartTemplateData';
@ -116,6 +121,7 @@ new Vue({
                {url:urlChart,reqType: 'get',data: {viewCode:code[4],linkageFilter:linkageFilter1+'eventType='+event_type}},//疾病前五
                {url:urlChart,reqType: 'get',data: {viewCode:code[5],linkageFilter:linkageFilter3+'eventType='+event_type}},//老年人就诊趋势-月
                {url:urlChart,reqType: 'get',data: {viewCode:code[6],linkageFilter:'eventType='+event_type}},//老年人就诊趋势-年
                {url:urlChart,reqType: 'get',data: {viewCode:code[7],linkageFilter:linkageFilter4+'eventType='+event_type}},//老年人就诊趋势-月
            ]
            $(".div-mask-layer").show();
            httpRequest.getReqPromises(reqUrl).then(function(datas) {
@ -127,8 +133,10 @@ new Vue({
                var chart3 = datas[4].obj.viewInfos[0].options[0].option;
                var chart4 = datas[5].obj.viewInfos[0].options[0].option;
                var chart5 = datas[6].obj.viewInfos[0].options[0].option;
                var chart6 = datas[7].obj.viewInfos[0].options[0].option;
                vm.qushiMonth = chart4;
                vm.qushiYear = chart5;
                vm.qushiSeason = chart6;
                console.log(chart5)
                vm.setAlertChart1(chart1);
                vm.setAlertChart2(chart2);
@ -220,6 +228,8 @@ new Vue({
                vm.setAlertChart5(vm.qushiMonth);
            }else if(time == 1){
                vm.setAlertChart5(vm.qushiYear);
            }else if(time == 2){
                vm.setAlertChart5(vm.qushiSeason);
            }
        },
        closeAlertClick:function(){
@ -243,95 +253,19 @@ new Vue({
			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 firstYearDate = new Date();
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            //格式化结果
            var year = date.getFullYear();
            debugger
            this.thirdJiDate = getThirdJiDate(year,lastMonth+1);
            this.firstDay = getLastMonthStartDate();
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastDay = getLastMonthEndDate();
            this.lastMonth = enddate.format("yyyy-MM");
            this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getCurrentMonthLast: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
		},
		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();
		    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;
		},
        formatDate2017: function() {
			//获取上个月第一天
			var firstdate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, 1);
			//获取上个月最后一天
			var date = new Date();
			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.setFullYear(new Date().getFullYear()-1)
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastMonth = enddate.format("yyyy-MM");
			this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getYesterday2017: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;
		},
		getCurrentMonthLast2017: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear() - 1, nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
            this.firstDayYear = getYearStartDate();
			this.lastDayYear = getYearEndDate();
			this.halfYearStartDate = getHalfYearStartDate();
			this.halfYearEndDate = getHalfYearEndDate();
			this.yesterdayDate = getYearEndDate();
        },
        getLastDay(year, month) {
            var new_year = year; //取当前的年份

+ 23 - 89
page/bigData/js/alert4.js

@ -25,6 +25,7 @@ new Vue({
            'VIEW_15_0005',//疾病前五
            'VIEW_15_0006',//就诊月趋势
            'VIEW_15_0007',//就诊年趋势
            'VIEW_15_0012',//就诊季趋势
        ],
        qushiMonth:'',
        qushiYear:'',
@ -33,7 +34,9 @@ new Vue({
		halfYearStartDate: "", //近半年开始时间
		halfYearEndDate: "", //近半年结束时间
        yesterdayDate:"",//昨天
        type:0
        type:0,
        thirdJiDate:"",//三个季度前
        qushiSeason:"",//季度趋势
	},
	mounted: function() {
        var vm = this;
@ -76,6 +79,7 @@ new Vue({
                }
                vm.halfYearStartDate = getLastHalfMonthArray(endDate.year+'-'+endDate.month)
                vm.halfYearEndDate = vm.lastDay;
                vm.thirdJiDate = getThirdJiDate(endDate.year,endDate.month)
                vm.initData(vm.type);
                vm.alertTime = 0;
              }
@ -95,6 +99,7 @@ new Vue({
                event_type = 0;//门诊
            }
            var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter2 = "quotaDate >= '" + vm.thirdJiDate + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
            console.log(linkageFilter1)
            var code = this.code;
@ -103,12 +108,13 @@ new Vue({
            var reqUrl = [
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[0]}},//总人数
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[0],linkageFilter:linkageFilter1}},//新增人数
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[1],linkageFilter:linkageFilter1+'eventType=0'}},//门诊,住院人次
                {url:urlNumber,reqType: 'get',data: {viewCodeStr:code[1],linkageFilter:linkageFilter1}},//门诊,住院人次
                {url:urlChart,reqType: 'get',data: {viewCode:code[2],linkageFilter:linkageFilter1+'eventType='+event_type}},//区县分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[3],linkageFilter:linkageFilter1+'eventType='+event_type}},//性别分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[4],linkageFilter:linkageFilter1+'eventType='+event_type}},//疾病前五
                {url:urlChart,reqType: 'get',data: {viewCode:code[5],linkageFilter:linkageFilter3+'eventType='+event_type}},//老年人就诊趋势-月
                {url:urlChart,reqType: 'get',data: {viewCode:code[6],linkageFilter:'eventType='+event_type}},//老年人就诊趋势-年
                {url:urlChart,reqType: 'get',data: {viewCode:code[7],linkageFilter:linkageFilter2+'eventType='+event_type}},//老年人就诊趋势-月
            ]
            $(".div-mask-layer").show();
            httpRequest.getReqPromises(reqUrl).then(function(datas) {
@ -121,8 +127,10 @@ new Vue({
                var chart3 = datas[5].obj.viewInfos[0].options[0].option;
                var chart4 = datas[6].obj.viewInfos[0].options[0].option;
                var chart5 = datas[7].obj.viewInfos[0].options[0].option;
                var chart6 = datas[8].obj.viewInfos[0].options[0].option;
                vm.qushiMonth = chart4;
                vm.qushiYear = chart5;
                vm.qushiSeason = chart6;
                vm.setAlertChart1(chart1);
                vm.setAlertChart3(chart2);
                vm.setAlertChart4(chart3);
@ -214,6 +222,8 @@ new Vue({
                vm.setAlertChart5(vm.qushiMonth);
            }else if(time == 1){
                vm.setAlertChart5(vm.qushiYear);
            }else if(time == 2){
                vm.setAlertChart5(vm.qushiSeason);
            }
        },
        closeAlertClick:function(){
@ -237,95 +247,19 @@ new Vue({
			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 firstYearDate = new Date();
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            //格式化结果
            var year = date.getFullYear();
            debugger
            this.thirdJiDate = getThirdJiDate(year,lastMonth+1);
            this.firstDay = getLastMonthStartDate();
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastDay = getLastMonthEndDate();
            this.lastMonth = enddate.format("yyyy-MM");
            this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getCurrentMonthLast: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
		},
		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();
		    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;
		},
        formatDate2017: function() {
			//获取上个月第一天
			var firstdate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, 1);
			//获取上个月最后一天
			var date = new Date();
			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.setFullYear(new Date().getFullYear()-1)
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastMonth = enddate.format("yyyy-MM");
			this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getYesterday2017: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;
		},
		getCurrentMonthLast2017: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear() - 1, nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
            this.firstDayYear = getYearStartDate();
			this.lastDayYear = getYearEndDate();
			this.halfYearStartDate = getHalfYearStartDate();
			this.halfYearEndDate = getHalfYearEndDate();
			this.yesterdayDate = getYearEndDate();
        },
        getLastDay(year, month) {
            var new_year = year; //取当前的年份

+ 22 - 89
page/bigData/js/alert5.js

@ -20,6 +20,7 @@ new Vue({
            'VIEW_13_0021',//性别分布
            'VIEW_13_0023',//新增患者月趋势
            'VIEW_13_0025',//新增患者年趋势
            'VIEW_13_0024',//新增患者季趋势
        ],
        qushiMonth:'',
        qushiYear:'',
@ -28,7 +29,9 @@ new Vue({
		halfYearStartDate: "", //近半年开始时间
		halfYearEndDate: "", //近半年结束时间
        yesterdayDate:"",//昨天
        type:0
        type:0,
        thirdJiDate:"",//三个季度前
        qushiSeason:"",//季度趋势
	},
	mounted: function() {
        var vm = this;
@ -71,6 +74,7 @@ new Vue({
                }
                vm.halfYearStartDate = getLastHalfMonthArray(endDate.year+'-'+endDate.month)
                vm.halfYearEndDate = vm.lastDay;
                vm.thirdJiDate = getThirdJiDate(endDate.year,endDate.month);
                vm.initData(vm.type);
                vm.alertTime = 0;
              }
@ -83,6 +87,7 @@ new Vue({
        initData:function(type){
            var vm = this;
            var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter2 = "quotaDate >= '" + vm.thirdJiDate + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
            console.log(linkageFilter1)
            var code = this.code;
@ -95,6 +100,7 @@ new Vue({
                {url:urlChart,reqType: 'get',data: {viewCode:code[3],linkageFilter:linkageFilter1}},//性别分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[4],linkageFilter:linkageFilter3}},//新增患者月趋势
                {url:urlChart,reqType: 'get',data: {viewCode:code[5]}},//老年人就诊趋势-年
                {url:urlChart,reqType: 'get',data: {viewCode:code[6],linkageFilter:linkageFilter2}},//新增患者季趋势
            ]
            $(".div-mask-layer").show();
            httpRequest.getReqPromises(reqUrl).then(function(datas) {
@ -107,9 +113,10 @@ new Vue({
                var chart2 = datas[3].obj.viewInfos[0].options[0].option;
                var chart3 = datas[4].obj.viewInfos[0].options[0].option;
                var chart4 = datas[5].obj.viewInfos[0].options[0].option;
                // var chart5 = datas[7].obj.viewInfos[0].options[0].option;
                var chart5 = datas[6].obj.viewInfos[0].options[0].option;
                vm.qushiMonth = chart3;
                vm.qushiYear = chart4;
                vm.qushiSeason = chart5;
                vm.setAlertChart2(chart1);
                vm.setAlertChart3(chart2);
                // vm.setAlertChart4(chart3);
@ -203,6 +210,8 @@ new Vue({
                vm.setAlertChart5(vm.qushiMonth);
            }else if(time == 1){
                vm.setAlertChart5(vm.qushiYear);
            }else if(time == 2){
                vm.setAlertChart5(vm.qushiSeason);
            }
        },
        closeAlertClick:function(){
@ -226,95 +235,19 @@ new Vue({
			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 firstYearDate = new Date();
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            //格式化结果
            var year = date.getFullYear();
            debugger
            this.thirdJiDate = getThirdJiDate(year,lastMonth+1);
            this.firstDay = getLastMonthStartDate();
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastDay = getLastMonthEndDate();
            this.lastMonth = enddate.format("yyyy-MM");
            this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getCurrentMonthLast: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
		},
		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();
		    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;
		},
        formatDate2017: function() {
			//获取上个月第一天
			var firstdate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, 1);
			//获取上个月最后一天
			var date = new Date();
			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.setFullYear(new Date().getFullYear()-1)
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastMonth = enddate.format("yyyy-MM");
			this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getYesterday2017: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;
		},
		getCurrentMonthLast2017: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear() - 1, nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
            this.firstDayYear = getYearStartDate();
			this.lastDayYear = getYearEndDate();
			this.halfYearStartDate = getHalfYearStartDate();
			this.halfYearEndDate = getHalfYearEndDate();
			this.yesterdayDate = getYearEndDate();
        },
        getLastDay(year, month) {
            var new_year = year; //取当前的年份

+ 22 - 89
page/bigData/js/alert6.js

@ -20,6 +20,7 @@ new Vue({
            'VIEW_13_0041',//性别分布
            'VIEW_13_0042',//新增患者月趋势
            'VIEW_13_0043',//新增患者年趋势
            'VIEW_13_0044',//新增患者季趋势
        ],
        qushiMonth:'',
        qushiYear:'',
@ -28,7 +29,9 @@ new Vue({
		halfYearStartDate: "", //近半年开始时间
		halfYearEndDate: "", //近半年结束时间
        yesterdayDate:"",//昨天
        type:0
        type:0,
        thirdJiDate:"",//三个季度前
        qushiSeason:"",//季度趋势
	},
	mounted: function() {
        var vm = this;
@ -71,6 +74,7 @@ new Vue({
                }
                vm.halfYearStartDate = getLastHalfMonthArray(endDate.year+'-'+endDate.month)
                vm.halfYearEndDate = vm.lastDay;
                vm.thirdJiDate = getThirdJiDate(endDate.year,endDate.month)
                vm.initData(vm.type);
                vm.alertTime = 0;
              }
@ -83,6 +87,7 @@ new Vue({
        initData:function(type){
            var vm = this;
            var linkageFilter1 = "quotaDate >= '" + vm.firstDay + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter2 = "quotaDate >= '" + vm.thirdJiDate + "' and quotaDate <= '" + vm.lastDay + "';";
            var linkageFilter3 = "quotaDate >= '" + vm.halfYearStartDate + "' and quotaDate <= '" + vm.halfYearEndDate + "';";
            console.log(linkageFilter1)
            var code = this.code;
@ -96,6 +101,7 @@ new Vue({
                {url:urlChart,reqType: 'get',data: {viewCode:code[3],linkageFilter:linkageFilter1}},//性别分布
                {url:urlChart,reqType: 'get',data: {viewCode:code[4],linkageFilter:linkageFilter3}},//新增患者月趋势
                {url:urlChart,reqType: 'get',data: {viewCode:code[5]}},//老年人就诊趋势-年
                {url:urlChart,reqType: 'get',data: {viewCode:code[6],linkageFilter:linkageFilter2}},//新增患者季趋势
            ]
            httpRequest.getReqPromises(reqUrl).then(function(datas) {
                console.log(datas);
@ -107,9 +113,10 @@ new Vue({
                var chart2 = datas[3].obj.viewInfos[0].options[0].option;
                var chart3 = datas[4].obj.viewInfos[0].options[0].option;
                var chart4 = datas[5].obj.viewInfos[0].options[0].option;
                // var chart5 = datas[7].obj.viewInfos[0].options[0].option;
                var chart5 = datas[6].obj.viewInfos[0].options[0].option;
                vm.qushiMonth = chart3;
                vm.qushiYear = chart4;
                vm.qushiSeason = chart5;
                vm.setAlertChart2(chart1);
                vm.setAlertChart3(chart2);
                // vm.setAlertChart4(chart3);
@ -203,6 +210,8 @@ new Vue({
                vm.setAlertChart5(vm.qushiMonth);
            }else if(time == 1){
                vm.setAlertChart5(vm.qushiYear);
            }else if(time == 2){
                vm.setAlertChart5(vm.qushiSeason);
            }
        },
        closeAlertClick:function(){
@ -226,95 +235,19 @@ new Vue({
			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 firstYearDate = new Date();
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            //格式化结果
            var year = date.getFullYear();
            debugger
            this.thirdJiDate = getThirdJiDate(year,lastMonth+1);
            this.firstDay = getLastMonthStartDate();
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastDay = getLastMonthEndDate();
            this.lastMonth = enddate.format("yyyy-MM");
            this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getCurrentMonthLast: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
		},
		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();
		    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;
		},
        formatDate2017: function() {
			//获取上个月第一天
			var firstdate = new Date(new Date().getFullYear()-1, new Date().getMonth() - 1, 1);
			//获取上个月最后一天
			var date = new Date();
			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.setFullYear(new Date().getFullYear()-1)
			firstYearDate.setDate(1);
			firstYearMonty = firstYearDate.setMonth(0);
			//近半年开始时间
			var date1 = new Date();
			date1.setMonth(date1.getMonth() - 6);
			var year1 = date1.getFullYear() - 1;
			var month1 = date1.getMonth() + 1;
			month1 = (month1 < 10 ? "0" + month1 : month1);
			//格式化结果
            this.firstDay = firstdate.format("yyyy-MM-dd");
            this.firstMonth = firstdate.format("yyyy-MM");
            this.lastDay = enddate.format("yyyy-MM-dd");
            this.lastMonth = enddate.format("yyyy-MM");
			this.firstDayYear = firstYearDate.format("yyyy-MM-dd");
			this.lastDayYear = (new Date().getFullYear()-1) + "-12-31";
			this.halfYearStartDate = year1.toString() + '-' + month1.toString() + "-01";
			this.halfYearEndDate = this.getCurrentMonthLast2017();
			this.yesterdayDate = this.getYesterday2017(-1, '-');
        },
		getYesterday2017: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;
		},
		getCurrentMonthLast2017: function() {
			var date = new Date();
			var currentMonth = date.getMonth();
			var nextMonth = ++currentMonth;
			var nextMonthFirstDay = new Date(date.getFullYear() - 1, nextMonth-1, 1);
			var oneDay = 1000 * 60 * 60 * 24;
			return(new Date(nextMonthFirstDay - oneDay)).format("yyyy-MM-dd");
            this.firstDayYear = getYearStartDate();
			this.lastDayYear = getYearEndDate();
			this.halfYearStartDate = getHalfYearStartDate();
			this.halfYearEndDate = getHalfYearEndDate();
			this.yesterdayDate = getYearEndDate();
        },
        getLastDay(year, month) {
            var new_year = year; //取当前的年份