|
@@ -438,6 +438,11 @@ checkNum = function (event) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+str2number = function(data){
|
|
|
|
+ // refer : https://blog.csdn.net/u010865136/article/details/49336255
|
|
|
|
+ return parseInt(data)
|
|
|
|
+}
|
|
|
|
+
|
|
checkNull = function (event) {
|
|
checkNull = function (event) {
|
|
var num = event.target.value;
|
|
var num = event.target.value;
|
|
console.log(num)
|
|
console.log(num)
|
|
@@ -611,8 +616,8 @@ generateJson = function(){
|
|
data.type = $('#testType').val();
|
|
data.type = $('#testType').val();
|
|
data.application_url = "tesst1";
|
|
data.application_url = "tesst1";
|
|
data.requirement_url = "text2";
|
|
data.requirement_url = "text2";
|
|
- data.report_num = $('#reportNum').val();
|
|
|
|
- data.worker_num = $('#auditNum').val();
|
|
|
|
|
|
+ data.report_num = str2number( $('#reportNum').val() );
|
|
|
|
+ data.worker_num = str2number( $('#auditNum').val() );
|
|
var item_group_list = new Array();
|
|
var item_group_list = new Array();
|
|
$('.rule').each(function () {
|
|
$('.rule').each(function () {
|
|
// every item information
|
|
// every item information
|
|
@@ -620,15 +625,15 @@ generateJson = function(){
|
|
var temp = new Object();
|
|
var temp = new Object();
|
|
var reportTemp = new Object()
|
|
var reportTemp = new Object()
|
|
var ruleIndex = element.attr("id").charAt(4); // index is 4 (like)
|
|
var ruleIndex = element.attr("id").charAt(4); // index is 4 (like)
|
|
- temp.index = ruleIndex;
|
|
|
|
|
|
+ // temp.index = ruleIndex;
|
|
var examples = $('#namelist'+ruleIndex).children();
|
|
var examples = $('#namelist'+ruleIndex).children();
|
|
var tempExample ;
|
|
var tempExample ;
|
|
var report_list = new Array();
|
|
var report_list = new Array();
|
|
for ( var i =0;i<examples.length;i++){
|
|
for ( var i =0;i<examples.length;i++){
|
|
tempExample = examples[i];
|
|
tempExample = examples[i];
|
|
- reportTemp = new Object();
|
|
|
|
- reportTemp.report_index = tempExample.innerHTML;
|
|
|
|
- report_list.push(reportTemp);
|
|
|
|
|
|
+ // reportTemp = new Object();
|
|
|
|
+ // reportTemp.report_index = tempExample.innerHTML;
|
|
|
|
+ report_list.push(str2number(tempExample.innerHTML));
|
|
}
|
|
}
|
|
temp.report_list = report_list
|
|
temp.report_list = report_list
|
|
// bianli biao
|
|
// bianli biao
|
|
@@ -642,61 +647,61 @@ generateJson = function(){
|
|
itemTemp = new Object()
|
|
itemTemp = new Object()
|
|
tr = myTable.rows[i];
|
|
tr = myTable.rows[i];
|
|
type=tr.getAttribute("type");
|
|
type=tr.getAttribute("type");
|
|
- itemTemp.index = (i-1)+'';
|
|
|
|
- itemTemp.is_required = 1+'';
|
|
|
|
|
|
+ itemTemp.index = (i-1);
|
|
|
|
+ itemTemp.is_required = true;
|
|
var options = new Array()
|
|
var options = new Array()
|
|
if(type=="singleCheck"){
|
|
if(type=="singleCheck"){
|
|
var singleCheckTip = myTable.rows[i].cells[1].children[0].value;
|
|
var singleCheckTip = myTable.rows[i].cells[1].children[0].value;
|
|
var singleCheckData = myTable.rows[i].cells[2].children[0].value;
|
|
var singleCheckData = myTable.rows[i].cells[2].children[0].value;
|
|
itemTemp.description = singleCheckTip
|
|
itemTemp.description = singleCheckTip
|
|
- itemTemp.is_multiple ="0"
|
|
|
|
|
|
+ // itemTemp.is_multiple ="0"
|
|
itemTemp.type="Multiple"
|
|
itemTemp.type="Multiple"
|
|
- var optionS = new Object();
|
|
|
|
- optionS.option = singleCheckData
|
|
|
|
- options.push(optionS)
|
|
|
|
|
|
+ // var optionS = new Object();
|
|
|
|
+ // optionS.option = singleCheckData
|
|
|
|
+ options.push(singleCheckData)
|
|
}else if(type=="check"){
|
|
}else if(type=="check"){
|
|
var checkTip = myTable.rows[i].cells[1].children[0].value;
|
|
var checkTip = myTable.rows[i].cells[1].children[0].value;
|
|
var checkData = myTable.rows[i].cells[2].children[0].value;
|
|
var checkData = myTable.rows[i].cells[2].children[0].value;
|
|
itemTemp.description = checkTip;
|
|
itemTemp.description = checkTip;
|
|
- itemTemp.is_multiple = "1"
|
|
|
|
|
|
+ // itemTemp.is_multiple = "1"
|
|
itemTemp.type="Multiple"
|
|
itemTemp.type="Multiple"
|
|
var optionC ;
|
|
var optionC ;
|
|
var checkArr = checkData.split(';');
|
|
var checkArr = checkData.split(';');
|
|
for( var checkJ = 0;checkJ<checkArr.length;checkJ++){
|
|
for( var checkJ = 0;checkJ<checkArr.length;checkJ++){
|
|
- optionC = new Object();
|
|
|
|
- optionC.option = checkArr[checkJ]
|
|
|
|
- options.push(optionC)
|
|
|
|
|
|
+ // optionC = new Object();
|
|
|
|
+ // optionC.option = checkArr[checkJ]
|
|
|
|
+ options.push(checkArr[checkJ])
|
|
}
|
|
}
|
|
}else if(type=="ratio"){
|
|
}else if(type=="ratio"){
|
|
var ratioTip = myTable.rows[i].cells[1].children[0].value;
|
|
var ratioTip = myTable.rows[i].cells[1].children[0].value;
|
|
var ratioData = myTable.rows[i].cells[2].children[0].value;
|
|
var ratioData = myTable.rows[i].cells[2].children[0].value;
|
|
var ratioArr = ratioData.split(';');
|
|
var ratioArr = ratioData.split(';');
|
|
itemTemp.description = ratioTip;
|
|
itemTemp.description = ratioTip;
|
|
- itemTemp.is_multiple = "0"
|
|
|
|
|
|
+ // itemTemp.is_multiple = "0"
|
|
itemTemp.type="Single"
|
|
itemTemp.type="Single"
|
|
var optionR ;
|
|
var optionR ;
|
|
for( var ratioJ = 0;ratioJ<ratioArr.length;ratioJ++){
|
|
for( var ratioJ = 0;ratioJ<ratioArr.length;ratioJ++){
|
|
- optionR = new Object();
|
|
|
|
- optionR.option = ratioArr[ratioJ]
|
|
|
|
- options.push(optionR)
|
|
|
|
|
|
+ // optionR = new Object();
|
|
|
|
+ // optionR.option = ratioArr[ratioJ]
|
|
|
|
+ options.push(ratioArr[ratioJ])
|
|
}
|
|
}
|
|
}else if(type=="text"){
|
|
}else if(type=="text"){
|
|
var textData = myTable.rows[i].cells[1].children[0].value;
|
|
var textData = myTable.rows[i].cells[1].children[0].value;
|
|
itemTemp.description = textData;
|
|
itemTemp.description = textData;
|
|
- itemTemp.is_multiple = "0"
|
|
|
|
|
|
+ // itemTemp.is_multiple = "0"
|
|
itemTemp.type="Description"
|
|
itemTemp.type="Description"
|
|
- var optionT = new Object();
|
|
|
|
- optionT.option = ""
|
|
|
|
- options.push(optionT)
|
|
|
|
|
|
+ // var optionT = new Object();
|
|
|
|
+ // optionT.option = ""
|
|
|
|
+ // options.push("")
|
|
|
|
|
|
}else if( type == "file"){
|
|
}else if( type == "file"){
|
|
var fileData = myTable.rows[i].cells[1].children[0].value;
|
|
var fileData = myTable.rows[i].cells[1].children[0].value;
|
|
itemTemp.description = fileData;
|
|
itemTemp.description = fileData;
|
|
- itemTemp.is_multiple = "0"
|
|
|
|
|
|
+ // itemTemp.is_multiple = "0"
|
|
itemTemp.type="File"
|
|
itemTemp.type="File"
|
|
- var optionF = new Object();
|
|
|
|
- optionF.option = ""
|
|
|
|
- options.push(optionF)
|
|
|
|
|
|
+ // var optionF = new Object();
|
|
|
|
+ // optionF.option = ""
|
|
|
|
+ // options.push("")
|
|
}
|
|
}
|
|
itemTemp.options= options
|
|
itemTemp.options= options
|
|
item_list.push(itemTemp)
|
|
item_list.push(itemTemp)
|
|
@@ -710,17 +715,17 @@ generateJson = function(){
|
|
data.group_list = getDeliverInfo()
|
|
data.group_list = getDeliverInfo()
|
|
console.log(JSON.stringify(data))
|
|
console.log(JSON.stringify(data))
|
|
|
|
|
|
- $.ajax({
|
|
|
|
- url: 'http://10.0.0.33:8090/Bug/api/extra/uploadJob',
|
|
|
|
- data:{
|
|
|
|
- 'jobJson':JSON.stringify(data)
|
|
|
|
- },
|
|
|
|
- type: 'POST',
|
|
|
|
- success: function (result) {
|
|
|
|
- alert(result);
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ // $.ajax({
|
|
|
|
+ // url: 'http://10.0.0.33:8090/Bug/api/extra/uploadJob',
|
|
|
|
+ // data:{
|
|
|
|
+ // 'jobJson':JSON.stringify(data)
|
|
|
|
+ // },
|
|
|
|
+ // type: 'POST',
|
|
|
|
+ // success: function (result) {
|
|
|
|
+ // alert(result);
|
|
|
|
+ //
|
|
|
|
+ // }
|
|
|
|
+ // });
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|