Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/statistics/js/comprehensive-analysis.js

@@ -137,7 +137,8 @@ function initData(vm){
    vm.userRole = JSON.parse(userRole);
    vm.level = vm.userRole.code == '350200' ? 4 : vm.userRole.code.length == 6 ? 3 : 2;
    vm.area = vm.userRole.code;
    vm.areaTile = vm.userRole.name;
    vm.areaTitle = vm.userRole.name;
    EventBus.$emit('update-area-name', {areaName: vm.areaTitle});
    
    var now = new Date();
    if(now.getMonth() >= 6){

app/statistics/js/home.js

@@ -53,15 +53,15 @@ new Vue({
		}, {
			photo: '../../images/zixunfenxi_icon.png',
			label: '咨询分析',
			url: ''
			url: 'consulting-analysis.html'
		}, {
			photo: '../../images/pijianfenxi_icon.png',
			label: '评价分析',
			url: ''
			url: 'resident-analysis.html'
		}, {
			photo: '../../images/changcufangfenxi_icon.png',
			label: '长处方分析',
			url: ''
			url: 'prescription-analysis.html'
		}]
	},
	methods: {

app/statistics/js/prescription-analysis.js

@@ -164,7 +164,8 @@ function initData(vm){
    vm.level = vm.userRole.code == '350200' ? 4 : vm.userRole.code.length == 6 ? 3 : 2;
    vm.lowLevel = vm.level - 1;
    vm.area = vm.userRole.code;
    vm.areaTile = vm.userRole.name;
    vm.areaTitle = vm.userRole.name;
    EventBus.$emit('update-area-name', {areaName: vm.areaTitle});
    
    var now = new Date();
    vm.endDate = now.format("yyyy-MM-dd");

app/statistics/resident-analysis.html

@@ -33,6 +33,7 @@
		<script src="../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../component/common/event-bus.js"></script>
		<script src="../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../api/statistics-api.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../component/common/vuedals.js" type="text/javascript" charset="utf-8"></script>
		<script src="js/common.js" type="text/javascript" charset="UTF-8"></script>

app/statistics/sign-progress.html

@@ -59,7 +59,8 @@
		<script src="../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../plugins/echarts/3.8.5/echarts.min.js" type="text/javascript" charset="utf-8"></script>
		<!--<script src="../../plugins/echarts/3.8.5/echarts.min.js" type="text/javascript" charset="utf-8"></script>-->
		<script src="js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../api/statistics-api.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../component/common/event-bus.js"></script>

component/statistics/line-chart.js

@@ -175,19 +175,21 @@
                    }
                }
            });
            options.markLine ={
            $.extend(options.series[0], {markLine: {
                    data:[
                        {yAxis: markLineValue, name: markLineName}
                    ],
                    label:{
                        show: true,
                        position: 'middle'
                        position: 'middle',
                        formatter: '{b}: {c}'
                    },
                    lineStyle:{
                        color: 'rgb(194,53,49)'
                    }
            };
            }});
        }
//          console.log(JSON.stringify(options));
        $("#lineChart").removeAttr('_echarts_instance_')
        lineCharts.setOption(options);
    }

component/statistics/resident-analysis-filter.js

@@ -44,8 +44,9 @@
                  this.yearHtml = yearHtml;
           },
           requestData:function(){
           		var vm = this;
           		var reqUrl = ""; 
           		var vm = this,
           		 reqPromise = [],
           		 reqUrl = ""; 
				if(vm.curLevel == 4){//市管
					reqUrl = "/area/"+this.curCode+"/towns";
				}else if(vm.curLevel == 3){//区管
@@ -53,12 +54,9 @@
				}else{//社区管
					reqUrl = "/doctor/admin-teams/teams/"+this.curCode;
				}
				var reqUrl = [{
					url: reqUrl,
					reqType: 'get',
					data: {}
				}]
				httpRequest.getReqPromises(reqUrl).then(function(datas) {
	
				reqPromise.push(httpRequest.get(reqUrl, {data: {}}));
				Promise.all(reqPromise).then(function(datas) {
					if(datas[0].status==200){
						vm.pingData(datas[0].data || [])
					}

component/statistics/resident-analysis.js

@@ -172,64 +172,18 @@ Vue.component('resident-analysis', {
//请求接口数据
function initData(vm) {
	var url = "/statistics/leveltwo_increment";
	EventBus.$emit('update-area-name', {areaName:vm.curName});//更新区域名称
	EventBus.$emit('update-statistics-time', {});//更新统计时间
	EventBus.$emit('update-statistics-year', {selectDate:vm.chooseYear+"年"});//更新统计年份
	var url = "/statistics/leveltwo_increment",reqPromise = [];
	
	var reqUrl = [{
			url: url,
			reqType: 'get',
			data: {
				endDate:vm.endDate,
				area:vm.curCode,
				level:vm.curLevel,
				index:16,
			}
		},
		{
			url: url,
			reqType: 'get',
			data: {
				endDate:vm.endDate,
				area:vm.curCode,
				level:vm.curLevel,
				index:15,
			}
		},
		{
			url: url,
			reqType: 'get',
			data: {
				endDate:vm.endDate,
				area:vm.curCode,
				level:vm.curLevel,
				index:vm.chooseYear==2016?7:36,
			}
		},
		{
			url: url,
			reqType: 'get',
			data: {
				endDate:vm.endDate,
				area:vm.curCode,
				level:vm.curLevel,
				index:6,
			}
		},
		{
			url: url,
			reqType: 'get',
			data: {
				endDate:vm.endDate,
				area:vm.curCode,
				level:vm.curLevel,
				index:8,
			}
		}
	];
	reqPromise.push(httpRequest.get(url, {data: {endDate:vm.endDate,area:vm.curCode,level:vm.curLevel,index:16}}));
	reqPromise.push(httpRequest.get(url, {data: {endDate:vm.endDate,area:vm.curCode,level:vm.curLevel,index:15}}));
	reqPromise.push(httpRequest.get(url, {data: {endDate:vm.endDate,area:vm.curCode,level:vm.curLevel,index:vm.chooseYear==2016?7:36}}));
	reqPromise.push(httpRequest.get(url, {data: {endDate:vm.endDate,area:vm.curCode,level:vm.curLevel,index:6}}));
	reqPromise.push(httpRequest.get(url, {data: {endDate:vm.endDate,area:vm.curCode,level:vm.curLevel,index:8}}));
	httpRequest.getReqPromises(reqUrl).then(function(datas) {
	Promise.all(reqPromise).then(function(datas) {
		var jiaoFeiArr = datas[0],
		healthArr = datas[1],
		serviceArr = datas[2],