Commit 091e31f7 authored by wanghao's avatar wanghao

1 老化过程中 获取卡号,获取IOT状态调整中

parent 0a1e841f
...@@ -273,7 +273,10 @@ public class AllCommandHandler { ...@@ -273,7 +273,10 @@ public class AllCommandHandler {
continue; continue;
} }
String nbCode = palletDeviceBinding.getNbCode(); String nbCode = palletDeviceBinding.getNbCode();
// 如果 nbCode 为空,则设状态为 2,加入待更新列表
if (StringUtils.isBlank(nbCode)) { if (StringUtils.isBlank(nbCode)) {
palletDeviceBinding.setIotStatus(2);
needUpdateList.add(palletDeviceBinding);
continue; continue;
} }
......
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
<el-table-column label="IOT状态" align="center" width="120"> <el-table-column label="IOT状态" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="success" v-if="scope.row.iotStatus === 1">正常</el-tag> <el-tag type="success" v-if="scope.row.iotStatus === 1">正常</el-tag>
<el-tag type="info" v-if="scope.row.iotStatus === 2">NB码为空</el-tag>
<el-tag type="info" v-if="scope.row.iotStatus === 0">异常</el-tag> <el-tag type="info" v-if="scope.row.iotStatus === 0">异常</el-tag>
<el-tag type="danger" v-if="scope.row.iotStatus === -9999">通讯异常</el-tag> <el-tag type="danger" v-if="scope.row.iotStatus === -9999">通讯异常</el-tag>
</template> </template>
......
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
<el-table-column label="IOT状态" align="center" width="120"> <el-table-column label="IOT状态" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="success" v-if="scope.row.iotStatus === 1">正常</el-tag> <el-tag type="success" v-if="scope.row.iotStatus === 1">正常</el-tag>
<el-tag type="info" v-if="scope.row.iotStatus === 2">NB码为空</el-tag>
<el-tag type="info" v-if="scope.row.iotStatus === 0">异常</el-tag> <el-tag type="info" v-if="scope.row.iotStatus === 0">异常</el-tag>
<el-tag type="danger" v-if="scope.row.iotStatus === -9999">通讯异常</el-tag> <el-tag type="danger" v-if="scope.row.iotStatus === -9999">通讯异常</el-tag>
</template> </template>
......
...@@ -201,6 +201,7 @@ ...@@ -201,6 +201,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.iotStatus === 1" class="write-success">正常</span> <span v-if="scope.row.iotStatus === 1" class="write-success">正常</span>
<span v-else-if="scope.row.iotStatus === 0" class="write-failed">异常</span> <span v-else-if="scope.row.iotStatus === 0" class="write-failed">异常</span>
<span v-else-if="scope.row.iotStatus === 2" class="write-failed">NB码为空</span>
<span v-else-if="scope.row.iotStatus === -9999" class="write-failed">通讯异常</span> <span v-else-if="scope.row.iotStatus === -9999" class="write-failed">通讯异常</span>
<span v-else class="write-unknown">-</span> <span v-else class="write-unknown">-</span>
</template> </template>
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
class="unbind-btn" class="unbind-btn"
@click="unbindAll" @click="unbindAll"
> >
<i class="fas fa-unlink"></i> 一键解绑 <i class="fas fa-unlink"></i> 一键解绑
</button> </button>
</div> </div>
</div> </div>
...@@ -638,7 +638,7 @@ export default { ...@@ -638,7 +638,7 @@ export default {
// 一键解绑所有设备 // 一键解绑所有设备
// 一键解绑所有设备 // 一键解绑所有设备
unbindAll() { unbindAll() {
// 原有代码位置:调用解绑的地方 // 原有代码位置:调用解绑的地方
this.showFirstConfirm(); this.showFirstConfirm();
// this.$confirm('确定要解绑当前托盘下所有设备吗?', '警告', { // this.$confirm('确定要解绑当前托盘下所有设备吗?', '警告', {
...@@ -721,7 +721,7 @@ export default { ...@@ -721,7 +721,7 @@ export default {
}, },
// 第二级确认:确实不上传MES? // 第二级确认:确实不上传MES?
showSecondConfirm() { showSecondConfirm() {
this.$confirm('确实解绑后不上传MES?', '提示', { this.$confirm('确实解绑后不上传MES?', '提示', {
confirmButtonText: '是', confirmButtonText: '是',
cancelButtonText: '否', cancelButtonText: '否',
......
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