Compare commits
10 Commits
e88910a680
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 2843743858 | |||
| c70f7de7cd | |||
| e888f0cee7 | |||
| e2ea6b3f4a | |||
| ba50f358cd | |||
| 620de4ffce | |||
|
|
c173a51f0a | ||
|
|
981c26e78d | ||
| 08eabfda10 | |||
|
|
6da197da11 |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -634,6 +634,7 @@ export default {
|
|||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.$message('提交成功,请点击轧制完成')
|
this.$message('提交成功,请点击轧制完成')
|
||||||
this.dialogVisible = false
|
this.dialogVisible = false
|
||||||
|
this.finalFlag = 0
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -579,7 +579,8 @@ export default {
|
|||||||
|
|
||||||
startProcess() {
|
startProcess() {
|
||||||
let params = {
|
let params = {
|
||||||
state: 1
|
state: 1,
|
||||||
|
batchId: this.processBatchId
|
||||||
}
|
}
|
||||||
materialStart(params).then(res => {
|
materialStart(params).then(res => {
|
||||||
if (res.data === 1) {
|
if (res.data === 1) {
|
||||||
@@ -630,6 +631,7 @@ export default {
|
|||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.$message('提交成功,请点击轧制完成')
|
this.$message('提交成功,请点击轧制完成')
|
||||||
this.dialogVisible = false
|
this.dialogVisible = false
|
||||||
|
this.finalFlag = 0
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -727,21 +729,17 @@ export default {
|
|||||||
mounted() {
|
mounted() {
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
// clearInterval(this.intervalTime)
|
clearInterval(this.intervalTime)
|
||||||
// this.getDataList() // 接口方法
|
|
||||||
//
|
this.intervalTime = setInterval(() => {
|
||||||
// this.intervalTime = setInterval(() => {
|
this.getFault()
|
||||||
// this.getFault()
|
this.getPLCData()
|
||||||
// this.getPLCData()
|
}, 2000)
|
||||||
// this.getDataList() // 接口方法
|
|
||||||
// }, 2000)
|
|
||||||
},
|
},
|
||||||
computed: {},
|
computed: {},
|
||||||
created() {
|
created() {
|
||||||
this.getPLCData()
|
|
||||||
this.getDataList() // 接口方法
|
this.getDataList() // 接口方法
|
||||||
newIP()
|
newIP()
|
||||||
this.getFault()
|
|
||||||
},
|
},
|
||||||
|
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
|
|||||||
@@ -20,16 +20,20 @@
|
|||||||
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">
|
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">
|
||||||
{{ index + 1 }}
|
{{ index + 1 }}
|
||||||
</td>
|
</td>
|
||||||
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
|
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">
|
||||||
|
{{
|
||||||
item.id }}
|
item.id }}
|
||||||
</td>
|
</td>
|
||||||
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
|
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">
|
||||||
|
{{
|
||||||
item.specification }}
|
item.specification }}
|
||||||
</td>
|
</td>
|
||||||
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
|
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">
|
||||||
|
{{
|
||||||
item.technology }}
|
item.technology }}
|
||||||
</td>
|
</td>
|
||||||
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
|
<td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">
|
||||||
|
{{
|
||||||
item.diameter }}
|
item.diameter }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -172,7 +176,7 @@
|
|||||||
<el-button style="margin-left: 20px;" @click="clear">初始化
|
<el-button style="margin-left: 20px;" @click="clear">初始化
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
||||||
<el-button style="margin-left: 20px;" type="danger" @click="removeMaterial" :disabled="indexSelect !== 0">删除物料
|
<el-button style="margin-left: 20px;" type="danger" @click="removeMaterial" :disabled="indexSelect === 0">删除物料
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -221,8 +225,6 @@
|
|||||||
<a href="#" class="hxjx-button-ensure btn btn-danger btn-sm custom hxjx_foot_btn_custom"
|
<a href="#" class="hxjx-button-ensure btn btn-danger btn-sm custom hxjx_foot_btn_custom"
|
||||||
style="margin-right: 0;" @click="ensure">确定</a>
|
style="margin-right: 0;" @click="ensure">确定</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
@@ -241,7 +243,7 @@ import {
|
|||||||
updateResource
|
updateResource
|
||||||
} from '@/api/system/resource'
|
} from '@/api/system/resource'
|
||||||
import { getFaultMessage, newIP } from '@/api/system/common'
|
import { getFaultMessage, newIP } from '@/api/system/common'
|
||||||
import { deleteMaterial } from "../../../api/system/material";
|
import { deleteMaterial } from "@/api/system/material";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'index',
|
name: 'index',
|
||||||
@@ -291,17 +293,20 @@ export default {
|
|||||||
alert('提交失败,检查是否存在物料')
|
alert('提交失败,检查是否存在物料')
|
||||||
} else if (res.data === 2) {
|
} else if (res.data === 2) {
|
||||||
alert('提交成功,但工艺出现差异,已将差异物料提交异常')
|
alert('提交成功,但工艺出现差异,已将差异物料提交异常')
|
||||||
|
} else if (res.data === 3) {
|
||||||
|
alert('检测到物料无对应的工艺,不允通过')
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
removeMaterial() {
|
removeMaterial() {
|
||||||
|
let materialId = this.dataList[this.indexSelect].id
|
||||||
if (this.indexSelect === 0) {
|
if (this.indexSelect === 0) {
|
||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
this.$modal.confirm('是否确认删除钽靶编号为"' + this.dataList[this.indexSelect].id + '"的数据项?').then(function () {
|
this.$modal.confirm('是否确认删除钽靶编号为"' + materialId + '"的数据项?').then(function () {
|
||||||
return deleteMaterial(this.dataList[this.indexSelect].id)
|
return deleteMaterial(materialId)
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.getDataList()
|
this.getDataList()
|
||||||
this.$modal.msgSuccess("删除成功");
|
this.$modal.msgSuccess("删除成功");
|
||||||
|
|||||||
Reference in New Issue
Block a user