Home Explore Help
Register Sign In
raolu
/
PC-application
Watch 0
Star 0
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Xiao_yanpeng 7 years ago
parent
cd3060c9d2 0bd5232eaf
commit
de27a5808f
7 changed files with 13 additions and 10 deletions
Split View Show Diff Stats
  1. 1 1
      app/statistics/html/comprehensive-analysis.html
  2. 1 1
      app/statistics/html/consulting-analysis.html
  3. 1 1
      app/statistics/html/estimate-analysis.html
  4. 1 1
      app/statistics/html/prescription-analysis.html
  5. 4 2
      app/statistics/js/home.js
  6. 4 3
      component/statistics/resident-analysis-filter.js
  7. 1 1
      component/statistics/resident-analysis.js

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

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

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

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

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

@ -25,7 +25,7 @@
 
    </head>
 
    <body>
 
        <div id="main" class="c-hide">
 
            <header-tab :appname="appname" :isback="true" :isrefresh="true" :isfilter="false" :isopen="true" ></header-tab>
 
            <header-tab :appname="appname" :isback="true" :isrefresh="true" :isfilter="false" :isopen="false" ></header-tab>
 
            <header-prompt></header-prompt>
 
            <div class="c-t-center mt20">
 
                <div class="tag">

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

@ -19,7 +19,7 @@
 
    </head>
 
    <body>
 
        <div id="main" class="c-hide">
 
            <header-tab :appname="appname" :isback="isback" :isrefresh="isrefresh" :isfilter="isfilter" :isopen="isopen" ></header-tab>
 
            <header-tab :appname="appname" :isback="isback" :isrefresh="isrefresh" :isfilter="isfilter" :isopen="false" ></header-tab>
 
            <header-prompt></header-prompt>
 
            <div v-show="sumType==1" class="order-tag-panel">
 
                <ul class="l-banner">

+ 4 - 2
app/statistics/js/home.js
View File 

@ -150,13 +150,15 @@ function getSignData(vm){
 
                    people: data.renew.split("/")[1]
 
                }
 
            }
 
            var val1 = data.signRate.people - data.signRate.sign,
 
                val2 = data.signTaskRate.people - data.signTaskRate.sign;
 
            var signArr = [
 
                    {name: "签约数", value: data.signRate.sign},
 
                    {name: "未签约数", value: data.signRate.people - data.signRate.sign},
 
                    {name: "未签约数", value: val1 >0 ? val1 : 0},
 
                ],
 
                signTaskArr = [
 
                    {name: "签约数", value: data.signTaskRate.sign},
 
                    {name: "未达标数", value: data.signTaskRate.people - data.signTaskRate.sign}
 
                    {name: "未达标数", value: val2 >0 ? val2 : 0 }
 
                ],
 
                val = data.renew.split("/")[1] - data.renew.split("/")[0],
 
                renewArr = [

+ 4 - 3
component/statistics/resident-analysis-filter.js
View File 

@ -1,6 +1,6 @@
 
(function(){
 
    Vue.component('resident-analysis-filter',{
 
        template: '<div style="height: 400px;overflow: auto;margin-bottom: 50px;">\
 
        template: '<div :style="{height: height}" style="overflow: auto;margin-bottom: 50px;overflow-y: scroll;">\
 
				<div class="mt10 ml10 filter-title">统计年份</div>\
 
				<div class="c-row mt20 ml40" id="signYear" v-html="yearHtml" @click="yearClick">\
 
				</div>\
 
@ -12,7 +12,7 @@
 
							<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>\
 
@ -22,7 +22,8 @@
 
            return {
 
                selectLevel:"",
 
                resultCode:"",
 
                roleLevel:""
 
                roleLevel:"",
 
                height: window.innerHeight * 0.6 + 'px'
 
            }
 
        },
 
        methods: {

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

@ -121,7 +121,7 @@ Vue.component('resident-analysis', {
 
		} else {
 
			vm.chooseYear = now.getFullYear() - 1;
 
		}
 
		vm.userRole = JSON.parse(window.localStorage.getItem("selectedRole"));
 
		vm.userRole = JSON.parse(window.sessionStorage.getItem("selectedRole"));
 
		vm.roleLevel = vm.userRole.code == '350200' ? 4 : vm.userRole.code.length == 6 ? 3 : 2;
 
		vm.endDate = getEndDate(vm.chooseYear);
 
		vm.curLevel = vm.roleLevel;