Home Explore Help
Register Sign In
chenyue
/
PC-application
forked from raolu/PC-application
Watch 0
Star 0
Fork 0
Files
Browse Source

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

Xiao_yanpeng 7 years ago
parent
fd44d0a2ee 25bdf914c9
commit
61ffe37f8a
21 changed files with 1188 additions and 181 deletions
Split View Show Diff Stats
  1. 17 16
      api/http-request.js
  2. 11 9
      app/record/html/tpl_follow_detail/followup_education.html
  3. 67 0
      app/record/html/tpl_follow_detail/followup_referral.html
  4. 2 2
      app/record/html/tpl_follow_detail/js/followup-tabs.js
  5. 11 0
      app/record/html/tpl_follow_detail/js/referral.js
  6. 1 26
      app/record/html/tpl_follow_detail/js/symptom.js
  7. 1 1
      app/statistics/comprehensive-analysis.html
  8. 9 0
      app/statistics/consulting-analysis.html
  9. 9 0
      app/statistics/estimate-analysis.html
  10. 59 20
      app/statistics/js/common.js
  11. 3 0
      app/statistics/js/comprehensive-analysis.js
  12. 92 70
      app/statistics/js/home.js
  13. 437 0
      app/statistics/js/prescription-analysis.js
  14. 31 12
      app/statistics/js/sign-progress.js
  15. 156 0
      app/statistics/prescription-analysis.html
  16. 2 2
      component/statistics/area-data-panel.js
  17. 162 0
      component/statistics/bar-chart.js
  18. 40 3
      component/statistics/line-chart.js
  19. 15 8
      component/statistics/resident-analysis-filter.js
  20. 7 1
      component/statistics/resident-analysis.js
  21. 56 11
      component/statistics/sign-progress-filter.js

+ 17 - 16
api/http-request.js
View File 

@ -2,24 +2,22 @@
 
    var publish_version = false,
 
	server,
 
	imgUrlDomain,
 
	agentName = "wlyyAgentForDoc",
 
//	agentName = "wlyyAgentForDoc",
 
    agentName = "useragent", //先设置与医生端一致，暂借用app端的userAgent值
 
	userInfo = "userInfoForPay",
 
	userAgent = window.localStorage.getItem(agentName);//获取pcIM缓存
 
	//临时添加
 
	var sendHead = {};
 
	var userObj = JSON.parse(userAgent)
 
	sendHead.uid = userObj.uid
 
	sendHead.imei = localStorage.getItem('WLYY_IMEI')
 
	sendHead.platform = 4
 
	sendHead.token= userObj.token
 
	
    if(publish_version) { //生产环境配置
 
        server = ""  
    } else { //测试环境配置
 
	userAgent = '';
 
    if(publish_version) { // 生产环境配置
 
        server = ""
 
        
    } else { // 测试环境配置
 
        server = "http://172.19.103.88:9092/wlyy/";
 
        imserver = "http://172.19.103.88:3000/api/v2";
 
        imgUrlDomain = "http://172.19.103.54/";
 
    }
 
    
    //测试使用，写死userAgent。如果要切换账号，自己再其他端登录后将userAgent的值拷贝过来即可
 
    var userAgent = {"id":4835,"uid":"rll201703150222","imei":"860573010176837","token":"c0cdef2e1238d89eb4397e1349b56416","platform":2,"hospital":"3502050100","appVersion":"1.4.3"};
 
    window.localStorage.setItem(agentName, JSON.stringify(userAgent));
 
    function httpGet(url, options) {
 
        //发送ajax请求
 
@ -28,8 +26,9 @@
 
                $.extend({}, {
 
                    type: 'GET',
 
                    dataType: 'JSON',
 
                    beforeSend: function(request) {                   	
                    	request.setRequestHeader("userAgent", JSON.stringify(sendHead));
 
                    beforeSend: function(request) {
 
                    	var userAgent = window.localStorage.getItem(agentName);
 
                    	request.setRequestHeader(agentName, userAgent);
 
                    },
 
                    error: function(res) {
 
                        reject(res)
 
@ -49,7 +48,8 @@
 
                    type: 'POST',
 
                    dataType: 'JSON',
 
                    beforeSend: function(request) {
 
                    	request.setRequestHeader("userAgent", JSON.stringify(sendHead));
 
                    	var userAgent = window.localStorage.getItem(agentName);
 
                    	request.setRequestHeader(agentName, userAgent);
 
                    },
 
                    error: function(res) {
 
                        reject(res)
 
@ -121,5 +121,6 @@
 
        	return imHttpGet(url, options)
 
        }
 
    }
 
    exports.httpRequest = httpRequest;
 
})(window)

+ 11 - 9
app/record/html/tpl_follow_detail/followup_education.html
View File 

@ -7,7 +7,7 @@
 
		<style type="text/css">
 
			em{font-style: normal;}
 
			.page_title{font-size: 18px;padding: 10px;margin-bottom: 0;text-align: center;}
 
			.inline-container{font-size: 0;}
 
			.inline-container{font-size: 0;padding: 10px 30px;}
 
			.row-inline-item{display: inline-block;margin-left: 20px;margin-top: 20px;}
 
			.row-inline-item span{font-size: 14px;}
 
			.form-control{display: inline-block;text-align: center;margin: 0 5px;width: 64px;border-radius: 0;padding: 2px 6px;line-height: 20px;height: 28px;}
 
@ -22,25 +22,27 @@
 
			.row-inline-item>div>span:after{content: '/';display: inline-block;margin: 0 2px 0 -2px;}
 
			.row-inline-item>div>span:last-child:after{display: none;}
 
			.row-inline-item>div>span:first-child:after{display: none;}
 
			.jynr .input-group-addon{background: none;border: none;padding: 0;}
 
			.jynr .form-control{padding: 10px;}
 
		</style>
 
	</head>
 
	<body>
 
		<div id="app">
 
			<p class="page_title">8、健康教育</p>
 
			<div class="inline-container disabled-input">
 
				<div>
 
					<span>日期</span>
 
					<input type="datetime-local" class="form-control form-control-180"  :value="educations.time" />
 
				</div>
 
				<div class="pull-right">
 
				<div style="font-size: 14px;" class="pull-right">
 
					<span>记录者</span>
 
					<select class="form-control form-control-180">
 
						<option v-for="name in educations.records" v-text="name"></option>
 
					</select>
 
				</div>
 
				<div class="input-group">
 
					<span class="input-group-addon"></span>
 
					<div class="form-control form-control-556-180" v-text="educations.jynr"></div>
 
				<div style="font-size: 14px;">
 
					<span>日期</span>
 
					<input type="datetime-local" class="form-control form-control-180"  :value="educations.time" />
 
				</div>
 
				<div class="input-group jynr" style="margin-top: 20px;">
 
					<span class="input-group-addon">教育内容</span>
 
					<div class="form-control form-control-556-180" style="width: 556px;height: 180px;text-align: left;" v-text="educations.jynr"></div>
 
				</div>
 
			</div>
 
		</div>

+ 67 - 0
app/record/html/tpl_follow_detail/followup_referral.html
View File 

@ -0,0 +1,67 @@
 
<!DOCTYPE html>
 
<html>
 
	<head>
 
		<meta charset="UTF-8">
 
		<title></title>
 
		<link rel="stylesheet" href="../../../../css/bootstrap.min.css" />
 
		<style type="text/css">
 
			.page_title{font-size: 18px;padding: 10px;margin-bottom: 0;text-align: center;}
 
			.inline-container{padding: 0 60px;font-size: 0;}
 
			.row-line-item{width: 160px;display: inline-block;font-size: 14px;margin-top: 20px;}
 
			.row-line-item-2{width: 320px;}
 
			.row-line-item-3{width: 480px;}
 
			.checkbox-inline{padding-left: 24px;}
 
			.radio-inline{padding-left: 30px;}
 
			.radio-inline+.radio-inline{margin-left: 20px;}
 
			.checkbox-inline input[type='checkbox'],.radio-inline input[type='radio']{opacity: 0;}
 
			input[type='checkbox']+span:before{content: '';position: absolute;left: 0;top: 4px;background: url(image/gouxuan_btn.png);width: 14px;height: 14px;display: inline-block;}
 
			input[type='checkbox']:checked+span:before{background: url(image/gouxuan_pre.png);}
 
			input[type='radio']+span:before{content: '';position: absolute;left: 0;top: 0;background: url(image/dianxuan_btn.png);width: 20px;height: 20px;display: inline-block;}
 
			input[type='radio']:checked+span:before{background: url(image/dianxuan_pre.png);}
 
			.remark{display: inline-block;width: 220px;border-radius: 0;padding: 2px 6px;line-height: 20px;height: 28px;}
 
			.disabled-input label,.disabled-input input{pointer-events: none;}
 
			.form-control{display: inline-block;text-align: center;margin: 0 5px;width: 64px;border-radius: 0;padding: 2px 6px;line-height: 20px;height: 28px;}
 
			.form-control-100{width: 100px;}
 
			.form-control-120{width: 120px;}
 
			.form-control-180{width: 180px;text-align: left;}
 
			.form-control-220{width: 220px;text-align: left;}
 
			.form-control-380{width: 380px;text-align: left;}
 
		</style>
 
	</head>
 
	<body>
 
		<div id="app">
 
			<p class="page_title">9、转诊</p>
 
			<div class="inline-container disabled-input">
 
				<div class="row-line-item row-line-item-3">
 
					<span>药物不良反应&nbsp;&nbsp;</span>
 
					<label class="radio-inline">
 
						<input type="radio" value="1" checked="checked" />
 
						<span>无</span>
 
					</label>
 
					<label class="radio-inline">
 
						<input type="radio" value="1" checked="checked" />
 
						<span>有</span>
 
					</label>
 
					<input type="text" class="form-control form-control-220" value="" />
 
				</div>
 
				<div class="row-line-item row-line-item-3">
 
					<span>患者拒绝转诊&nbsp;&nbsp;</span>
 
					<label class="radio-inline">
 
						<input type="radio" value="1" checked="checked" />
 
						<span>是</span>
 
					</label>
 
					<label class="radio-inline">
 
						<input type="radio" value="1" checked="checked" />
 
						<span>否</span>
 
					</label>
 
					<input type="text" class="form-control form-control-220" value="" />
 
				</div>
 
				<div class="row-line-item row-line-item-2">
 
				
				</div>
 
			</div>
 
		</div>
 
		<script type="text/javascript" src="../../../../js/vue.js" ></script>
 
		<script type="text/javascript" src="js/referral.js" ></script>
 
	</body>
 
</html>

+ 2 - 2
app/record/html/tpl_follow_detail/js/followup-tabs.js
View File 

@ -39,10 +39,10 @@ new Vue({
 
		    url: 'followup_target.html'+location.search,
 
		    name: '控制目标'
 
		},{
 
		    url: 'questionaires.html'+location.search,
 
		    url: 'followup_education.html'+location.search,
 
		    name: '健康教育'
 
		},{
 
		    url: 'questionaires.html'+location.search,
 
		    url: 'followup_referral.html'+location.search,
 
		    name: '转诊'
 
		}],
 
    activeidx: 0,

+ 11 - 0
app/record/html/tpl_follow_detail/js/referral.js
View File 

@ -0,0 +1,11 @@
 
new Vue({
 
  el: '#app',
 
  data: {
 
   	referrals:[
 
   		
   	]
 
  },
 
  mounted: function() {
 
  	
  }
 
})

+ 1 - 26
app/record/html/tpl_follow_detail/js/symptom.js
View File 

@ -73,29 +73,4 @@ new Vue({
 
  mounted: function() {
 
  	
  }
 
})
 
$(function(){
 
    $("#fv_tabs").on('click', 'a', function(){
 
        var $this = $(this),
 
            $li = $this.parent(),
 
            index = $li.index();
 
        
        if(parent.clickOtherTab){
 
            $li.siblings().removeClass("active");
 
            $li.addClass("active");
 
            selectedTab = $this.data('index');
 
    //      reqLinkList.push(links[tab].url+'&from=tab&fromTabIdx='+fromTabIdx);
 
            var url = links[selectedTab].url;
 
            parent.document.getElementById('fv_main').src = url;
 
        }else{
 
            return false;
 
        }
 
    })
 
})
 
parent.goFollowupNextQuestionaire = function(){
 
    selectedTab ++;
 
    $("#fv_tabs a").eq(selectedTab).trigger('click');
 
}
 
})

+ 1 - 1
app/statistics/comprehensive-analysis.html
View File 

@ -15,7 +15,7 @@
 
    </head>
 
    <body>
 
        <div id="main">
 
            <header-tab :isback="isback" :isrefresh="isrefresh" :isfilter="isfilter" :isopen="isopen" ></header-tab>
 
            <header-tab :appname="appname" :isback="isback" :isrefresh="isrefresh" :isfilter="isfilter" :isopen="isopen" ></header-tab>
 
            <header-prompt></header-prompt>
 
            <div class="clearfix ">
 
                <ul class="l-banner">

+ 9 - 0
app/statistics/consulting-analysis.html
View File 

@ -0,0 +1,9 @@
 
<!DOCTYPE html>
 
<html>
 
	<head>
 
		<meta charset="UTF-8">
 
		<title>咨询分析</title>
 
	</head>
 
	<body>
 
	</body>
 
</html>

+ 9 - 0
app/statistics/estimate-analysis.html
View File 

@ -0,0 +1,9 @@
 
<!DOCTYPE html>
 
<html>
 
	<head>
 
		<meta charset="UTF-8">
 
		<title>评价分析</title>
 
	</head>
 
	<body>
 
	</body>
 
</html>

+ 59 - 20
app/statistics/js/common.js
View File 

@ -90,23 +90,62 @@ function drawPieChart(elId, arry, color){
 
    myChart.setOption(option);
 
}
 
Date.prototype.format = function(format) {
 
	var o = {
 
		"M+": this.getMonth() + 1, //month 
		"d+": this.getDate(), //day 
		"h+": this.getHours(), //hour 
		"m+": this.getMinutes(), //minute 
		"s+": this.getSeconds(), //second 
		"q+": Math.floor((this.getMonth() + 3) / 3), //quarter 
		"S": this.getMilliseconds() //millisecond 
	}
 
	if(/(y+)/.test(format)) {
 
		format = format.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
 
	}
 
	for(var k in o) {
 
		if(new RegExp("(" + k + ")").test(format)) {
 
			format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
 
		}
 
	}
 
	return format;
 
}
 
/**
 
 * 绘制柱状图
 
 */
 
function drawBarChart(el, xData, yData, color, name){
 
    var myChart = echarts.init(document.getElementById(el));
 
       
    // 指定图表的配置项和数据
 
    var option = {
 
        tooltip: {
 
            trigger: 'item'
 
        },
 
        toolbox: {
 
            dataZoom: true,
 
            show: true,
 
            orient: 'vertical',
 
            x: 'right',
 
            y: 'center'
 
        },
 
        grid: {
 
            left: '20px',
 
            right: '20px',
 
            bottom: '20px',
 
            top: '20px',
 
            containLabel: true
 
        },
 
        xAxis: [{
 
            type: 'category',
 
            data: xData,
 
            axisLabel: {
 
                interval:0,//横轴信息全部显示  
            },
 
            splitLine: {
 
                show: false
 
            }
 
        }],
 
        yAxis: [{
 
            type: 'value',
 
            splitLine: {show:false}
 
        }],
 
        series: [{
 
            clickable: true,
 
            name: name,
 
            itemStyle : { 
                normal: {
 
                    label : {
 
                        show: true, position: 'top'
 
                    },
 
                    color: color
 
                }
 
            },
 
            barWidth: 20,
 
            type: 'bar',
 
            data: yData 
        }]
 
    };
 
    
    // 使用刚指定的配置项和数据显示图表。
 
    myChart.setOption(option);
 
}

+ 3 - 0
app/statistics/js/comprehensive-analysis.js
View File 

@ -3,6 +3,7 @@ Vue.use(Vuedals.default);
 
new Vue({
 
    el: "#main",
 
    data: {
 
        appname: "总体分析",
 
        isback: true,
 
        isrefresh: true,
 
        isfilter: true,
 
@ -67,8 +68,10 @@ new Vue({
 
                this.level = arg.level;
 
                this.lowLevel = arg.lowLevel;
 
                this.area = arg.area;
 
                this.areaTitle = arg.areaTitle;
 
                loadData([0,1,2], this);
 
            }
 
            EventBus.$emit('update-area-name', {areaName: this.areaTitle});
 
            //存储请求所带的参数
 
            reqList.push({
 
                level: this.level,

+ 92 - 70
app/statistics/js/home.js
View File 

@ -1,71 +1,93 @@
 
new Vue({
 
    el: '#main',
 
    data: {
 
        roles: [{"high":"0","code":"3502050100","level":"4","name":"海沧区嵩屿街道社区卫生服务中心","isManage":"1","authOperate":"0","areas":"3502050100"},
 
            {"high":"1","code":"350200","level":"2","name":"厦门市卫生与计划生育委员会","isManage":"1","authOperate":"0","areas":"350200"}],
 
        selectedRole: "",
 
        isopen: true,
 
        signAnalysis: [{
 
            photo: '../../images/qianyujingzhan_icon.png',
 
            label: '签约进展',
 
            url: ''
 
        },{
 
            photo: '../../images/xuqianjingzhan_icon.png',
 
            label: '续签进展',
 
            url: ''
 
        },{
 
            photo: '../../images/jumingfenxi_icon.png',
 
            label: '居民分析',
 
            url: 'resident-analysis.html'
 
        },{
 
            photo: '../../images/tuigaiqian_icon.png',
 
            label: '退改签',
 
            url: ''
 
        },{
 
            photo: '../../images/lianglvfenxi_icon.png',
 
            label: '两率分析',
 
            url: ''
 
        }],
 
        serviceAnalysis: [{
 
            photo: '../../images/zongtifenxi_icon.png',
 
            label: '总体分析',
 
            url: 'comprehensive-analysis.html'
 
        },{
 
            photo: '../../images/zixunfenxi_icon.png',
 
            label: '咨询分析',
 
            url: ''
 
        },{
 
            photo: '../../images/pijianfenxi_icon.png',
 
            label: '评价分析',
 
            url: ''
 
        },{
 
            photo: '../../images/changcufangfenxi_icon.png',
 
            label: '长处方分析',
 
            url: ''
 
        }]
 
    },
 
    methods: {
 
        open: function(){
 
            EventBus.$emit('open-click', {});
 
        },
 
        showDetail: function(url){
 
            window.location.href = url;
 
        }
 
    },
 
    mounted: function(){
 
        var selected = window.localStorage.getItem("selectedRole");
 
        if(selected){
 
            this.selectedRole = JSON.parse(selected).code;
 
        }else{
 
            this.selectedRole = this.roles[0].code;
 
            var selected = this.roles[0];
 
            window.localStorage.setItem("selectedRole", JSON.stringify(selected));
 
        }
 
    },
 
    watch: {
 
        selectedRole: function(val){
 
            var selected = _.findWhere(this.roles, {code: val});
 
            window.localStorage.setItem("selectedRole", JSON.stringify(selected));
 
        }
 
    }
 
})
 
	el: '#main',
 
	data: {
 
		roles: [{
 
			"code": "350205",
 
			"level": "3",
 
			"name": "海沧区",
 
			"isManage": "1",
 
			"authOperate": "1",
 
			"areas": "350205"
 
		}, {
 
			"code": "350200",
 
			"level": "2",
 
			"name": "厦门市卫生与计划生育委员会",
 
			"isManage": "1",
 
			"authOperate": "1",
 
			"areas": "350200"
 
		}, {
 
			"code": "3502050100",
 
			"level": "4",
 
			"name": "海沧区嵩屿街道社区卫生服务中心",
 
			"isManage": "1",
 
			"authOperate": "1",
 
			"areas": "3502050100"
 
		}],
 
		selectedRole: "",
 
		isopen: true,
 
		signAnalysis: [{
 
			photo: '../../images/qianyujingzhan_icon.png',
 
			label: '签约进展',
 
			url: 'sign-progress.html'
 
		}, {
 
			photo: '../../images/xuqianjingzhan_icon.png',
 
			label: '续签进展',
 
			url: ''
 
		}, {
 
			photo: '../../images/jumingfenxi_icon.png',
 
			label: '居民分析',
 
			url: 'resident-analysis.html'
 
		}, {
 
			photo: '../../images/tuigaiqian_icon.png',
 
			label: '退改签',
 
			url: ''
 
		}, {
 
			photo: '../../images/lianglvfenxi_icon.png',
 
			label: '两率分析',
 
			url: ''
 
		}],
 
		serviceAnalysis: [{
 
			photo: '../../images/zongtifenxi_icon.png',
 
			label: '总体分析',
 
			url: 'comprehensive-analysis.html'
 
		}, {
 
			photo: '../../images/zixunfenxi_icon.png',
 
			label: '咨询分析',
 
			url: ''
 
		}, {
 
			photo: '../../images/pijianfenxi_icon.png',
 
			label: '评价分析',
 
			url: ''
 
		}, {
 
			photo: '../../images/changcufangfenxi_icon.png',
 
			label: '长处方分析',
 
			url: ''
 
		}]
 
	},
 
	methods: {
 
		open: function() {
 
			EventBus.$emit('open-click', {});
 
		},
 
		showDetail: function(url) {
 
			window.location.href = url;
 
		}
 
	},
 
	mounted: function() {
 
		var selected = window.localStorage.getItem("selectedRole");
 
		if(selected) {
 
			this.selectedRole = JSON.parse(selected).code;
 
		} else {
 
			this.selectedRole = this.roles[0].code;
 
			var selected = this.roles[0];
 
			window.localStorage.setItem("selectedRole", JSON.stringify(selected));
 
		}
 
	},
 
	watch: {
 
		selectedRole: function(val) {
 
			var selected = _.findWhere(this.roles, {
 
				code: val
 
			});
 
			window.localStorage.setItem("selectedRole", JSON.stringify(selected));
 
		}
 
	}
 
})

+ 437 - 0
app/statistics/js/prescription-analysis.js
View File 

@ -0,0 +1,437 @@
 
var reqList = [];
 
Vue.use(Vuedals.default);
 
new Vue({
 
    el: "#main",
 
    data: {
 
        appname: "长处分分析",
 
        isback: true,
 
        isrefresh: true,
 
        isfilter: true,
 
        isopen: true,
 
        //页面请求参数
 
        level: '',
 
        area: '',
 
        areaTitle: '',
 
        userRole: {},
 
        lowLevel: '3', //市级对应lowLevel为3，逐级递减
 
        dateType: 1, //折线图坐标值1-日，2-周，3-月
 
        startDate: "",
 
        endDate: "",
 
        tagCode: 1, //顶部各个tag标签对应的值
 
        sumType: 4, //记录从筛选页面选择的统计维度 1-订单统计，2-费用统计，3-配送统计，4-年龄统计
 
        disease: "", //疾病类型
 
        orderTagDatas: {
 
            total: 0,
 
            finishCount: 0,
 
            patientCancelCount: 0,
 
            noReviewedCount: 0,
 
            processingCount: 0,
 
            payOuttimeCount: 0
 
        },
 
        paymentData: {
 
            sum: 0,
 
            avg: 0
 
        },
 
        expressData: {
 
            self: 0,
 
            doctor: 0,
 
            delivery: 0
 
        },
 
        ageDatas: [
 
            {name: "0~6岁", color: "#ff5442", value: 0},
 
            {name: "7~18岁", color: "#ffc800", value: 0},
 
            {name: "19~30岁", color: "#4ce428", value: 0},
 
            {name: "31~50岁", color: "#24bbfa", value: 0},
 
            {name: "51~64岁", color: "#fb5dab", value: 0},
 
            {name: "65岁以上", color: "#9b5ffd", value: 0}]
 
    },
 
    components: {
 
        vuedals: Vuedals.Component
 
    },
 
    mounted: function(){
 
        //初始化数据
 
        initData(this);
 
        
        //获得顶部各tab的值
 
        loadData([0,1,2], this); //参数组数表示请求的区域为上中下
 
        
        //存储请求所带的参数
 
        reqList.push({
 
            level: this.level,
 
            area: this.area,
 
            areaTitle: this.areaTitle,
 
            endDate: this.endDate,
 
            startDate: this.startDate,
 
            lowLevel: this.lowLevel,
 
            tagCode: this.tagCode,
 
            sumType: this.sumType,
 
            disease: this.disease
 
        });
 
        
        //设置监听器， 监听折线图日期变化
 
        var vm = this;
 
        //监听后退按钮的操作
 
        EventBus.$on("back-click", function(arg){
 
            if(reqList.length == 1){
 
                history.go(-1);
 
            } 
            else{
 
                var preInfo = reqList.pop();
 
                var info = reqList[reqList.length - 1];
 
                vm.level = info.level;
 
                vm.area = info.area;
 
                vm.areaTitle = info.areaTitle;
 
                vm.lowLevel = info.lowLevel;
 
                vm.tagCode = info.tagCode;
 
                vm.sumType = info.sumType;
 
                vm.disease = info.disease;
 
                
                loadData([0,1,2], vm);
 
            }
 
        });
 
        //监听页面刷新
 
        EventBus.$on("refresh-click", function(arg){
 
            loadData([0,1,2], vm);
 
        });
 
    },
 
    methods: {
 
        changeTagCode: function(val){
 
            this.tagCode = val;
 
            if(this.sumType == 2){
 
                //费用统计只查看人均费用的变化趋势
 
                loadData([2], this);
 
            }else{
 
                loadData([1,2], this);
 
            }
 
            //存储请求所带的参数
 
            reqList.push({
 
                level: this.level,
 
                area: this.area,
 
                areaTitle: this.areaTitle,
 
                endDate: this.endDate,
 
                startDate: this.startDate,
 
                lowLevel: this.lowLevel,
 
                tagCode: this.tagCode,
 
                sumType: this.sumType,
 
                disease: this.disease,
 
            })
 
        },
 
        getBarData: function(arg){
 
            this.dateType = arg.dateType;
 
            loadData([1], this);
 
        },
 
        getPaymentLineData: function(arg){
 
            this.dateType = arg.dateType;
 
            loadData([1], this);
 
        },
 
        getBottomAreaData: function(arg){
 
            //如果level改变，则需要重新加载整个页面的数据，否则只需加载底部区域数据
 
            if(arg.level == this.level){
 
                this.lowLevel = arg.lowLevel;
 
                loadData([2], this);
 
            }else{
 
                this.level = arg.level;
 
                //长处方这边level改了lowLevel也需要跟着一起变
 
                this.lowLevel = arg.level - 1;
 
                this.area = arg.area;
 
                this.areaTitle = arg.areaTitle;
 
                loadData([0,1,2], this);
 
            }
 
            EventBus.$emit('update-area-name', {areaName: this.areaTitle});
 
            //存储请求所带的参数
 
            reqList.push({
 
                level: this.level,
 
                area: this.area,
 
                areaTitle: this.areaTitle,
 
                endDate: this.endDate,
 
                startDate: this.startDate,
 
                lowLevel: this.lowLevel,
 
                tagCode: this.tagCode,
 
                sumType: this.sumType,
 
                disease: this.disease,
 
            })
 
        }
 
    }
 
});
 
function initData(vm){
 
    //获得缓存中缓存的角色权限
 
    var userRole = window.localStorage.getItem("selectedRole");
 
    if(!userRole){
 
        return false;
 
    }
 
    vm.userRole = JSON.parse(userRole);
 
    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;
 
    
    var now = new Date();
 
    vm.endDate = now.format("yyyy-MM-dd");
 
}
 
function initReqParams(vm){
 
    //sumType: 1-订单统计，2-费用统计，3-配送统计，4-年龄统计
 
    var reqParam = [];
 
    switch(vm.sumType){
 
        case 1: 
            //tagCode: 1.总量，2.已完成，3.居民取消，4.审核不通过，5.进行中，6.其他原因取消
 
            reqParam = [{
 
                url: "/statistics/getPrescriptionCount",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease}
 
            },{
 
                url: "/statistics/getPrescriptionTotalHistogram",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease, type: vm.tagCode, interval: vm.dateType}
 
            },{
 
                url: "/statistics/getPrescriptionTotalLowLevel",
 
                data: {level: vm.level, lowlevel: vm.lowLevel, area: vm.area, disease: vm.disease, type: vm.tagCode}
 
            }];
 
            break;
 
        case 2: 
            //dateType: 折线图坐标值1-日，2-周，3-月
 
            //tagCode: 1.总量，2.平均值
 
            vm.startDate = getBeforeMonthStartDate(3, vm.dateType);
 
            reqParam = [{
 
                url: "/statistics/getPrescriptionCost",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease}
 
            },{
 
                url: "/statistics/getPrescriptionCostAvgLine",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease, type: vm.dateType, startDate: vm.startDate, endDate: vm.endDate}
 
            },{
 
                url: "/statistics/getPrescriptionCostLowLevel",
 
                data: {level: vm.level, lowlevel: vm.lowLevel, area: vm.area, disease: vm.disease, type: vm.tagCode}
 
            }];
 
            break;
 
        case 3: 
            //tagCode: 1.自取，2.快递配送，3.健管师配送
 
            reqParam = [{
 
                url: "/statistics/getPrescriptionDispatchingTotal",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease}
 
            },{
 
                url: "/statistics/getPrescriptionDispatchingHistogram",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease, type: vm.tagCode, interval: vm.dateType}
 
            },{
 
                url: "/statistics/getPrescriptionDispatchingLowLevel",
 
                data: {level: vm.level, lowlevel: vm.lowLevel, area: vm.area, disease: vm.disease, type: vm.tagCode}
 
            }];
 
            break;
 
        case 4: 
            reqParam = [{
 
                url: "/statistics/getPrescriptionAgeTotal",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease}
 
            },{
 
                url: "/statistics/getPrescriptionAgeHistogram",
 
                data: {level: vm.level, area: vm.area, disease: vm.disease}
 
            },{
 
                url: "/statistics/getPrescriptionAgeLowLevel",
 
                data: {level: vm.level, lowlevel: vm.lowLevel, area: vm.area, disease: vm.disease}
 
            }];
 
            break;  
        default:
 
            reqParam = [];
 
            break;
 
    };
 
    
    return reqParam;
 
}
 
function loadData(loadArr, vm){
 
    //获取其他请求的参数
 
    var reqParams = initReqParams(vm),
 
        reqPromise = [];
 
    
    for(i=0; i<loadArr.length; i++){
 
        var j = loadArr[i];
 
        var param = reqParams[j];
 
        reqPromise.push(httpRequest.get(param.url, {data: param.data}));
 
    }
 
        
    if(reqPromise.length > 0){
 
        Promise.all(reqPromise).then(function(ress){
 
            var res1, res2, res2;
 
            for(var i=0; i<loadArr.length; i++){
 
                var j = loadArr[i] + 1;
 
                if(j == 1){
 
                    res1 = ress[i];
 
                }
 
                if(j == 2){
 
                    res2 = ress[i];
 
                }
 
                if(j == 3){
 
                    res3 = ress[i];
 
                }
 
                
            }
 
            if(res1){
 
                if(res1.status == 200){
 
                    handleTopPanelData(res1.data, vm);
 
                }else{
 
                    console.log(res1.msg);
 
                }
 
            }
 
            if(res2){
 
                if(res2.status == 200){
 
                    handleSecondPanelData(res2.data, vm);
 
                }else{
 
                   console.log(res2.msg);
 
                }
 
                
            }
 
            if(res3){
 
                if(res3.status == 200){
 
                    listHandle(res3.data, vm);
 
                }else{
 
                    console.log(res3.msg);
 
                }
 
            }
 
        })
 
    }
 
}
 
function handleTopPanelData(data, vm){
 
    switch(vm.sumType){
 
        case 1:
 
            vm.orderTagDatas = {
 
                total: data.total,
 
                finishCount: data.finishCount,
 
                patientCancelCount: data.patientCancelCount,
 
                noReviewedCount: data.noReviewedCount,
 
                processingCount: data.processingCount,
 
                payOuttimeCount: data.payOuttimeCount
 
            };
 
            break;
 
        case 2:
 
            vm.paymentData = {
 
                sum: data.sum,
 
                avg: data.avg
 
            }
 
            break;
 
        case 3:
 
            vm.expressData = {
 
                self: data.seltTotal,
 
                doctor: data.deliveryTotal,
 
                delivery: data.doctorTotal
 
            }
 
            break;
 
        case 4:
 
            var len = vm.ageDatas.length,
 
                color = ['#ff5442', '#ffc800 ','#4ce428', '#24bbfa','#fb5dab', "#9b5ffd"],
 
                objName = ['0age', '7age', '19age', '31age', '51age', '65age'],
 
                arr = [];
 
            for(i=0; i<len; i++){
 
                vm.ageDatas[i].value = data[objName[i]];
 
            }
 
            //绘制饼图
 
            drawPieChart("agePie", vm.ageDatas, color);
 
    }
 
}
 
function handleSecondPanelData(data, vm){
 
    switch(vm.sumType){
 
        case 1:
 
        case 3:
 
            var color = "#17b3ec",
 
                xAxisData = [],
 
                seriesData = [];
 
            for(i=0; i<data.length; i++){
 
                var item = data[i];
 
                xAxisData.push(item.date);
 
                seriesData.push(item.count);
 
            }
 
            var names;
 
            if(vm.sumType == 1){
 
                names = ["续方总量", "已完成", "居民取消", "审核未通过", "进行中", "其他原因取消"];
 
            }else if(vm.sumType == 3){
 
                names = ["居民自取", "物流配送", "健管师配送"];
 
            }
 
            EventBus.$emit("draw-bar-chart", {
 
                panelName: "近半年统计",
 
                xData: xAxisData,
 
                yData: seriesData,
 
                quotaName: names[vm.tagCode - 1],
 
                color: color,
 
                unit: "笔"
 
            });
 
            break;
 
        case 2:
 
            var yDatas = [],
 
                colors = ['#12b7f5'];
 
                
            var xData = _.map(data, function(o){
 
                return o.date;
 
            });
 
            var yData = _.map(data, function(o){
 
                return o.avg;
 
            });
 
            yDatas.push(yData);
 
            
            EventBus.$emit("draw-line-chart", {
 
                panelName : "近三个月人均费用趋势",
 
                quotaNames : ["人均费用"],
 
                xData : xData,
 
                yDatas : yDatas,
 
                colors : colors,
 
                unit: "元"
 
            });
 
            break;
 
        case 4: 
            var color = "#17b3ec",
 
                xAxisData = ['0~6岁', '7~18岁', '19~30岁', '31~50岁', '51~64岁', '65岁以上'],
 
                fieldName = ['0ageRate', '7ageRate', '19ageRate', '31ageRate', '51ageRate', '65ageRate']
 
                seriesData = [];
 
            for(i=0; i<6; i++){
 
                seriesData.push(parseInt(data[fieldName[i]]));
 
            }
 
            
            drawBarChart("ageBar", xAxisData, seriesData, color, "人均使用次数");
 
            break;
 
    }
 
}
 
function listHandle(data, vm){
 
    var list = data;
 
    var topArr = soreRank(getKeyValueArr(list, 'val'));
 
    var arr = _.map(list, function(o, index){
 
        var cols = [o.name, o.val];
 
        return {
 
            rank: topArr[index],
 
            code: o.code,
 
            name: o.name,
 
            cols: cols
 
        }
 
    });
 
    var headers = {
 
        '1': ["排名", "续方总量", "已完成", "居民取消", "审核未通过", "进行中", "其他原因取消"],
 
        '2': ["排名", "费用总计", "人均费用"],
 
        '3': ["排名", "居民自取", "物流配送", "健管师配送"],
 
        '4': ["排名", "绑定设备"],
 
    };
 
    EventBus.$emit("render-area-data",{
 
        level: vm.level,
 
        area: vm.area,
 
        lowLevel: vm.lowLevel,
 
        headers:["排名", headers[vm.sumType][vm.tagCode]],
 
        rows: arr
 
    });
 
}
 
/*
 
 * months :  月份差距（例如months=3，则获取今天往前数3个月的那天的值）
 
 */
 
function getBeforeMonthStartDate(months,type){
 
    //type: 折线图坐标值1-日，2-周，3-月
 
    //从1号开始算每个月开始的时间
 
    var sDate = new Date(),
 
        now = new Date();
 
    
    sDate.setMonth(now.getMonth() - months + 1);// 包含本月算一个月
 
    
    var sDateStr = sDate.format("yyyy-MM-dd");
 
    var startDate = "";
 
    if(type == '3'){
 
        startDate = sDateStr.substr(0,8)+"01";
 
    }else{
 
        startDate = sDateStr;
 
    }
 
    return startDate;
 
}

+ 31 - 12
app/statistics/js/sign-progress.js
View File 

@ -31,7 +31,9 @@ new Vue({
 
			completeRate:"",
 
			completeAmount:"",
 
			completeRateAll:""
 
		}
 
		},
 
		yearHtml:"",
 
		contentHtml:""
 
	},
 
	components: {
 
		vuedals: Vuedals.Component
 
@ -76,7 +78,8 @@ new Vue({
 
				endDate: this.endDate,
 
				startDate: this.startDate,
 
				lowLevel: this.lowLevel,
 
				lowCode:this.lowCode
 
				lowCode:this.lowCode,
 
				analysisType: this.analysisType,
 
			})
 
		}
 
	},
 
@ -96,7 +99,8 @@ new Vue({
 
			endDate: this.endDate,
 
			startDate: this.startDate,
 
			lowLevel: this.lowLevel,
 
			lowCode:this.lowCode
 
			lowCode:this.lowCode,
 
			analysisType: this.analysisType
 
		});
 
		//设置监听器， 监听折线图日期变化
 
@ -131,11 +135,23 @@ new Vue({
 
            Vuedals.Bus.$emit('new', {
 
                title: '条件筛选',
 
                onClose:function(data){
 
                    
					vm.analysisType = data.id;
 
					vm.lowCode = data.lowCode;
 
					vm.yearHtml = data.yearHtml;
 
					vm.contentHtml = data.contentHtml;
 
					vm.chooseYear = data.year;
 
					vm.startDate = getStartDate(vm.chooseYear);
 
					vm.endDate = getEndDate(vm.chooseYear);
 
					
					loadData([0, 1, 2], vm);//刷新数据
 
					EventBus.$emit('update-statistics-year', {selectDate:data.year + "年"});//更新年份
 
					EventBus.$emit('update-dimension-name', {dimensionVal:data.name});//更新维度名称
 
					EventBus.$emit('update-statistics-time', {});//更新统计时间
 
                },
 
                component: 'sign-progress-filter',
 
                props: {
 
                    
                    yearHtml:vm.yearHtml,
 
                    contentHtml:vm.contentHtml
 
                }
 
            });
 
		});
 
@ -151,7 +167,7 @@ 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;
 
	var now = new Date();
 
	if(now.getMonth() >= 6) {
 
		vm.chooseYear = now.getFullYear();
 
@ -161,7 +177,7 @@ function initData(vm) {
 
	vm.startDate = getStartDate(vm.chooseYear);
 
	vm.endDate = getEndDate(vm.chooseYear);
 
	//更新头部信息
 
	EventBus.$emit('update-all-prompt-info', {areaName:vm.areaTile,selectDate:vm.chooseYear+"年",dimensionVal:vm.analysisName});
 
	EventBus.$emit('update-all-prompt-info', {areaName:vm.areaTitle,selectDate:vm.chooseYear+"年",dimensionVal:vm.analysisName});
 
}
 
function initReqParams(vm) {
 
@ -306,6 +322,7 @@ function handleSecondPanelData(data, vm) {
 
	var xDatas = [],
 
		yDatas = [],
 
		names = [],
 
		taskNum = data.index_1.taskNum,
 
		colors = ['#12b7f5'],
 
		index_names = {
 
			'index_1': '总签约人数'
 
@ -318,7 +335,7 @@ function handleSecondPanelData(data, vm) {
 
		var yData = _.map(data[p].data, function(o) {
 
			return o.amount;
 
		});
 
		 
		xDatas.push(xData);
 
		yDatas.push(yData);
 
	}
 
@ -327,7 +344,9 @@ function handleSecondPanelData(data, vm) {
 
		quotaNames: names,
 
		xData: xDatas[0],
 
		yDatas: yDatas,
 
		colors: colors
 
		colors: colors,
 
		markLineValue:taskNum,
 
		markLineName:"目标量"
 
	});
 
}
 
@ -338,7 +357,7 @@ function listHandle(data, vm) {
 
		topArr = soreRank(getKeyValueArr(list, 'amount'));
 
		var arr = _.map(list, function(o, index) {
 
			var cols = [o.name];
 
			if(vm.analysisType=="2" && vm.level>2 && vm.lowLevel!=1){
 
			if(vm.analysisType=="2" && vm.level>2 && vm.lowLevel!=1){//按人口
 
				cols.push(o.num);
 
			}else{
 
				cols.push(o.amount);
 
@ -358,9 +377,9 @@ function listHandle(data, vm) {
 
			}
 
		});
 
		var activeTab =  $(".area-tab-panel .area-tab.active span").html();
 
		var headers = ["排名", "签约量", "目标率","当前签约率"];
 
		var headers = ["排名", (vm.analysisType=="2"?"人口数":"签约量"), "目标率","当前签约率"];//analysisType=2 为按人口
 
		if(activeTab=="团队"){
 
			headers = ["排名", "签约量", "调控量"];
 
			headers = ["排名", (vm.analysisType=="2"?"人口数":"签约量"), "调控量"];
 
		}
 
		EventBus.$emit("render-area-data", {

+ 156 - 0
app/statistics/prescription-analysis.html
View File 

@ -0,0 +1,156 @@
 
<!DOCTYPE html>
 
<html>
 
    <head>
 
        <meta charset="UTF-8">
 
        <title>长处方分析</title>
 
        <meta name="author" content="yihu.com" />
 
        <meta name="format-detection" content="telephone=no" />
 
        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
 
        <meta name="apple-mobile-web-app-capable" content="yes" />
 
        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
 
        <link rel="stylesheet" type="text/css" href="../../css/font-awesome.min.css"/>
 
        <link rel="stylesheet" type="text/css" href="../../css/style.min.css"/>
 
        <link rel="stylesheet" type="text/css" href="../../css/cross.css"/>
 
        <link rel="stylesheet" type="text/css" href="css/common.css"/>
 
        <style>
 
            .chart-center-text{position: absolute; width: 100%; top: 50%; margin-top: -17px;}
 
        </style>
 
    </head>
 
    <body>
 
        <div id="main">
 
            <header-tab :appname="appname" :isback="isback" :isrefresh="isrefresh" :isfilter="isfilter" :isopen="isopen" ></header-tab>
 
            <header-prompt></header-prompt>
 
            <div v-show="sumType==1" class="order-tag-panel">
 
                <ul class="l-banner">
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==1}" @click="changeTagCode(1)">
 
                            <div class="c-f18">{{orderTagDatas.total}}</div>
 
                            <div class="mt5 c-f14 l-name">续方总量</div>
 
                        </div>
 
                    </li>
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==2}" @click="changeTagCode(2)">
 
                            <div class="c-f18">{{orderTagDatas.finishCount}}</div>
 
                            <div class="mt5 c-f14 l-name">已完成</div>
 
                        </div>
 
                    </li>
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==3}" @click="changeTagCode(3)">
 
                            <div class="c-f18">{{orderTagDatas.patientCancelCount}}</div>
 
                            <div class="mt5 c-f14 l-name">居民取消</div>
 
                        </div>
 
                    </li>
 
                </ul>
 
                <ul class="l-banner">
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==4}" @click="changeTagCode(4)">
 
                            <div class="c-f18">{{orderTagDatas.noReviewedCount}}</div>
 
                            <div class="mt5 c-f14 l-name">审核未通过</div>
 
                        </div>
 
                    </li>
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==5}" @click="changeTagCode(5)">
 
                            <div class="c-f18">{{orderTagDatas.processingCount}}</div>
 
                            <div class="mt5 c-f14 l-name">进行中</div>
 
                        </div>
 
                    </li>
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==6}" @click="changeTagCode(6)">
 
                            <div class="c-f18">{{orderTagDatas.payOuttimeCount}}</div>
 
                            <div class="mt5 c-f14 l-name">其他原因取消</div>
 
                        </div>
 
                    </li>
 
                </ul>
 
            </div>
 
            <div v-show="sumType==2" class="payment-tag-panel">
 
                <ul class="l-banner">
 
                    <li style="width:calc(100% / 2)">
 
                        <div class="tag" :class="{'active': tagCode==1}" @click="changeTagCode(1)" style="width: 60%">
 
                            <div class="c-f18">{{paymentData.sum}}</div>
 
                            <div class="mt5 c-f14 l-name">费用总计</div>
 
                        </div>
 
                    </li>
 
                    <li style="width:calc(100% / 2)">
 
                        <div class="tag" :class="{'active': tagCode==2}" @click="changeTagCode(2)" style="width: 60%">
 
                            <div class="c-f18">{{paymentData.avg}}</div>
 
                            <div class="mt5 c-f14 l-name">人均费用</div>
 
                        </div>
 
                    </li>
 
                </ul>
 
            </div>
 
            <div v-show="sumType==3">
 
                <ul class="l-banner">
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==1}" @click="changeTagCode(1)">
 
                            <div class="c-f18">{{expressData.self}}</div>
 
                            <div class="mt5 c-f14 l-name">居民自取</div>
 
                        </div>
 
                    </li>
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==2}" @click="changeTagCode(2)">
 
                            <div class="c-f18">{{expressData.delivery}}</div>
 
                            <div class="mt5 c-f14 l-name">物流配送</div>
 
                        </div>
 
                    </li>
 
                    <li>
 
                        <div class="tag" :class="{'active': tagCode==3}" @click="changeTagCode(3)">
 
                            <div class="c-f18">{{expressData.doctor}}</div>
 
                            <div class="mt5 c-f14 l-name">健管师配送</div>
 
                        </div>
 
                    </li>
 
                </ul>
 
            </div>
 
            <div v-show="sumType==4" class="mt10 c-border">
 
                <div class="plr10 ptb10 c-border-b">
 
                    <span class="c-f14 c-333 ml5">年龄统计</span>
 
                </div>
 
                <div class="ui-grid ui-grid-middle">
 
                    <div class="ui-col-0 ptb10 c-position-r" style="width: 50%">
 
                        <div class="c-t-center chart-center-text">年龄分布<br/>情况</div>
 
                        <div id="agePie" style="width: 100%; height:160px;"></div>
 
                    </div>
 
                    <div class="ui-col-1" id="fenbuList">
 
                        <div v-for="age in ageDatas" class="mtb5 ml10">
 
                            <span class="color-tag" :style="{'background-color': age.color}"></span>
 
                            <span class="div-jkrq c-f14" :style="{'color': age.color}">{{age.value}}人</span>
 
                            <span class="c-f12 c-909090 ml5">({{age.name}})</span>
 
                        </div>
 
                    </div>
 
                </div>
 
            </div>
 
            
            <bar-chart v-show="sumType==1 || sumType==3" class="mt15" @getbardata="getBarData" :barid="'barChart'+ sumType"></bar-chart>
 
            
            <line-chart v-show="sumType==2" @getlinedata="getPaymentLineData"></line-chart>
 
            
            <div v-show="sumType==4" class="mt10 c-border">
 
                <div class="plr10 ptb10 c-border-b">
 
                    <span class="c-f14 c-333 ml5">人均使用次数</span>
 
                </div>
 
                <div id="ageBar" style="height: 200px; width: 100%;"></div>
 
            </div>
 
            
            <area-data-panel class="mt15" @getnewdata="getBottomAreaData"></area-data-panel>
 
            
            <vuedals></vuedals>
 
        </div>
 
        <script src="../../js/vue.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="../../js/jquery-2.2.4.js" type="text/javascript" charset="utf-8"></script>
 
        <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="../../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>
 
        <script src="../../component/common/vuedals.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="../../component/statistics/header-tab.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="../../component/statistics/header-prompt.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="../../component/statistics/line-chart.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="../../component/statistics/bar-chart.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="../../component/statistics/area-data-panel.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="../../component/statistics/team-info.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="js/common.js" type="text/javascript" charset="utf-8"></script>
 
        <script src="js/prescription-analysis.js" type="text/javascript" charset="utf-8"></script>
 
    </body>
 
</html>

+ 2 - 2
component/statistics/area-data-panel.js
View File 

@ -47,7 +47,7 @@
 
            getLowLeverData: function(row){
 
                if(this.level > 2 && this.lowLevel != 1){
 
                    //跳转去下一级数据
 
                    if((this.level - this.lowLevel) >= 2){
 
                    if(this.lowLevel && (this.level - this.lowLevel) >= 2){
 
                        //从次级tab的内容查看再下一级的数据
 
                        this.level = this.level - 2;
 
                        this.lowLevel --;
 
@ -69,7 +69,7 @@
 
                        title: '团队信息',
 
                        component: 'team-info',
 
                        props: {
 
                            teamId: 644
 
                            teamId: row.code
 
                        }
 
                    });
 
                }

+ 162 - 0
component/statistics/bar-chart.js
View File 

@ -0,0 +1,162 @@
 
(function(){
 
    Vue.component('bar-chart',{
 
        template: '<div class="bgc-fff c-border">\
 
            <div class="ui-grid ui-grid-middle plr10 c-border-b">\
 
                <div class="ui-col-0">\
 
                    <span class="c-333 c-bold c-f14">{{panelName}}</span>\
 
                </div>\
 
                <div class="ui-col-1 c-t-right ptb5">\
 
                    <span class="date-tag" :class="{active: selectedDateType == 1}" data-type="1" @click="changeType(1)">日</span><!--\
 
                    --><span class="date-tag" :class="{active: selectedDateType == 2}" data-type="2" @click="changeType(2)">周</span><!--\
 
                    --><span class="date-tag" :class="{active: selectedDateType == 3}" data-type="3" @click="changeType(3)">月</span>\
 
                </div>\
 
            </div>\
 
            <div class="clearfix mt5 plr10">\
 
                <div class="fl c-f12 c-909090"><span>{{startDate}}</span> ~ <span>{{endDate}}</span>数据</div>\
 
                <div class="fr c-f12 c-909090">单位：{{unit}}</div>\
 
            </div>\
 
            <div class="bar-chart" :id="barid" style="height: 200px; width: 100%;"></div>\
 
        </div>',
 
        props:['barid'],
 
        data: function(){
 
            return {
 
                selectedDateType: 1,
 
                startDate: "", //数据展示时显示的开始时间
 
                endDate: "", //数据展示时显示的结束时间
 
                panelName: "",
 
                unit: "人"
 
            }
 
        },
 
        methods: {
 
            changeType: function(type){
 
                this.selectedDateType = type;
 
                //触发页面更新折线图的数据,触发器是父类页面自定在组件上的
 
                this.$emit("getbardata", {dateType: type});
 
            }
 
        },
 
        mounted: function(){
 
            var vm = this;
 
            EventBus.$on("draw-bar-chart", function(arg){
 
                vm.panelName = arg.panelName;
 
                if(arg.unit){
 
                    vm.unit = arg.unit;
 
                }
 
                drawBar(vm, arg);
 
            })
 
        }
 
    });
 
    
    function drawBar(vm, arg){
 
        var myChart = echarts.init(document.getElementById(vm.barid));
 
        
        var xData = arg.xData,
 
            yData = arg.yData,
 
            name = arg.quotaName,
 
            color = arg.color;
 
        //处理数据, 数据按照10条数一屏展示
 
        var lastIndex = xData.length % 10;
 
        if(xData.length >10 ){  
            dataZoom_end = 100-(9/xData.length)*100;  
        }else{  
            dataZoom_end = 0;
 
        }
 
        //初始结束时间
 
        var lastValue = xData[xData.length - 1];
 
        if(vm.selectedDateType == 1 || vm.selectedDateType == 2){
 
            vm.endDate = lastValue;
 
        }else if(vm.selectedDateType == 3){
 
            var val = lastValue.substr(5,2)+"月"
 
            vm.endDate = lastValue.substr(0,4)+"年"+val;
 
        }
 
        // 指定图表的配置项和数据
 
        var option = {
 
            tooltip: {
 
                trigger: 'item'
 
            },
 
            toolbox: {
 
                dataZoom: true,
 
                show: true,
 
                orient: 'vertical',
 
                x: 'right',
 
                y: 'center'
 
            },
 
            grid: {
 
//              show: false,
 
                left: '20px',
 
                right: '20px',
 
                bottom: '40px',
 
                top: '20px',
 
                containLabel: true
 
            },
 
            xAxis: [{
 
                type: 'category',
 
                data: xData,
 
                axisLabel: {
 
                    interval:0,//横轴信息全部显示  
                    formatter: function (value, index) {
 
                        if(vm.selectedDateType == 1 || vm.selectedDateType == 2){
 
                            if(index == 0){
 
                                vm.startDate = value;
 
                                return value.substr(5,2)+"月"+value.substr(8,2)+"日";
 
                            }else{
 
                                if(index == 9){
 
                                    vm.endDate = value;
 
                                }
 
                                return value.substr(8,2)+"日";
 
                            }
 
                            
                        }else if(vm.selectedDateType == 3){
 
                            var val = value.substr(5,2)+"月"
 
                            if(index == 0){
 
                                vm.startDate = value.substr(0,4)+"年"+val;
 
                            }else{
 
                                if(index == 9){
 
                                    vm.endDate = value.substr(0,4)+"年"+val;
 
                                }
 
                            }
 
                            return val;
 
                        }
 
                        return value;
 
                    }
 
                },
 
                splitLine: {
 
                    show: false
 
                }
 
            }],
 
            yAxis: [{
 
                type: 'value',
 
                splitLine: {show:false}
 
            }],
 
            dataZoom: [{//给x轴设置滚动条  
//              show: false,
 
                start: dataZoom_end,
 
                end: 100,
 
                type: 'slider',
 
                zoomLock: true,
 
            },{ //下面这个属性是内容区域配置
 
                start: dataZoom_end,
 
                end: 100,
 
                type: 'inside',
 
                zoomLock: true,
 
            }],
 
            series: [{
 
                clickable: true,
 
                name: name,
 
                itemStyle : { 
                    normal: {
 
                        label : {
 
                            show: true, position: 'top'
 
                        },
 
                        color: color
 
                    }
 
                },
 
                barWidth: 20,
 
                type: 'bar',
 
                data: yData 
            }]
 
        };
 
        
        // 使用刚指定的配置项和数据显示图表。
 
        myChart.setOption(option);
 
    }
 
})()

+ 40 - 3
component/statistics/line-chart.js
View File 

@ -13,7 +13,7 @@
 
            </div>\
 
            <div class="clearfix mt5 plr10">\
 
                <div class="fl c-f12 c-909090"><span>{{startDate}}</span> ~ <span>{{endDate}}</span>数据</div>\
 
                <div class="fr c-f12 c-909090">单位：人</div>\
 
                <div class="fr c-f12 c-909090">单位：{{unit}}</div>\
 
            </div>\
 
            <div class="line-chart" id="lineChart" style="height: 200px; width: 100%;"></div>\
 
        </div>',
 
@ -23,7 +23,8 @@
 
                selectedDateType: 1,
 
                startDate: "", //数据展示时显示的开始时间
 
                endDate: "", //数据展示时显示的结束时间
 
                panelName: ""
 
                panelName: "",
 
                unit: "人"
 
            }
 
        },
 
        methods: {
 
@ -37,6 +38,9 @@
 
            var vm = this;
 
            EventBus.$on("draw-line-chart", function(arg){
 
                vm.panelName = arg.panelName;
 
                if(arg.unit){
 
                    vm.unit = arg.unit;
 
                }
 
                drawLine(vm, arg);
 
            })
 
        }
 
@ -47,7 +51,9 @@
 
        var xData = arg.xData,
 
            yDatas = arg.yDatas,
 
            names = arg.quotaNames,
 
            colors = arg.colors;
 
            colors = arg.colors,
 
            markLineValue = arg.markLineValue,
 
            markLineName = arg.markLineName;
 
        //处理数据, 数据按照10条数一屏展示
 
        var lastIndex = xData.length % 10;
 
        if(xData.length >10 ){  
@ -151,6 +157,37 @@
 
            series.push(obj);
 
        }
 
        options.series = series;
 
        if(markLineValue){ 
            //目前统计只有签约统计页面有目标量
 
            $.extend(options.yAxis, {
 
                min: function(value) {
 
                    if(value.min > markLineValue){
 
                        return markLineValue / 2;
 
                    }else{
 
                        return value.min / 2;
 
                    }
 
                },
 
                max: function(value){
 
                    if(value.max > markLineValue){
 
                        return parseInt(value.max * 1.5);
 
                    }else{
 
                        return parseInt(markLineValue * 1.2);
 
                    }
 
                }
 
            });
 
            options.markLine ={
 
                    data:[
 
                        {yAxis: markLineValue, name: markLineName}
 
                    ],
 
                    label:{
 
                        show: true,
 
                        position: 'middle'
 
                    },
 
                    lineStyle:{
 
                        color: 'rgb(194,53,49)'
 
                    }
 
            };
 
        }
 
        $("#lineChart").removeAttr('_echarts_instance_')
 
        lineCharts.setOption(options);
 
    }

+ 15 - 8
component/statistics/resident-analysis-filter.js
View File 

@ -5,23 +5,21 @@
 
				<div class="c-row mt20 ml40" id="signYear" v-html="yearHtml" @click="yearClick">\
 
				</div>\
 
				<div class="mt20 ml10 filter-title">统计维度</div>\
 
				<div class="div-content" @click="divBtnClick"></div>\
 
				<div class="div-content" @click="divBtnClick" v-html="filterHtml"></div>\
 
				<div id="footer">\
 
					<div class="c-row btn-wrap c-border-top fr">\
 
						<div class="div-foot-btn mr20" @click="resetClick">\
 
							<a href="#" class="c-666 f-fs16">重置</a>\
 
						</div>\
 
						<div class="div-foot-btn active" @click="confirmClick">\
 
							<a href="#" class="c-666 f-fs16">确定</a>\
 
							<a href="#" class="c-666 f-fs16">保存</a>\
 
						</div>\
 
					</div>\
 
				</div>\
 
			</div>',
 
        props:['curLevel','curCode','curName'],
 
        props:['curLevel','curCode','curName','yearHtml','filterHtml'],
 
        data: function(){
 
            return {
 
                yearHtml:"",
 
                contentHtml:"",
 
                selectLevel:"",
 
                resultCode:"",
 
                roleLevel:""
 
@ -133,7 +131,14 @@
 
         	console.log("level:"+vm.selectLevel)
 
         	console.log("year:"+$("#signYear .c-33.active").attr("data-val"))
 
			//触发刷新
 
			this.$emit('vuedals:close',{areaCode:vm.resultCode,name:vm.curName,level:vm.selectLevel,year:$("#signYear .c-33.active").attr("data-val")});
 
			this.$emit('vuedals:close', {
 
				areaCode: vm.resultCode,
 
				name: vm.curName,
 
				level: vm.selectLevel,
 
				year: $("#signYear .c-33.active").attr("data-val"),
 
				filterHtml:$(".div-content").html(),
 
				yearHtml:$("#signYear").html()
 
			});
 
         },
 
         pingData:function(list){
 
          		var vm = this;
 
@ -230,8 +235,10 @@
 
        	this.roleLevel = this.curLevel;
 
        	this.selectLevel = this.curLevel;
 
        	this.resultCode = this.curCode;
 
			this.formatYearData();
 
			this.requestData();
 
			if(!(this.filterHtml && this.yearHtml)){
 
				this.formatYearData();
 
				this.requestData();
 
			}
 
        }
 
    });

+ 7 - 1
component/statistics/resident-analysis.js
View File 

@ -109,6 +109,8 @@ Vue.component('resident-analysis', {
 
			endDate:null,
 
			userRole:null,
 
			roleLevel:null,
 
			filterHtml:null,
 
			yearHtml:null
 
		}
 
	},
 
	mounted: function() {
 
@ -146,13 +148,17 @@ Vue.component('resident-analysis', {
 
                    vm.curCode = data.areaCode;
 
                    vm.curLevel = data.level;
 
                    vm.endDate = getEndDate(vm.chooseYear);
 
                    vm.yearHtml = data.yearHtml;
 
                     vm.filterHtml = data.filterHtml;
 
                    initData(vm);//刷新数据
 
                },
 
                component: 'resident-analysis-filter',
 
                props: {
 
                    curLevel: vm.roleLevel,
 
                    curCode: vm.userRole.code,
 
                    curName: vm.userRole.name
 
                    curName: vm.userRole.name,
 
                    yearHtml:vm.yearHtml,
 
                    filterHtml:vm.filterHtml
 
                }
 
            });
 
		});

+ 56 - 11
component/statistics/sign-progress-filter.js
View File 

@ -5,38 +5,79 @@
 
				<div class="c-row mt20 ml40" id="signYear" v-html="yearHtml" @click="yearClick">\
 
				</div>\
 
				<div class="mt20 ml10 filter-title">统计维度</div>\
 
				<div class="div-content">\
 
				<div class="div-content" @click="contentClick">\
 
					<div class="mt20 div-group-btn c-row ml40">\
 
						<div class="div-btn c-33 active">\
 
						<div class="div-btn c-33 active" data-val="1">\
 
							<a href="#" class="f-fs14">按任务</a>\
 
						</div>\
 
						<div class="div-btn c-33">\
 
						<div class="div-btn c-33" data-val="2">\
 
							<a href="#" class="f-fs14">按人口</a>\
 
						</div>\
 
						<div class="div-btn c-33">\
 
						<div class="div-btn c-33" data-val="5" data-lowCode="3">\
 
							<a href="#" class="f-fs14">65岁以上签约</a>\
 
						</div>\
 
					</div>\
 
					<div class="mt20 div-group-btn c-row ml40">\
 
						<div class="div-btn c-33">\
 
						<div class="div-btn c-33" data-val="3" data-lowCode="1">\
 
							<a href="#" class="f-fs14">高血压</a>\
 
						</div>\
 
						<div class="div-btn c-33">\
 
						<div class="div-btn c-33" data-val="4" data-lowCode="2">\
 
							<a href="#" class="f-fs14">糖尿病</a>\
 
						</div>\
 
					</div>\
 
				</div>\
 
				<div id="footer">\
 
					<div class="c-row btn-wrap c-border-top fr">\
 
						<div class="div-foot-btn mr20" @click="resetClick">\
 
							<a href="#" class="c-666 f-fs16">重置</a>\
 
						</div>\
 
						<div class="div-foot-btn active" @click="confirmClick">\
 
							<a href="#" class="c-666 f-fs16">保存</a>\
 
						</div>\
 
					</div>\
 
				</div>\
 
			</div>',
 
        props:[],
 
        props:['yearHtml','contentHtml'],
 
        data: function(){
 
            return {
 
                yearHtml:""
 
                
            }
 
        },
 
        methods: {
 
        	 yearClick:function(){
 
	          	$(event.target.closest("div")).addClass('active').siblings().removeClass('active')
 
	          },
 
	          	$(event.target.closest("div")).addClass('active').siblings().removeClass('active');
 
	         },
 
	         contentClick:function(){
 
	         	$(".div-content").find(".div-btn").removeClass('active');
 
	         	$(event.target.closest("div")).addClass('active');
 
	         },
 
	         resetClick:function(){
 
				$("#signYear").find(".c-33").removeClass("active");
 
				$("#signYear").find(".c-33").eq(0).addClass("active");
 
				$(".div-content").find(".c-33").removeClass("active");
 
				$(".div-content").find(".c-33").eq(0).addClass("active");
 
	         },
 
	         confirmClick:function(){
 
	         	var vm = this;
 
	         	var year = $("#signYear .c-33.active").attr("data-val"),
 
	         		$type = $(".div-content .div-btn.active"),
 
                    typeCode = $type.attr("data-val"),
 
                    lowCode = $type.attr("data-lowCode"),
 
                    name = $type.find("a").html();
 
	         	console.log("year:"+$("#signYear .c-33.active").attr("data-val"))
 
	         	console.log("id:"+typeCode)
 
	         	console.log("lowCode:"+lowCode)
 
	         	console.log("name:"+name)
 
				//触发刷新
 
				this.$emit('vuedals:close', {
 
					year: year,
 
					id: typeCode,
 
					lowCode: lowCode,
 
					name: name,
 
					yearHtml:$("#signYear").html(),
 
					contentHtml:$(".div-content").html()
 
				});
 
	         },
 
        	formatYearData: function () {     
        		//显示年份最低是2016年
 
				var now = new Date(),
 
@ -56,7 +97,11 @@
 
           },
 
        },
 
        mounted: function(){
 
        	this.formatYearData();
 
        	if(this.contentHtml){
 
        		$(".div-content").html(this.contentHtml);
 
        	}else{
 
        		this.formatYearData();
 
        	}
 
        }
 
    });