weiz
/
suyuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新后台

This commit is contained in:
yaooo 2023-11-29 17:22:10 +08:00
parent fe5be17613
commit fd5077e500
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/src/views/device/detail.vue
View File

@ -133,10 +133,10 @@ const getDetails = async () => {
deviceData.device.status = res.status deviceData.device.status = res.status
deviceData.device.is_online = res.is_online deviceData.device.is_online = res.is_online
deviceData.device.is_bind = res.is_bind deviceData.device.is_bind = res.is_bind
deviceData.device.land_id = res.land_id deviceData.device.land_id = res.land_id == null ? '' : res.land_id
deviceData.device.land_title = res.land_title deviceData.device.land_title = res.land_title == null ? '' : res.land_title
deviceData.device.product_id = res.product_id deviceData.device.product_id = res.product_id == null ? '' : res.product_id
deviceData.device.product_name = res.product_name deviceData.device.product_name = res.product_name == null ? '' : res.product_name
deviceData.monitor_item = res.monitor_item deviceData.monitor_item = res.monitor_item
}) })
.catch((err: any) => { .catch((err: any) => {

2
admin/src/views/device/index.vue
View File

@ -106,7 +106,6 @@
<dict-value :options="dictData.device_type" :value="row.type" /> <dict-value :options="dictData.device_type" :value="row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备编码" width="120" prop="code" show-overflow-tooltip />
<el-table-column label="所属土地" width="200"> <el-table-column label="所属土地" width="200">
<template #default="{ row }"> <template #default="{ row }">
<el-tag class="mr-2" type="info">ID: {{ row.land_id }}</el-tag> <el-tag class="mr-2" type="info">ID: {{ row.land_id }}</el-tag>
@ -119,6 +118,7 @@
<el-tag class="mr-2" type="info">名称: {{ row.product_name }}</el-tag> <el-tag class="mr-2" type="info">名称: {{ row.product_name }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备编码" width="120" prop="code" show-overflow-tooltip />
<el-table-column label="设备状态" width="100" align="center" prop="status"> <el-table-column label="设备状态" width="100" align="center" prop="status">
<template #default="{ row }"> <template #default="{ row }">
<dict-value :options="dictData.device_status" :value="row.status" /> <dict-value :options="dictData.device_status" :value="row.status" />

2
admin/src/views/product/index.vue
View File

@ -66,8 +66,8 @@
<el-tag class="mr-2" type="info">账户: {{ row.account }}</el-tag> <el-tag class="mr-2" type="info">账户: {{ row.account }}</el-tag>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="产品编号" prop="code" show-overflow-tooltip />
<el-table-column label="产品名称" prop="name" show-overflow-tooltip /> <el-table-column label="产品名称" prop="name" show-overflow-tooltip />
<el-table-column label="产品编号" prop="code" show-overflow-tooltip />
<el-table-column label="所属土地" width="200"> <el-table-column label="所属土地" width="200">
<template #default="{ row }"> <template #default="{ row }">
<el-tag class="mr-2" type="info">ID: {{ row.land_id }}</el-tag> <el-tag class="mr-2" type="info">ID: {{ row.land_id }}</el-tag>