|
@@ -2079,7 +2079,7 @@ $(function() {
|
|
$.each(getAllJson[j],function(k){
|
|
$.each(getAllJson[j],function(k){
|
|
if(getAllJson[j][k].indexOf(searchInp)>-1){
|
|
if(getAllJson[j][k].indexOf(searchInp)>-1){
|
|
var firstArrey = [];
|
|
var firstArrey = [];
|
|
- if(getAllJson[j].dep == getAllJson[j][k] || getAllJson[j].type == getAllJson[j][k]) {
|
|
|
|
|
|
+ if(getAllJson[j].dep == getAllJson[j][k] || getAllJson[j].type == getAllJson[j][k] || getAllJson[j].sptype == getAllJson[j][k]) {
|
|
firstArrey = getAllJson[j];
|
|
firstArrey = getAllJson[j];
|
|
}
|
|
}
|
|
firstGroup.push(firstArrey);
|
|
firstGroup.push(firstArrey);
|
|
@@ -2087,26 +2087,26 @@ $(function() {
|
|
});
|
|
});
|
|
});
|
|
});
|
|
let removeFirstCroupZero = firstGroup.filter(item => item.length!=0);
|
|
let removeFirstCroupZero = firstGroup.filter(item => item.length!=0);
|
|
- let newFirstGroup = [...new Set(removeFirstCroupZero)];
|
|
|
|
- for (let i = 0; i < newFirstGroup.length; i++) {
|
|
|
|
- for (let j = 1; j < newFirstGroup.length; j++) {
|
|
|
|
- if (newFirstGroup[j].dep == newFirstGroup[i].dep) {
|
|
|
|
- newFirstGroup.splice(j, 2);
|
|
|
|
|
|
+ // let newFirstGroup = [...new Set(removeFirstCroupZero)];
|
|
|
|
+ for (let i = 0; i < removeFirstCroupZero.length; i++) {
|
|
|
|
+ for (let j = i; j < removeFirstCroupZero.length; j++) {
|
|
|
|
+ if (removeFirstCroupZero[j].dep === removeFirstCroupZero[i].dep) {
|
|
|
|
+ removeFirstCroupZero.splice(j, 1);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (newFirstGroup == '') {
|
|
|
|
|
|
+ if (removeFirstCroupZero == '') {
|
|
var html = '';
|
|
var html = '';
|
|
html += '<ul class="titleFirst" style="color:#2775CC;font-size:14px;">暂无数据</ul>'
|
|
html += '<ul class="titleFirst" style="color:#2775CC;font-size:14px;">暂无数据</ul>'
|
|
$('.show-fourth .search-result').empty().append(html);
|
|
$('.show-fourth .search-result').empty().append(html);
|
|
} else {
|
|
} else {
|
|
var html = '';
|
|
var html = '';
|
|
- for (var item = 0; item < newFirstGroup.length; item++) {
|
|
|
|
- var jzdep = newFirstGroup[item].dep;
|
|
|
|
- var jzdhs = newFirstGroup[item].tel;
|
|
|
|
- var jzdzs = newFirstGroup[item].address;
|
|
|
|
- var type = newFirstGroup[item].type;
|
|
|
|
- var sptype = newFirstGroup[item].sptype
|
|
|
|
|
|
+ for (var item = 0; item < removeFirstCroupZero.length; item++) {
|
|
|
|
+ var jzdep = removeFirstCroupZero[item].dep;
|
|
|
|
+ var jzdhs = removeFirstCroupZero[item].tel;
|
|
|
|
+ var jzdzs = removeFirstCroupZero[item].address;
|
|
|
|
+ var type = removeFirstCroupZero[item].type;
|
|
|
|
+ var sptype = removeFirstCroupZero[item].sptype
|
|
var sum = 1;
|
|
var sum = 1;
|
|
sum += item;
|
|
sum += item;
|
|
html += "<div class='title-first1'>"
|
|
html += "<div class='title-first1'>"
|