Commit 13e4be5f authored by Scott Sun's avatar Scott Sun

s

parent 889f7c91
...@@ -575,7 +575,7 @@ try { ...@@ -575,7 +575,7 @@ try {
var drillLayers = analysis_obj.matrixInfo.mDrills.map(function(v){return v.name}) var drillLayers = analysis_obj.matrixInfo.mDrills.map(function(v){return v.name})
console.log("=============================> 13 save card_copper_distribution") console.log("=============================> 13 save copperArea copper_distribution")
var copper_distribution_steplist= [pcs_step, array_step]; var copper_distribution_steplist= [pcs_step, array_step];
copper_distribution_steplist.forEach(function(step){ copper_distribution_steplist.forEach(function(step){
if(step){ if(step){
...@@ -669,7 +669,6 @@ try { ...@@ -669,7 +669,6 @@ try {
GEN.clearLayers() GEN.clearLayers()
GEN.affectedLayer({ affected: 'no', mode: 'all' }) GEN.affectedLayer({ affected: 'no', mode: 'all' })
console.log("==================================> Drill analysis") console.log("==================================> Drill analysis")
// 钻孔 // 钻孔
var drillToSignals = drillLayers.map(function(v){ // 获取到钻孔层对应的顶层和底层 var drillToSignals = drillLayers.map(function(v){ // 获取到钻孔层对应的顶层和底层
...@@ -683,7 +682,6 @@ try { ...@@ -683,7 +682,6 @@ try {
},[])[0] },[])[0]
return {layer:v,symbol:symbol,start:tmp_matrix[v]["drl_start"],end:tmp_matrix[v]["drl_end"]} return {layer:v,symbol:symbol,start:tmp_matrix[v]["drl_start"],end:tmp_matrix[v]["drl_end"]}
}) })
console.log("==================================> 12 Drill analysis")
var drillRes = analysisDrill(drillToSignals,step) // 钻孔分析结果 var drillRes = analysisDrill(drillToSignals,step) // 钻孔分析结果
console.log("===============drillRes:" + _.toString(drillRes)); console.log("===============drillRes:" + _.toString(drillRes));
...@@ -698,6 +696,7 @@ try { ...@@ -698,6 +696,7 @@ try {
}) })
}) })
console.log("==================================> chk signals analysis")
// 创建chklist并运行 如果chklist存在先删除 // 创建chklist并运行 如果chklist存在先删除
if (GEN.isChklistExists({ job: job, step: step, chklist: oChecklistName })) { if (GEN.isChklistExists({ job: job, step: step, chklist: oChecklistName })) {
GEN.COM("chklist_delete", { chklist: oChecklistName }) GEN.COM("chklist_delete", { chklist: oChecklistName })
...@@ -726,7 +725,6 @@ try { ...@@ -726,7 +725,6 @@ try {
layers: signalLayers, layers: signalLayers,
items: [tmpitem] items: [tmpitem]
}) })
console.log("==================================> 11 signals analysis")
// signal层分析结果 // signal层分析结果
var res = analysisChkAttr({layers:signalLayers, info:info, step:step, job:job, oChecklistName:oChecklistName}) var res = analysisChkAttr({layers:signalLayers, info:info, step:step, job:job, oChecklistName:oChecklistName})
// 数据入库 // 数据入库
......
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