Browse Source

bug解决

raolu 7 years ago
parent
commit
471394b7ef

+ 2 - 1
app/statistics/js/comprehensive-analysis.js

@ -137,7 +137,8 @@ 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;
    EventBus.$emit('update-area-name', {areaName: vm.areaTitle});
    
    var now = new Date();
    if(now.getMonth() >= 6){

File diff suppressed because it is too large
+ 1 - 0
app/statistics/js/echarts.min.js


+ 2 - 1
app/statistics/js/prescription-analysis.js

@ -164,7 +164,8 @@ function initData(vm){
    vm.level = vm.userRole.code == '350200' ? 4 : vm.userRole.code.length == 6 ? 3 : 2;
    vm.lowLevel = vm.level - 1;
    vm.area = vm.userRole.code;
    vm.areaTile = vm.userRole.name;
    vm.areaTitle = vm.userRole.name;
    EventBus.$emit('update-area-name', {areaName: vm.areaTitle});
    
    var now = new Date();
    vm.endDate = now.format("yyyy-MM-dd");

+ 2 - 1
app/statistics/sign-progress.html

@ -59,7 +59,8 @@
		<script src="../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../plugins/echarts/3.8.5/echarts.min.js" type="text/javascript" charset="utf-8"></script>
		<!--<script src="../../plugins/echarts/3.8.5/echarts.min.js" type="text/javascript" charset="utf-8"></script>-->
		<script src="js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../api/statistics-api.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../component/common/event-bus.js"></script>

+ 5 - 3
component/statistics/line-chart.js

@ -175,19 +175,21 @@
                    }
                }
            });
            options.markLine ={
            $.extend(options.series[0], {markLine: {
                    data:[
                        {yAxis: markLineValue, name: markLineName}
                    ],
                    label:{
                        show: true,
                        position: 'middle'
                        position: 'middle',
                        formatter: '{b}: {c}'
                    },
                    lineStyle:{
                        color: 'rgb(194,53,49)'
                    }
            };
            }});
        }
//          console.log(JSON.stringify(options));
        $("#lineChart").removeAttr('_echarts_instance_')
        lineCharts.setOption(options);
    }