This commit is contained in:
2025-07-15 15:20:00 +08:00
parent 9dc7c91c3a
commit ca191dfc48
2 changed files with 22 additions and 22 deletions

View File

@@ -62,7 +62,6 @@ export function materialAbnormalStart(query) {
} }
// /work/material/abnormal_start
export function stepFinishError(batchId) { export function stepFinishError(batchId) {
return request({ return request({
url: '/work/step/finishError/'+batchId, url: '/work/step/finishError/'+batchId,
@@ -70,7 +69,6 @@ export function stepFinishError(batchId) {
}) })
} }
// /work/material/abnormal_start
export function materialNextError(query) { export function materialNextError(query) {
return request({ return request({
url: '/work/material/nextError', url: '/work/material/nextError',
@@ -79,7 +77,6 @@ export function materialNextError(query) {
}) })
} }
// /work/material/abnormal_start
export function stepCheckAbnormal(batchId) { export function stepCheckAbnormal(batchId) {
return request({ return request({
url: '/work/step/check_abnormal/'+batchId, url: '/work/step/check_abnormal/'+batchId,

View File

@@ -509,7 +509,7 @@ export default {
nextStep() { nextStep() {
let step = this.nowPass let step = this.nowPass
if (step && step.state === 0) { if (step && step.state === 0) {
alert('请操作当前道次') this.$message('请操作当前道次')
this.nextStepLoading = false this.nextStepLoading = false
} else { } else {
this.nextStepLoading = true this.nextStepLoading = true
@@ -566,7 +566,6 @@ export default {
if (res.data !== 0) { if (res.data !== 0) {
materialNextStepFlagError().then(res => { materialNextStepFlagError().then(res => {
this.submitButton = res.data === 0 this.submitButton = res.data === 0
this.getDataList()
}) })
alert('开始轧制') alert('开始轧制')
this.getDataList() this.getDataList()
@@ -658,27 +657,31 @@ export default {
let params = { let params = {
materialId: this.processing.id, materialId: this.processing.id,
delFlag: 1, delFlag: 1,
batchId: this.processing.batchId batchId: this.processBatchId
} }
stepProcess(params).then(res => { stepProcess(params).then(res => {
this.passList = res.data this.passList = res.data
this.nextStepFlagError = res.data.filter(item => item.operation === 1)[0].state if (res.data.length()>0){
this.nowPass = this.passList.filter(item => item.operation === 1)[0] this.nextStepFlagError = res.data.filter(item => item.operation === 1)>0?res.data.filter(item => item.operation === 1)[0].state:-1
let nowPass = this.nowPass this.nowPass = this.passList.filter(item => item.operation === 1)>0?this.passList.filter(item => item.operation === 1)[0]:{}
if (this.nowPass!=={}){
let nowPass = this.nowPass
let temp = nowPass.step % 8 let temp = nowPass.step % 8
const angleMap = { const angleMap = {
0: 315, 0: 315,
1: 0, 1: 0,
2: 90, 2: 90,
3: 45, 3: 45,
4: 135, 4: 135,
5: 180, 5: 180,
6: 270, 6: 270,
7: 225, 7: 225,
8: 315, 8: 315,
}; };
this.circleStart = angleMap[temp]; this.circleStart = angleMap[temp];
}
}
}) })
}, },