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

app/jbsc/js/statistics.js

@@ -174,13 +174,16 @@ new Vue({
			var vm = this
			vm.type = $("#Type").attr("data-id");
			var status = $("#Status").attr("data-id");
			if(status == "" || status == undefined) {
			if(status == "5") {
				vm.status = "";
				vm.isDanger = "0";
			} else if(status == "" || status == undefined) {
				if(vm.isDanger == "0") {
					vm.isDanger = ""
				}
				vm.status = status;
			} else {
//				vm.isDanger = "1";
				vm.isDanger = "1";
				vm.status = status;
			}
			vm.currentPage = page