Browse Source

长处方相关bug修复

raolu 6 years ago
parent
commit
0ddaf71704

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

@ -130,7 +130,7 @@
            
            <!--<bar-chart v-show="sumType==3" class="mt15" @getbardata="getBarData" :barid="'barChart'+ sumType"></bar-chart>-->
            
            <line-chart v-show="sumType==1 || sumType==3" class="mt15" @getlinedata="getBarData" lineid="lineChart1" :show-date-panel="1" :dateValue="dateValue"></line-chart>
            <line-chart v-show="sumType==1 || sumType==3" class="mt15" @getlinedata="getBarData" lineid="lineChart1" :show-date-panel="1"></line-chart>
            
            <line-chart v-show="sumType==2" @getlinedata="getPaymentLineData" lineid="lineChart2"></line-chart>
            

+ 9 - 3
app/statistics/js/prescription-analysis.js

@ -110,10 +110,17 @@ new Vue({
                    vm.sumTypeName = data.sumTypeName;
                    vm.disease = data.disease;
                    vm.diseaseName = data.diseaseName;
                    var newYear = false;
                    if(vm.chooseYear != data.chooseYear){
                        newYear = true;
                    }
                    vm.chooseYear = data.chooseYear;
                    
                    vm.startDate = getStartDate(vm.chooseYear);
                    vm.endDate = getEndDate(vm.chooseYear)
                    if(newYear){
                        vm.dateValue = [vm.startDate, vm.endDate];
                    }
                    
                    //将参数职位初始值
                    vm.level = vm.userRole.code == '350200' ? 4 : vm.userRole.code.length == 6 ? 3 : 2;
@ -196,7 +203,6 @@ new Vue({
        getBarData: function(arg){
            this.dateType = arg.dateType || this.dateType;
            var dateValue = arg.dateValue;
            console.log(arg);
            if(dateValue){
                this.dateValue = arg.dateValue;
                this.sDate = dateValue[0];
@ -489,7 +495,6 @@ function handleSecondPanelData(data, vm){
//              selectedDateType: vm.dateType
//          });
            
            console.log(vm.dateValue);
            EventBus.$emit("draw-line-chart", {
                panelName : panelName,
                quotaNames : ["订单数"],
@ -498,7 +503,8 @@ function handleSecondPanelData(data, vm){
                colors : [color],
                unit: "笔",
                selectedDateType: vm.dateType,
                dateValue: vm.dateValue
                dateValue: vm.dateValue,
                chooseYear: vm.chooseYear
            });
            break;
        case 2:

+ 11 - 14
component/statistics/line-chart.js

@ -1,6 +1,7 @@
(function(){
    var startDate,
        endDate;
        endDate,
        chooseYear;
    Vue.component('line-chart',{
        template: '<div class="mtb10 bgc-fff c-border pb10">\
            <div class="ui-grid ui-grid-middle plr10 c-border-b">\
@ -35,7 +36,7 @@
            </div>\
            <div class="line-chart" :id="lineid" style="height: 200px; width: 100%;"></div>\
        </div>',
        props:['lineid', 'showDatePanel'],
        props:['lineid', 'showDatePanel', "chooseYear"],
        data: function(){
            return {
                selectedDateType: 1,
@ -72,23 +73,13 @@
                        }
                    }],
                    disabledDate: function(d){
                        var start = new Date(startDate),
                            end = new Date(endDate);
                        var start = new Date(getStartDate(chooseYear)),
                            end = new Date(getEndDate(chooseYear));
                        return d < start || d > end;
                    }
                }
            }
        },
        watch:{
            dateValue: function(val){
//              this.$emit("getlinedata", {dateValue: val});
                if(val){
                    startDate = this.dateValue[0];
                    endDate = this.dateValue[1];
                }
                
            }
        },
        methods: {
            changeType: function(type){
                this.selectedDateType = type;
@ -112,8 +103,14 @@
                    vm.unit = arg.unit;
                }
                vm.dateValue = arg.dateValue;
                vm.chooseYear = arg.chooseYear;
                chooseYear = arg.chooseYear;
                drawLine(vm, arg);
            })
            
            EventBus.$on("change-date-value", function(arg){
                this.defaultValue = arg;
            })
        }
    });