bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:5bd0f38ff2ca4e11b5cfaa52ea1d26cabe3eacbe
Branches Tags
bonus:main
bonus:dev-nx
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master
..
compare: bonus:40c6391e02f90d0134ba9503524b61cce6e1ccab
Branches Tags
bonus:dev-nx
bonus:main
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master

No commits in common. "5bd0f38ff2ca4e11b5cfaa52ea1d26cabe3eacbe" and "40c6391e02f90d0134ba9503524b61cce6e1ccab" have entirely different histories.
5bd0f38ff2 ... 40c6391e02

2 changed files with 6 additions and 8 deletions
Show Stats Expand all files Collapse all files

7
sgzb-ui/src/views/warehouseManage/machinery/coding/debug.vue
View File

@ -209,9 +209,9 @@
</el-table-column> </el-table-column>
<el-table-column label="IOT设备" align="center" prop="ownHouseName"> <el-table-column label="IOT设备" align="center" prop="ownHouseName">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" @click="handleBindIOT(row)">{{ <el-button type="text" @click="handleBindIOT(row)"
row.iotNum === 0 ? '未绑定' : row.iotNum >未绑定</el-button
}}</el-button> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -223,7 +223,6 @@
<i <i
class="el-icon-location location-icon" class="el-icon-location location-icon"
@click="handleMap(row)" @click="handleMap(row)"
v-if="row.iotNum > 0"
/> />
</template> </template>
</el-table-column> </el-table-column>

7
sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
View File

@ -209,9 +209,9 @@
</el-table-column> </el-table-column>
<el-table-column label="IOT设备" align="center" prop="ownHouseName"> <el-table-column label="IOT设备" align="center" prop="ownHouseName">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" @click="handleBindIOT(row)">{{ <el-button type="text" @click="handleBindIOT(row)"
row.iotNum === 0 ? '未绑定' : row.iotNum >未绑定</el-button
}}</el-button> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -223,7 +223,6 @@
<i <i
class="el-icon-location location-icon" class="el-icon-location location-icon"
@click="handleMap(row)" @click="handleMap(row)"
v-if="row.iotNum > 0"
/> />
</template> </template>
</el-table-column> </el-table-column>