Merge branch 'sr-1.11.0' of http://192.168.1.220:10080/lulihong0928/bigScreenShow into sr-1.11.0

page/bigData/css/home.css

@@ -131,6 +131,7 @@ body {
	background: url(../images/fengexian.png) no-repeat;
	background-size: 2.677rem 3.1rem;
	margin-left: 0.1rem;
	position: relative;
}
.center-panel .map {

page/bigData/js/alert4.js

@@ -111,8 +111,6 @@ new Vue({
            ]
            $(".div-mask-layer").show();
            httpRequest.getReqPromises(reqUrl).then(function(datas) {
                console.log(datas);
                debugger
                vm.alertData1 = datas[0].obj.VIEW_15_0001[0].HC_15_1006;
                vm.alertData2 = datas[1].obj.VIEW_15_0001[0].HC_15_1006;
                vm.alertData3 = datas[2].obj.VIEW_15_0002[0].HC_15_1003;
@@ -166,7 +164,7 @@ new Vue({
        setAlertChart3:function(data){
            var options = JSON.parse(data);
            options = xingbieChart(options);
            options.color = ["#00E7F3","#ff616f"];
            options.color = ["#00E7F3","#ff616f","#6576e0"];
            options.legend.formatter = function(name) {
                var index = 0;
                var clientlabels = options.legend.data;