Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/wpm_gx/mlog_form.vue

@@ -523,10 +523,10 @@ export default {
 						that.form.route = null;
 					}
 					if (that.mode === "add") {
-						if(that.mgroupName=='黑化'){
+						if(that.mgroupName=='黑化'||that.mgroupName=='退火'){
 							let times = 0;
 							that.testitems.forEach(item=>{
-								if(item.name=='保温时间'||item.name=='冷却时间'){
+								if(item.name=='退火时间'||item.name=='冷却时间'||item.name=='黑化时间'){
 									times = times + item.value;
 								}
 							})