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

page/bigData/html/alert5.html

@@ -102,7 +102,7 @@
								<input type="radio">年
							</label>
						</div>
                        <bar-chart :config="alertChart5" ref="_alertChart5"></bar-chart>
                        <bar-chart :config="alertChart5" ref="_alertChart5" style="padding: 0 5px;"></bar-chart>
                    </div>
                </div>
            </div>

page/bigData/html/alert6.html

@@ -102,7 +102,7 @@
								<input type="radio">年
							</label>
						</div>
                        <bar-chart :config="alertChart5" ref="_alertChart5"></bar-chart>
                        <bar-chart :config="alertChart5" ref="_alertChart5"  style="padding: 0 5px;"></bar-chart>
                    </div>
                </div>
            </div>