更新 'SrcJuSet.js'

Ju
src48597962 1 year ago
parent 800a1c263e
commit 48d68e1b51
  1. 12
      SrcJuSet.js

@ -909,20 +909,20 @@ function JYimport(input,ruleTitle) {
let datalist3 = [];//存放待二次确认的临时接口 let datalist3 = [];//存放待二次确认的临时接口
datalist2.forEach(data=>{ datalist2.forEach(data=>{
data['updatetime'] = data['updatetime'] || $.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss"); data['updatetime'] = data['updatetime'] || $.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss");
let ii = datalist.findIndex(item => item.name == data.name && item.type==data.type); let index = datalist.findIndex(item => item.name == data.name && item.type==data.type);
log(ii); if (index>-1) {
xlog(ii); log(datalist[index].name);
if (i>-1) {
log(datalist[ii].name);
//存在时,做对应处理 //存在时,做对应处理
if(Juconfig['ImportType']=="Skip"){ if(Juconfig['ImportType']=="Skip"){
//跳过,啥也不做 //跳过,啥也不做
}else if(Juconfig['ImportType']=="Confirm"){ }else if(Juconfig['ImportType']=="Confirm"){
//二次手工确认代码 //二次手工确认代码
if(datalist[index].updatetime != data.updatetime){
datalist3.push(data); datalist3.push(data);
}
}else{ }else{
//默认是覆盖已存在的 //默认是覆盖已存在的
let index = datalist.indexOf(datalist.filter(d => d.name == data.name && d.type==data.type)[0]); //let index = datalist.indexOf(datalist.filter(d => d.name == data.name && d.type==data.type)[0]);
datalist.splice(index, 1); datalist.splice(index, 1);
datalist.push(data); datalist.push(data);
num = num + 1; num = num + 1;

Loading…
Cancel
Save