Commit ea6417a0 authored by Scott Sun's avatar Scott Sun

scott

parent 5659f8da
var plugin = require('topsin.gengui'); var plugin = require('topsin.gengui');
var _ = require("lodash")
var gui = plugin.newGui(plugin.__dirname); var gui = plugin.newGui(plugin.__dirname);
function gen() { function gen() {
...@@ -70,7 +70,9 @@ r = gui.showForm({ ...@@ -70,7 +70,9 @@ r = gui.showForm({
} }
}, },
getter: function (obj, self) { getter: function (obj, self) {
return obj.allDataMap(); print((Object.keys(obj)));
return obj.selectedRowDataMaps();
// return obj.allDataMap();
} }
} }
] ]
...@@ -87,6 +89,22 @@ r = gui.showForm({ ...@@ -87,6 +89,22 @@ r = gui.showForm({
"result": "test", "result": "test",
"standard": "test", "standard": "test",
"remark": "test" "remark": "test"
},
{
"id": 2,
"analysis_item": "test2",
"analysis_result": "test2",
"result": "test2",
"standard": "test2",
"remark": "test2"
},
{
"id": 3,
"analysis_item": "test3",
"analysis_result": "test3",
"result": "test3",
"standard": "test3",
"remark": "test3"
} }
] ]
}, },
......
...@@ -827,16 +827,16 @@ try { ...@@ -827,16 +827,16 @@ try {
var smdInfo; var smdInfo;
try { try {
if(!analysis_obj.matrixInfo.mOuters[0].solderL){throw "no mask"} if(!analysis_obj.matrixInfo.mOuters[0].solderL){throw "no mask"}
smdInfo = smdAnalysis({job:job,steplist:[pcs_step],layers:analysis_obj.matrixInfo.mOuters,attr:".smd"}) smdInfo = smdAnalysis({job:job,steplist:[pcs_step],layers:analysis_obj.matrixInfo.mOuters,attr:".smd"});
} catch (msg) { } catch (msg) {
console.log("smdInfo:error:"+msg) console.log("smdInfo:error:"+msg);
} }
// bga // bga
console.log("===================================> 7 bga info") console.log("===================================> 7 bga info");
var bgaInfo; var bgaInfo;
bgaInfo = bgaAnalysis({job:job,steplist:[pcs_step],layers:analysis_obj.matrixInfo.mOuters,attr:".bga"}) bgaInfo = bgaAnalysis({job:job,steplist:[pcs_step],layers:analysis_obj.matrixInfo.mOuters,attr:".bga"});
// 保存 // 保存
console.log("============== =====================> 8 save bga smd info") console.log("============== =====================> 8 save bga smd info");
var save_info = [smdInfo, analysis_obj.jobInfo.laser_info,bgaInfo]; // 保存 smd 和 bga数据 var save_info = [smdInfo, analysis_obj.jobInfo.laser_info,bgaInfo]; // 保存 smd 和 bga数据
save_info.forEach(function(item){ save_info.forEach(function(item){
if(JSON.stringify(item)!= "{}" && item){ if(JSON.stringify(item)!= "{}" && item){
...@@ -847,21 +847,21 @@ try { ...@@ -847,21 +847,21 @@ try {
layer: key, layer: key,
layerinfohash: val layerinfohash: val
}) })
}) });
} }
}) });
console.log("================================> 9 copper_percent signal drill") console.log("================================> 9 copper_percent signal drill");
// 分析layer info // 分析layer info
var stepList = [pcs_step]; var stepList = [pcs_step];
var oChecklistName = "mychecklist"; var oChecklistName = "mychecklist";
var signalLayers = analysis_obj.matrixInfo.mSignals.map(function(v){return v.name}); var signalLayers = analysis_obj.matrixInfo.mSignals.map(function(v){return v.name});
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 copperArea 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){
GEN.openStep({ job: job, name: step }) GEN.openStep({ job: job, name: step });
// 铜面积 分step // 铜面积 分step
var copper_percent_tmp = signalLayers.map(function(v){ var copper_percent_tmp = signalLayers.map(function(v){
var tmp = {layer:v} var tmp = {layer:v}
...@@ -882,9 +882,9 @@ try { ...@@ -882,9 +882,9 @@ try {
array_copper_distribution: item.copper_percent array_copper_distribution: item.copper_percent
} }
} }
save_layerinfo(save_info2) save_layerinfo(save_info2);
}) })
GEN.closeStep() GEN.closeStep();
} }
}) })
// var info = { // var info = {
...@@ -1051,10 +1051,10 @@ try { ...@@ -1051,10 +1051,10 @@ try {
drl_pad_top: item.drl_pad_top, drl_pad_top: item.drl_pad_top,
drl_pad_bot: item.drl_pad_bot, drl_pad_bot: item.drl_pad_bot,
} }
}) });
}) });
console.log("==================================> chk signals analysis") console.log("==================================> chk signals analysis");
// 删除线路层的外形线 // 删除线路层的外形线
if(GEN.isLayerExists({job:job, layer:"out_rout"})){GEN.deleteLayer({job:job, layer:"out_rout"})} if(GEN.isLayerExists({job:job, layer:"out_rout"})){GEN.deleteLayer({job:job, layer:"out_rout"})}
......
...@@ -743,7 +743,7 @@ function autoUn(path, dirname, dir) { ...@@ -743,7 +743,7 @@ function autoUn(path, dirname, dir) {
fs.mkdir(dirname); fs.mkdir(dirname);
if(pwd){ if(pwd){
process.exec('/opt/rar/unrar', ['x' , path, dirname, "-o+","-p"+pwd]) process.exec('/opt/rar/unrar', ['x' , path, dirname, "-o+","-p"+pwd]);
} else { } else {
process.exec('/opt/rar/unrar', ['x' , path, dirname, "-o+"]) process.exec('/opt/rar/unrar', ['x' , path, dirname, "-o+"])
} }
......
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