修改签约进展

app/statistics/js/sign-progress.js

@@ -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) {
@@ -338,7 +354,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 +374,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", {

component/statistics/resident-analysis-filter.js

@@ -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();
			}
        }
    });
    

component/statistics/resident-analysis.js

@@ -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
                }
            });
		});

component/statistics/sign-progress-filter.js

@@ -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();
        	}
        }
    });