Commit 984a3cdf authored by Administrator's avatar Administrator

2018年4月24日 --智能分析平台

--jQuery升级1.9版本,方法重写
parent 131b3ed5
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<artifact type="war" name="CmszMonitorAnalysis"> <artifact type="war" name="CmszMonitorAnalysis">
<output-path>$PROJECT_DIR$/out/artifacts/CmszMonitorAnalysis</output-path> <output-path>$PROJECT_DIR$/out/artifacts/CmszMonitorAnalysis</output-path>
<root id="archive" name="CmszMonitorAnalysis.war"> <root id="archive" name="CmszMonitorAnalysis.war">
<element id="artifact" artifact-name="CmszMonitorAnalysis run" /> <element id="artifact" artifact-name="CmszMonitorAnalysis:war exploded" />
</root> </root>
</artifact> </artifact>
</component> </component>
\ No newline at end of file
This diff is collapsed.
...@@ -28,8 +28,8 @@ jdbc.database=ccolap ...@@ -28,8 +28,8 @@ jdbc.database=ccolap
#jdbc.username=szcm #jdbc.username=szcm
#jdbc.password=szcm #jdbc.password=szcm
jdbc.driver=com.vertica.jdbc.Driver jdbc.driver=com.vertica.jdbc.Driver
#jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap
jdbc.url=jdbc:vertica://192.168.127.58:5433/vertica_prd #jdbc.url=jdbc:vertica://192.168.127.58:5433/vertica_prd
jdbc.username=ccolap jdbc.username=ccolap
jdbc.password=hg.2015 jdbc.password=hg.2015
##test ##test
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</c:forEach> </c:forEach>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$("#allProvinceDetail").click(function(){ $("#allProvinceDetail").on('click',function(){
alert(21) alert(21)
}); });
</script> </script>
\ No newline at end of file
...@@ -23,19 +23,19 @@ ...@@ -23,19 +23,19 @@
<script type="text/javascript"> <script type="text/javascript">
var businessCheckedValues=$(".business:checked"); var businessCheckedValues=$(".business:checked");
$("#allBusiness").click(function(){ $("#allBusiness").on('click',function(){
if($("#allBusiness").attr("checked") == "checked"){//全选 if($("#allBusiness").prop("checked") == true){//全选
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
$(".business").attr("disabled",true); $(".business").prop("disabled",true);
businessCheckedValues=$(".business"); businessCheckedValues=$(".business");
}else{//不全选 }else{//不全选
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
businessCheckedValues=$(".business:checked"); businessCheckedValues=$(".business:checked");
} }
}); });
$(".business").click(function(){ $(".business").on('click',function(){
businessCheckedValues=$(".business:checked"); businessCheckedValues=$(".business:checked");
}); });
......
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
<script type="text/javascript"> <script type="text/javascript">
var channelCheckedValues=$(".channel:checked"); var channelCheckedValues=$(".channel:checked");
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
} }
}); });
$(".channel").click(function(){ $(".channel").on('click',function(){
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
}); });
......
...@@ -54,19 +54,19 @@ ...@@ -54,19 +54,19 @@
<script type="text/javascript"> <script type="text/javascript">
var dataSourceCheckedValues=$(".datasource:checked"); var dataSourceCheckedValues=$(".datasource:checked");
$("#allDataSource").click(function(){ $("#allDataSource").on('click',function(){
if($("#allDataSource").attr("checked") == "checked"){//全选 if($("#allDataSource").prop("checked") == true){//全选
$(".datasource").attr("checked","checked"); $(".datasource").prop("checked",true);
$(".datasource").attr("disabled",true); $(".datasource").prop("disabled",true);
dataSourceCheckedValues=$(".datasource"); dataSourceCheckedValues=$(".datasource");
}else{//不全选 }else{//不全选
$(".datasource").attr("checked",false); $(".datasource").prop("checked",false);
$(".datasource").attr("disabled",false); $(".datasource").prop("disabled",false);
dataSourceCheckedValues=$(".datasource:checked"); dataSourceCheckedValues=$(".datasource:checked");
} }
}); });
$(".datasource").click(function(){ $(".datasource").on('click',function(){
dataSourceCheckedValues=$(".datasource:checked"); dataSourceCheckedValues=$(".datasource:checked");
}); });
......
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
$(".deployedServer").prop("checked",true); $(".deployedServer").prop("checked",true);
deployedServerCheckedValues=$(".deployedServer"); deployedServerCheckedValues=$(".deployedServer");
}else{ }else{
$(".deployedServer").attr("checked",false); $(".deployedServer").prop("checked",false);
deployedServerCheckedValues=$(".deployedServer:checked"); deployedServerCheckedValues=$(".deployedServer:checked");
} }
}); });
$(".deployedServer").click(function(){ $(".deployedServer").on('click',function(){
$("#allDeployedServer").attr("checked",false); $("#allDeployedServer").prop("checked",false);
deployedServerCheckedValues=$(".deployedServer:checked"); deployedServerCheckedValues=$(".deployedServer:checked");
}); });
......
...@@ -177,7 +177,7 @@ function getStatsChannelCheckedValues(){ ...@@ -177,7 +177,7 @@ function getStatsChannelCheckedValues(){
statsChannelArray[i]=$(this).val(); statsChannelArray[i]=$(this).val();
i++; i++;
}); });
//if($("#allChannelStats").attr("checked") == "checked"&&statsChannelArray.length>0){statsChannelArray[0]+=",-1";} //if($("#allChannelStats").prop("checked") == "checked"&&statsChannelArray.length>0){statsChannelArray[0]+=",-1";}
return statsChannelArray; return statsChannelArray;
} }
...@@ -192,7 +192,7 @@ function getStatsChannelCheckedValuesString(){ ...@@ -192,7 +192,7 @@ function getStatsChannelCheckedValuesString(){
statsChannelStr+=statsChannelArray[i]+","; statsChannelStr+=statsChannelArray[i]+",";
} }
} }
//if($("#allChannelStats").attr("checked") == "checked"&&statsChannelStr.length>0){statsChannelStr+=",-1";} //if($("#allChannelStats").prop("checked") == "checked"&&statsChannelStr.length>0){statsChannelStr+=",-1";}
return statsChannelStr; return statsChannelStr;
} }
......
...@@ -93,8 +93,8 @@ function getDetailProviderCheckedTitles(){ ...@@ -93,8 +93,8 @@ function getDetailProviderCheckedTitles(){
} }
function detailProviderReset(){ function detailProviderReset(){
$("#allProviderDetail").prop("checked","checked"); $("#allProviderDetail").prop("checked",true);
$(".providerDetail").prop("checked","checked"); $(".providerDetail").prop("checked",true);
statsProviderCheckedValues=$(".providerDetail:checked"); statsProviderCheckedValues=$(".providerDetail:checked");
} }
......
...@@ -20,32 +20,32 @@ ...@@ -20,32 +20,32 @@
var statsProvinceCheckedValues=$(".provinceStats:checked"); var statsProvinceCheckedValues=$(".provinceStats:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvinceStats").click(function(){ $("#allProvinceStats").on('click',function(){
if($("#allProvinceStats").attr("checked") == "checked"){//全选 if($("#allProvinceStats").prop("checked") == true){//全选
$(".provinceStats").attr("checked","checked"); $(".provinceStats").prop("checked",true);
statsProvinceCheckedValues=$(".provinceStats"); statsProvinceCheckedValues=$(".provinceStats");
$("#cityDiv").empty(); $("#cityDiv").empty();
}else{//不全选 }else{//不全选
$(".provinceStats").attr("checked",false); $(".provinceStats").prop("checked",false);
$(".provinceStats").attr("disabled",false); $(".provinceStats").prop("disabled",false);
statsProvinceCheckedValues=$(".provinceStats:checked"); statsProvinceCheckedValues=$(".provinceStats:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".provinceStats").click(function(){ $(".provinceStats").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".provinceStats").each(function(){ $(".provinceStats").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allProvinceStats").attr("checked",clickFlag); $("#allProvinceStats").prop("checked",clickFlag);
statsProvinceCheckedValues=$(".provinceStats:checked"); statsProvinceCheckedValues=$(".provinceStats:checked");
// alert(getStatsProvinceCheckedValuesString()); // alert(getStatsProvinceCheckedValuesString());
}); });
//重置 //重置
function statsProvinceReset(){ function statsProvinceReset(){
$("#allProvinceStats").attr("checked","checked"); $("#allProvinceStats").prop("checked",true);
$(".provinceStats").attr("checked","checked"); $(".provinceStats").prop("checked",true);
statsProvinceCheckedValues=$(".provinceStats"); statsProvinceCheckedValues=$(".provinceStats");
} }
......
...@@ -133,16 +133,16 @@ ...@@ -133,16 +133,16 @@
var detailProviderCheckedValues = $(".providerDetail:checked"); var detailProviderCheckedValues = $(".providerDetail:checked");
$("#allProviderDetail").click(function () { $("#allProviderDetail").on('click',function () {
if ($("#allProviderDetail").attr("checked") == "checked") {//全选 if ($("#allProviderDetail").prop("checked") == true) {//全选
$(".providerDetail").attr("checked", "checked"); $(".providerDetail").prop("checked", true);
// $(".providerDetail").attr("disabled",true); // $(".providerDetail").prop("disabled",true);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
//alert(getDetailChannelCheckedValuesString()); //alert(getDetailChannelCheckedValuesString());
detailProviderChange(); detailProviderChange();
} else {//不全选 } else {//不全选
$(".providerDetail").attr("checked", false); $(".providerDetail").prop("checked", false);
$(".providerDetail").attr("disabled", false); $(".providerDetail").prop("disabled", false);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
// alert(getDetailChannelCheckedValuesString()); // alert(getDetailChannelCheckedValuesString());
detailProviderChange(); detailProviderChange();
...@@ -150,14 +150,14 @@ ...@@ -150,14 +150,14 @@
judge = false; judge = false;
}); });
$(".providerDetail").click(function () { $(".providerDetail").on('click',function () {
var clickFlag = true;//是否全部选中 var clickFlag = true;//是否全部选中
$(".providerDetail").each(function () { $(".providerDetail").each(function () {
if ($(this).attr("checked") == null || $(this).attr("checked") == false) { if ($(this).prop("checked") == null || $(this).prop("checked") == false) {
clickFlag = false; clickFlag = false;
} }
}); });
$("#allProviderDetail").attr("checked", clickFlag); $("#allProviderDetail").prop("checked", clickFlag);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
detailProviderChange(); detailProviderChange();
//alert(getDetailProviderCheckedValuesString()); //alert(getDetailProviderCheckedValuesString());
...@@ -221,8 +221,8 @@ ...@@ -221,8 +221,8 @@
} }
function detailProviderReset() { function detailProviderReset() {
$("#allProviderDetail").attr("checked", "checked"); $("#allProviderDetail").prop("checked", true);
$(".providerDetail").attr("checked", "checked"); $(".providerDetail").prop("checked", true);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
detailProviderChange(); detailProviderChange();
...@@ -235,27 +235,27 @@ ...@@ -235,27 +235,27 @@
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvinceDetail").click(function () { $("#allProvinceDetail").on('click',function () {
if ($("#allProvinceDetail").attr("checked") == "checked") {//全选 if ($("#allProvinceDetail").prop("checked") == true) {//全选
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} else {//不全选 } else {//不全选
$(".provinceDetail").attr("checked", false); $(".provinceDetail").prop("checked", false);
$(".provinceDetail").attr("disabled", false); $(".provinceDetail").prop("disabled", false);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} }
judge = false; judge = false;
}); });
//选中勾选了的省 //选中勾选了的省
$(".provinceDetail").click(function () { $(".provinceDetail").on('click',function () {
var clickFlag = true;//是否全部选中 var clickFlag = true;//是否全部选中
$(".provinceDetail").each(function () { $(".provinceDetail").each(function () {
if ($(this).attr("checked") == null || $(this).attr("checked") == false) { if ($(this).prop("checked") == null || $(this).prop("checked") == false) {
clickFlag = false; clickFlag = false;
} }
}); });
$("#allProvinceDetail").attr("checked", clickFlag); $("#allProvinceDetail").prop("checked", clickFlag);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
//alert(getDetailProvinceCheckedValueString()); //alert(getDetailProvinceCheckedValueString());
judge = false; judge = false;
...@@ -263,8 +263,8 @@ ...@@ -263,8 +263,8 @@
//重置 //重置
function detailProvinceReset() { function detailProvinceReset() {
$("#allProvinceDetail").attr("checked", "checked"); $("#allProvinceDetail").prop("checked", true);
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
detailProvinceCheckedValues = $(".provinceDetail"); detailProvinceCheckedValues = $(".provinceDetail");
} }
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
data = eval("(" + data + ")");//获取从后台返回的数据,通常是Json格式 data = eval("(" + data + ")");//获取从后台返回的数据,通常是Json格式
if (data != null && data != "") { if (data != null && data != "") {
$("#allProvinceDetail").attr("checked", true); $("#allProvinceDetail").prop("checked", true);
for (var t = 0; t < data.length; t++) { for (var t = 0; t < data.length; t++) {
$("#provinceSelectAreaDetail").append('<div class="checkbox-inline"><label><input type="checkbox" name="provinceDetail" class="provinceDetail" title="' + data[t].provinceName + '" value="' + data[t].provinceId + '" checked>' + data[t].provinceName + '</label></div>'); $("#provinceSelectAreaDetail").append('<div class="checkbox-inline"><label><input type="checkbox" name="provinceDetail" class="provinceDetail" title="' + data[t].provinceName + '" value="' + data[t].provinceId + '" checked>' + data[t].provinceName + '</label></div>');
} }
...@@ -345,27 +345,27 @@ ...@@ -345,27 +345,27 @@
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvinceDetail").click(function () { $("#allProvinceDetail").on('click',function () {
if ($("#allProvinceDetail").attr("checked") == "checked") {//全选 if ($("#allProvinceDetail").prop("checked") == true) {//全选
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} else {//不全选 } else {//不全选
$(".provinceDetail").attr("checked", false); $(".provinceDetail").prop("checked", false);
$(".provinceDetail").attr("disabled", false); $(".provinceDetail").prop("disabled", false);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} }
judge = false; judge = false;
}); });
//选中勾选了的省 //选中勾选了的省
$(".provinceDetail").click(function () { $(".provinceDetail").on('click',function () {
var clickFlag = true;//是否全部选中 var clickFlag = true;//是否全部选中
$(".provinceDetail").each(function () { $(".provinceDetail").each(function () {
if ($(this).attr("checked") == null || $(this).attr("checked") == false) { if ($(this).prop("checked") == null || $(this).prop("checked") == false) {
clickFlag = false; clickFlag = false;
} }
}); });
$("#allProvinceDetail").attr("checked", clickFlag); $("#allProvinceDetail").prop("checked", clickFlag);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
//alert(getDetailProvinceCheckedValueString()); //alert(getDetailProvinceCheckedValueString());
judge = false; judge = false;
...@@ -378,8 +378,8 @@ ...@@ -378,8 +378,8 @@
// reset province // reset province
function detail_Province_Reset() { function detail_Province_Reset() {
$("#allProvinceDetail").attr("checked", "checked"); $("#allProvinceDetail").prop("checked", true);
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
} }
// reset dimension // reset dimension
......
...@@ -139,16 +139,16 @@ ...@@ -139,16 +139,16 @@
var detailProviderCheckedValues = $(".providerDetail:checked"); var detailProviderCheckedValues = $(".providerDetail:checked");
$("#allProviderDetail").click(function () { $("#allProviderDetail").on('click',function () {
if ($("#allProviderDetail").attr("checked") == "checked") {//全选 if ($("#allProviderDetail").prop("checked") == true) {//全选
$(".providerDetail").attr("checked", "checked"); $(".providerDetail").prop("checked", true);
// $(".providerDetail").attr("disabled",true); // $(".providerDetail").prop("disabled",true);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
//alert(getDetailChannelCheckedValuesString()); //alert(getDetailChannelCheckedValuesString());
detailProviderChange(); detailProviderChange();
} else {//不全选 } else {//不全选
$(".providerDetail").attr("checked", false); $(".providerDetail").prop("checked", false);
$(".providerDetail").attr("disabled", false); $(".providerDetail").prop("disabled", false);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
// alert(getDetailChannelCheckedValuesString()); // alert(getDetailChannelCheckedValuesString());
detailProviderChange(); detailProviderChange();
...@@ -156,14 +156,14 @@ ...@@ -156,14 +156,14 @@
judge = false; judge = false;
}); });
$(".providerDetail").click(function () { $(".providerDetail").on('click',function () {
var clickFlag = true;//是否全部选中 var clickFlag = true;//是否全部选中
$(".providerDetail").each(function () { $(".providerDetail").each(function () {
if ($(this).attr("checked") == null || $(this).attr("checked") == false) { if ($(this).prop("checked") == null || $(this).prop("checked") == false) {
clickFlag = false; clickFlag = false;
} }
}); });
$("#allProviderDetail").attr("checked", clickFlag); $("#allProviderDetail").prop("checked", clickFlag);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
detailProviderChange(); detailProviderChange();
//alert(getDetailProviderCheckedValuesString()); //alert(getDetailProviderCheckedValuesString());
...@@ -227,8 +227,8 @@ ...@@ -227,8 +227,8 @@
} }
function detailProviderReset() { function detailProviderReset() {
$("#allProviderDetail").attr("checked", "checked"); $("#allProviderDetail").prop("checked", true);
$(".providerDetail").attr("checked", "checked"); $(".providerDetail").prop("checked", true);
detailProviderCheckedValues = $(".providerDetail:checked"); detailProviderCheckedValues = $(".providerDetail:checked");
detailProviderChange(); detailProviderChange();
...@@ -241,27 +241,27 @@ ...@@ -241,27 +241,27 @@
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvinceDetail").click(function () { $("#allProvinceDetail").on('click',function () {
if ($("#allProvinceDetail").attr("checked") == "checked") {//全选 if ($("#allProvinceDetail").prop("checked") == true) {//全选
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} else {//不全选 } else {//不全选
$(".provinceDetail").attr("checked", false); $(".provinceDetail").prop("checked", false);
$(".provinceDetail").attr("disabled", false); $(".provinceDetail").prop("disabled", false);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} }
judge = false; judge = false;
}); });
//选中勾选了的省 //选中勾选了的省
$(".provinceDetail").click(function () { $(".provinceDetail").on('click',function () {
var clickFlag = true;//是否全部选中 var clickFlag = true;//是否全部选中
$(".provinceDetail").each(function () { $(".provinceDetail").each(function () {
if ($(this).attr("checked") == null || $(this).attr("checked") == false) { if ($(this).prop("checked") == null || $(this).prop("checked") == false) {
clickFlag = false; clickFlag = false;
} }
}); });
$("#allProvinceDetail").attr("checked", clickFlag); $("#allProvinceDetail").prop("checked", clickFlag);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
//alert(getDetailProvinceCheckedValueString()); //alert(getDetailProvinceCheckedValueString());
judge = false; judge = false;
...@@ -269,8 +269,8 @@ ...@@ -269,8 +269,8 @@
//重置 //重置
function detailProvinceReset() { function detailProvinceReset() {
$("#allProvinceDetail").attr("checked", "checked"); $("#allProvinceDetail").prop("checked", true);
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
detailProvinceCheckedValues = $(".provinceDetail"); detailProvinceCheckedValues = $(".provinceDetail");
} }
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
data = eval("(" + data + ")");//获取从后台返回的数据,通常是Json格式 data = eval("(" + data + ")");//获取从后台返回的数据,通常是Json格式
if (data != null && data != "") { if (data != null && data != "") {
$("#allProvinceDetail").attr("checked", true); $("#allProvinceDetail").prop("checked", true);
for (var t = 0; t < data.length; t++) { for (var t = 0; t < data.length; t++) {
$("#provinceSelectAreaDetail").append('<div class="checkbox-inline"><label><input type="checkbox" name="provinceDetail" class="provinceDetail" title="' + data[t].provinceName + '" value="' + data[t].provinceId + '" checked>' + data[t].provinceName + '</label></div>'); $("#provinceSelectAreaDetail").append('<div class="checkbox-inline"><label><input type="checkbox" name="provinceDetail" class="provinceDetail" title="' + data[t].provinceName + '" value="' + data[t].provinceId + '" checked>' + data[t].provinceName + '</label></div>');
} }
...@@ -351,27 +351,27 @@ ...@@ -351,27 +351,27 @@
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvinceDetail").click(function () { $("#allProvinceDetail").on('click',function () {
if ($("#allProvinceDetail").attr("checked") == "checked") {//全选 if ($("#allProvinceDetail").prop("checked") == true) {//全选
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} else {//不全选 } else {//不全选
$(".provinceDetail").attr("checked", false); $(".provinceDetail").prop("checked", false);
$(".provinceDetail").attr("disabled", false); $(".provinceDetail").prop("disabled", false);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
} }
judge = false; judge = false;
}); });
//选中勾选了的省 //选中勾选了的省
$(".provinceDetail").click(function () { $(".provinceDetail").on('click',function () {
var clickFlag = true;//是否全部选中 var clickFlag = true;//是否全部选中
$(".provinceDetail").each(function () { $(".provinceDetail").each(function () {
if ($(this).attr("checked") == null || $(this).attr("checked") == false) { if ($(this).prop("checked") == null || $(this).prop("checked") == false) {
clickFlag = false; clickFlag = false;
} }
}); });
$("#allProvinceDetail").attr("checked", clickFlag); $("#allProvinceDetail").prop("checked", clickFlag);
detailProvinceCheckedValues = $(".provinceDetail:checked"); detailProvinceCheckedValues = $(".provinceDetail:checked");
//alert(getDetailProvinceCheckedValueString()); //alert(getDetailProvinceCheckedValueString());
judge = false; judge = false;
...@@ -384,8 +384,8 @@ ...@@ -384,8 +384,8 @@
// reset province // reset province
function detail_Province_Reset() { function detail_Province_Reset() {
$("#allProvinceDetail").attr("checked", "checked"); $("#allProvinceDetail").prop("checked", true);
$(".provinceDetail").attr("checked", "checked"); $(".provinceDetail").prop("checked", true);
} }
// reset dimension // reset dimension
......
...@@ -46,16 +46,16 @@ ...@@ -46,16 +46,16 @@
<script type="text/javascript"> <script type="text/javascript">
var detailProviderCheckedValues=$(".providerDetail:checked"); var detailProviderCheckedValues=$(".providerDetail:checked");
$("#allProviderDetail").click(function(){ $("#allProviderDetail").on('click',function(){
if($("#allProviderDetail").attr("checked") == "checked"){//全选 if($("#allProviderDetail").prop("checked") == true){//全选
$(".providerDetail").attr("checked","checked"); $(".providerDetail").prop("checked",true);
// $(".providerDetail").attr("disabled",true); // $(".providerDetail").prop("disabled",true);
detailProviderCheckedValues=$(".providerDetail:checked"); detailProviderCheckedValues=$(".providerDetail:checked");
//alert(getDetailChannelCheckedValuesString()); //alert(getDetailChannelCheckedValuesString());
detailProviderChange(); detailProviderChange();
}else{//不全选 }else{//不全选
$(".providerDetail").attr("checked",false); $(".providerDetail").prop("checked",false);
$(".providerDetail").attr("disabled",false); $(".providerDetail").prop("disabled",false);
detailProviderCheckedValues=$(".providerDetail:checked"); detailProviderCheckedValues=$(".providerDetail:checked");
// alert(getDetailChannelCheckedValuesString()); // alert(getDetailChannelCheckedValuesString());
detailProviderChange(); detailProviderChange();
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,12 @@
judge=false; judge=false;
}); });
$(".providerDetail").click(function(){ $(".providerDetail").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".providerDetail").each(function(){ $(".providerDetail").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allProviderDetail").attr("checked",clickFlag); $("#allProviderDetail").prop("checked",clickFlag);
detailProviderCheckedValues=$(".providerDetail:checked"); detailProviderCheckedValues=$(".providerDetail:checked");
detailProviderChange(); detailProviderChange();
//alert(getDetailProviderCheckedValuesString()); //alert(getDetailProviderCheckedValuesString());
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
} }
function detailProviderReset(){ function detailProviderReset(){
$("#allProviderDetail").attr("checked","checked"); $("#allProviderDetail").prop("checked",true);
$(".providerDetail").attr("checked","checked"); $(".providerDetail").prop("checked",true);
detailProviderCheckedValues=$(".providerDetail:checked"); detailProviderCheckedValues=$(".providerDetail:checked");
detailProviderChange(); detailProviderChange();
...@@ -136,33 +136,33 @@ ...@@ -136,33 +136,33 @@
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvinceDetail").click(function(){ $("#allProvinceDetail").on('click',function(){
if($("#allProvinceDetail").attr("checked") == "checked"){//全选 if($("#allProvinceDetail").prop("checked") == true){//全选
$(".provinceDetail").attr("checked","checked"); $(".provinceDetail").prop("checked",true);
detailProvinceCheckedValues=$(".provinceDetail:checked"); detailProvinceCheckedValues=$(".provinceDetail:checked");
}else{//不全选 }else{//不全选
$(".provinceDetail").attr("checked",false); $(".provinceDetail").prop("checked",false);
$(".provinceDetail").attr("disabled",false); $(".provinceDetail").prop("disabled",false);
detailProvinceCheckedValues=$(".provinceDetail:checked"); detailProvinceCheckedValues=$(".provinceDetail:checked");
} }
judge=false; judge=false;
}); });
//选中勾选了的省 //选中勾选了的省
$(".provinceDetail").click(function(){ $(".provinceDetail").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".provinceDetail").each(function(){ $(".provinceDetail").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allProvinceDetail").attr("checked",clickFlag); $("#allProvinceDetail").prop("checked",clickFlag);
detailProvinceCheckedValues=$(".provinceDetail:checked"); detailProvinceCheckedValues=$(".provinceDetail:checked");
//alert(getDetailProvinceCheckedValueString()); //alert(getDetailProvinceCheckedValueString());
judge=false; judge=false;
}); });
//重置 //重置
function detailProvinceReset(){ function detailProvinceReset(){
$("#allProvinceDetail").attr("checked","checked"); $("#allProvinceDetail").prop("checked",true);
$(".provinceDetail").attr("checked","checked"); $(".provinceDetail").prop("checked",true);
detailProvinceCheckedValues=$(".provinceDetail"); detailProvinceCheckedValues=$(".provinceDetail");
} }
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
data=eval("("+data+")");//获取从后台返回的数据,通常是Json格式 data=eval("("+data+")");//获取从后台返回的数据,通常是Json格式
if(data != null && data != ""){ if(data != null && data != ""){
$("#allProvinceDetail").attr("checked",true); $("#allProvinceDetail").prop("checked",true);
for(var t=0;t<data.length;t++){ for(var t=0;t<data.length;t++){
$("#provinceSelectAreaDetail").append('<div class="checkbox-inline"><label><input type="checkbox" name="provinceDetail" class="provinceDetail" title="'+data[t].provinceName+'" value="'+data[t].provinceId+'" checked>'+data[t].provinceName+'</label></div>'); $("#provinceSelectAreaDetail").append('<div class="checkbox-inline"><label><input type="checkbox" name="provinceDetail" class="provinceDetail" title="'+data[t].provinceName+'" value="'+data[t].provinceId+'" checked>'+data[t].provinceName+'</label></div>');
} }
...@@ -243,25 +243,25 @@ ...@@ -243,25 +243,25 @@
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvinceDetail").click(function(){ $("#allProvinceDetail").on('click',function(){
if($("#allProvinceDetail").attr("checked") == "checked"){//全选 if($("#allProvinceDetail").prop("checked") == true){//全选
$(".provinceDetail").attr("checked","checked"); $(".provinceDetail").prop("checked",true);
detailProvinceCheckedValues=$(".provinceDetail:checked"); detailProvinceCheckedValues=$(".provinceDetail:checked");
}else{//不全选 }else{//不全选
$(".provinceDetail").attr("checked",false); $(".provinceDetail").prop("checked",false);
$(".provinceDetail").attr("disabled",false); $(".provinceDetail").prop("disabled",false);
detailProvinceCheckedValues=$(".provinceDetail:checked"); detailProvinceCheckedValues=$(".provinceDetail:checked");
} }
judge=false; judge=false;
}); });
//选中勾选了的省 //选中勾选了的省
$(".provinceDetail").click(function(){ $(".provinceDetail").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".provinceDetail").each(function(){ $(".provinceDetail").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allProvinceDetail").attr("checked",clickFlag); $("#allProvinceDetail").prop("checked",clickFlag);
detailProvinceCheckedValues=$(".provinceDetail:checked"); detailProvinceCheckedValues=$(".provinceDetail:checked");
//alert(getDetailProvinceCheckedValueString()); //alert(getDetailProvinceCheckedValueString());
judge=false; judge=false;
...@@ -276,8 +276,8 @@ ...@@ -276,8 +276,8 @@
$("#allProvinceDetail").removeAttr("checked"); $("#allProvinceDetail").removeAttr("checked");
$("#provinceDetail").removeAttr("checked"); $("#provinceDetail").removeAttr("checked");
$("#allProvinceDetail").attr("checked","checked"); $("#allProvinceDetail").prop("checked",true);
$(".provinceDetail").attr("checked","checked"); $(".provinceDetail").prop("checked",true);
detailProvinceCheckedValues=$(".provinceDetail"); detailProvinceCheckedValues=$(".provinceDetail");
} }
// reset dimension // reset dimension
......
...@@ -48,6 +48,6 @@ function getImportanceLevelCheckedTitles(){ ...@@ -48,6 +48,6 @@ function getImportanceLevelCheckedTitles(){
return str; return str;
} }
//重置$(':checkbox').attr("checked",true); //重置$(':checkbox').prop("checked",true);
</script> </script>
\ No newline at end of file
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
<script type="text/javascript"> <script type="text/javascript">
var channelCheckedValues=$(".channel:checked"); var channelCheckedValues=$(".channel:checked");
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
} }
}); });
...@@ -63,9 +63,9 @@ $(".channel").click(function(){ ...@@ -63,9 +63,9 @@ $(".channel").click(function(){
//重置 //重置
function channelReset(){ function channelReset(){
$("#allChannel").attr("checked","checked") $("#allChannel").prop("checked",true)
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
} }
//返回结果为一个数组,数组中包含选中的渠道类型 //返回结果为一个数组,数组中包含选中的渠道类型
......
...@@ -45,14 +45,13 @@ ...@@ -45,14 +45,13 @@
<script type="text/javascript"> <script type="text/javascript">
var channel2CheckedValues=$(".channel2:checked"); var channel2CheckedValues=$(".channel2:checked");
$("#allChannel2").click(function(){ $("#allChannel2").on('click',function(){
if($("#allChannel2").attr("checked") == "checked"){//全选 if($("#allChannel2").prop("checked") == true){//全选
$(".channel2").attr("checked","checked"); $(".channel2").prop("disabled",true);
$(".channel2").attr("disabled",true);
channel2CheckedValues=$(".channel2"); channel2CheckedValues=$(".channel2");
}else{//不全选 }else{//不全选
$(".channel2").attr("checked",false); $(".channel2").prop("checked",false);
$(".channel2").attr("disabled",false); $(".channel2").prop("disabled",false);
channel2CheckedValues=$(".channel2:checked"); channel2CheckedValues=$(".channel2:checked");
} }
}); });
...@@ -63,9 +62,9 @@ $(".channel2").click(function(){ ...@@ -63,9 +62,9 @@ $(".channel2").click(function(){
//重置 //重置
function channelReset2(){ function channelReset2(){
$("#allChannel2").attr("checked","checked") $("#allChannel2").prop("checked",true)
$(".channel2").attr("checked","checked"); $(".channel2").prop("checked",true);
$(".channel2").attr("disabled",true); $(".channel2").prop("disabled",true);
channel2CheckedValues=$(".channel2"); channel2CheckedValues=$(".channel2");
} }
......
...@@ -34,25 +34,25 @@ ...@@ -34,25 +34,25 @@
var channelCheckedValues; var channelCheckedValues;
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
//全选和不全选 //全选和不全选
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
ComBusiness(); ComBusiness();
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
ComBusiness(); ComBusiness();
} }
}); });
//选中勾选了的渠道 //选中勾选了的渠道
$(".channel").click(function(){ $(".channel").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".channel").each(function(){ $(".channel").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allChannel").attr("checked",clickFlag); $("#allChannel").prop("checked",clickFlag);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
ComBusiness(); ComBusiness();
//alert(getChannelCheckedValuesString()); //alert(getChannelCheckedValuesString());
...@@ -75,7 +75,7 @@ function getChannelCheckedValuesString(){ ...@@ -75,7 +75,7 @@ function getChannelCheckedValuesString(){
// var str=""; // var str="";
var channelArray=getChannelCheckedValues(); var channelArray=getChannelCheckedValues();
if($("#allChannel").attr("checked") == "checked"){channelArray.push("-1");} if($("#allChannel").prop("checked") == true){channelArray.push("-1");}
/* for(var i=0;i<channelArray.length;i++){ /* for(var i=0;i<channelArray.length;i++){
if(i==channelArray.length-1){ if(i==channelArray.length-1){
str+=channelArray[i]; str+=channelArray[i];
...@@ -115,8 +115,8 @@ function getChannelCheckedTitles(){ ...@@ -115,8 +115,8 @@ function getChannelCheckedTitles(){
} }
function channelReset(){ function channelReset(){
$("#allChannel").attr("checked","checked"); $("#allChannel").prop("checked",true);
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
ComBusiness(); ComBusiness();
} }
...@@ -125,24 +125,24 @@ function channelReset(){ ...@@ -125,24 +125,24 @@ function channelReset(){
var competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); var competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allCompetitorsBusiness").click(function(){ $("#allCompetitorsBusiness").on('click',function(){
if($("#allCompetitorsBusiness").attr("checked") == "checked"){//全选 if($("#allCompetitorsBusiness").prop("checked") == true){//全选
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
// $(".competitorsBusiness").attr("disabled",true); // $(".competitorsBusiness").prop("disabled",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
}else{//不全选 }else{//不全选
$(".competitorsBusiness").attr("checked",false); $(".competitorsBusiness").prop("checked",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".competitorsBusiness").click(function(){ $(".competitorsBusiness").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".competitorsBusiness").each(function(){ $(".competitorsBusiness").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allCompetitorsBusiness").attr("checked",clickFlag); $("#allCompetitorsBusiness").prop("checked",clickFlag);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
//alert(getCompetitorsBusinessCheckedValuesIdString()); //alert(getCompetitorsBusinessCheckedValuesIdString());
}); });
...@@ -177,25 +177,25 @@ var channelIds = getChannelCheckedValuesString(); ...@@ -177,25 +177,25 @@ var channelIds = getChannelCheckedValuesString();
} }
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allCompetitorsBusiness").click(function(){ $("#allCompetitorsBusiness").on('click',function(){
if($("#allCompetitorsBusiness").attr("checked") == "checked"){//全选 if($("#allCompetitorsBusiness").prop("checked") == true){//全选
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
// $(".competitorsBusiness").attr("disabled",true); // $(".competitorsBusiness").prop("disabled",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
}else{//不全选 }else{//不全选
$(".competitorsBusiness").attr("checked",false); $(".competitorsBusiness").prop("checked",false);
$(".competitorsBusiness").attr("disabled",false); $(".competitorsBusiness").prop("disabled",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".competitorsBusiness").click(function(){ $(".competitorsBusiness").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".competitorsBusiness").each(function(){ $(".competitorsBusiness").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allCompetitorsBusiness").attr("checked",clickFlag); $("#allCompetitorsBusiness").prop("checked",clickFlag);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
//alert(getCompetitorsBusinessCheckedValuesIdString()); //alert(getCompetitorsBusinessCheckedValuesIdString());
}); });
...@@ -230,7 +230,7 @@ function getCompetitorsBusinessCheckedValuesTitle(){ ...@@ -230,7 +230,7 @@ function getCompetitorsBusinessCheckedValuesTitle(){
function getCompetitorsBusinessCheckedValuesIdString(){ function getCompetitorsBusinessCheckedValuesIdString(){
//var str=""; //var str="";
var competitorsBusinessArray=getCompetitorsBusinessCheckedValuesId(); var competitorsBusinessArray=getCompetitorsBusinessCheckedValuesId();
if($("#allCompetitorsBusiness").attr("checked") == "checked"){competitorsBusinessArray.push(-1);} if($("#allCompetitorsBusiness").prop("checked") == true){competitorsBusinessArray.push(-1);}
/* for(var i=0;i<competitorsBusinessArray.length;i++){ /* for(var i=0;i<competitorsBusinessArray.length;i++){
if(i==competitorsBusinessArray.length-1){ if(i==competitorsBusinessArray.length-1){
str+=competitorsBusinessArray[i]; str+=competitorsBusinessArray[i];
...@@ -258,8 +258,8 @@ function getCompetitorsBusinessCheckedTitlesString(){ ...@@ -258,8 +258,8 @@ function getCompetitorsBusinessCheckedTitlesString(){
} }
function CompetitorsBusinessReset(){ function CompetitorsBusinessReset(){
$("#allCompetitorsBusiness").attr("checked","checked"); $("#allCompetitorsBusiness").prop("checked",true);
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
} }
......
...@@ -217,28 +217,28 @@ function month(){ ...@@ -217,28 +217,28 @@ function month(){
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allMonth").click(function(){ $("#allMonth").on('click',function(){
if($("#allMonth").attr("checked") == "checked"){//全选 if($("#allMonth").prop("checked") == true){//全选
$(".month").attr("checked","checked"); $(".month").prop("checked",true);
// $(".month").attr("disabled",true); // $(".month").prop("disabled",true);
monthCheckedValues=$(".month"); monthCheckedValues=$(".month");
}else{//不全选 }else{//不全选
$(".month").attr("checked",false); $(".month").prop("checked",false);
$(".month").attr("disabled",false); $(".month").prop("disabled",false);
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".month").click(function(){ $(".month").on('click',function(){
$("#allMonth").attr("checked",false); $("#allMonth").prop("checked",false);
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
}); });
} }
//重置 //重置
function MonthReset(){ function MonthReset(){
$(".month").attr("checked","checked"); $(".month").prop("checked",true);
$(".month").attr("disabled",true); $(".month").prop("disabled",true);
monthCheckedValues=$(".month"); monthCheckedValues=$(".month");
} }
...@@ -318,23 +318,23 @@ $(document).ready(function (){ ...@@ -318,23 +318,23 @@ $(document).ready(function (){
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
ComBusiness(); ComBusiness();
//全选和不全选 //全选和不全选
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
//$(".channel").attr("disabled",true); //$(".channel").prop("disabled",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
ComBusiness(); ComBusiness();
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
ComBusiness(); ComBusiness();
} }
}); });
//选中勾选了的渠道 //选中勾选了的渠道
$(".channel").click(function(){ $(".channel").on('click',function(){
$("#allChannel").attr("checked",false); $("#allChannel").prop("checked",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
ComBusiness(); ComBusiness();
}); });
...@@ -400,8 +400,8 @@ function getChannelCheckedTitles(){ ...@@ -400,8 +400,8 @@ function getChannelCheckedTitles(){
} }
function channelReset(){ function channelReset(){
$("#allChannel").attr("checked","checked"); $("#allChannel").prop("checked",true);
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
} }
...@@ -438,21 +438,21 @@ var channelIds = getChannelCheckedValues(); ...@@ -438,21 +438,21 @@ var channelIds = getChannelCheckedValues();
} }
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allCompetitorsBusiness").click(function(){ $("#allCompetitorsBusiness").on('click',function(){
if($("#allCompetitorsBusiness").attr("checked") == "checked"){//全选 if($("#allCompetitorsBusiness").prop("checked") == true){//全选
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
// $(".competitorsBusiness").attr("disabled",true); // $(".competitorsBusiness").prop("disabled",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
}else{//不全选 }else{//不全选
$(".competitorsBusiness").attr("checked",false); $(".competitorsBusiness").prop("checked",false);
$(".competitorsBusiness").attr("disabled",false); $(".competitorsBusiness").prop("disabled",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".competitorsBusiness").click(function(){ $(".competitorsBusiness").on('click',function(){
$("#allCompetitorsBusiness").attr("checked",false); $("#allCompetitorsBusiness").prop("checked",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
}); });
...@@ -512,8 +512,8 @@ function getCompetitorsBusinessCheckedTitlesString(){ ...@@ -512,8 +512,8 @@ function getCompetitorsBusinessCheckedTitlesString(){
} }
function CompetitorsBusinessReset(){ function CompetitorsBusinessReset(){
$("#allCompetitorsBusiness").attr("checked","checked"); $("#allCompetitorsBusiness").prop("checked",true);
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
} }
......
...@@ -81,21 +81,21 @@ function getYearCheckedText(){ ...@@ -81,21 +81,21 @@ function getYearCheckedText(){
var monthCheckedValues=$(".month:checked"); var monthCheckedValues=$(".month:checked");
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allMonth").click(function(){ $("#allMonth").on('click',function(){
if($("#allMonth").attr("checked") == "checked"){//全选 if($("#allMonth").prop("checked") == true){//全选
$(".month").attr("checked","checked"); $(".month").prop("checked",true);
// $(".month").attr("disabled",true); // $(".month").prop("disabled",true);
monthCheckedValues=$(".month"); monthCheckedValues=$(".month");
}else{//不全选 }else{//不全选
$(".month").attr("checked",false); $(".month").prop("checked",false);
$(".month").attr("disabled",false); $(".month").prop("disabled",false);
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".month").click(function(){ $(".month").on('click',function(){
$("#allMonth").attr("checked",false); $("#allMonth").prop("checked",false);
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
}); });
function getMonth(){ function getMonth(){
...@@ -122,21 +122,21 @@ function getMonth(){ ...@@ -122,21 +122,21 @@ function getMonth(){
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allMonth").click(function(){ $("#allMonth").on('click',function(){
if($("#allMonth").attr("checked") == "checked"){//全选 if($("#allMonth").prop("checked") == true){//全选
$(".month").attr("checked","checked"); $(".month").prop("checked",true);
// $(".month").attr("disabled",true); // $(".month").prop("disabled",true);
monthCheckedValues=$(".month"); monthCheckedValues=$(".month");
}else{//不全选 }else{//不全选
$(".month").attr("checked",false); $(".month").prop("checked",false);
$(".month").attr("disabled",false); $(".month").prop("disabled",false);
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".month").click(function(){ $(".month").on('click',function(){
$("#allMonth").attr("checked",false); $("#allMonth").prop("checked",false);
monthCheckedValues=$(".month:checked"); monthCheckedValues=$(".month:checked");
}); });
} }
...@@ -145,8 +145,8 @@ function getMonth(){ ...@@ -145,8 +145,8 @@ function getMonth(){
//重置 //重置
function MonthReset(){ function MonthReset(){
$(".month").attr("checked","checked"); $(".month").prop("checked",true);
$(".month").attr("disabled",true); $(".month").prop("disabled",true);
monthCheckedValues=$(".month"); monthCheckedValues=$(".month");
} }
...@@ -202,22 +202,22 @@ function getMonthCheckedTitles(){ ...@@ -202,22 +202,22 @@ function getMonthCheckedTitles(){
var channelCheckedValues; var channelCheckedValues;
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
//全选和不全选 //全选和不全选
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
ComBusiness(); ComBusiness();
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
ComBusiness(); ComBusiness();
} }
}); });
//选中勾选了的渠道 //选中勾选了的渠道
$(".channel").click(function(){ $(".channel").on('click',function(){
$("#allChannel").attr("checked",false); $("#allChannel").prop("checked",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
ComBusiness(); ComBusiness();
}); });
...@@ -276,8 +276,8 @@ function getChannelCheckedTitles(){ ...@@ -276,8 +276,8 @@ function getChannelCheckedTitles(){
} }
function channelReset(){ function channelReset(){
$("#allChannel").attr("checked","checked"); $("#allChannel").prop("checked",true);
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
} }
...@@ -285,21 +285,21 @@ function channelReset(){ ...@@ -285,21 +285,21 @@ function channelReset(){
var competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); var competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allCompetitorsBusiness").click(function(){ $("#allCompetitorsBusiness").on('click',function(){
if($("#allCompetitorsBusiness").attr("checked") == "checked"){//全选 if($("#allCompetitorsBusiness").prop("checked") == true){//全选
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
// $(".competitorsBusiness").attr("disabled",true); // $(".competitorsBusiness").prop("disabled",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
}else{//不全选 }else{//不全选
$(".competitorsBusiness").attr("checked",false); $(".competitorsBusiness").prop("checked",false);
$(".competitorsBusiness").attr("disabled",false); $(".competitorsBusiness").prop("disabled",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".competitorsBusiness").click(function(){ $(".competitorsBusiness").on('click',function(){
$("#allCompetitorsBusiness").attr("checked",false); $("#allCompetitorsBusiness").prop("checked",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
}); });
var timestamp = Date.parse(new Date());//时间戳,用于从服务器得到最新的数据 var timestamp = Date.parse(new Date());//时间戳,用于从服务器得到最新的数据
...@@ -332,21 +332,21 @@ var channelIds = getChannelCheckedValues(); ...@@ -332,21 +332,21 @@ var channelIds = getChannelCheckedValues();
} }
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allCompetitorsBusiness").click(function(){ $("#allCompetitorsBusiness").on('click',function(){
if($("#allCompetitorsBusiness").attr("checked") == "checked"){//全选 if($("#allCompetitorsBusiness").prop("checked") == true){//全选
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
// $(".competitorsBusiness").attr("disabled",true); // $(".competitorsBusiness").prop("disabled",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
}else{//不全选 }else{//不全选
$(".competitorsBusiness").attr("checked",false); $(".competitorsBusiness").prop("checked",false);
$(".competitorsBusiness").attr("disabled",false); $(".competitorsBusiness").prop("disabled",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".competitorsBusiness").click(function(){ $(".competitorsBusiness").on('click',function(){
$("#allCompetitorsBusiness").attr("checked",false); $("#allCompetitorsBusiness").prop("checked",false);
competitorsBusinessCheckedValues=$(".competitorsBusiness:checked"); competitorsBusinessCheckedValues=$(".competitorsBusiness:checked");
}); });
...@@ -406,8 +406,8 @@ function getCompetitorsBusinessCheckedTitlesString(){ ...@@ -406,8 +406,8 @@ function getCompetitorsBusinessCheckedTitlesString(){
} }
function CompetitorsBusinessReset(){ function CompetitorsBusinessReset(){
$("#allCompetitorsBusiness").attr("checked","checked"); $("#allCompetitorsBusiness").prop("checked",true);
$(".competitorsBusiness").attr("checked","checked"); $(".competitorsBusiness").prop("checked",true);
competitorsBusinessCheckedValues=$(".competitorsBusiness"); competitorsBusinessCheckedValues=$(".competitorsBusiness");
} }
......
...@@ -31,32 +31,32 @@ ...@@ -31,32 +31,32 @@
} }
var MonthCheckedValues=$(".Month:checked"); var MonthCheckedValues=$(".Month:checked");
$(".allmonth").click(function(){ $(".allmonth").on('click',function(){
if($("#allmonth").attr("checked") == "checked"){//全选 if($("#allmonth").prop("checked") == true){//全选
if(currentMonth==12){ if(currentMonth==12){
$(".Month").attr("checked","checked"); $(".Month").prop("checked",true);
MonthCheckedValues=$(".Month"); MonthCheckedValues=$(".Month");
}else{ }else{
alert("你选择的月份已超出了当前月份"); alert("你选择的月份已超出了当前月份");
// $(".allmonth").attr("checked",false); // $(".allmonth").prop("checked",false);
} }
}else{//不全选 }else{//不全选
$(".Month").attr("checked",false); $(".Month").prop("checked",false);
$(".Month").attr("disabled",false); $(".Month").prop("disabled",false);
MonthCheckedValues=$(".Month:checked"); MonthCheckedValues=$(".Month:checked");
} }
}); });
$(".Month").click(function(){ $(".Month").on('click',function(){
if($(this).val()>currentMonth){ if($(this).val()>currentMonth){
alert("你选择的月份已超出了当前月份"); alert("你选择的月份已超出了当前月份");
$(this).attr("checked",false); $(this).prop("checked",false);
}else{ }else{
$("#allmonth").attr("checked",false); $("#allmonth").prop("checked",false);
MonthCheckedValues=$(".Month:checked"); MonthCheckedValues=$(".Month:checked");
} }
}); });
...@@ -66,10 +66,10 @@ function MonthReset(){ ...@@ -66,10 +66,10 @@ function MonthReset(){
for(var i=1;i<=12;i++){ for(var i=1;i<=12;i++){
// alert($("#month"+i).val()); // alert($("#month"+i).val());
$("#month"+i).attr("checked",false); $("#month"+i).prop("checked",false);
if($("#month"+i).val()==currentMonth){ if($("#month"+i).val()==currentMonth){
$("#month"+i).attr("checked",true); $("#month"+i).prop("checked",true);
} }
} }
} }
......
This diff is collapsed.
...@@ -11,21 +11,21 @@ ...@@ -11,21 +11,21 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
//全选和不全选 //全选和不全选
$("#allProvider").click(function(){ $("#allProvider").on('click',function(){
if($("#allProvider").attr("checked") == "checked"){//全选 if($("#allProvider").prop("checked") == true){//全选
$(".provider").attr("checked","checked"); $(".provider").prop("checked",true);
}else{//不全选 }else{//不全选
$(".provider").attr("checked",false); $(".provider").prop("checked",false);
} }
}); });
//选中勾选了的厂商 //选中勾选了的厂商
$(".provider").click(function(){ $(".provider").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".provider").each(function(){ $(".provider").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allProvider").attr("checked",clickFlag); $("#allProvider").prop("checked",clickFlag);
}); });
...@@ -37,7 +37,7 @@ function getProviderCheckedValues(){ ...@@ -37,7 +37,7 @@ function getProviderCheckedValues(){
providerArray[i]=$(this).val(); providerArray[i]=$(this).val();
i++; i++;
}); });
// if($("#allProvider").attr("checked") == "checked"&& providerArray.length>0){providerArray[providerArray.length-1]+=",-1";} // if($("#allProvider").porp("checked") == true&& providerArray.length>0){providerArray[providerArray.length-1]+=",-1";}
return providerArray; return providerArray;
} }
...@@ -50,5 +50,5 @@ function getProviderCheckedTitles(){ ...@@ -50,5 +50,5 @@ function getProviderCheckedTitles(){
return str; return str;
} }
//重置$(':checkbox').attr("checked",true); //重置$(':checkbox').prop("checked",true);
</script> </script>
\ No newline at end of file
...@@ -62,23 +62,23 @@ var cityCheckedValues; ...@@ -62,23 +62,23 @@ var cityCheckedValues;
//选中的省的个数,默认为全选,个数为31 //选中的省的个数,默认为全选,个数为31
var provinceCheckedTotal=31; var provinceCheckedTotal=31;
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvince").click(function(){ $("#allProvince").on('click',function(){
if($("#allProvince").attr("checked") == "checked"){//全选 if($("#allProvince").prop("checked") == true){//全选
$(".province").attr("checked","checked"); $(".province").prop("checked",true);
$(".province").attr("disabled",true); $(".province").prop("disabled",true);
provinceCheckedValues=$(".province"); provinceCheckedValues=$(".province");
provinceCheckedTotal=31; provinceCheckedTotal=31;
$("#cityDiv").empty(); $("#cityDiv").empty();
}else{//不全选 }else{//不全选
$(".province").attr("checked",false); $(".province").prop("checked",false);
$(".province").attr("disabled",false); $(".province").prop("disabled",false);
provinceCheckedValues=$(".province:checked"); provinceCheckedValues=$(".province:checked");
provinceCheckedTotal=0; provinceCheckedTotal=0;
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".province").click(function(){ $(".province").on('click',function(){
provinceCheckedValues=$(".province:checked"); provinceCheckedValues=$(".province:checked");
var i=0; var i=0;
provinceCheckedValues.each(function(){ provinceCheckedValues.each(function(){
...@@ -121,20 +121,20 @@ $(".pro").click(function(){ ...@@ -121,20 +121,20 @@ $(".pro").click(function(){
cityCheckedValues=$(".city:checked"); cityCheckedValues=$(".city:checked");
//全选和不全选所有的市 //全选和不全选所有的市
$("#allCity").click(function(){ $("#allCity").on('click',function(){
if($("#allCity").attr("checked") == "checked"){//全选 if($("#allCity").prop("checked") == true){//全选
$(".city").attr("checked","checked"); $(".city").prop("checked",true);
$(".city").attr("disabled",true); $(".city").prop("disabled",true);
cityCheckedValues=$(".city"); cityCheckedValues=$(".city");
}else{//不全选 }else{//不全选
$(".city").attr("checked",false); $(".city").prop("checked",false);
$(".city").attr("disabled",false); $(".city").prop("disabled",false);
cityCheckedValues=$(".city:checked"); cityCheckedValues=$(".city:checked");
} }
}); });
//选中勾选了的市 //选中勾选了的市
$(".city").click(function(){ $(".city").on('click',function(){
cityCheckedValues=$(".city:checked"); cityCheckedValues=$(".city:checked");
}); });
......
...@@ -33,21 +33,21 @@ $(document).ready(function (){ ...@@ -33,21 +33,21 @@ $(document).ready(function (){
} }
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
//全选和不全选 //全选和不全选
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
//$(".channel").attr("disabled",true); //$(".channel").prop("disabled",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
} }
}); });
//选中勾选了的渠道 //选中勾选了的渠道
$(".channel").click(function(){ $(".channel").on('click',function(){
$("#allChannel").attr("checked",false); $("#allChannel").prop("checked",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
}); });
...@@ -112,8 +112,8 @@ function getChannelCheckedTitles(){ ...@@ -112,8 +112,8 @@ function getChannelCheckedTitles(){
} }
function channelReset(){ function channelReset(){
$("#allChannel").attr("checked","checked"); $("#allChannel").prop("checked",true);
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
} }
</script> </script>
\ No newline at end of file
...@@ -33,21 +33,21 @@ $(document).ready(function (){ ...@@ -33,21 +33,21 @@ $(document).ready(function (){
} }
providerCheckedValues=$(".provider:checked"); providerCheckedValues=$(".provider:checked");
//全选和不全选 //全选和不全选
$("#allProvider").click(function(){ $("#allProvider").on('click',function(){
if($("#allProvider").attr("checked") == "checked"){//全选 if($("#allProvider").prop("checked") == true){//全选
$(".provider").attr("checked","checked"); $(".provider").prop("checked",true);
//$(".provider").attr("disabled",true); //$(".provider").prop("disabled",true);
providerCheckedValues=$(".provider"); providerCheckedValues=$(".provider");
}else{//不全选 }else{//不全选
$(".provider").attr("checked",false); $(".provider").prop("checked",false);
$(".provider").attr("disabled",false); $(".provider").prop("disabled",false);
providerCheckedValues=$(".provider:checked"); providerCheckedValues=$(".provider:checked");
} }
}); });
//选中勾选了的厂商 //选中勾选了的厂商
$(".provider").click(function(){ $(".provider").on('click',function(){
$("#allProvider").attr("checked",false); $("#allProvider").prop("checked",false);
providerCheckedValues=$(".provider:checked"); providerCheckedValues=$(".provider:checked");
}); });
...@@ -103,8 +103,8 @@ function getProviderCheckedTitles(){ ...@@ -103,8 +103,8 @@ function getProviderCheckedTitles(){
} }
function providerReset(){ function providerReset(){
$("#allProvider").attr("checked","checked"); $("#allProvider").prop("checked",true);
$(".provider").attr("checked","checked"); $(".provider").prop("checked",true);
providerCheckedValues=$(".provider"); providerCheckedValues=$(".provider");
} }
......
...@@ -34,25 +34,25 @@ $(document).ready(function (){ ...@@ -34,25 +34,25 @@ $(document).ready(function (){
} }
provinceCheckedValues=$(".province2:checked"); provinceCheckedValues=$(".province2:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allProvince2").click(function(){ $("#allProvince2").on('click',function(){
if($("#allProvince2").attr("checked") == "checked"){//全选 if($("#allProvince2").prop("checked") == true){//全选
$(".province2").attr("checked","checked"); $(".province2").prop("checked",true);
// $(".province").attr("disabled",true); // $(".province").attr("disabled",true);
provinceCheckedValues=$(".province2"); provinceCheckedValues=$(".province2");
}else{//不全选 }else{//不全选
$(".province2").attr("checked",false); $(".province2").prop("checked",false);
$(".province2").attr("disabled",false); $(".province2").prop("disabled",false);
provinceCheckedValues=$(".province2:checked"); provinceCheckedValues=$(".province2:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".province2").click(function(){ $(".province2").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".province2").each(function(){ $(".province2").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allProvince2").attr("checked",clickFlag); $("#allProvince2").prop("checked",clickFlag);
provinceCheckedValues=$(".province2:checked"); provinceCheckedValues=$(".province2:checked");
}); });
...@@ -119,8 +119,8 @@ function getProvinceCheckedTitles2(){ ...@@ -119,8 +119,8 @@ function getProvinceCheckedTitles2(){
//重置 || Add by August //重置 || Add by August
function ProvinceTwoReset(){ function ProvinceTwoReset(){
$("#allProvince2").attr("checked","checked"); $("#allProvince2").prop("checked",true);
$(".province2").attr("checked","checked"); $(".province2").prop("checked",true);
// $(".province").attr("disabled",true); // $(".province").attr("disabled",true);
provinceCheckedValues=$(".province2:checked"); provinceCheckedValues=$(".province2:checked");
} }
......
...@@ -47,27 +47,27 @@ ...@@ -47,27 +47,27 @@
var pzxAttributeValueCheckedValues; var pzxAttributeValueCheckedValues;
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
//全选和不全选所有的属性值 //全选和不全选所有的属性值
$("#allpzxAttributeValue").click(function(){ $("#allpzxAttributeValue").on('click',function(){
if($("#allpzxAttributeValue").attr("checked") == "checked"){//全选 if($("#allpzxAttributeValue").prop("checked") == true){//全选
$(".attributevalue").attr("checked","checked"); $(".attributevalue").prop("checked",true);
pzxAttributeValueCheckedValues=$(".attributevalue"); pzxAttributeValueCheckedValues=$(".attributevalue");
}else{//不全选 }else{//不全选
$(".attributevalue").attr("checked",false); $(".attributevalue").prop("checked",false);
$(".attributevalue").attr("disabled",false); $(".attributevalue").prop("disabled",false);
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
} }
}); });
//选中勾选了的属性值 //选中勾选了的属性值
$(".attributevalue").click(function(){ $(".attributevalue").on('click',function(){
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".attributevalue").each(function(){ $(".attributevalue").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allpzxAttributeValue").attr("checked",clickFlag); $("#allpzxAttributeValue").prop("checked",clickFlag);
}); });
var timestamp = Date.parse(new Date());//时间戳,用于从服务器得到最新的数据 var timestamp = Date.parse(new Date());//时间戳,用于从服务器得到最新的数据
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
$("#pzxAttribute_div2").empty(); $("#pzxAttribute_div2").empty();
$("#pzxAttributeValue_div").empty(); $("#pzxAttributeValue_div").empty();
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
if($("#allpzxAttributeValue").attr("checked") == "checked"){//全选{ if($("#allpzxAttributeValue").prop("checked") == true){//全选{
$("#allpzxAttributeValue").attr("checked",false); $("#allpzxAttributeValue").prop("checked",false);
} }
var ciclass=$("#pzxclass2").val(); var ciclass=$("#pzxclass2").val();
$.ajax({ $.ajax({
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
// pzxAttributeCheckedValues2=$(".pzxAttribute2:checked"); // pzxAttributeCheckedValues2=$(".pzxAttribute2:checked");
$(".pzxAttribute2").click(function(){ $(".pzxAttribute2").on('click',function(){
// pzxAttributeCheckedValues2=$(".pzxAttribute2:checked"); // pzxAttributeCheckedValues2=$(".pzxAttribute2:checked");
...@@ -218,8 +218,8 @@ ...@@ -218,8 +218,8 @@
$("#pzxAttribute_div2").empty(); $("#pzxAttribute_div2").empty();
$("#pzxAttributeValue_div").empty(); $("#pzxAttributeValue_div").empty();
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
if($("#allpzxAttributeValue").attr("checked") == "checked"){//全选{ if($("#allpzxAttributeValue").prop("checked") == true){//全选{
$("#allpzxAttributeValue").attr("checked",false); $("#allpzxAttributeValue").prop("checked",false);
} }
// alert(typeName); // alert(typeName);
// alert($("#pzxtype").val()); // alert($("#pzxtype").val());
...@@ -278,8 +278,8 @@ function getTypeSelectedName(){ ...@@ -278,8 +278,8 @@ function getTypeSelectedName(){
//重置 //重置
function pzxAttributeReset2(){ function pzxAttributeReset2(){
$(".pzxAttribute").attr("checked","checked"); $(".pzxAttribute").prop("checked",true);
$(".pzxAttribute").attr("disabled",true); $(".pzxAttribute").prop("disabled",true);
pzxAttributeCheckedValues2=$(".pzxAttribute"); pzxAttributeCheckedValues2=$(".pzxAttribute");
} }
...@@ -317,27 +317,27 @@ function changeattributevalue(){ ...@@ -317,27 +317,27 @@ function changeattributevalue(){
} }
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
//全选和不全选所有的属性值 //全选和不全选所有的属性值
$("#allpzxAttributeValue").click(function(){ $("#allpzxAttributeValue").on('click',function(){
if($("#allpzxAttributeValue").attr("checked") == "checked"){//全选 if($("#allpzxAttributeValue").prop("checked") == true){//全选
$(".attributevalue").attr("checked","checked"); $(".attributevalue").prop("checked",true);
pzxAttributeValueCheckedValues=$(".attributevalue"); pzxAttributeValueCheckedValues=$(".attributevalue");
}else{//不全选 }else{//不全选
$(".attributevalue").attr("checked",false); $(".attributevalue").prop("checked",false);
$(".attributevalue").attr("disabled",false); $(".attributevalue").prop("disabled",false);
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
} }
}); });
//选中勾选了的属性值 //选中勾选了的属性值
$(".attributevalue").click(function(){ $(".attributevalue").on('click',function(){
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".attributevalue").each(function(){ $(".attributevalue").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allpzxAttributeValue").attr("checked",clickFlag); $("#allpzxAttributeValue").prop("checked",clickFlag);
}); });
} }
}); });
...@@ -567,29 +567,29 @@ function getAttriValueCheckedValuesStringTitles(){ ...@@ -567,29 +567,29 @@ function getAttriValueCheckedValuesStringTitles(){
$("#pzxAttributeValue_div").append("<c:forEach var='attrivalue' items='${attrivaluelist}'><c:if test='${attrivalue!=null}'><div class='checkbox-inline'><label><input type='checkbox' class='attributevalue' value='${attrivalue}' checked>${attrivalue}</label></div></c:if></c:forEach>"); $("#pzxAttributeValue_div").append("<c:forEach var='attrivalue' items='${attrivaluelist}'><c:if test='${attrivalue!=null}'><div class='checkbox-inline'><label><input type='checkbox' class='attributevalue' value='${attrivalue}' checked>${attrivalue}</label></div></c:if></c:forEach>");
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
//全选和不全选所有的属性值 //全选和不全选所有的属性值
$("#allpzxAttributeValue").click(function(){ $("#allpzxAttributeValue").on('click',function(){
if($("#allpzxAttributeValue").attr("checked") == "checked"){//全选 if($("#allpzxAttributeValue").prop("checked") == true){//全选
$(".attributevalue").attr("checked","checked"); $(".attributevalue").prop("checked",true);
pzxAttributeValueCheckedValues=$(".attributevalue"); pzxAttributeValueCheckedValues=$(".attributevalue");
}else{//不全选 }else{//不全选
$(".attributevalue").attr("checked",false); $(".attributevalue").prop("checked",false);
$(".attributevalue").attr("disabled",false); $(".attributevalue").prop("disabled",false);
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
} }
}); });
//选中勾选了的属性值 //选中勾选了的属性值
$(".attributevalue").click(function(){ $(".attributevalue").on('click',function(){
pzxAttributeValueCheckedValues=$(".attributevalue:checked"); pzxAttributeValueCheckedValues=$(".attributevalue:checked");
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".attributevalue").each(function(){ $(".attributevalue").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allpzxAttributeValue").attr("checked",clickFlag); $("#allpzxAttributeValue").prop("checked",clickFlag);
}); });
$("#allpzxAttributeValue").attr("checked",true); $("#allpzxAttributeValue").prop("checked",true);
} }
......
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
function changeAllChannel(checked) { function changeAllChannel(checked) {
if(checked) { if(checked) {
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
} else { } else {
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
} }
channelChange(); channelChange();
} }
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
function changeAllDataSource(checked) { function changeAllDataSource(checked) {
if(checked) { if(checked) {
$(".dataSource").attr("checked","checked"); $(".dataSource").prop("checked",true);
$(".dataSource").attr("disabled",true); $(".dataSource").prop("disabled",true);
} else { } else {
$(".dataSource").attr("checked",false); $(".dataSource").prop("checked",false);
$(".dataSource").attr("disabled",false); $(".dataSource").prop("disabled",false);
} }
dataSourceChange(); dataSourceChange();
} }
...@@ -132,11 +132,11 @@ ...@@ -132,11 +132,11 @@
function changeAllBusiness(checked) { function changeAllBusiness(checked) {
if(checked) { if(checked) {
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
$(".business").attr("disabled",true); $(".business").prop("disabled",true);
} else { } else {
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
} }
businessChange(); businessChange();
} }
...@@ -179,11 +179,11 @@ ...@@ -179,11 +179,11 @@
function changeAllKpi(checked) { function changeAllKpi(checked) {
if(checked) { if(checked) {
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
$(".kpi").attr("disabled",true); $(".kpi").prop("disabled",true);
} else { } else {
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
$(".kpi").attr("disabled",false); $(".kpi").prop("disabled",false);
} }
} }
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
} }
$('#dataSourceDiv').html(dataSourceDivHtml); $('#dataSourceDiv').html(dataSourceDivHtml);
if(checkAll) { if(checkAll) {
$('#allDataSource').attr('checked', true); $('#allDataSource').prop('checked', true);
} }
if(init) { if(init) {
<c:forEach items="${ruleDataSourceList}" var="dataSource"> <c:forEach items="${ruleDataSourceList}" var="dataSource">
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
} }
$('#businessDiv').html(businessDivHtml); $('#businessDiv').html(businessDivHtml);
if(checkAll) { if(checkAll) {
$('#allBusiness').attr('checked', true); $('#allBusiness').prop('checked', true);
} }
if(init) { if(init) {
<c:forEach items="${ruleBusinessList}" var="business"> <c:forEach items="${ruleBusinessList}" var="business">
...@@ -255,12 +255,12 @@ ...@@ -255,12 +255,12 @@
'title="' + kpi.kpiName + '"' + checkAll + ' />' + kpi.kpiName + '</label></div>'; 'title="' + kpi.kpiName + '"' + checkAll + ' />' + kpi.kpiName + '</label></div>';
} }
if(checkAll) { if(checkAll) {
$('#allKpi').attr('checked', true); $('#allKpi').prop('checked', true);
} }
$('#kpiDiv').html(kpiDivHtml); $('#kpiDiv').html(kpiDivHtml);
if(init) { if(init) {
<c:forEach items="${ruleKpiList}" var="kpi"> <c:forEach items="${ruleKpiList}" var="kpi">
$("input:checkbox[name='kpis'][value='${kpi.kpiId}']").attr('checked','true'); $("input:checkbox[name='kpis'][value='${kpi.kpiId}']").prop('checked','true');
</c:forEach> </c:forEach>
} }
init = false; init = false;
......
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
function changeAllChannel(checked) { function changeAllChannel(checked) {
if(checked) { if(checked) {
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
} else { } else {
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
} }
channelChange(); channelChange();
} }
...@@ -98,10 +98,10 @@ ...@@ -98,10 +98,10 @@
function changeAllDataSource(checked) { function changeAllDataSource(checked) {
if(checked) { if(checked) {
$(".dataSource")[0].checked = true; $(".dataSource")[0].checked = true;
//$(".dataSource").attr("disabled",true); //$(".dataSource").prop("disabled",true);
} else { } else {
$(".dataSource").attr("checked",false); $(".dataSource").prop("checked",false);
//$(".dataSource").attr("disabled",false); //$(".dataSource").prop("disabled",false);
} }
dataSourceChange(); dataSourceChange();
} }
...@@ -153,11 +153,11 @@ ...@@ -153,11 +153,11 @@
function changeAllBusiness(checked) { function changeAllBusiness(checked) {
if(checked) { if(checked) {
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
$(".business").attr("disabled",true); $(".business").prop("disabled",true);
} else { } else {
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
} }
businessChange(); businessChange();
} }
...@@ -200,11 +200,11 @@ ...@@ -200,11 +200,11 @@
function changeAllKpi(checked) { function changeAllKpi(checked) {
if(checked) { if(checked) {
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
$(".kpi").attr("disabled",true); $(".kpi").prop("disabled",true);
} else { } else {
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
$(".kpi").attr("disabled",false); $(".kpi").prop("disabled",false);
} }
} }
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
} }
$('#businessDiv').html(businessDivHtml); $('#businessDiv').html(businessDivHtml);
if(checkAll) { if(checkAll) {
$('#allBusiness').attr('checked', true); $('#allBusiness').prop('checked', true);
} }
if(init){ if(init){
<c:forEach items="${ruleBusinessList}" var="business"> <c:forEach items="${ruleBusinessList}" var="business">
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
$('#kpiIds').val(ids); $('#kpiIds').val(ids);
$('#kpiDiv').html(kpiDivHtml); $('#kpiDiv').html(kpiDivHtml);
if(checkAll) { if(checkAll) {
$('#allKpi').attr('checked', true); $('#allKpi').prop('checked', true);
} }
if(init) { if(init) {
<c:forEach items="${ruleKpiList}" var="kpi"> <c:forEach items="${ruleKpiList}" var="kpi">
......
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
function changeAllChannel(checked) { function changeAllChannel(checked) {
if(checked) { if(checked) {
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
} else { } else {
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
} }
channelChange(); channelChange();
} }
...@@ -84,11 +84,11 @@ ...@@ -84,11 +84,11 @@
function changeAllDataSource(checked) { function changeAllDataSource(checked) {
if(checked) { if(checked) {
$(".dataSource").attr("checked","checked"); $(".dataSource").prop("checked",true);
$(".dataSource").attr("disabled",true); $(".dataSource").prop("disabled",true);
} else { } else {
$(".dataSource").attr("checked",false); $(".dataSource").prop("checked",false);
$(".dataSource").attr("disabled",false); $(".dataSource").prop("disabled",false);
} }
dataSourceChange(); dataSourceChange();
} }
...@@ -134,11 +134,11 @@ ...@@ -134,11 +134,11 @@
function changeAllBusiness(checked) { function changeAllBusiness(checked) {
if(checked) { if(checked) {
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
$(".business").attr("disabled",true); $(".business").prop("disabled",true);
} else { } else {
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
} }
businessChange(); businessChange();
} }
...@@ -181,11 +181,11 @@ ...@@ -181,11 +181,11 @@
function changeAllKpi(checked) { function changeAllKpi(checked) {
if(checked) { if(checked) {
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
$(".kpi").attr("disabled",true); $(".kpi").prop("disabled",true);
} else { } else {
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
$(".kpi").attr("disabled",false); $(".kpi").prop("disabled",false);
} }
} }
...@@ -206,11 +206,11 @@ ...@@ -206,11 +206,11 @@
} }
$('#dataSourceDiv').html(dataSourceDivHtml); $('#dataSourceDiv').html(dataSourceDivHtml);
if(checkAll) { if(checkAll) {
$('#allDataSource').attr('checked', true); $('#allDataSource').prop('checked', true);
} }
if(init) { if(init) {
<c:forEach items="${ruleDataSourceList}" var="dataSource"> <c:forEach items="${ruleDataSourceList}" var="dataSource">
$("input:checkbox[name='dataSources'][value='${dataSource.dataSourceId}']").attr('checked','true'); $("input:checkbox[name='dataSources'][value='${dataSource.dataSourceId}']").prop('checked','true');
</c:forEach> </c:forEach>
} }
} }
...@@ -232,11 +232,11 @@ ...@@ -232,11 +232,11 @@
} }
$('#businessDiv').html(businessDivHtml); $('#businessDiv').html(businessDivHtml);
if(checkAll) { if(checkAll) {
$('#allBusiness').attr('checked', true); $('#allBusiness').prop('checked', true);
} }
if(init) { if(init) {
<c:forEach items="${ruleBusinessList}" var="business"> <c:forEach items="${ruleBusinessList}" var="business">
$("input:checkbox[name='businesses'][value='${business.businessId}']").attr('checked','true'); $("input:checkbox[name='businesses'][value='${business.businessId}']").prop('checked','true');
</c:forEach> </c:forEach>
} }
} }
...@@ -257,12 +257,12 @@ ...@@ -257,12 +257,12 @@
'title="' + kpi.kpiName + '"' + checkAll + ' />' + kpi.kpiName + '</label></div>'; 'title="' + kpi.kpiName + '"' + checkAll + ' />' + kpi.kpiName + '</label></div>';
} }
if(checkAll) { if(checkAll) {
$('#allKpi').attr('checked', true); $('#allKpi').prop('checked', true);
} }
$('#kpiDiv').html(kpiDivHtml); $('#kpiDiv').html(kpiDivHtml);
if(init) { if(init) {
<c:forEach items="${ruleKpiList}" var="kpi"> <c:forEach items="${ruleKpiList}" var="kpi">
$("input:checkbox[name='kpis'][value='${kpi.kpiId}']").attr('checked','true'); $("input:checkbox[name='kpis'][value='${kpi.kpiId}']").prop('checked','true');
</c:forEach> </c:forEach>
} }
init = false; init = false;
......
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
function changeAllChannel(checked) { function changeAllChannel(checked) {
if(checked) { if(checked) {
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
} else { } else {
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
} }
channelChange(); channelChange();
} }
...@@ -98,10 +98,10 @@ ...@@ -98,10 +98,10 @@
function changeAllDataSource(checked) { function changeAllDataSource(checked) {
if(checked) { if(checked) {
$(".dataSource")[0].checked = true; $(".dataSource")[0].checked = true;
//$(".dataSource").attr("disabled",true); //$(".dataSource").prop("disabled",true);
} else { } else {
$(".dataSource").attr("checked",false); $(".dataSource").prop("checked",false);
//$(".dataSource").attr("disabled",false); //$(".dataSource").prop("disabled",false);
} }
dataSourceChange(); dataSourceChange();
} }
...@@ -153,11 +153,11 @@ ...@@ -153,11 +153,11 @@
function changeAllBusiness(checked) { function changeAllBusiness(checked) {
if(checked) { if(checked) {
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
$(".business").attr("disabled",true); $(".business").prop("disabled",true);
} else { } else {
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
} }
businessChange(); businessChange();
} }
...@@ -200,11 +200,11 @@ ...@@ -200,11 +200,11 @@
function changeAllKpi(checked) { function changeAllKpi(checked) {
if(checked) { if(checked) {
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
$(".kpi").attr("disabled",true); $(".kpi").prop("disabled",true);
} else { } else {
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
$(".kpi").attr("disabled",false); $(".kpi").prop("disabled",false);
} }
} }
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
function changeAllProvince(checked) { function changeAllProvince(checked) {
if(checked) { if(checked) {
$(".province").attr("checked","checked"); $(".province").prop("checked",true);
$(".province").attr("disabled",true); $(".province").prop("disabled",true);
} else { } else {
$(".province").attr("checked",false); $(".province").prop("checked",false);
$(".province").attr("disabled",false); $(".province").prop("disabled",false);
} }
} }
......
...@@ -34,27 +34,27 @@ $(document).ready(function (){ ...@@ -34,27 +34,27 @@ $(document).ready(function (){
} }
channelCheckedValues=$(".channel2:checked"); channelCheckedValues=$(".channel2:checked");
//全选和不全选 //全选和不全选
$("#allChannel2").click(function(){ $("#allChannel2").on('click',function(){
if($("#allChannel2").attr("checked") == "checked"){//全选 if($("#allChannel2").prop("checked") == true){//全选
$(".channel2").attr("checked","checked"); $(".channel2").prop("checked",true);
//$(".channel2").attr("disabled",true); //$(".channel2").prop("disabled",true);
channelCheckedValues=$(".channel2"); channelCheckedValues=$(".channel2");
}else{//不全选 }else{//不全选
$(".channel2").attr("checked",false); $(".channel2").prop("checked",false);
$(".channel2").attr("disabled",false); $(".channel2").prop("disabled",false);
channelCheckedValues=$(".channel2:checked"); channelCheckedValues=$(".channel2:checked");
} }
}); });
//选中勾选了的渠道 //选中勾选了的渠道
$(".channel2").click(function(){ $(".channel2").on('click',function(){
channelCheckedValues=$(".channel2:checked"); channelCheckedValues=$(".channel2:checked");
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".channel2").each(function(){ $(".channel2").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allChannel2").attr("checked",clickFlag); $("#allChannel2").prop("checked",clickFlag);
}); });
...@@ -111,8 +111,8 @@ function getChannelCheckedTitles2(){ ...@@ -111,8 +111,8 @@ function getChannelCheckedTitles2(){
//协查单渠道重置 || Add by August //协查单渠道重置 || Add by August
function xcdChannelReset(){ function xcdChannelReset(){
$("#allChannel2").attr("checked","checked"); $("#allChannel2").prop("checked",true);
$(".channel2").attr("checked","checked"); $(".channel2").prop("checked",true);
channelCheckedValues=$(".channel2"); channelCheckedValues=$(".channel2");
} }
......
...@@ -144,19 +144,19 @@ function kpi(){ ...@@ -144,19 +144,19 @@ function kpi(){
} }
kpiCheckedValues=$(".kpi:checked"); kpiCheckedValues=$(".kpi:checked");
//全选和不全选所有的省 //全选和不全选所有的省
$("#allKpi").click(function(){ $("#allKpi").on('click',function(){
if($("#allKpi").attr("checked") == "checked"){//全选 if($("#allKpi").prop("checked") == true){//全选
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
kpiCheckedValues=$(".kpi"); kpiCheckedValues=$(".kpi");
}else{//不全选 }else{//不全选
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
$(".kpi").attr("disabled",false); $(".kpi").prop("disabled",false);
kpiCheckedValues=$(".kpi:checked"); kpiCheckedValues=$(".kpi:checked");
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".kpi").click(function(){ $(".kpi").on('click',function(){
kpiCheckedValues=$(".kpi:checked"); kpiCheckedValues=$(".kpi:checked");
}); });
......
...@@ -261,7 +261,7 @@ function province(){ ...@@ -261,7 +261,7 @@ function province(){
for(var t=0;t<data.length;t=t+2){ for(var t=0;t<data.length;t=t+2){
$("#province_div").append('<div class="checkbox-inline"><input type="radio" id="pro'+data[t]+'" name="province" class="province" title="'+data[t+1]+'" value="'+data[t]+'" >'+data[t+1]+'</div>'); $("#province_div").append('<div class="checkbox-inline"><input type="radio" id="pro'+data[t]+'" name="province" class="province" title="'+data[t+1]+'" value="'+data[t]+'" >'+data[t+1]+'</div>');
} }
$("#pro26").attr("checked",true); $("#pro26").prop("checked",true);
} }
else { else {
document.getElementById("province_div").style.display="block"; document.getElementById("province_div").style.display="block";
......
...@@ -69,22 +69,22 @@ ...@@ -69,22 +69,22 @@
<script type="text/javascript"> <script type="text/javascript">
var DataSourceCheckedValues=$(".datasource:checked"); var DataSourceCheckedValues=$(".datasource:checked");
$("#allDataSource").click(function(){ $("#allDataSource").on('click',function(){
if($("#allDataSource").attr("checked") == "checked"){//全选 if($("#allDataSource").prop("checked") == true){//全选
$(".datasource").attr("checked","checked"); $(".datasource").prop("checked",true);
// $(".datasource").attr("disabled",true); // $(".datasource").prop("disabled",true);
DataSourceCheckedValues=$(".datasource"); DataSourceCheckedValues=$(".datasource");
DatasourceChange(); DatasourceChange();
}else{//不全选 }else{//不全选
$(".datasource").attr("checked",false); $(".datasource").prop("checked",false);
$(".datasource").attr("disabled",false); $(".datasource").prop("disabled",false);
DataSourceCheckedValues=$(".datasource:checked"); DataSourceCheckedValues=$(".datasource:checked");
DatasourceChange(); DatasourceChange();
} }
}); });
$(".datasource").click(function(){ $(".datasource").on('click',function(){
$("#allDataSource").attr("checked",false); $("#allDataSource").prop("checked",false);
DataSourceCheckedValues=$(".datasource:checked"); DataSourceCheckedValues=$(".datasource:checked");
DatasourceChange(); DatasourceChange();
//alert(getDataSourceCheckedValuesString()); //alert(getDataSourceCheckedValuesString());
...@@ -161,9 +161,9 @@ function getDataSourceCheckedTitles(){ ...@@ -161,9 +161,9 @@ function getDataSourceCheckedTitles(){
//数据来源,渠道,业务三级联动重置 //数据来源,渠道,业务三级联动重置
function DataSourceReset(){ function DataSourceReset(){
$("#allDataSource").attr("checked","ckecked"); $("#allDataSource").prop("checked",true);
$(".datasource").attr("checked","checked"); $(".datasource").prop("checked",true);
// $(".datasource").attr("disabled",true); // $(".datasource").prop("disabled",true);
DataSourceCheckedValues=$(".datasource"); DataSourceCheckedValues=$(".datasource");
DatasourceChange(); DatasourceChange();
//datasourceChange(); //datasourceChange();
...@@ -175,24 +175,24 @@ function DataSourceReset(){ ...@@ -175,24 +175,24 @@ function DataSourceReset(){
<script type="text/javascript"> <script type="text/javascript">
var ChannelCheckedValues=$(".channel:checked"); var ChannelCheckedValues=$(".channel:checked");
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
// $(".channel").attr("disabled",true); // $(".channel").prop("disabled",true);
ChannelCheckedValues=$(".channel"); ChannelCheckedValues=$(".channel");
ChannelChange(); ChannelChange();
// alert(getChannelCheckedValuesString()); // alert(getChannelCheckedValuesString());
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
ChannelCheckedValues=$(".channel:checked"); ChannelCheckedValues=$(".channel:checked");
ChannelChange(); ChannelChange();
//alert(getChannelCheckedValuesString()); //alert(getChannelCheckedValuesString());
} }
}); });
$(".channel").click(function(){ $(".channel").on('click',function(){
$("#allChannel").attr("checked",false); $("#allChannel").prop("checked",false);
ChannelCheckedValues=$(".channel:checked"); ChannelCheckedValues=$(".channel:checked");
ChannelChange(); ChannelChange();
//alert(getChannelCheckedValuesString()); //alert(getChannelCheckedValuesString());
...@@ -273,18 +273,18 @@ function getChannelCheckedTitles(){ ...@@ -273,18 +273,18 @@ function getChannelCheckedTitles(){
var BusinessCheckedValues=$(".business:checked"); var BusinessCheckedValues=$(".business:checked");
$("#allBusiness").click(function(){ $("#allBusiness").on('click',function(){
if($("#allBusiness").attr("checked") == "checked"){//全选 if($("#allBusiness").prop("checked") == true){//全选
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
// $(".business").attr("disabled",true); // $(".business").prop("disabled",true);
BusinessCheckedValues=$(".business"); BusinessCheckedValues=$(".business");
keyLink(); keyLink();
kpi(); kpi();
// alert(getBusinessCheckedValuesString()); // alert(getBusinessCheckedValuesString());
}else{//不全选 }else{//不全选
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
BusinessCheckedValues=$(".business:checked"); BusinessCheckedValues=$(".business:checked");
keyLink(); keyLink();
kpi(); kpi();
...@@ -293,8 +293,8 @@ $("#allBusiness").click(function(){ ...@@ -293,8 +293,8 @@ $("#allBusiness").click(function(){
} }
}); });
$(".business").click(function(){ $(".business").on('click',function(){
$("#allBusiness").attr("checked",false); $("#allBusiness").prop("checked",false);
BusinessCheckedValues=$(".business:checked"); BusinessCheckedValues=$(".business:checked");
keyLink(); keyLink();
kpi(); kpi();
...@@ -405,20 +405,20 @@ function keyLink(){ ...@@ -405,20 +405,20 @@ function keyLink(){
} }
keyLinkCheckedValues=$(".keyLink:checked"); keyLinkCheckedValues=$(".keyLink:checked");
//全选和不全选所有的 //全选和不全选所有的
$("#allKeyLink").click(function(){ $("#allKeyLink").on('click',function(){
if($("#allKeyLink").attr("checked") == "checked"){//全选 if($("#allKeyLink").prop("checked") == true){//全选
$(".keyLink").attr("checked","checked"); $(".keyLink").prop("checked",true);
keyLinkCheckedValues=$(".keyLink"); keyLinkCheckedValues=$(".keyLink");
}else{//不全选 }else{//不全选
$(".keyLink").attr("checked",false); $(".keyLink").prop("checked",false);
$(".keyLink").attr("disabled",false); $(".keyLink").prop("disabled",false);
keyLinkCheckedValues=$(".keyLink:checked"); keyLinkCheckedValues=$(".keyLink:checked");
} }
}); });
//选中勾选了的 //选中勾选了的
$(".keyLink").click(function(){ $(".keyLink").on('click',function(){
$("#allKeyLink").attr("checked",false); $("#allKeyLink").prop("checked",false);
keyLinkCheckedValues=$(".keyLink:checked"); keyLinkCheckedValues=$(".keyLink:checked");
}); });
...@@ -515,20 +515,20 @@ function kpi(){ ...@@ -515,20 +515,20 @@ function kpi(){
} }
kpiCheckedValues=$(".kpi:checked"); kpiCheckedValues=$(".kpi:checked");
//全选和不全选所有的 //全选和不全选所有的
$("#allKpi").click(function(){ $("#allKpi").on('click',function(){
if($("#allKpi").attr("checked") == "checked"){//全选 if($("#allKpi").prop("checked") == true){//全选
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
kpiCheckedValues=$(".kpi"); kpiCheckedValues=$(".kpi");
}else{//不全选 }else{//不全选
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
$(".kpi").attr("disabled",false); $(".kpi").prop("disabled",false);
kpiCheckedValues=$(".kpi:checked"); kpiCheckedValues=$(".kpi:checked");
} }
}); });
//选中勾选了的 //选中勾选了的
$(".kpi").click(function(){ $(".kpi").on('click',function(){
$("#allKpi").attr("checked",false); $("#allKpi").prop("checked",false);
kpiCheckedValues=$(".kpi:checked"); kpiCheckedValues=$(".kpi:checked");
}); });
...@@ -628,7 +628,7 @@ function DatasourceChange(){ ...@@ -628,7 +628,7 @@ function DatasourceChange(){
$("#ChannelSelectArea").empty(); $("#ChannelSelectArea").empty();
} }
else{ else{
$("#allChannel").attr("checked",true); $("#allChannel").prop("checked",true);
$("#ChannelSelectArea").empty(); $("#ChannelSelectArea").empty();
// $("#ChannelSelectArea").append('<div class="checkbox-inline"><label><input type="checkbox" id="allChannel" checked>'+'全选'+'<label></div>'); // $("#ChannelSelectArea").append('<div class="checkbox-inline"><label><input type="checkbox" id="allChannel" checked>'+'全选'+'<label></div>');
...@@ -637,24 +637,24 @@ function DatasourceChange(){ ...@@ -637,24 +637,24 @@ function DatasourceChange(){
} }
ChannelCheckedValues=$(".channel:checked"); ChannelCheckedValues=$(".channel:checked");
ChannelChange(); ChannelChange();
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
//$(".channel").attr("disabled",true); //$(".channel").prop("disabled",true);
ChannelCheckedValues=$(".channel"); ChannelCheckedValues=$(".channel");
ChannelChange(); ChannelChange();
// alert(getChannelCheckedValuesString()); // alert(getChannelCheckedValuesString());
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
ChannelCheckedValues=$(".channel:checked"); ChannelCheckedValues=$(".channel:checked");
ChannelChange(); ChannelChange();
// alert(getChannelCheckedValuesString()); // alert(getChannelCheckedValuesString());
} }
}); });
$(".channel").click(function(){ $(".channel").on('click',function(){
$("#allChannel").attr("checked",false); $("#allChannel").prop("checked",false);
ChannelCheckedValues=$(".channel:checked"); ChannelCheckedValues=$(".channel:checked");
ChannelChange(); ChannelChange();
// alert(getChannelCheckedValuesString()); // alert(getChannelCheckedValuesString());
...@@ -717,17 +717,17 @@ function ChannelChange(){ ...@@ -717,17 +717,17 @@ function ChannelChange(){
BusinessCheckedValues=$(".business:checked"); BusinessCheckedValues=$(".business:checked");
keyLink(); keyLink();
kpi(); kpi();
$("#allBusiness").click(function(){ $("#allBusiness").on('click',function(){
if($("#allBusiness").attr("checked") == "checked"){//全选 if($("#allBusiness").prop("checked") == true){//全选
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
//$(".business").attr("disabled",true); //$(".business").prop("disabled",true);
BusinessCheckedValues=$(".business"); BusinessCheckedValues=$(".business");
keyLink(); keyLink();
kpi(); kpi();
// alert(getBusinessCheckedValuesString()); // alert(getBusinessCheckedValuesString());
}else{//不全选 }else{//不全选
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
BusinessCheckedValues=$(".business:checked"); BusinessCheckedValues=$(".business:checked");
keyLink(); keyLink();
kpi(); kpi();
...@@ -735,8 +735,8 @@ function ChannelChange(){ ...@@ -735,8 +735,8 @@ function ChannelChange(){
} }
}); });
$(".business").click(function(){ $(".business").on('click',function(){
$("#allBusiness").attr("checked",false); $("#allBusiness").prop("checked",false);
BusinessCheckedValues=$(".business:checked"); BusinessCheckedValues=$(".business:checked");
keyLink(); keyLink();
kpi(); kpi();
......
...@@ -148,7 +148,7 @@ function getProviderCheckedValues(){ ...@@ -148,7 +148,7 @@ function getProviderCheckedValues(){
providerArray[i]=$(this).val(); providerArray[i]=$(this).val();
i++; i++;
}); });
// if($("#allProvider").attr("checked") == "checked"&& providerArray.length>0){providerArray[providerArray.length-1]+=",-1";} // if($("#allProvider").prop("checked") == true&& providerArray.length>0){providerArray[providerArray.length-1]+=",-1";}
return providerArray; return providerArray;
} }
......
...@@ -34,21 +34,21 @@ $(document).ready(function (){ ...@@ -34,21 +34,21 @@ $(document).ready(function (){
} }
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
//全选和不全选 //全选和不全选
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
// $(".channel").attr("disabled",true); // $(".channel").prop("disabled",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
} }
}); });
//选中勾选了的渠道 //选中勾选了的渠道
$(".channel").click(function(){ $(".channel").on('click',function(){
$("#allChannel").attr("checked",false); $("#allChannel").prop("checked",false);
channelCheckedValues=$(".channel:checked"); channelCheckedValues=$(".channel:checked");
}); });
...@@ -105,9 +105,9 @@ function getChannelCheckedTitles(){ ...@@ -105,9 +105,9 @@ function getChannelCheckedTitles(){
//重置 //重置
function YWTZ_ChannelReset(){ function YWTZ_ChannelReset(){
$("#allChannel").attr("checked","checked") $("#allChannel").prop("checked",true)
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
// $(".channel").attr("disabled",true); // $(".channel").prop("disabled",true);
channelCheckedValues=$(".channel"); channelCheckedValues=$(".channel");
} }
......
...@@ -46,22 +46,22 @@ dataSourceId = 5; ...@@ -46,22 +46,22 @@ dataSourceId = 5;
} }
business(); business();
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
business(); business();
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
business(); business();
} }
}); });
$(".channel").click(function(){ $(".channel").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".channel").each(function(){ $(".channel").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allChannel").attr("checked",clickFlag); $("#allChannel").prop("checked",clickFlag);
business(); business();
}); });
} }
...@@ -161,23 +161,23 @@ function business(){ ...@@ -161,23 +161,23 @@ function business(){
} }
kpi(); kpi();
//全选和不全选所有的业务 //全选和不全选所有的业务
$("#allBusiness").click(function(){ $("#allBusiness").on('click',function(){
if($("#allBusiness").attr("checked") == "checked"){//全选 if($("#allBusiness").prop("checked") == true){//全选
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
kpi(); kpi();
}else{//不全选 }else{//不全选
$(".business").attr("checked",false); $(".business").prop("checked",false);
kpi(); kpi();
} }
}); });
//选中勾选了的业务 //选中勾选了的业务
$(".business").click(function(){ $(".business").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".business").each(function(){ $(".business").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allBusiness").attr("checked",clickFlag); $("#allBusiness").prop("checked",clickFlag);
kpi(); kpi();
}); });
...@@ -269,21 +269,21 @@ function kpi(){ ...@@ -269,21 +269,21 @@ function kpi(){
$("#kpi_div").append('<div class="checkbox-inline"><label><input type="checkbox" name="kpi" class="kpi" title="'+data[t+1]+'" value="'+data[t]+'" checked >'+data[t+1]+'</label></div>'); $("#kpi_div").append('<div class="checkbox-inline"><label><input type="checkbox" name="kpi" class="kpi" title="'+data[t+1]+'" value="'+data[t]+'" checked >'+data[t+1]+'</label></div>');
} }
//全选和不全选所有的省 //全选和不全选所有的省
$("#allKpi").click(function(){ $("#allKpi").on('click',function(){
if($("#allKpi").attr("checked") == "checked"){//全选 if($("#allKpi").prop("checked") == true){//全选
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
}else{//不全选 }else{//不全选
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
} }
}); });
//选中勾选了的省 //选中勾选了的省
$(".kpi").click(function(){ $(".kpi").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".kpi").each(function(){ $(".kpi").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allKpi").attr("checked",clickFlag); $("#allKpi").prop("checked",clickFlag);
}); });
......
...@@ -57,20 +57,20 @@ var BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1"); ...@@ -57,20 +57,20 @@ var BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1");
/* 数据来源 */ /* 数据来源 */
var dataSourceCheckedValues=$(".datasource1"); var dataSourceCheckedValues=$(".datasource1");
$(".datasource1").click(function(){ $(".datasource1").on('click',function(){
dataSourceCheckedValues=$(".datasource1:checked"); dataSourceCheckedValues=$(".datasource1:checked");
$("#belongingOrVisitingDiv").attr("style",""); $("#belongingOrVisitingDiv").attr("style","");
$(".BelongingOrVisiting1").attr("checked","checked"); $(".BelongingOrVisiting1").prop("checked",true);
BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked"); BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked");
$("#channel1").empty(); $("#channel1").empty();
channel1(); channel1();
judge = false; judge = false;
}); });
$(".datasource2").click(function(){ $(".datasource2").on('click',function(){
dataSourceCheckedValues=$(".datasource2:checked"); dataSourceCheckedValues=$(".datasource2:checked");
$("#belongingOrVisitingDiv").attr("style","display:none;"); $("#belongingOrVisitingDiv").attr("style","display:none;");
$(".BelongingOrVisiting1").attr("checked","checked"); $(".BelongingOrVisiting1").prop("checked","checked");
BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked"); BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked");
$("#channel1").empty(); $("#channel1").empty();
channel1(); channel1();
...@@ -150,23 +150,23 @@ function channel1(){ ...@@ -150,23 +150,23 @@ function channel1(){
} }
business(); business();
$("#allChannel").click(function(){ $("#allChannel").on('click',function(){
if($("#allChannel").attr("checked") == "checked"){//全选 if($("#allChannel").prop("checked") == true){//全选
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
business(); business();
}else{//不全选 }else{//不全选
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
business(); business();
} }
judge = false; judge = false;
}); });
$(".channel").click(function(){ $(".channel").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".channel").each(function(){ $(".channel").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allChannel").attr("checked",clickFlag); $("#allChannel").prop("checked",clickFlag);
business(); business();
judge = false; judge = false;
}); });
...@@ -180,13 +180,13 @@ $(document).ready(function (){ ...@@ -180,13 +180,13 @@ $(document).ready(function (){
channel1(); channel1();
}); });
/* 归属和来访地市 */ /* 归属和来访地市 */
$(".BelongingOrVisiting1").click(function(){ $(".BelongingOrVisiting1").on('click',function(){
BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked"); BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked");
}); });
$(".BelongingOrVisiting2").click(function(){ $(".BelongingOrVisiting2").on('click',function(){
BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting2:checked"); BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting2:checked");
}); });
...@@ -268,23 +268,23 @@ if(channel.length < 1){ channel = 0;} ...@@ -268,23 +268,23 @@ if(channel.length < 1){ channel = 0;}
} }
kpi(); kpi();
$("#allBusiness").click(function(){ $("#allBusiness").on('click',function(){
if($("#allBusiness").attr("checked") == "checked"){//全选 if($("#allBusiness").prop("checked") == true){//全选
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
kpi(); kpi();
}else{//不全选 }else{//不全选
$(".business").attr("checked",false); $(".business").prop("checked",false);
kpi(); kpi();
} }
judge = false; judge = false;
}); });
$(".business").click(function(){ $(".business").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".business").each(function(){ $(".business").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allBusiness").attr("checked",clickFlag); $("#allBusiness").prop("checked",clickFlag);
kpi(); kpi();
judge = false; judge = false;
}); });
...@@ -372,21 +372,21 @@ if(business.length < 1){ business = 0;} ...@@ -372,21 +372,21 @@ if(business.length < 1){ business = 0;}
$("#kpiSpan").append('<div class="checkbox-inline"><label><input type="checkbox" name="kpi" class="kpi" title="'+data[t+1]+'" value="'+data[t]+'" checked>'+data[t+1]+'</label></div>'); $("#kpiSpan").append('<div class="checkbox-inline"><label><input type="checkbox" name="kpi" class="kpi" title="'+data[t+1]+'" value="'+data[t]+'" checked>'+data[t+1]+'</label></div>');
} }
$("#allKpi").click(function(){ $("#allKpi").on('click',function(){
if($("#allKpi").attr("checked") == "checked"){//全选 if($("#allKpi").prop("checked") == true){//全选
$(".kpi").attr("checked","checked"); $(".kpi").prop("checked",true);
}else{//不全选 }else{//不全选
$(".kpi").attr("checked",false); $(".kpi").prop("checked",false);
} }
judge = false; judge = false;
}); });
$(".kpi").click(function(){ $(".kpi").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".kpi").each(function(){ $(".kpi").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allKpi").attr("checked",clickFlag); $("#allKpi").prop("checked",clickFlag);
judge = false; judge = false;
}); });
...@@ -498,11 +498,11 @@ function getBelongingOrVisitingCheckedValuesStringTitle(){ ...@@ -498,11 +498,11 @@ function getBelongingOrVisitingCheckedValuesStringTitle(){
function YWTZ_DataSourceTagReset(){ function YWTZ_DataSourceTagReset(){
//数据来源 //数据来源
$(".datasource1").attr("checked","checked"); $(".datasource1").prop("checked",true);
dataSourceCheckedValues=$(".datasource1"); dataSourceCheckedValues=$(".datasource1");
/* 归属和来访地市 */ /* 归属和来访地市 */
$("#belongingOrVisitingDiv").attr("style",""); $("#belongingOrVisitingDiv").attr("style","");
$(".BelongingOrVisiting1").attr("checked","checked"); $(".BelongingOrVisiting1").prop("checked",true);
BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked"); BelongingOrVisitingCheckedValues=$(".BelongingOrVisiting1:checked");
//渠道 //渠道
$("#channel1").empty(); $("#channel1").empty();
...@@ -511,8 +511,8 @@ channelCheckedValues=$(".channel:checked"); ...@@ -511,8 +511,8 @@ channelCheckedValues=$(".channel:checked");
$("#businessSpan").empty(); $("#businessSpan").empty();
$("#button").attr("style",""); $("#button").attr("style","");
business(); business();
$("#allChannel").attr("checked","checked"); $("#allChannel").prop("checked",true);
$("#allBusiness").attr("checked","checked"); $("#allBusiness").prop("checked",true);
$("#allKpi").attr("checked","checked"); $("#allKpi").prop("checked",true);
} }
</script> </script>
\ No newline at end of file
...@@ -67,22 +67,22 @@ ...@@ -67,22 +67,22 @@
<%--------------------------------------------------数据来源JS代码块 --------------------------------------------------%> <%--------------------------------------------------数据来源JS代码块 --------------------------------------------------%>
<script type="text/javascript"> <script type="text/javascript">
$("#allDataSourceStats").click(function(){ $("#allDataSourceStats").on('click',function(){
if($("#allDataSourceStats").attr("checked") == "checked"){//全选 if($("#allDataSourceStats").prop("checked") == true){//全选
$(".datasourceStats").attr("checked","checked"); $(".datasourceStats").prop("checked",true);
statsDatasourceChange(); statsDatasourceChange();
}else{//不全选 }else{//不全选
$(".datasourceStats").attr("checked",false); $(".datasourceStats").prop("checked",false);
statsDatasourceChange(); statsDatasourceChange();
} }
}); });
$(".datasourceStats").click(function(){ $(".datasourceStats").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".datasourceStats").each(function(){ $(".datasourceStats").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allDataSourceStats").attr("checked",clickFlag); $("#allDataSourceStats").prop("checked",clickFlag);
statsDatasourceChange(); statsDatasourceChange();
}); });
...@@ -158,29 +158,29 @@ ...@@ -158,29 +158,29 @@
//数据来源,渠道,业务三级联动重置 //数据来源,渠道,业务三级联动重置
function statsDataSourceReset(){ function statsDataSourceReset(){
$("#allDataSourceStats").attr("checked","ckecked"); $("#allDataSourceStats").prop("checked",true);
$(".datasourceStats").attr("checked","checked"); $(".datasourceStats").prop("checked",true);
statsDatasourceChange(); statsDatasourceChange();
} }
</script> </script>
<%--------------------------------------------------渠道JS代码块 --------------------------------------------------%> <%--------------------------------------------------渠道JS代码块 --------------------------------------------------%>
<script type="text/javascript"> <script type="text/javascript">
$("#allChannelStats").click(function(){ $("#allChannelStats").on('click',function(){
if($("#allChannelStats").attr("checked") == "checked"){//全选 if($("#allChannelStats").prop("checked") == true){//全选
$(".channelStats").attr("checked","checked"); $(".channelStats").prop("checked",true);
statsChannelChange(); statsChannelChange();
}else{//不全选 }else{//不全选
$(".channelStats").attr("checked",false); $(".channelStats").prop("checked",false);
statsChannelChange(); statsChannelChange();
} }
}); });
$(".channelStats").click(function(){ $(".channelStats").on('click',(function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".channelStats").each(function(){ $(".channelStats").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allChannelStats").attr("checked",clickFlag); $("#allChannelStats").prop("checked",clickFlag);
statsChannelChange(); statsChannelChange();
}); });
...@@ -256,23 +256,23 @@ ...@@ -256,23 +256,23 @@
</script> </script>
<%--------------------------------------------------业务JS代码块 --------------------------------------------------%> <%--------------------------------------------------业务JS代码块 --------------------------------------------------%>
<script type="text/javascript"> <script type="text/javascript">
$("#allBusinessStats").click(function(){ $("#allBusinessStats").on('click',function(){
if($("#allBusinessStats").attr("checked") == "checked"){//全选 if($("#allBusinessStats").prop("checked") == true){//全选
$(".businessStats").attr("checked","checked"); $(".businessStats").prop("checked",true);
// statsBusinessChange() // statsBusinessChange()
}else{//不全选 }else{//不全选
$(".businessStats").attr("checked",false); $(".businessStats").prop("checked",false);
$(".businessStats").attr("disabled",false); $(".businessStats").prop("disabled",false);
// statsBusinessChange() // statsBusinessChange()
} }
}); });
$(".businessStats").click(function(){ $(".businessStats").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".businessStats").each(function(){ $(".businessStats").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allBusinessStats").attr("checked",clickFlag); $("#allBusinessStats").prop("checked",clickFlag);
// statsBusinessChange() // statsBusinessChange()
}); });
...@@ -324,21 +324,21 @@ ...@@ -324,21 +324,21 @@
</script> </script>
<%--------------------------------------------------指标JS代码块(指标太多,无法展示,未编写) --------------------------------------------------%> <%--------------------------------------------------指标JS代码块(指标太多,无法展示,未编写) --------------------------------------------------%>
<script type="text/javascript"> <script type="text/javascript">
$("#allKpiStats").click(function(){ $("#allKpiStats").on('click',function(){
if($("#allKpiStats").attr("checked") == "checked"){//全选 if($("#allKpiStats").prop("checked") == true){//全选
$(".kpiStats").attr("checked","checked"); $(".kpiStats").prop("checked",true);
}else{//不全选 }else{//不全选
$(".kpiStats").attr("checked",false); $(".kpiStats").prop("checked",false);
$(".kpiStats").attr("disabled",false); $(".kpiStats").prop("disabled",false);
} }
}); });
$(".kpiStats").click(function(){ $(".kpiStats").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".kpiStats").each(function(){ $(".kpiStats").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allKpiStats").attr("checked",clickFlag); $("#allKpiStats").prop("checked",clickFlag);
}); });
//返回结果为一个数组,数组中包含选中的渠道类型 //返回结果为一个数组,数组中包含选中的渠道类型
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
statsKpiArray[i]=$(this).val(); statsKpiArray[i]=$(this).val();
i++; i++;
}); });
//if($("#allBusinessStats").attr("checked") == "checked"&&statsBusinessArray.length>0){statsBusinessArray[0]+=",-1";} //if($("#allBusinessStats").prop("checked") == "checked"&&statsBusinessArray.length>0){statsBusinessArray[0]+=",-1";}
return statsKpiArray; return statsKpiArray;
} }
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
statsKpiStr+=statsKpiArray[i]+","; statsKpiStr+=statsKpiArray[i]+",";
} }
} }
//if($("#allBusinessStats").attr("checked") == "checked"&&statsBusinessStr.length>0){statsBusinessStr+=",-1";} //if($("#allBusinessStats").prop("checked") == "checked"&&statsBusinessStr.length>0){statsBusinessStr+=",-1";}
return statsKpiStr; return statsKpiStr;
} }
...@@ -415,7 +415,7 @@ ...@@ -415,7 +415,7 @@
$("#ChannelSelectAreaStats").empty(); $("#ChannelSelectAreaStats").empty();
} }
else{ else{
$("#allChannelStats").attr("checked",true); $("#allChannelStats").prop("checked",true);
$("#ChannelSelectAreaStats").empty(); $("#ChannelSelectAreaStats").empty();
for(var t=0;t<data.length;t++){ for(var t=0;t<data.length;t++){
...@@ -423,12 +423,12 @@ ...@@ -423,12 +423,12 @@
} }
statsChannelChange(); statsChannelChange();
} }
$(".channelStats").click(function(){ $(".channelStats").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".channelStats").each(function(){ $(".channelStats").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allChannelStats").attr("checked",clickFlag); $("#allChannelStats").prop("checked",clickFlag);
statsChannelChange(); statsChannelChange();
}); });
} }
...@@ -459,19 +459,19 @@ ...@@ -459,19 +459,19 @@
if(data == null || data == ""){ if(data == null || data == ""){
$("#businessSelectAreaStats").empty(); $("#businessSelectAreaStats").empty();
}else{ }else{
$("#allBusinessStats").attr("checked",true); $("#allBusinessStats").prop("checked",true);
$("#businessSelectAreaStats").show(); $("#businessSelectAreaStats").show();
$("#businessSelectAreaStats").empty(); $("#businessSelectAreaStats").empty();
for(var t=0;t<data.length;t=t+2){ for(var t=0;t<data.length;t=t+2){
$("#businessSelectAreaStats").append('<div class="checkbox-inline"><label><input type="checkbox" name="businessStats" class="businessStats" title="'+data[t+1]+'" value="'+data[t]+'" checked>'+data[t+1]+'</label></div>'); $("#businessSelectAreaStats").append('<div class="checkbox-inline"><label><input type="checkbox" name="businessStats" class="businessStats" title="'+data[t+1]+'" value="'+data[t]+'" checked>'+data[t+1]+'</label></div>');
} }
} }
$(".businessStats").click(function(){ $(".businessStats").on('click',function(){
var clickFlag=true;//是否全部选中 var clickFlag=true;//是否全部选中
$(".businessStats").each(function(){ $(".businessStats").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; } if($(this).prop("checked") == null||$(this).prop("checked") == false){ clickFlag=false; }
}); });
$("#allBusinessStats").attr("checked",clickFlag); $("#allBusinessStats").prop("checked",clickFlag);
}); });
} }
}); });
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
} }
}); });
function changeDate() { function changeDate() {
$("input[name='ifRepeate']:eq(1)").attr("checked",'checked'); $("input[name='ifRepeate']:eq(1)").prop("checked",true);
$(".period").hide(); $(".period").hide();
} }
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
}); });
$(".businessItem").click(function(){ $(".businessItem").on('click',function(){
businessIds=""; businessIds="";
$("[name='businessinput']:checked").each(function (){ $("[name='businessinput']:checked").each(function (){
businessIds += $(this).val()+","; businessIds += $(this).val()+",";
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
var businessArr = $("input:checkbox[name='businessinput']"); var businessArr = $("input:checkbox[name='businessinput']");
var businessChecked=false; var businessChecked=false;
businessArr.each(function () { businessArr.each(function () {
if($(this).attr("checked"))businessChecked=true if($(this).prop("checked"))businessChecked=true
}); });
if(businessArr.length !==0 && !businessChecked){ if(businessArr.length !==0 && !businessChecked){
alertMsg.push("您没有选择业务,请选择业务") alertMsg.push("您没有选择业务,请选择业务")
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
var kpiArr = $("input:checkbox[name='kpiinput']"); var kpiArr = $("input:checkbox[name='kpiinput']");
var kpiChecked = false; var kpiChecked = false;
kpiArr.each(function () { kpiArr.each(function () {
if($(this).attr("checked"))kpiChecked=true if($(this).prop("checked"))kpiChecked=true
}); });
if(kpiArr.length !==0 && !kpiChecked){ if(kpiArr.length !==0 && !kpiChecked){
alertMsg.push("您没有选择指标,请选择指标") alertMsg.push("您没有选择指标,请选择指标")
......
...@@ -542,16 +542,16 @@ function userInfo(userId){ ...@@ -542,16 +542,16 @@ function userInfo(userId){
}); });
// document.getElementById('username1').focus(); // document.getElementById('username1').focus();
$("#modifycbAll").click(function(){ $("#modifycbAll").on('click',function(){
if($("#modifycbAll").attr("checked")=="checked"){ if($("#modifycbAll").prop("checked")==true){
$(".modifycb").attr("checked","checked"); $(".modifycb").prop("checked",true);
}else{ }else{
$(".modifycb").attr("checked",false); $(".modifycb").prop("checked",false);
} }
}); });
$(".modifycb").click(function(){ $(".modifycb").on('click',function(){
$("#modifycbAll").attr("checked",false); $("#modifycbAll").prop("checked",false);
}); });
}, },
lock: false lock: false
......
...@@ -112,16 +112,16 @@ function createRole(){ ...@@ -112,16 +112,16 @@ function createRole(){
"background": "#428bca", "background": "#428bca",
"border-color": "#357ebd" "border-color": "#357ebd"
}); });
$("#createcbAll").click(function(){ $("#createcbAll").on('click',function(){
if($("#createcbAll").attr("checked")=="checked"){ if($("#createcbAll").prop("checked")==true){
$(".createcb").attr("checked","checked"); $(".createcb").prop("checked",true);
}else{ }else{
$(".createcb").attr("checked",false); $(".createcb").prop("checked",false);
} }
}); });
$(".createcb").click(function(){ $(".createcb").on('click',function(){
$("#createcbAll").attr("checked",false); $("#createcbAll").prop("checked",false);
}); });
}, },
button: [{ button: [{
...@@ -224,16 +224,16 @@ function modifyRole(){ ...@@ -224,16 +224,16 @@ function modifyRole(){
}); });
// document.getElementById('rolename1').focus(); // document.getElementById('rolename1').focus();
$("#modifycbAll").click(function(){ $("#modifycbAll").on('click',function(){
if($("#modifycbAll").attr("checked")=="checked"){ if($("#modifycbAll").prop("checked")==true){
$(".modifycb").attr("checked","checked"); $(".modifycb").prop("checked",true);
}else{ }else{
$(".modifycb").attr("checked",false); $(".modifycb").prop("checked",false);
} }
}); });
$(".modifycb").click(function(){ $(".modifycb").on('click',function(){
$("#modifycbAll").attr("checked",false); $("#modifycbAll").prop("checked",false);
}); });
}, },
button: [{ button: [{
...@@ -401,16 +401,16 @@ function roleInfo(roleId){ ...@@ -401,16 +401,16 @@ function roleInfo(roleId){
}); });
// document.getElementById('rolename1').focus(); // document.getElementById('rolename1').focus();
$("#modifycbAll").click(function(){ $("#modifycbAll").on('click',function(){
if($("#modifycbAll").attr("checked")=="checked"){ if($("#modifycbAll").prop("checked")==true){
$(".modifycb").attr("checked","checked"); $(".modifycb").prop("checked",true);
}else{ }else{
$(".modifycb").attr("checked",false); $(".modifycb").prop("checked",false);
} }
}); });
$(".modifycb").click(function(){ $(".modifycb").on('click',function(){
$("#modifycbAll").attr("checked",false); $("#modifycbAll").prop("checked",false);
}); });
}, },
lock: false lock: false
......
...@@ -269,22 +269,22 @@ ...@@ -269,22 +269,22 @@
}); });
//全选和不全选所有的省 //全选和不全选所有的省
$("#provinceDetailAll").click(function () { $("#provinceDetailAll").on('click',function () {
if ($("#provinceDetailAll").attr("checked") == "checked") {//全选 if ($("#provinceDetailAll").prop("checked") == true) {//全选
$("provinceDetail").attr("checked", "checked"); $("provinceDetail").prop("checked", true);
$("input[name='provinceDetail']").attr("checked", "checked"); $("input[name='provinceDetail']").prop("checked", true);
$("input[name='provinceDetail'][value='32']").attr("checked", false); $("input[name='provinceDetail'][value='32']").prop("checked", false);
} else {//不全选 } else {//不全选
$("input[name='provinceDetail']").attr("checked", false); $("input[name='provinceDetail']").prop("checked", false);
$("input[name='provinceDetail']").attr("disabled", false); $("input[name='provinceDetail']").prop("disabled", false);
} }
}); });
$("input[name='provinceDetail'][value='3000']").click(function () { $("input[name='provinceDetail'][value='3000']").on('click',function () {
if ($("input[name='provinceDetail'][value='32']").attr("checked") == "checked") { if ($("input[name='provinceDetail'][value='32']").prop("checked") == true) {
$("#provinceDetailAll").prop("disabled", "disabled"); $("#provinceDetailAll").prop("disabled", "disabled");
$("input[name='provinceDetail'][value!='32']").prop("disabled", "disabled"); $("input[name='provinceDetail'][value!='32']").prop("disabled", "disabled");
...@@ -438,7 +438,7 @@ ...@@ -438,7 +438,7 @@
function getDetailProvinceCheckedValues() { function getDetailProvinceCheckedValues() {
var provinceArray = new Array(); var provinceArray = new Array();
$("input[name='provinceDetail']").each(function () { $("input[name='provinceDetail']").each(function () {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
provinceArray.push($(this).val()); provinceArray.push($(this).val());
} }
}); });
...@@ -590,8 +590,8 @@ ...@@ -590,8 +590,8 @@
//业务 全选复选框 点击 事件 2018.1.23 bymoi //业务 全选复选框 点击 事件 2018.1.23 bymoi
function BusinessCheckALLCLICK(){ function BusinessCheckALLCLICK(){
if($("input[name='BusinessCheckALL']").attr('checked')){ if($("input[name='BusinessCheckALL']").prop('checked')){
$("input[name='BusinessCheck']").attr('checked','true'); $("input[name='BusinessCheck']").prop('checked','true');
}else{ }else{
$("input[name='BusinessCheck']").removeAttr('checked'); $("input[name='BusinessCheck']").removeAttr('checked');
} }
...@@ -645,8 +645,8 @@ ...@@ -645,8 +645,8 @@
// 2018.1.23 bymoi // 2018.1.23 bymoi
//指标复选框 全选 2018.1.23 bymoi //指标复选框 全选 2018.1.23 bymoi
function dimKpiAllCheckedClick(){ function dimKpiAllCheckedClick(){
if($("input[name='dimKpiAllChecked']").attr('checked')){ if($("input[name='dimKpiAllChecked']").prop('checked')){
$("input[name='dimKpiCheck']").attr('checked','true'); $("input[name='dimKpiCheck']").prop('checked','true');
}else{ }else{
$("input[name='dimKpiCheck']").removeAttr('checked'); $("input[name='dimKpiCheck']").removeAttr('checked');
} }
...@@ -656,9 +656,9 @@ ...@@ -656,9 +656,9 @@
function channelRadioAllCheckedClick(){ function channelRadioAllCheckedClick(){
//判断 全选框是否选中 若选中 所有 渠道复选框 都选中 //判断 全选框是否选中 若选中 所有 渠道复选框 都选中
if($("input[name='channelRadioAll']").attr('checked')){ if($("input[name='channelRadioAll']").prop('checked')){
$("input[name='channelRadio']").attr('checked','true'); $("input[name='channelRadio']").prop('checked','true');
}else{ }else{
$("input[name='channelRadio']").removeAttr('checked'); $("input[name='channelRadio']").removeAttr('checked');
...@@ -717,9 +717,9 @@ ...@@ -717,9 +717,9 @@
//判断 全选框是否选中 若选中 所有 数据源复选框 都选中 //判断 全选框是否选中 若选中 所有 数据源复选框 都选中
if($("input[name='dataSourceRadioAll']").attr('checked')){ if($("input[name='dataSourceRadioAll']").prop('checked')){
$("input[name='dataSourceRadio']").attr('checked','true'); $("input[name='dataSourceRadio']").prop('checked','true');
}else{ }else{
$("input[name='dataSourceRadio']").removeAttr('checked'); $("input[name='dataSourceRadio']").removeAttr('checked');
...@@ -844,7 +844,7 @@ ...@@ -844,7 +844,7 @@
var businessSelectedArr = []; var businessSelectedArr = [];
$("input[name='BusinessCheck']").each(function (e) { $("input[name='BusinessCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
businessSelectedArr.push($(this).context.id.split("_")[1]); businessSelectedArr.push($(this).context.id.split("_")[1]);
} }
}); });
...@@ -981,7 +981,7 @@ ...@@ -981,7 +981,7 @@
}); });
//如果 指标栏 全选复选框 选中 //如果 指标栏 全选复选框 选中
if($("input[name='dimKpiAllChecked']").attr('checked')){ if($("input[name='dimKpiAllChecked']").prop('checked')){
$("#dimKpiListTd").empty(); $("#dimKpiListTd").empty();
} }
//如果 指标栏不存在 指标 条项 //如果 指标栏不存在 指标 条项
...@@ -1010,7 +1010,7 @@ ...@@ -1010,7 +1010,7 @@
function getArrDimKpiidAndNameChecked() { function getArrDimKpiidAndNameChecked() {
var arrDimKpiChecked = []; var arrDimKpiChecked = [];
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
//var id_name = $(this).context.id.split("_")[1] + "_" + $(this).context.title.split(" ")[0]+"_"+$(this).context.title.split(" ")[1]; //var id_name = $(this).context.id.split("_")[1] + "_" + $(this).context.title.split(" ")[0]+"_"+$(this).context.title.split(" ")[1];
var id_name = $(this).context.id.split("_")[1] + "&" + $(this).next().text()+"&"+$(this).context.title; var id_name = $(this).context.id.split("_")[1] + "&" + $(this).next().text()+"&"+$(this).context.title;
...@@ -1023,7 +1023,7 @@ ...@@ -1023,7 +1023,7 @@
function getArrDimKpiChecked() { function getArrDimKpiChecked() {
var arrDimKpiChecked = []; var arrDimKpiChecked = [];
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
arrDimKpiChecked.push($(this).context.id.split("_")[1]); arrDimKpiChecked.push($(this).context.id.split("_")[1]);
} }
}); });
......
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
function getArrIdAndWeightDimKpiChecked() { function getArrIdAndWeightDimKpiChecked() {
var arrIdAndWeightDimKpiChecked = []; var arrIdAndWeightDimKpiChecked = [];
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
var kpiWeight_="kpiWeight_"+$(this).context.id.split("_")[1]; var kpiWeight_="kpiWeight_"+$(this).context.id.split("_")[1];
arrIdAndWeightDimKpiChecked.push($(this).context.id.split("_")[1]+"_"+$("input[name="+kpiWeight_+"]").val()); arrIdAndWeightDimKpiChecked.push($(this).context.id.split("_")[1]+"_"+$("input[name="+kpiWeight_+"]").val());
} }
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
var businessSelectedArr =new Array(); var businessSelectedArr =new Array();
$("input[name='BusinessCheck']").each(function (e) { $("input[name='BusinessCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
businessSelectedArr.push($(this).context.id.split("_")[1]); businessSelectedArr.push($(this).context.id.split("_")[1]);
} }
}); });
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
function getValueOfNamedimKpiCheck(){ function getValueOfNamedimKpiCheck(){
var arr=new Array(); var arr=new Array();
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
var dimKpiHadCheckId = Number($(this).attr("id").split("_")[1]); var dimKpiHadCheckId = Number($(this).attr("id").split("_")[1]);
arr.push(dimKpiHadCheckId); arr.push(dimKpiHadCheckId);
} }
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
function getkpiid_NameOfNamedimKpiCheck(){ function getkpiid_NameOfNamedimKpiCheck(){
var arr=new Array(); var arr=new Array();
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
var dimKpiHadCheckId = Number($(this).attr("id").split("_")[1]); var dimKpiHadCheckId = Number($(this).attr("id").split("_")[1]);
var dimKpiHadCheckCode = $(this).attr("title"); var dimKpiHadCheckCode = $(this).attr("title");
var dimKpiHadCheckName = $(this).next().text(); var dimKpiHadCheckName = $(this).next().text();
...@@ -611,7 +611,7 @@ ...@@ -611,7 +611,7 @@
var arrDimKpiChecked = []; var arrDimKpiChecked = [];
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if (!$(this).attr("checked")) { if (!$(this).prop("checked")) {
arrDimKpiChecked.push($(this).context.id.split("_")[1]); arrDimKpiChecked.push($(this).context.id.split("_")[1]);
$(this).remove(); $(this).remove();
$(this).next().remove(); $(this).next().remove();
...@@ -639,14 +639,14 @@ ...@@ -639,14 +639,14 @@
//渠道选择值 //渠道选择值
var channelArray = new Array();// 存放 所选 频道 var channelArray = new Array();// 存放 所选 频道
$("input[name='channelRadio']:checked").each(function (e) { $("input[name='channelRadio']:checked").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
channelArray.push($(this).context.value); channelArray.push($(this).context.value);
} }
}); });
//数据源选择值 //数据源选择值
var dataSourceArray = new Array(); var dataSourceArray = new Array();
$("input[name='dataSourceRadio']:checked").each(function (e) { $("input[name='dataSourceRadio']:checked").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
dataSourceArray.push($(this).context.value); dataSourceArray.push($(this).context.value);
} }
}); });
...@@ -693,14 +693,14 @@ ...@@ -693,14 +693,14 @@
//渠道选择值 //渠道选择值
var channelArray = new Array();// 存放 所选 频道 var channelArray = new Array();// 存放 所选 频道
$("input[name='channelRadio']:checked").each(function (e) { $("input[name='channelRadio']:checked").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
channelArray.push($(this).context.value); channelArray.push($(this).context.value);
} }
}); });
//数据源选择值 //数据源选择值
var dataSourceArray = new Array(); var dataSourceArray = new Array();
$("input[name='dataSourceRadio']:checked").each(function (e) { $("input[name='dataSourceRadio']:checked").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
dataSourceArray.push($(this).context.value); dataSourceArray.push($(this).context.value);
} }
}); });
...@@ -802,14 +802,14 @@ ...@@ -802,14 +802,14 @@
var addRow = $("<tr class='"+id_name.split("&")[0]+"' id='dimKpiCheck_"+id_name.split("&")[0]+"'><td title='"+id_name.split("&")[2]+"'>"+id_name.split("&")[1]+"</td><td style='display: none'>"+id_kpiWeightTd_value+"</td><td><a href='javascript:;' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;</td></tr>");//<a href='javascript:;' onclick='updateRow(this)'>修改</a> var addRow = $("<tr class='"+id_name.split("&")[0]+"' id='dimKpiCheck_"+id_name.split("&")[0]+"'><td title='"+id_name.split("&")[2]+"'>"+id_name.split("&")[1]+"</td><td style='display: none'>"+id_kpiWeightTd_value+"</td><td><a href='javascript:;' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;</td></tr>");//<a href='javascript:;' onclick='updateRow(this)'>修改</a>
$("#addTr").append(addRow); $("#addTr").append(addRow);
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
$(this).next().remove(); $(this).next().remove();
$(this).remove(); $(this).remove();
} }
}); });
} }
//如果 指标栏 全选复选框 选中 //如果 指标栏 全选复选框 选中
if($("input[name='dimKpiAllChecked']").attr('checked')){ if($("input[name='dimKpiAllChecked']").prop('checked')){
$("#dimKpiListTd").empty(); $("#dimKpiListTd").empty();
} }
//如果 指标栏不存在 指标 条项 //如果 指标栏不存在 指标 条项
...@@ -858,9 +858,9 @@ ...@@ -858,9 +858,9 @@
//判断 全选框是否选中 若选中 所有 数据源复选框 都选中 //判断 全选框是否选中 若选中 所有 数据源复选框 都选中
if($("input[name='dataSourceRadioAll']").attr('checked')){ if($("input[name='dataSourceRadioAll']").prop('checked')){
$("input[name='dataSourceRadio']").attr('checked','true'); $("input[name='dataSourceRadio']").prop('checked','true');
}else{ }else{
$("input[name='dataSourceRadio']").removeAttr('checked'); $("input[name='dataSourceRadio']").removeAttr('checked');
...@@ -917,9 +917,9 @@ ...@@ -917,9 +917,9 @@
function channelRadioAllCheckedClick(){ function channelRadioAllCheckedClick(){
//判断 全选框是否选中 若选中 所有 渠道复选框 都选中 //判断 全选框是否选中 若选中 所有 渠道复选框 都选中
if($("input[name='channelRadioAll']").attr('checked')){ if($("input[name='channelRadioAll']").prop('checked')){
$("input[name='channelRadio']").attr('checked','true'); $("input[name='channelRadio']").prop('checked','true');
}else{ }else{
$("input[name='channelRadio']").removeAttr('checked'); $("input[name='channelRadio']").removeAttr('checked');
...@@ -977,9 +977,9 @@ ...@@ -977,9 +977,9 @@
function BusinessCheckALLCLICK(){ function BusinessCheckALLCLICK(){
if($("input[name='BusinessCheckALL']").attr('checked')){ if($("input[name='BusinessCheckALL']").prop('checked')){
$("input[name='BusinessCheck']").attr('checked','true'); $("input[name='BusinessCheck']").prop('checked','true');
}else{ }else{
$("input[name='BusinessCheck']").removeAttr('checked'); $("input[name='BusinessCheck']").removeAttr('checked');
...@@ -993,7 +993,7 @@ ...@@ -993,7 +993,7 @@
var businessSelectedArr =new Array(); var businessSelectedArr =new Array();
$("input[name='BusinessCheck']").each(function (e) { $("input[name='BusinessCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).prop("checked")) {
businessSelectedArr.push($(this).context.id.split("_")[1]); businessSelectedArr.push($(this).context.id.split("_")[1]);
} }
}); });
...@@ -1055,8 +1055,8 @@ ...@@ -1055,8 +1055,8 @@
// 2018.1.23 bymoi // 2018.1.23 bymoi
//指标复选框 全选 2018.1.23 bymoi //指标复选框 全选 2018.1.23 bymoi
function dimKpiAllCheckedClick(){ function dimKpiAllCheckedClick(){
if($("input[name='dimKpiAllChecked']").attr('checked')){ if($("input[name='dimKpiAllChecked']").prop('checked')){
$("input[name='dimKpiCheck']").attr('checked','true'); $("input[name='dimKpiCheck']").prop('checked','true');
}else{ }else{
$("input[name='dimKpiCheck']").removeAttr('checked'); $("input[name='dimKpiCheck']").removeAttr('checked');
} }
......
...@@ -67,11 +67,11 @@ ...@@ -67,11 +67,11 @@
function changeAll(checked) { function changeAll(checked) {
if(checked) { if(checked) {
$(".province").attr("checked","checked"); $(".province").prop("checked",true);
$(".province").attr("disabled",true); $(".province").prop("disabled",true);
} else { } else {
$(".province").attr("checked",false); $(".province").prop("checked",false);
$(".province").attr("disabled",false); $(".province").prop("disabled",false);
} }
} }
......
...@@ -54,21 +54,21 @@ ...@@ -54,21 +54,21 @@
function changeAllProvince(checked) { function changeAllProvince(checked) {
if(checked) { if(checked) {
$(".province").attr("checked","checked"); $(".province").prop("checked",true);
$(".province").attr("disabled",true); $(".province").prop("disabled",true);
} else { } else {
$(".province").attr("checked",false); $(".province").prop("checked",false);
$(".province").attr("disabled",false); $(".province").prop("disabled",false);
} }
} }
function changeAllChannel(checked) { function changeAllChannel(checked) {
if(checked) { if(checked) {
$(".channel").attr("checked","checked"); $(".channel").prop("checked",true);
$(".channel").attr("disabled",true); $(".channel").prop("disabled",true);
} else { } else {
$(".channel").attr("checked",false); $(".channel").prop("checked",false);
$(".channel").attr("disabled",false); $(".channel").prop("disabled",false);
} }
} }
...@@ -106,11 +106,11 @@ ...@@ -106,11 +106,11 @@
} }
} else { } else {
if(checked) { if(checked) {
$(".dataSource").attr("checked","checked"); $(".dataSource").prop("checked",true);
$(".dataSource").attr("disabled",true); $(".dataSource").prop("disabled",true);
} else { } else {
$(".dataSource").attr("checked",false); $(".dataSource").prop("checked",false);
$(".dataSource").attr("disabled",false); $(".dataSource").prop("disabled",false);
} }
} }
...@@ -127,11 +127,11 @@ ...@@ -127,11 +127,11 @@
} }
} else { } else {
if(checked) { if(checked) {
$(".business").attr("checked","checked"); $(".business").prop("checked",true);
$(".business").attr("disabled",true); $(".business").prop("disabled",true);
} else { } else {
$(".business").attr("checked",false); $(".business").prop("checked",false);
$(".business").attr("disabled",false); $(".business").prop("disabled",false);
} }
} }
} }
......
...@@ -29,6 +29,7 @@ jdbc.database=ccolap ...@@ -29,6 +29,7 @@ jdbc.database=ccolap
#jdbc.password=szcm #jdbc.password=szcm
jdbc.driver=com.vertica.jdbc.Driver jdbc.driver=com.vertica.jdbc.Driver
jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap
#jdbc.url=jdbc:vertica://192.168.127.58:5433/vertica_prd
jdbc.username=ccolap jdbc.username=ccolap
jdbc.password=hg.2015 jdbc.password=hg.2015
##test ##test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment