Commit 9425812b authored by jingnan's avatar jingnan 👀

theoreticalTemperature

parent 60568da0
......@@ -1655,6 +1655,12 @@ export function findByNameVnode(obj, targetName) {
return findByNameVnode(obj.$parent, targetName)
}
}
export function addMinutes(date, minutes) {
const dateFormat=new Date(date)
dateFormat.setMinutes(dateFormat.getMinutes() + minutes)
const resDate= formatDate(dateFormat, 'YYYY-MM-DD HH:mm:ss')
return resDate
}
export default {
findByNameVnode,
......@@ -1746,5 +1752,6 @@ export default {
sumArray,
subNum,
getTargetJobResponses,
export_excel
export_excel,
addMinutes
}
......@@ -457,7 +457,7 @@ export default {
{
'fieldName': 'modelNo',
'operator': 'LIKE',
'value': modelNo
'value': modelNo.includes('-') ? modelNo.split('-')[0] : modelNo
},
{
'fieldName': 'spec',
......@@ -503,6 +503,8 @@ export default {
this.$set(this.form, 'standard', res.items.content[0].standard)
this.$set(this.form, 'matching', res.items.content[0].matching)
this.$set(this.form, 'theoreticalTemperature', res.items.content[0].temperature)
this.$set(this.form, 'theoreInductionPeriod', res.items.content[0].inductionPeriod)
this.$set(this.form, 'theorePotLife', res.items.content[0].potLife)
this.$set(this.form, 'humidity', res.items.content[0].humidity)
this.$set(this.form, 'component', res.items.content[0].component)
this.$set(this.form, 'shellacDeployId', res.items.content[0].id)
......@@ -519,6 +521,10 @@ export default {
Object.keys(res.items.content[0]).forEach(key => {
if (key === 'temperature') {
this.$set(this.form, 'theoreticalTemperature', res.items.content[0][key])
} else if (key === 'inductionPeriod') {
this.$set(this.form, 'theoreInductionPeriod', res.items.content[0][key])
} else if (key === 'potLife') {
this.$set(this.form, 'theorePotLife', res.items.content[0][key])
} else if (key === 'viscosity') {
this.$set(this.form, 'theoreticalViscosity', res.items.content[0][key])
} else if (key === 'bulk') {
......
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