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

app/statistics/css/common.css

@@ -683,6 +683,12 @@ a {
	color: #333 !important;
}
.vuedal header .title {
	font-size: 16px !important;
	color: #333 !important;
}
.vuedal.lg header {
	font-size: 18px;

app/statistics/html/blessing-analysis.html

@@ -90,7 +90,7 @@
        <div class="c-border bottomTable m20 mb0">
            <div class="c-f16 c-333 title ptb20">未发送生日祝福分析</div>
            <!-- 底部区域图 -->
            <area-data-panel class="mlr8" v-on:getnewdata="getAreaData"></area-data-panel>
            <area-data-panel v-on:getnewdata="getAreaData"></area-data-panel>
            <div class="tableBlock">
            </div>

app/statistics/js/blessing-analysis.js

@@ -260,8 +260,8 @@ function getTopTagDatas(data, vm) {
		vm.total=parseFloat(data.index_98+data.index_99)
		vm.sendCount=data.index_98
		vm.noSendCount=data.index_99
		vm.sendRate=vm.total!=0?data.index_98 / vm.total *100 +'%':'0%'
		vm.noSendRate=vm.total!=0?data.index_99 / vm.total *100 +'%':'0%'	
		vm.sendRate=vm.total!=0?(data.index_98 / vm.total *100).toFixed(2) +'%':'0%'
		vm.noSendRate=vm.total!=0?(data.index_99 / vm.total *100).toFixed(2) +'%':'0%'	
	window.onresize = function () {
		window.lineCharts.resize(); //日周月折线图
	}

component/statistics/area-data-panel.js

@@ -9,7 +9,7 @@
                <table class="bottom-list-table mb20" id="listTable">\
                    <thead><tr>\
                        <th v-for="th in headers">{{th}}</th>\
                        <th v-show="level>2 && lowLevel != 1" width="20"></th>\
                        <th width="20"></th>\
                    </tr></thead>\
                    <tbody>\
                        <tr v-for="row in rows" class="data-row" @click="getLowLeverData(row)">\
@@ -18,7 +18,7 @@
                                <div v-if="index==0" class="ui-col-1 c-nowrap-multi">{{col}}</div>\
                                <span v-else>{{col}}</span>\
                            </td>\
                            <td v-show="level>2 && lowLevel != 1"><i class="fa fa-angle-right"></i></td>\
                            <td ><i class="fa fa-angle-right"></i></td>\
                        </tr>\
                    </tbody>\
                </table>\

component/statistics/area-data-panel3.js

@@ -1,26 +1,28 @@
(function(){
    Vue.component('area-data-panel',{
        template: `<div class="area-panel">\
        template: '<div class="area-panel">\
                <div class="ui-grid bgc-ebebf5 panelTop">\
                    <img v-show="reqList.length!=1" @click="back" src="../../../images/fanhui_icon.png" width="18" height="18" class="mr10 vam">\
                    <div v-show="level==4" class="area-tab" :class="{\'active\': level==4 && (!lowLevel || lowLevel==3)}" @click="getLowCodeData(3)"><span>各区</span></div>\
                    <div v-show="level >= 3" class="area-tab" :class="{\'active\': (level==3 && lowLevel!=1) || lowLevel==2}" @click="getLowCodeData(2)"><span>社区</span></div>\
                    <div v-show="showTeamTab" class="area-tab" :class="{\'active\': level==2 || lowLevel==1}" @click="getLowCodeData(1)"><span>团队</span></div>\
                </div>\
                <table class="bottom-list-table mb20" id="listTable">\
                    <thead><tr>\
                        <th v-for="th in headers">{{th}}</th>\
                    </tr></thead>\
                    <tbody>\
                        <tr v-for="row in rows" class="data-row">\
                            <td v-for="(col, index) in row.cols">\
                                <span v-if="index==1&&level>2 && lowLevel != 1" :class="{\'toJump\':(index==1&&level>2 && lowLevel != 1)}" @click="getLowLeverData(row)">{{col}}</span>
                                <span v-else>{{col}}</span>\
                            </td>\
                        </tr>\
                    </tbody>\
                </table>\
            </div>`,
                <div style="padding: 0 30px;">\
	                <table class="bottom-list-table mb20" id="listTable">\
	                    <thead><tr>\
	                        <th v-for="th in headers">{{th}}</th>\
	                    </tr></thead>\
	                    <tbody>\
	                        <tr v-for="row in rows" class="data-row">\
	                            <td v-for="(col, index) in row.cols">\
	                                <span v-if="index==1&&level>2 && lowLevel != 1" :class="{\'toJump\':(index==1&&level>2 && lowLevel != 1)}" @click="getLowLeverData(row)">{{col}}</span>\
	                                <span v-else>{{col}}</span>\
	                            </td>\
	                        </tr>\
	                    </tbody>\
	                </table>\
                </div>\
            </div>',
        props:[],
        data: function(){
            return {

component/statistics/team-info-dyy.js

@@ -1,14 +1,14 @@
(function(){
    Vue.component('team-info-dyy',{
        template: '<div class="team-info-dyy" style="height:500px;overflow:auto;">\
        	<div class="dyy-title">团队信息</div>\
        	<div class="ui-grid mt20 c-f16 c-333 plr20">\
        	<div class="dyy-title" style="font-size: 14px;">团队信息</div>\
        	<div class="ui-grid mt20 c-f16 c-333 plr20" style="font-size: 14px;">\
        		<div class="ui-col-0 pr10" style="width:50%"><span class="c-999">团队名称：</span>{{team.name}}</div>\
        		<div class="ui-col-0 pl10" style="width:50%"><span class="c-999">所在社区：</span>{{team.hospitalName}}</div>\
        	</div>\
        	<div class="mt20 c-f16 c-333 plr20" style="word-break: break-all;"><span class="c-999">团队长：</span>{{team.leaderName}}</div>\
        	<div class="mt20 c-f16 c-333 plr20 pb40 c-border-b mb20" style="word-break: break-all;"><span class="c-999">团队成员：</span><span v-for="(member, index) in members">{{index==0? "": " 、"}}{{member.name}}</span>\</div>\
            <div class="dyy-title">代预约记录</div>\
        	<div class="mt20 c-f16 c-333 plr20" style="word-break: break-all;font-size: 14px;"><span class="c-999">团队长：</span>{{team.leaderName}}</div>\
        	<div class="mt20 c-f16 c-333 plr20 pb40 c-border-b mb20" style="word-break: break-all;font-size: 14px;"><span class="c-999">团队成员：</span><span v-for="(member, index) in members">{{index==0? "": " 、"}}{{member.name}}</span>\</div>\
            <div class="dyy-title" style="font-size: 14px;">代预约记录</div>\
            <div id="sc_table" class="p20">\
				<table class="table-bordered table-striped width-100 c-t-center">\
					<thead>\