Selaa lähdekoodia

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan 4 vuotta sitten
vanhempi
commit
22c94f9a75
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 2 2
      src/views/analysis/CoreDeviceReport.vue
  2. 1 1
      src/views/room/index.vue

+ 2 - 2
src/views/analysis/CoreDeviceReport.vue

@@ -41,9 +41,9 @@
                 <Input iconType='search' v-model='searchKey' placeholder='搜索' width='192' @pressEnter='getTableData' @clear='getTableData' />
             </div>
             <el-table :data='tableData' style='width: 100%;margin-bottom: 63px;' @row-click='showEquipmentStatus'>
-                <el-table-column label='序号' type='index' :index='indexMethod'></el-table-column>
+                <el-table-column label='序号' width='50' type='index' :index='indexMethod'></el-table-column>
                 <el-table-column prop='sbjc' label='设备简称'></el-table-column>
-                <el-table-column prop='assetnum' label='设备编号'></el-table-column>
+                <el-table-column prop='assetnum' label='设备内码'></el-table-column>
                 <el-table-column prop='is_exception' label='状态'>
                     <template slot-scope='scope'>
                         <span

+ 1 - 1
src/views/room/index.vue

@@ -875,7 +875,7 @@ export default {
                 this.smsxtArr = res.data ? res.data[0] : {}
                 // 5201 设备间   5204设备间  5209设备间
                 this.showLocationflid = false
-                if (this.smsxtArr.length > 0) {
+                if (Object.keys(this.smsxtArr).length > 0) {
                     let locationflid = this.smsxtArr.locationflid
                     if (locationflid == '5201' || locationflid == '5204' || locationflid == '5209') {
                         this.showLocationflid = true