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

app/home/html/menu.html

@@ -54,7 +54,7 @@
                    </a>
                </div>
                <div class="col-xs-6" :class="{'active': selectedTab == 4, 'disabled': disableTabs.indexOf(4)>-1}">
                    <a href="../statistics/home.html" target="view_frame" @click="chooseTab(4)">
                    <a href="../../statistics/html/home.html" target="view_frame" @click="chooseTab(4)">
                        <img :src="selectedTab == 4?'../../../images/tongjifenxi02_icon.png' : '../../../images/tongjifenxi_icon.png'">
                        <div class="mt10 c-f16">统计分析</div>
                    </a>

app/statistics/js/change-back.js

@@ -58,10 +58,10 @@ new Vue({
				this.level = arg.level;
				this.lowLevel = arg.lowLevel;
				this.area = arg.area;
				this.areaTitle = arg.areaTitle;
				loadData([0, 1, 2], this);
			}
			
			this.areaTitle = arg.areaTitle;
			EventBus.$emit('update-area-name', {areaName: this.areaTitle});
			//存储请求所带的参数
			reqList.push({

app/statistics/js/prescription-analysis.js

@@ -199,7 +199,7 @@ new Vue({
        getBottomAreaData: function(arg){
            //如果level改变，则需要重新加载整个页面的数据，否则只需加载底部区域数据
            if(arg.level == this.level){
                this.lowLevel = arg.lowLevel;
                this.lowLevel = arg.lowLevel || 3;
                loadData([2], this);
            }else{
                this.level = arg.level;
@@ -221,6 +221,7 @@ new Vue({
                tagCode: this.tagCode,
                sumType: this.sumType,
                disease: this.disease,
                dateType: this.dateType
            })
        }
    }

component/statistics/resident-analysis-filter.js

@@ -139,8 +139,10 @@
			if(lastItem=="全社区"){
				if($(".div-content .div-item .div-btn.active").length==3){
					vm.resultCode = $($(".div-content .div-item .div-btn.active").eq(1)).attr("data-id");
				    vm.curName = $($(".div-content .div-item .div-btn.active").eq(1)).find("a").text();
				}else{
				    vm.resultCode = $($(".div-content .div-item .div-btn.active").eq(0)).attr("data-id");
				}
				vm.resultCode = $($(".div-content .div-item .div-btn.active").eq(0)).attr("data-id");
				vm.selectLevel = 2;
			}
			this.$emit('vuedals:close', {