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

2024-01-15 18:07:02 +08:00
parent 5b3786dd36
commit 89ef0a6514
20 changed files with 2141 additions and 252 deletions
--- a/web/layui/Checker/EWChecker.js
+++ b/web/layui/Checker/EWChecker.js
@@ -344,18 +344,78 @@ EW_ErrorInfo={
 //错误描述
 //主错误段
 MajorErrInfo:[
-{Info:"执行成功",MajorErrCode:0,SubErrCode:[]},
-{Info:"检测器异常",MajorErrCode:1,SubErrCode:[21,23,254]},
-{Info:"主电容异常",MajorErrCode:2,SubErrCode:[30,31,32,33,34,35,42]},
-{Info:"接触异常",MajorErrCode:3,SubErrCode:[27]},
-{Info:"桥丝阻值异常",MajorErrCode:4,SubErrCode:[30,41,42,51]},
-{Info:"芯片异常",MajorErrCode:5,SubErrCode:[22,24,25,26,27,28,29,30,32,33,35,36,37,38,39,40,41,42,43,44,45,52,53,54]},
-{Info:"判定任务缺失",MajorErrCode:6,SubErrCode:[212]},
-{Info:"过流",MajorErrCode:7,SubErrCode:[]},
-{Info:"短路",MajorErrCode:8,SubErrCode:[]},
-{Info:"未执行槽任务",MajorErrCode:9,SubErrCode:[]},
-{Info:"槽任务参数错误",MajorErrCode:10,SubErrCode:[]},
-{Info:"其他异常",MajorErrCode:20,SubErrCode:[255,208,209,210,211,212,213]},
+{
+Info:"执行成功",
+MajorErrCode:0,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"检测器异常",
+MajorErrCode:1,
+SubErrCode:[21,23,254],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"主电容异常",
+MajorErrCode:2,
+SubErrCode:[30,31,32,33,34,35,42],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"接触异常",
+MajorErrCode:3,
+SubErrCode:[27],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"桥丝阻值异常",
+MajorErrCode:4,
+SubErrCode:[30,41,42,51],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"芯片异常",
+MajorErrCode:5,
+SubErrCode:[22,24,25,26,27,28,29,30,32,33,35,36,37,38,39,40,41,42,43,44,45,52,53,54],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"判定任务缺失",
+MajorErrCode:6,
+SubErrCode:[212],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"过流",
+MajorErrCode:7,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"短路",
+MajorErrCode:8,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"未执行槽任务",
+MajorErrCode:9,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"槽任务参数错误",
+MajorErrCode:10,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"其他异常",
+MajorErrCode:20,
+SubErrCode:[255,208,209,210,211,212,213],
+ErrFac:["参考错误细分项"],
+},
 ],//需要根据返回参数进行判断]
 SubErrInfo:[
 //详细错误段
@@ -477,4 +537,4 @@ ErrFac:[],
 },//需要通过指标判断
 ],
 };
-var EW_Product_Names=["EJ01","EJ03","EJ04","EJ05","EJ06","EJ09","EJ10","EQ09"];
+var EW_Product_Names=["EW"];
--- a/web/layui/Checker/JQChecker.js
+++ b/web/layui/Checker/JQChecker.js
@@ -350,28 +350,88 @@ JQ_ErrorInfo={
 //错误描述
 //主错误段
 MajorErrInfo:[
-{Info:"执行成功",MajorErrCode:0,SubErrCode:[]},
-{Info:"检测器异常",MajorErrCode:1,SubErrCode:[21,23,254]},
+{
+Info:"执行成功",
+MajorErrCode:0,
+SubErrCode:[],
+ErrFac:["未检测到异常"],
+},
+{
+Info:"检测器异常",
+MajorErrCode:1,
+SubErrCode:[21,23,254],
+ErrFac:["1.外部短路导致检测器调压失败","2.设备故障"],
+},
 // 主电容异常移除 dac比较错误30，状态错误42
 // 如果有电容异常，在充能阶段已经暴露
-{Info:"主电容异常",MajorErrCode:2,SubErrCode:[31,32,33,34,35]},
-{Info:"接触异常",MajorErrCode:3,SubErrCode:[27]},
+{
+Info:"主电容异常",
+MajorErrCode:2,
+SubErrCode:[31,32,33,34,35],
+ErrFac:["1.电容充放电测试指标超出限制","2.电容短路、短路或损坏"],
+},
+{
+Info:"接触异常",
+MajorErrCode:3,
+SubErrCode:[27],
+ErrFac:["1.线路接触异常","2.模块铆接异常","3.芯片虚焊或损坏"],
+},
 // 桥丝异常移除 41，42
 // 如果有桥丝异常，在dac比较阶段和电阻检阶段已暴露
-{Info:"桥丝阻值异常",MajorErrCode:4,SubErrCode:[30,51]},
+{
+Info:"桥丝阻值异常",
+MajorErrCode:4,
+SubErrCode:[30,51],
+ErrFac:["1.(外力导致)桥丝断","2.桥丝焊接异常"],
+},
 // 移除上电充能异常22，加入其他异常
-{Info:"芯片异常",MajorErrCode:5,SubErrCode:[24,25,26,27,28,29,30,32,33,35,36,37,38,39,40,41,42,43,44,45,52,53,54]},
-{Info:"判定任务缺失",MajorErrCode:6,SubErrCode:[212]},
-{Info:"过流",MajorErrCode:7,SubErrCode:[]},
-{Info:"短路",MajorErrCode:8,SubErrCode:[]},
-{Info:"未执行槽任务",MajorErrCode:9,SubErrCode:[]},
-{Info:"槽任务参数错误",MajorErrCode:10,SubErrCode:[]},
-{Info:"其他异常",MajorErrCode:20,SubErrCode:[22,255,208,209,210,211,212,213]},
+{
+Info:"芯片异常",
+MajorErrCode:5,
+SubErrCode:[24,25,26,27,28,29,30,32,33,35,36,37,38,39,40,41,42,43,44,45,52,53,54],
+ErrFac:["1.对芯片功能(读写OTP、时钟校准等)的检测失败"],
+},
+{
+Info:"判定任务缺失",
+MajorErrCode:6,
+SubErrCode:[212],
+ErrFac:["1.设备程序未更新"],
+},
+{
+Info:"过流",
+MajorErrCode:7,
+SubErrCode:[],
+ErrFac:["1.模块静态电流指标超过限制"],
+},
+{
+Info:"连接线短路",
+MajorErrCode:8,
+SubErrCode:[],
+ErrFac:["1.线路短路","2.芯片焊接异常","3.器件损坏"],
+},
+{
+Info:"未执行槽任务",
+MajorErrCode:9,
+SubErrCode:[],
+ErrFac:["1.设备程序未更新"],
+},
+{
+Info:"槽任务参数错误",
+MajorErrCode:10,
+SubErrCode:[],
+ErrFac:["1.槽任务(写延时、写流水号等)返回值错误"],
+},
+{
+Info:"其他异常",
+MajorErrCode:20,
+SubErrCode:[22,255,208,209,210,211,212,213],
+ErrFac:["1.不常见的异常"],
+},
 ],//需要根据返回参数进行判断]
 SubErrInfo:[
 //详细错误段
 {Info:"无异常",ErrCode:0,
-ErrFac:["当检测任务不产生异常时使用此错误码"]},		
+ErrFac:["1.当检测任务不产生异常时使用此错误码"]},		
 {Info:"预设电压异常",ErrCode:21,
 ErrFac:["1.检测小板电压调节失效，存在无法设置的电压"]},		
 {Info:"上电充能错误",ErrCode:22,
@@ -487,4 +547,4 @@ ErrFac:[],
 },//需要通过指标判断
 ],
 };
-var JQ_Product_Names=["EJ01","EJ03","EJ04","EJ05","EJ06","EJ09","EJ10","EQ09","EQ05","EQ06","EQ07"];
+var JQ_Product_Names=["EJ","EQ","EJ(Q)"];
--- a/web/layui/Checker/XTChecker.js
+++ b/web/layui/Checker/XTChecker.js
@@ -305,17 +305,67 @@ XT_ErrorInfo={
 //错误描述
 //主错误段
 MajorErrInfo:[
-{Info:"执行成功",MajorErrCode:0,SubErrCode:[]},
+{
+Info:"执行成功",
+MajorErrCode:0,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
 // 添加异常代码254
-{Info:"检测器异常",MajorErrCode:1,SubErrCode:[21,23,254]},
-{Info:"主电容异常",MajorErrCode:2,SubErrCode:[31,32,33,34,35]},
-{Info:"接触异常",MajorErrCode:3,SubErrCode:[27,37]},
-{Info:"桥丝阻值异常",MajorErrCode:4,SubErrCode:[30,51]},
-{Info:"芯片异常",MajorErrCode:5,SubErrCode:[22,24,25,26,27,28,29,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,54,55]},
-{Info:"判定任务缺失",MajorErrCode:6,SubErrCode:[212]},
-{Info:"过流",MajorErrCode:7,SubErrCode:[]},
-{Info:"短路",MajorErrCode:8,SubErrCode:[]},
-{Info:"其他异常",MajorErrCode:20,SubErrCode:[255,208,209,210,211,212,213]},
+{
+Info:"检测器异常",
+MajorErrCode:1,
+SubErrCode:[21,23,254],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"主电容异常",
+MajorErrCode:2,
+SubErrCode:[31,32,33,34,35],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"接触异常",
+MajorErrCode:3,
+SubErrCode:[27,37],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"桥丝阻值异常",
+MajorErrCode:4,
+SubErrCode:[30,51],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"芯片异常",
+MajorErrCode:5,
+SubErrCode:[22,24,25,26,27,28,29,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,54,55],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"判定任务缺失",
+MajorErrCode:6,
+SubErrCode:[212],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"过流",
+MajorErrCode:7,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"短路",
+MajorErrCode:8,
+SubErrCode:[],
+ErrFac:["参考错误细分项"],
+},
+{
+Info:"其他异常",
+MajorErrCode:20,
+SubErrCode:[255,208,209,210,211,212,213],
+ErrFac:["参考错误细分项"],
+},
 ],//需要根据返回参数进行判断]
 SubErrInfo:[
 //详细错误段
@@ -447,6 +497,6 @@ ErrFac:[],
 }


-var XT_Product_Names=["EX05A","EX09C","EX09F","EX09J","EX09A"];
+var XT_Product_Names=["EX"];


--- a/web/layui/Checker/checker_cmdTest.js
+++ b/web/layui/Checker/checker_cmdTest.js
@@ -160,6 +160,7 @@ function Checker_PlanTest()
 var MesBox_InputTestResult_ID = -1;
 function CheckerShowMes_InputResult()
 {
+
 	if(MesBox_InputTestResult_ID < 0)
 	{
 	
@@ -382,23 +383,20 @@ function Checker_CommSendStr(str)
 	
 }

-function Checker_ShowCurMontior()
-{
-	
-	
-}

 function Checker_ShowReadStr(str)
 {
 	//str = "test taefCurM1ontiorofjiofjowfjoeifdslafjow\n"
-	str = str.replace("\r\n","\n");
-	str = str.replace("\r","\n");
-	if(str.indexOf("CurMontior") >= 0)
+
+	if(str.indexOf("CurMR") >= 0)
 	{
-		CheckerShowCurEcharts(cur);
+		str = str.split("\t");
+		CheckerShowCurEcharts(str[1]);
 	}
 	else if(CheckerPlanTest_flag == false)
 	{
+		str = str.replace("\r\n","\n");
+		str = str.replace("\r","\n");
 		str = str.split("\n");
 		for(var index = 0; index < str.length;index++)
 		{
--- a/web/layui/Checker/checker_ye_cfg.js
+++ b/web/layui/Checker/checker_ye_cfg.js
@@ -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();
+}