|
|
@@ -68,17 +68,19 @@ function initOther() {
|
|
|
if (nameEn === 'needCustom') {
|
|
|
$.each($(".needCustomInput"), function (index, obj) {
|
|
|
var url = $(obj).attr("url");
|
|
|
+ var typetype = $(obj).attr("typetype");
|
|
|
var nameEn2 = $(obj).attr("nameEn");
|
|
|
var slideDiv = $(this_).attr("slideDiv") + '-' + $(obj).attr("id");
|
|
|
|
|
|
- apisMoveDivButton2Timer4Custorm[index] = setInterval(mainSearch, 3000, url, nameEn2, slideDiv, "1");
|
|
|
+ apisMoveDivButton2Timer4Custorm[index] = setInterval(mainSearch, 3000, url, nameEn2, slideDiv, typetype, "1");
|
|
|
});
|
|
|
actualFlag = true;
|
|
|
} else {
|
|
|
var url = selectedOption.attr("url");
|
|
|
+ var typetype = selectedOption.attr("typetype");
|
|
|
var slideDiv = $(this).attr("slideDiv");
|
|
|
|
|
|
- apisMoveDivButton2Timer = setInterval(mainSearch, 3000, url, nameEn, slideDiv, "2");
|
|
|
+ apisMoveDivButton2Timer = setInterval(mainSearch, 3000, url, nameEn, slideDiv, typetype, "2");
|
|
|
actualFlag = true;
|
|
|
}
|
|
|
}
|
|
|
@@ -88,11 +90,13 @@ function initOther() {
|
|
|
|
|
|
var selectedOption = $("select#apis-quiet-select").find("option:selected");
|
|
|
var url = selectedOption.attr("url");
|
|
|
+ var typetype = selectedOption.attr("typetype");
|
|
|
+
|
|
|
var nameEn = selectedOption.attr("nameEn");
|
|
|
|
|
|
var slideDiv = $(this).attr("slideDiv");
|
|
|
|
|
|
- mainSearch(url, nameEn, slideDiv, "2");
|
|
|
+ mainSearch(url, nameEn, slideDiv, typetype,"2");
|
|
|
});
|
|
|
|
|
|
$(".apis-move-div-button3").click(function () {
|
|
|
@@ -140,6 +144,7 @@ function initOther4Select() {
|
|
|
var nameEn = $('#' + obj.nameEn);
|
|
|
nameEn.attr('nameEn', obj.nameEn);
|
|
|
nameEn.attr('url', obj.url);
|
|
|
+ nameEn.attr('typetype', obj.type);
|
|
|
nameEn.attr('returnEn', obj.returnEn);
|
|
|
nameEn.attr('returnCn', obj.returnCn);
|
|
|
|
|
|
@@ -148,7 +153,7 @@ function initOther4Select() {
|
|
|
moveStr += '<option type="9999" nameEn="' + obj.nameEn + '" url="' + obj.url + '" returnEn="' + obj.returnEn + '" returnCn="' + obj.returnCn + '" value="' + obj.nameEn + '-option">' + obj.nameCn + '</option>';
|
|
|
}
|
|
|
} else if (obj.type2 === 2) {
|
|
|
- quietStr += '<option nameEn="' + obj.nameEn + '" url="' + obj.url + '" returnEn="' + obj.returnEn + '" returnCn="' + obj.returnCn + '" value="' + obj.nameEn + '-option">' + obj.nameCn + '</option>';
|
|
|
+ quietStr += '<option typetype="' + obj.type + '" nameEn="' + obj.nameEn + '" url="' + obj.url + '" returnEn="' + obj.returnEn + '" returnCn="' + obj.returnCn + '" value="' + obj.nameEn + '-option">' + obj.nameCn + '</option>';
|
|
|
}
|
|
|
|
|
|
// watchlist
|
|
|
@@ -257,6 +262,7 @@ function handleSelectChange(objj) {
|
|
|
stopFlag = false;
|
|
|
|
|
|
var url = selectedOption.attr("url");
|
|
|
+ var typetype = selectedOption.attr("typetype");
|
|
|
var slideDiv = $(this).attr("slideDiv");
|
|
|
|
|
|
var pageNoVar = $("#" + $(this).parent().attr("id") + "-pageNo");
|
|
|
@@ -272,7 +278,7 @@ function handleSelectChange(objj) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- mainSearch(url, nameEn, slideDiv, "2");
|
|
|
+ mainSearch(url, nameEn, slideDiv, typetype, "2");
|
|
|
});
|
|
|
|
|
|
// 对输入框、选择框加入对应事件,方便及时筛选查询操作
|
|
|
@@ -298,7 +304,7 @@ function handleSelectChange(objj) {
|
|
|
* 多条件搜索
|
|
|
* @param pageNo
|
|
|
*/
|
|
|
-function mainSearch(url, nameEn, slideDiv, needCustomFlag) {
|
|
|
+function mainSearch(url, nameEn, slideDiv, typetype, needCustomFlag) {
|
|
|
var jsonData = {};
|
|
|
jsonData.url = url;
|
|
|
jsonData.nameEn = nameEn;
|
|
|
@@ -429,10 +435,14 @@ function mainSearch(url, nameEn, slideDiv, needCustomFlag) {
|
|
|
}
|
|
|
},
|
|
|
beforeSend: function () {
|
|
|
- $(".quiet-loading").css("display", "block");
|
|
|
+ if (typetype === '2') {
|
|
|
+ $(".quiet-loading").css("display", "block");
|
|
|
+ }
|
|
|
},
|
|
|
complete: function () {
|
|
|
- $(".quiet-loading").css("display", "none");
|
|
|
+ if (typetype === '2') {
|
|
|
+ $(".quiet-loading").css("display", "none");
|
|
|
+ }
|
|
|
},
|
|
|
error: function (data) {
|
|
|
//请求出错处理
|
|
|
@@ -533,7 +543,7 @@ function initContentEvent(nameEn) {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
- }else if (nameEn === 'image') {
|
|
|
+ } else if (nameEn === 'image') {
|
|
|
$(".apis-quiet-div-image-delete").click(function () {
|
|
|
var symbol = $(this).attr("symbolName");
|
|
|
$.ajax({
|