소스 검색

机房钻取表title

zhulizhen1111 4 년 전
부모
커밋
abc685fd87
3개의 변경된 파일11개의 추가작업 그리고 10개의 파일을 삭제
  1. 5 5
      src/views/room/detail.vue
  2. 3 2
      src/views/room/index.vue
  3. 3 3
      src/views/room/room3.vue

+ 5 - 5
src/views/room/detail.vue

@@ -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 = {

+ 3 - 2
src/views/room/index.vue

@@ -130,6 +130,7 @@
                         <room-table3
                             v-if='table3.length>=0'
                             :table3='table3'
+                            :systemName='systemName'
                             :loading='loading2'
                             :page='page2'
                             :total='total2'
@@ -632,9 +633,9 @@ export default {
             }
             if (this.sbjcInput) {
                 if (data.keyword) {
-                    data.keyword = `${data.keyword + ';' + this.sbjcInput}:sbjc`
+                    data.keyword = `${data.keyword + ';' + this.sbjcInput}:type_name`
                 } else {
-                    data.keyword = `${this.sbjcInput}:sbjc`
+                    data.keyword = `${this.sbjcInput}:type_name`
                 }
             }
             if (this.ppxhInput) {

+ 3 - 3
src/views/room/room3.vue

@@ -11,7 +11,7 @@
             >
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='150'>
-                    <template slot-scope='{row}'>{{row.classqc||'--'}}</template>
+                    <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='数量' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
@@ -41,7 +41,7 @@
                 @current-change='pageChanged'
             ></el-pagination>
         </div>
-        <el-dialog width='90%' title='设备清单' :visible.sync='innerVisible' append-to-body>
+        <el-dialog width='90%' :title='`${systemName}-${row.type_name}`' :visible.sync='innerVisible' append-to-body>
             <detail v-if='row' :row='row' :floorChange='floorChange'></detail>
         </el-dialog>
     </div>
@@ -53,7 +53,7 @@ import { Select } from 'meri-design'
 import Detail from './detail'
 
 export default {
-    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange'],
+    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange', 'systemName'],
     data() {
         return {
             innerVisible: false,