Browse Source

总体分析,代预约记录

chenyue 5 years ago
parent
commit
3517893ec9

+ 1 - 1
app/statistics/css/common.css

@ -414,7 +414,7 @@ ul {
	height: 70px;
	top: 50%;
	margin-top: -35px;
	left: 50%;
	left: 50.3%;
	margin-left: -35px;
	/*z-index: 2;*/
	background-color: #17b3ec;

+ 5 - 5
app/statistics/html/comprehensive-analysis.html

@ -49,8 +49,8 @@
    }
    .shadow{
        position: absolute;
        left: 70%;
        top:44px;
        left: 50%;
    	top: 85px;
       background-color: rgba(50, 50, 50, 0.701961);
       border-color: rgb(51, 51, 51);
       color: rgb(255, 255, 255);
@ -64,7 +64,7 @@
	    text-align: left;
    }
    .shadowr{
        left: -70%;
        left: 0%;
    }
    .article-bar, .send-bar{height:15px;width:0%;}
    .article-bar{background: #7a97e0;}
@ -164,12 +164,12 @@
                            <div class="ui-col-1 c-position-r">
                                <div class="c-f24 c-333 mt20 c-t-center">{{topDatas['index_5']}}</div>
                                <div class="health-count c-f16 c-333 pt10 c-t-center" >触达人数<img @mouseenter="jumpTip(3)" @mouseleave="leaveTip(3)"class="tip" data-val="3"  width="16" src="../../../images/icon_wenhao.png" alt=""></div>
                                <div class="shadow" id="shadow1">以微信绑定账号+家庭成员为统计口径</div>
                                <div class="shadow" id="shadow3">以微信绑定账号+家庭成员为统计口径</div>
                            </div>
                            <div class="ui-col-1 c-position-r">
                                <div class="c-f24 c-333 mt20 c-t-center">{{topDatas['index_106']}}</div>
                                <div class="health-count c-f16 c-333 pt10 c-t-center" >推送人数<img @mouseenter="jumpTip(4)" @mouseleave="leaveTip(4)"class="tip" data-val="4"  width="16" src="../../../images/icon_wenhao.png" alt=""></div>
                                <div class="shadow" id="shadow2">以微信绑定账号为统计口径</div>
                                <div class="shadow shadowr" id="shadow4">以微信绑定账号为统计口径</div>
                            </div>
                        </div>
                    </div>

+ 11 - 0
app/statistics/js/common.js

@ -17,6 +17,17 @@ function getEndDate(chooseYear){
        return (chooseYear+1) + '-06-30';
    }
}
//获取结束时间29
function getEndDate29(chooseYear){
    chooseYear = parseInt(chooseYear);
    var endDate = new Date((chooseYear+1) + '-06-29'),
        now = new Date();
    if(now <= endDate){
        return now.format("yyyy-MM-dd");
    }else{
        return (chooseYear+1) + '-06-29';
    }
}
/**
 * 获取多少天前的日期

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

@ -478,6 +478,8 @@ function listHandle(data, vm){
            topArr = soreRank(getKeyValueArr(list, 'bindRate'));
        }else if(vm.index == '3'){
            topArr = soreRank(getKeyValueArr2(list, 'amount'));
        }else if(vm.index == '27'){
            topArr = soreRank(getKeyValueArr(list, 'reservationTotalAmount0'));
        }else{
            topArr = soreRank(getKeyValueArr(list, 'amount'));
        }
@ -529,6 +531,7 @@ function listHandle(data, vm){
            area: vm.area,
            lowLevel: vm.lowLevel,
            headers: headers[vm.index],
            year:vm.chooseYear,
            rows: arr
        });
    }

+ 5 - 1
component/statistics/area-data-panel.js

@ -32,6 +32,7 @@
                area: '',
                headers: [],
                rows: [],
                year:'',
                cityLevelNoShowTeamTab: false,
                districtLevelNoShowTeamTab: false
            }
@ -45,6 +46,7 @@
                vm.area = arg.area;
                vm.headers = arg.headers;
                vm.rows = arg.rows;
                vm.year=arg.year;
                vm.cityLevelNoShowTeamTab = arg.cityLevelNoShowTeamTab;
                vm.districtLevelNoShowTeamTab = arg.districtLevelNoShowTeamTab;
            })
@ -72,6 +74,7 @@
        },
        methods: {
            getLowLeverData: function(row){
            	var vm=this
                if(this.level > 2 && this.lowLevel != 1){
                    //跳转去下一级数据
                    if(this.lowLevel && (this.level - this.lowLevel) >= 2){
@ -105,7 +108,8 @@
                        title: title,
                        component: component,
                        props: {
                            teamId: row.code
                            teamId: row.code,
                            year: vm.year
                        },
                        size:size
                    });

+ 8 - 5
component/statistics/team-info-dyy.js

@ -36,24 +36,25 @@
				<navigation :pages="pagetotal" :current="currentPage" @navpage="search" :total="total" :size="pagesize"></navigation>\
			</div>\
        </div>',
        props:['teamId'],
        props:['teamId','year'],
        data: function(){
            return {
                team: {},
                members: [],
                memberLength: 0,                
				pagesize: 5,
				total: "",
				pagetotal: '', //总页数
				total: 0,
				pagetotal: 1, //总页数
				currentPage: 1, //当前页数
				tablelist: [],
				wujilu: false,
				isloading:false,
				date:'',
            }
        },
        mounted: function(){
            console.log(this.teamId);
            var vm = this;
            vm.date = getEndDate29(vm.year);
            getTeamInfo(vm);
            vm.getDatas()
        },
@ -61,7 +62,9 @@
        	getDatas:function(){
        		var vm = this
				var params = {
					teamId: 5 || vm.teamId,
					teamId: vm.teamId,
					year:vm.year,
					date:vm.date,
					pageIndex: vm.currentPage,
					pageSize: vm.pagesize
				}

+ 2 - 2
component/statistics/team-info.js

@ -2,7 +2,7 @@
    Vue.component('team-info',{
        template: '<div>\
            <div class="pt15" id="teamInfoBox">\
                <div class="plr15 pb20">\
            <div class="plr15 pb20">\
                <span class="c-f14 c-bold c-333">团队名称:</span>\
                <span class="c-f14 c-333">{{team.name}}</span>\
            </div>\
@ -20,7 +20,7 @@
                    <span v-for="(member, index) in members">{{index==0? "": " 、"}}{{member.name}}</span>\
                </p>\
            </div>\
        </div>',
        </div></div>',
        props:['teamId'],
        data: function(){
            return {