andy/python_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实现方案导入导出，根据选项自动生成文件名

Browse Source
This commit is contained in:
ranchuan
2024-01-15 18:07:02 +08:00
parent 5b3786dd36
commit 89ef0a6514
20 changed files with 2141 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
web/layui/Checker/checker_ye_cfg.js
View File

@@ -8,11 +8,11 @@ var CheckerChipID = 0;
var Checker_Product_Name = JQ_Product_Names;
var epe_qthandle = null;
var Checker_Test_CMD_ID_BEG = 200;//测试命令的起始ID应该大于200
var ProductFun_Class = ["0:100uF大电解30um桥丝","1:68uF坦电容22um桥丝","2:68uF坦电容8Ω电阻","3:68uF坦电容6Ω电阻","4:33uF钽电容22um桥丝",
"5:33uF钽电容2欧电阻","6:100uF固液混合","7:82uF电解8R电阻"]
var ProductFun_Class = ["0:通用","1:68uF坦电容22um桥丝","2:68uF坦电容8Ω电阻","3:68uF坦电容6Ω电阻","4:33uF钽电容22um桥丝",
"5:33uF钽电容2Ω电阻","6:100uF固液混合6欧","7:82uF电解8Ω电阻","8:100uF固液混合8Ω电阻","9:100uF大电解30um桥丝"]
var Checker_YE_Cfg = {
PlanID:01,//检测方案ID
PlanID:1,//检测方案ID
PlanBrief:"电解电容雷管厂高压检测",
CheckSoftVersion:[0x0001,0x0002],//适配检测小板，检测小板主版本
CheckHardVersion:[0x000],//适配的硬件
@@ -25,7 +25,7 @@ FacInfoAddr:-1,//小于0表示未选择
FacFunClass:0,
}
var CheckerChipType=["EJ系列","EX系列","EW系列"];
var CheckerChipType=["EJ/EQ系列","EX系列","EW系列"];
function JQChecker_GetErrorInfo(errcode)
{
@@ -104,8 +104,7 @@ function CheckerPlan_Init()
{
console.log("JQCheckerPlan_Init OK ---");
}else{
// epe_qthandle = qchannel.objects.epe_qthandle;
epe_qthandle=pywebview.api
epe_qthandle = qchannel.objects.epe_qthandle;
if ((typeof(epe_qthandle) != "undefined") && (epe_qthandle != null))
{
console.log("JQCheckerPlan_Init OK ---");
@@ -260,11 +259,11 @@ function Checker_UpdateChipInfo(chipid)
switch(chipid)
{
case 0:Checker_Error_Info = JQ_ErrorInfo;CheckerTask_Info = JQCheckerTaskInfo;
Checker_Product_Name = JQ_Product_Names; break;
Checker_Product_Name = JQ_Product_Names; break;
case 1:Checker_Error_Info = XT_ErrorInfo;CheckerTask_Info = XTCheckerTaskInfo;
Checker_Product_Name = XT_Product_Names;break;
case 2:Checker_Error_Info = EW_ErrorInfo;CheckerTask_Info = EWCheckerTaskInfo;
Checker_Product_Name = EW_Product_Names;break;
Checker_Product_Name = XT_Product_Names;break;
case 2:Checker_Error_Info = EW_ErrorInfo;CheckerTask_Info = EWCheckerTaskInfo;
Checker_Product_Name = EW_Product_Names;break;
}
}
@@ -526,14 +525,28 @@ function Checker_GetCfgInfo()
retry_count = parseInt(retry_count,10);
var param_info = [];
/*2023-11-20 修改遍历查找对应ID的配置信息*/
var CheckerItem_Info ;
for(var i = 0; i < CheckerTask_Info.length;i++)
{
if(CheckerTask_Info[i].TaskID == task_id)
{
CheckerItem_Info = CheckerTask_Info[i];
break;
}
}
if(param_array.length != 0 && task_id < Checker_Test_CMD_ID_BEG)//TaskID = 255 是独立测试命令
{
param_info = CheckerTask_Info[task_id].ParamInfo.slice(0,param_array.length);
param_info = CheckerItem_Info.ParamInfo.slice(0,param_array.length);
}
var rtv_info = [];
// if(target_min.length != 0)
// {
// rtv_info = CheckerTask_Info[task_id].ReturnInfo.slice(0,target_min.length);
// rtv_info = CheckerItem_Info.ReturnInfo.slice(0,target_min.length);
// }
temp_input_list = temp_obj.find('.rtv_alias_input');
@@ -602,35 +615,41 @@ function Checker_GetCfgInfo()
function Cheker_Export()
{
Checker_Export_Plan = Checker_GetCfgInfo();
// var json_str = JSON.stringify(Checker_Export_Plan);
// console.log(json_str);
// if(!(epe_qthandle != null && typeof(epe_qthandle) != "undefined"))
// {
// var json_str = JSON.stringify(Checker_Export_Plan);
// Checker_ExportMesInfo();
// console.log(json_str);
// return ;
// }
if(Checker_Export_Plan.PlanID == (~0))
{
return;
}
// Checker_ExportInputPWD();
pywebview.api.save_plan(Checker_Export_Plan)
}
function Checker_Import()
{
if(epe_qthandle != null && typeof(epe_qthandle) != "undefined")
{
// console.log("ssssss")
epe_qthandle.Epe_JQImportPlan();
}else{
var checker_plan = testPaln;
// console.log(checker_plan)
Checker_LoadPlan(checker_plan);
}
// var checker_plan = testPaln;
// Checker_LoadPlan(checker_plan);
pywebview.api.load_plan().then((result)=>{
if(result !=null){
Checker_LoadPlan(result);
}else{
// Checker_LoadPlan(testPaln);
}
})
}
function Checker_LoadPlan(checker_plan)
{
if((checker_plan.PlanID & 0xFFFFFF00) == 0)
{
var date = new Date();
date_str = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDay();
date_str = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate();
checker_plan.planid = Checker_GetPlanID(date_str,0,checker_plan.PlanID);
}
var plan_info = Checker_GetShowPlanID(checker_plan.PlanID);
@@ -643,7 +662,7 @@ function Checker_LoadPlan(checker_plan)
function Checker_ImportShow(checker_plan )
{
//var checker_plan = Checker_YE_Cfg;
// console.log(checker_plan);
console.log(checker_plan);
var obj_list = $(".checker_cfig_div").children();
//删除所有元素
while(obj_list.length > 1)
@@ -1353,6 +1372,120 @@ function Checker_ErrorChoice(btnobj)
});
}
function Checker_ExportMesInfo()
{
Checker_Export_Plan.MajorErrInfo = Checker_Error_Info.MajorErrInfo;
Checker_Export_Plan.SubErrInfo = Checker_Error_Info.SubErrInfo;
var AllError
var Cheker_Info = {
AllTaskInfoArray:CheckerTask_Info,
PlanTaskInfoArray:[],
AllErrorInfoArray:[],
PlanErroInfoArray:[],
PlanStandardInfo:[],
}
//taskInfoArray = Checker_Export_Plan.TaskArray;
var allErrorInfoArray=[];
var planErroInfoArray = [];
var count = 0;
var major_count = 0;
for(var i =0; i < Checker_Error_Info.MajorErrInfo.length;i++ )
{
var info_ = {};
info_.ErrCode = Checker_Error_Info.MajorErrInfo[i].MajorErrCode;
info_.Info = Checker_Error_Info.MajorErrInfo[i].Info;
info_.ErrFac = Checker_Error_Info.MajorErrInfo[i].ErrFac;
allErrorInfoArray[count++] = info_;
}
planErroInfoArray = allErrorInfoArray;//将主错误放在每次方案错误里面
major_count = count;
for(var i = 0; i < Checker_Error_Info.SubErrInfo.length;i++ )
{
allErrorInfoArray[count++] = Checker_Error_Info.SubErrInfo[i];
}
Cheker_Info.AllErrorInfoArray = allErrorInfoArray;
var taskInfoArray = [];
count = 0;
for(var i = 0; i < Checker_Export_Plan.TaskArray.length; i++)
{
var taskid = Checker_Export_Plan.TaskArray[i].TaskID;
var index_ = 0;
var flag_ = 0;
var taskMes = "";
for(var index_ = 0; index_< Cheker_Info.AllTaskInfoArray.length;index_++)
{
if(Cheker_Info.AllTaskInfoArray[index_].TaskID == taskid)
{
flag_ = 1;
taskMes = Cheker_Info.AllTaskInfoArray[index_].TaskBrief ;
break;
}
}
if(flag_ == 0)
{
continue;
}
var obj_ = Checker_Export_Plan.TaskArray[i];
obj_.TaskMes = taskMes;
taskInfoArray[count++] = obj_;
}
count = 0;
for(var i = 0; i < Checker_Export_Plan.TaskArray.length; i++)
{
var tempStandard = Checker_Export_Plan.TaskArray[i].TestStandard;
var tempRetInfo = Checker_Export_Plan.TaskArray[i].ReturnInfo;
var taskid = Checker_Export_Plan.TaskArray[i].TaskID;
var index_ = 0;
for(var index_ = 0; index_< tempStandard.length;index_++)
{
var obj_={
RetName:tempRetInfo[index_],
Max:tempStandard[index_].Max,
Min:tempStandard[index_].Min,
}
Cheker_Info.PlanStandardInfo[count++] = obj_;
}
}
for(var i = 0; i < Checker_Error_Info.SubErrInfo.length; i++)
{
var err_code = Checker_Error_Info.SubErrInfo[i].ErrCode;
for(var index_ = 0; index_< Checker_Export_Plan.TaskArray.length;index_++)
{
if(err_code == Checker_Export_Plan.TaskArray[index_].ExecuteErrCode)
{
break;
}
var ResultErrCodeArray = Checker_Export_Plan.TaskArray[index_].ResultErrCode;
for(var index2 = 0; index2 < ResultErrCodeArray.length; index2++)
{
if(ResultErrCodeArray[index2] == err_code)
{
break;
}
}
}
planErroInfoArray[planErroInfoArray.length] = Cheker_Info.AllErrorInfoArray[i];
}
Cheker_Info.PlanTaskInfoArray = taskInfoArray;
Cheker_Info.PlanErroInfoArray = planErroInfoArray;
var checker_info_str = JSON.stringify(Cheker_Info,null,2);
var json_str = JSON.stringify(Checker_Export_Plan,null,2);
var pwd_str = $('.checker_export_pwd_input').val();
if(epe_qthandle != null && typeof(epe_qthandle) != "undefined")
{
console.log("epe_qthandle.Epe_JQSavePlan");
epe_qthandle.Epe_JQSavePlan2(pwd_str,CheckPlan_Export_PWD,Checker_Export_Plan.PlanBrief,json_str,checker_info_str);
}
}
function Checker_ExportInputPWD()
{
var content_str = '<div style="padding: 5px; min-width:30rem; line-height: 1.8rem; background-color: #393D49; color:#cdd4d3; ">';
@@ -1383,99 +1516,8 @@ function Checker_ExportInputPWD()
});
Checker_Pwwd_Dialog_ID = tip_id;
$(".jqchecker_export_pwd_btn").click(function(){
Checker_Export_Plan.MajorErrInfo = Checker_Error_Info.MajorErrInfo;
Checker_Export_Plan.SubErrInfo = Checker_Error_Info.SubErrInfo;
var Cheker_Info = {
AllTaskInfoArray:CheckerTask_Info,
PlanTaskInfoArray:[],
AllErrorInfoArray:Checker_Error_Info.SubErrInfo,
PlanErroInfoArray:[],
PlanStandardInfo:[],
}
//taskInfoArray = Checker_Export_Plan.TaskArray;
var taskInfoArray = [];
var count = 0;
for(var i = 0; i < Checker_Export_Plan.TaskArray.length; i++)
{
var taskid = Checker_Export_Plan.TaskArray[i].TaskID;
var index_ = 0;
var flag_ = 0;
var taskMes = "";
for(var index_ = 0; index_< Cheker_Info.AllTaskInfoArray.length;index_++)
{
if(Cheker_Info.AllTaskInfoArray[index_].TaskID == taskid)
{
flag_ = 1;
taskMes = Cheker_Info.AllTaskInfoArray[index_].TaskBrief ;
break;
}
}
if(flag_ == 0)
{
continue;
}
var obj_ = Checker_Export_Plan.TaskArray[i];
obj_.TaskMes = taskMes;
taskInfoArray[count++] = obj_;
}
var count = 0;
for(var i = 0; i < Checker_Export_Plan.TaskArray.length; i++)
{
var tempStandard = Checker_Export_Plan.TaskArray[i].TestStandard;
var tempRetInfo = Checker_Export_Plan.TaskArray[i].ReturnInfo;
var taskid = Checker_Export_Plan.TaskArray[i].TaskID;
var index_ = 0;
for(var index_ = 0; index_< tempStandard.length;index_++)
{
var obj_={
RetName:tempRetInfo[index_],
Max:tempStandard[index_].Max,
Min:tempStandard[index_].Min,
}
Cheker_Info.PlanStandardInfo[count++] = obj_;
}
}
var planErroInfoArray = [];
count = 0;
for(var i = 0; i < Cheker_Info.AllErrorInfoArray.length; i++)
{
var taskid = Cheker_Info.AllErrorInfoArray[i].ErrCode;
var flag_ = 0;
for(var index_ = 0; index_< Checker_Export_Plan.TaskArray.length;index_++)
{
if(taskid == Checker_Export_Plan.TaskArray[index_].ExecuteErrCode)
{
flag_ = 1;
break;
}
var ResultErrCodeArray = Checker_Export_Plan.TaskArray[index_].ResultErrCode;
for(var index2 = 0; index2 < ResultErrCodeArray.length; index2++)
{
if(ResultErrCodeArray[index2] == taskid)
{
flag_ = 1;
break;
}
}
}
planErroInfoArray[count++] = Cheker_Info.AllErrorInfoArray[i];
}
Cheker_Info.PlanTaskInfoArray = taskInfoArray;
Cheker_Info.PlanErroInfoArray = planErroInfoArray;
var checker_info_str = JSON.stringify(Cheker_Info,null,2);
var json_str = JSON.stringify(Checker_Export_Plan,null,2);
var pwd_str = $('.checker_export_pwd_input').val();
if(epe_qthandle != null && typeof(epe_qthandle) != "undefined")
{
console.log("epe_qthandle.Epe_JQSavePlan");
epe_qthandle.Epe_JQSavePlan(pwd_str,CheckPlan_Export_PWD,json_str,checker_info_str);
}
});
Checker_ExportMesInfo();
});
}
@@ -1505,4 +1547,66 @@ function Checker_AddTaskList()
}
function Checker_UpLoadServer()
{
Checker_Export_Plan = Checker_GetCfgInfo();
if(Checker_Export_Plan.PlanID == (~0))
{
return;
}
var json_str = JSON.stringify(Checker_Export_Plan,null,2);
$.ajax({
url: 'http://47.108.119.117:9080/pjySource/upCheckplan',
method: 'POST',
data: json_str,
success: function(response) {
response = eval("(" + response+")");
if(response.isOK == true)
{
console.log('请求成功：', response);
}
},
error: function(xhr, status, error) {
console.log('请求失败：', error);
}
});
}
// 选项改变之后
function slect_onchange(){
// 选择工厂
var chip = document.getElementById("product_class_sel_id");
var fatc = document.getElementById("plan_fatc_sel_id");
var step = document.getElementById("plan_step_sel_id");
var bref = document.getElementById("plan_bref_input");
var featur = document.getElementById("plan_featur_sel_id");
var date_input = document.getElementById("plan_date_id");
var planid_input = document.getElementById("plan_id_input_id");
var fatc_text = fatc.options[fatc.selectedIndex].text;
var step_text = step.options[step.selectedIndex].text;
var featur_text = featur.options[featur.selectedIndex].text;
var chip_text= chip.options[chip.selectedIndex].text;
var date_text=date_input.value.split("-");
bref.value=chip_text+fatc_text+step_text+featur_text.split(":")[1]
+date_text[1]+date_text[2]+'_'+planid_input.value;
}
function date_click(){
console.log("date_click");
var date = new Date();
var date_str = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate();
var date_input = document.getElementById("plan_date_id");
date_input.value=date_str;
// 更新日期显示
var plan_id=Checker_GetPlanIDInput();
var planid_info=Checker_GetShowPlanID(plan_id);
date_input.value=planid_info.date_str;
console.log(date_str);
slect_onchange();
}