|
|
@@ -18,7 +18,7 @@
|
|
|
<td width="200">{{tenant.taskNo}}</td>
|
|
|
<td class="blodTd" align="center" width="120">{{$t("runCenter.form.viewSched.status")+"："}}</td>
|
|
|
<td width="120">
|
|
|
- <el-tag v-if="tenant.status == 0" type="info">{{$t("runCenter.common.schedulStatus.noStart")}}</el-tag>
|
|
|
+ <el-tag v-if="tenant.status == 0" type="info">{{$t("runCenter.common.schedulStatus.noStart")}}</el-tag>
|
|
|
<el-tag v-if="tenant.status == 1" type="">{{$t("runCenter.common.schedulStatus.run")}}</el-tag>
|
|
|
<el-tag v-if="tenant.status == 2" type="success">{{$t("runCenter.common.schedulStatus.finished")}}</el-tag>
|
|
|
</td>
|
|
|
@@ -30,7 +30,7 @@
|
|
|
<td width="200">{{tenant.content}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.prepareWorkHours")+"："}}</td>
|
|
|
+ <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.prepareWorkHours")+"："}}</td>
|
|
|
<td>{{tenant.time}}分钟</td>
|
|
|
<td class="blodTd" align="center">{{$t("runCenter.form.viewSched.procedurePosition")+"："}}</td>
|
|
|
<td>{{tenant.currentStationName}}</td>
|
|
|
@@ -46,9 +46,9 @@
|
|
|
|
|
|
<!-- 装夹物料 -->
|
|
|
<el-row>
|
|
|
- <p class="titleP" style="margin-top:15px;color:#000;font-size:18px;" >ST1: 拆零件</p>
|
|
|
- <p class="titleP" style="margin-top:15px;color:#000;font-size:18px;" >第一步：请贴物料编码二维码<el-button size="medium" type="primary" :disabled="confirmDisabled" @click="printCode" round>打印物料编码</el-button></p>
|
|
|
- <p v-if="this.tenant.trayConf=='3'" class="titleP" style="margin-top:15px;color:#000;font-size:18px;" >第二步：请更换托盘工装<el-button size="medium" type="primary" :disabled="confirmDisabled" @click="callRobot" round>呼叫托盘工装</el-button></p>
|
|
|
+ <p class="titleP" style="margin-top:15px;color:#000;font-size:18px;height:35px;line-height:33px;" >第一步：请拆零件</p>
|
|
|
+ <p class="titleP" style="margin-top:15px;color:#000;font-size:18px;white-space:pre;" >第二步：请贴物料编码二维码 <el-button size="medium" type="primary" :disabled="confirmDisabled" @click="printCode" round>打印物料编码</el-button></p>
|
|
|
+ <p v-if="this.tenant.trayConf==='3'" class="titleP" style="margin-top:15px;color:#000;font-size:18px;white-space:pre;" >第三步：请更换托盘工装 <el-button size="medium" type="primary" :disabled="confirmDisabled" @click="callRobot" round>呼叫托盘工装</el-button></p>
|
|
|
<!-- Table数据 -->
|
|
|
<el-table
|
|
|
ref="table"
|
|
|
@@ -106,7 +106,7 @@ export default {
|
|
|
return {
|
|
|
screenWidth: 0,
|
|
|
confirmDisabled: false,
|
|
|
- callRobotFlag:false,
|
|
|
+ callRobotFlag:false,
|
|
|
width: this.initWidth(),
|
|
|
tenant: {},
|
|
|
queryParams: initQueryParams({}),
|
|
|
@@ -220,7 +220,7 @@ export default {
|
|
|
this.RFIDParams.taskNodeId = this.tenant.taskNodeId
|
|
|
this.RFIDParams.data.positionIndex = this.tenant.currentStationName.substr(-1)
|
|
|
let that = this
|
|
|
- machiningClientApi.read(this.RFIDParams).then(res => {
|
|
|
+ machiningClientApi.read(this.RFIDParams).then(res => {
|
|
|
if(res.data.result){
|
|
|
this.$message({
|
|
|
message: "RFID: "+res.data.result,
|
