|
@@ -114,7 +114,7 @@
|
|
|
>
|
|
|
<el-table-column type='index' label='序号' width='50' :index='indexMethod'></el-table-column>
|
|
|
<el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
|
|
|
- <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
|
|
|
+ <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop='assetnum' label='设备编号' :show-overflow-tooltip='true'>
|
|
|
<template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
|
|
@@ -303,9 +303,9 @@ export default {
|
|
|
}
|
|
|
if (this.mcbhChange) {
|
|
|
if (data.keyword) {
|
|
|
- data.keyword = `${data.keyword + ';' + this.mcbhChange}:sbjc,sbbh`
|
|
|
+ data.keyword = `${data.keyword + ';' + this.mcbhChange}:type_name,sbbh`
|
|
|
} else {
|
|
|
- data.keyword = `${this.mcbhChange}:sbjc,sbbh`
|
|
|
+ data.keyword = `${this.mcbhChange}:type_name,sbbh`
|
|
|
}
|
|
|
}
|
|
|
if (this.ssppbh) {
|
|
@@ -342,8 +342,8 @@ export default {
|
|
|
if (res.data.data) {
|
|
|
let sb_status = [],
|
|
|
sbglgs = []
|
|
|
- sb_status = res.data.data.sms_asset.sb_status ? res.data.data.sms_asset.sb_status : []
|
|
|
- sbglgs = res.data.data.sms_asset.sbglgs ? res.data.data.sms_asset.sbglgs : []
|
|
|
+ sb_status = res.data.data.sms_asset ? res.data.data.sms_asset.sb_status : []
|
|
|
+ sbglgs = res.data.data.sms_asset ? res.data.data.sms_asset.sbglgs : []
|
|
|
if (sb_status.length > 0) {
|
|
|
sb_status.forEach(el => {
|
|
|
let obj = {
|