zhulizhen1111 4 years ago
parent
commit
f562938827

+ 4 - 4
src/views/equipment/eqDialog.vue

@@ -68,13 +68,13 @@
                             major='暖通'
                         ></tableList>
                         <!-- 重要维保表格 -->
-                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></wb-table>
+                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :tabLabel='tabLabel' :assetnum='""' :diff='diff' :size='10'></wb-table>
                         <!-- 日常维保表格 -->
-                        <rcwb-table v-else-if='value.id=="RB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></rcwb-table>
+                        <rcwb-table v-else-if='value.id=="RB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :assetnum='""' :size='10'></rcwb-table>
                         <!-- 重要维修的表格 -->
-                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></wx-table>
+                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :tabLabel='tabLabel' :assetnum='""' :diff='diff' :size='10'></wx-table>
                         <!-- 日常维修的表格 -->
-                        <rcwx-table v-else-if='value.id=="RX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></rcwx-table>
+                        <rcwx-table v-else-if='value.id=="RX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :assetnum='""' :size='10'></rcwx-table>
                         <!-- 专维 -->
                         <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='difference' :major='dialogInfo.id'></zw-table>
                         <!-- 其他 -->

+ 9 - 8
src/views/equipment/table/eqDetaileDialog.vue

@@ -109,20 +109,20 @@
             <div v-if='activeId==1'>
                 <el-tabs v-model='activeName1' @tab-click='handleClickWb'>
                     <el-tab-pane label='重要维保' name='wb1'>
-                        <wbTable ref='wb1' :smsxt='smsxt' tabLabel='重要维保' :diff='diff' :size='3'></wbTable>
+                        <wbTable ref='wb1' :smsxt='smsxt' tabLabel='重要维保' :diff='diff' :assetnum='row.assetnum' :size='3'></wbTable>
                     </el-tab-pane>
                     <el-tab-pane label='日常维保' name='wb2'>
-                        <rcwbTable ref='wb2' :smsxt='smsxt' tabLabel='日常维保' :diff='diff' :size='3'></rcwbTable>
+                        <rcwbTable ref='wb2' :smsxt='smsxt' tabLabel='日常维保' :diff='diff' :assetnum='row.assetnum' :size='3'></rcwbTable>
                     </el-tab-pane>
                 </el-tabs>
             </div>
             <div v-if='activeId==2'>
                 <el-tabs v-model='activeName2' @tab-click='handleClickWx'>
                     <el-tab-pane label='重要维修' name='wx1'>
-                        <wxTable ref='wx1' :smsxt='smsxt' tabLabel='重要维修' :diff='diff' :size='3'></wxTable>
+                        <wxTable ref='wx1' :smsxt='smsxt' tabLabel='重要维修' :diff='diff' :assetnum='row.assetnum' :size='3'></wxTable>
                     </el-tab-pane>
                     <el-tab-pane label='日常维修' name='wx2'>
-                        <rcwxTable ref='wx2' :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :size='3'></rcwxTable>
+                        <rcwxTable ref='wx2' :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :assetnum='row.assetnum' :size='3'></rcwxTable>
                     </el-tab-pane>
                 </el-tabs>
             </div>
@@ -181,6 +181,7 @@ export default {
     },
     props: ['row', 'major', 'smsxt', 'diff'],
     mounted() {
+        console.log(this.row)
         this.queryTableList()
         this.tabFind()
         this.getFloorAllSelect()
@@ -369,11 +370,11 @@ export default {
     flex-direction: column;
     .qdxq-top {
         .gdqd-dialog-top {
-            margin-bottom: 20px;
+            // margin-bottom: 20px;
         }
         .gdqd-dialog-bottom {
-            overflow: auto;
-            max-height: 10vh;
+            overflow: hidden;
+            max-height: 9vh;
         }
     }
     .qdxq-bottom {
@@ -428,7 +429,7 @@ export default {
             height: 0;
         }
         .el-tabs {
-            height: 80vh;
+            height: 95vh;
         }
         .el-tabs__content {
             height: calc(100% - 45px);

+ 11 - 11
src/views/equipment/table/rcwbTable.vue

@@ -148,7 +148,7 @@
     </div>
 </template>
 <script>
-import {queryWb} from '@/api/room.js'
+import { queryWb } from '@/api/room.js'
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
 import inputDialog from './inputDIalog'
@@ -198,7 +198,7 @@ export default {
             tableMaxHeight: 0,
         }
     },
-    props: ['smsxt', 'diff', 'tabLabel','size'],
+    props: ['smsxt', 'diff', 'tabLabel', 'size', 'assetnum'],
     computed: {
         ...mapGetters(['floorSelect', 'plazaId']),
     },
@@ -239,7 +239,7 @@ export default {
             this.currentPage = page
             this.getList()
         },
-         // 下拉框数据
+        // 下拉框数据
         changeSelect() {
             this.department = []
             let postParams = [
@@ -281,7 +281,7 @@ export default {
                 }
             })
         },
-        getList() {     
+        getList() {
             let data = {
                 smsxt: this.smsxt,
                 plazaId: this.plazaId,
@@ -327,15 +327,15 @@ export default {
             if (this.rwbh) {
                 data.keyword += `${this.rwbh}:wb_gzglid;`
             }
-            if(this.bill){
-                  data.keyword += `${this.bill}:wonum;`
+            if (this.bill) {
+                data.keyword += `${this.bill}:wonum;`
             }
             if (data.keyword == '') {
                 delete data.keyword
             }
-             queryWb({getParams:data}).then((res) => {
+            queryWb({ getParams: data }).then((res) => {
                 this.total = res.count
-                this.tableData = res.data ? res.data: []
+                this.tableData = res.data ? res.data : []
             })
         },
         clickPic(row) {
@@ -351,14 +351,14 @@ export default {
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
         },
-        startMethods(){
+        startMethods() {
             this.changeSelect()
             this.getList()
             this.$nextTick(() => {
                 // 页面渲染完成后的回调
                 this.tableMaxHeight = this.$refs.tableBox.offsetHeight
             })
-        }
+        },
     },
     watch: {
         diff(newV, oldV) {
@@ -381,7 +381,7 @@ export default {
         },
     },
     mounted() {
-       this.startMethods()
+        this.startMethods()
     },
 }
 </script>

+ 9 - 9
src/views/equipment/table/rcwxTable.vue

@@ -156,7 +156,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['smsxt', 'diff', 'tabLabel','size'],
+    props: ['smsxt', 'diff', 'tabLabel', 'size', 'assetnum'],
     methods: {
         //序号的方法
         indexMethod(index) {
@@ -203,8 +203,8 @@ export default {
                 getParams.data.wotjyssjStartDate = this.real[0] + '000000'
                 getParams.data.wotjyssjEndDate = this.real[1] + '000000'
             }
-            if(this.source && this.source != '全部'){
-                 getParams.data.bxfwlymc = this.source
+            if (this.source && this.source != '全部') {
+                getParams.data.bxfwlymc = this.source
             }
             //输入框搜索
             getParams.data.keyword = ''
@@ -238,7 +238,7 @@ export default {
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
         },
-        startMethods(){
+        startMethods() {
             this.tabFind()
             this.getList()
             this.$nextTick(() => {
@@ -246,7 +246,7 @@ export default {
                 this.tableMaxHeight = this.$refs.tableBox.offsetHeight
             })
         },
-         //下拉框查询
+        //下拉框查询
         tabFind() {
             let postParams = [
                 {
@@ -256,13 +256,13 @@ export default {
                     },
                     tableName: 'sms_wxzy', //视图名称
                 },
-            ] 
+            ]
             let data = {
                 plazaId: this.$store.state.plazaId,
             }
             querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
-                let bxfwlymc = res.data && res.data.data && res.data.data.sms_zxzy?res.data.data.sms_zxzy.bxfwlymc:[]
+                let bxfwlymc = res.data && res.data.data && res.data.data.sms_zxzy ? res.data.data.sms_zxzy.bxfwlymc : []
                 this.sourceOption = []
                 this.sourceOption.push({
                     name: '全部',
@@ -280,12 +280,12 @@ export default {
     watch: {
         diff(newV, oldV) {
             if (newV !== oldV) {
-               this.startMethods()
+                this.startMethods()
             }
         },
         tabLabel(newV, oldV) {
             if (newV !== oldV) {
-             this.startMethods()
+                this.startMethods()
             }
         },
     },

+ 1 - 1
src/views/equipment/table/wbTable.vue

@@ -174,7 +174,7 @@ export default {
             tableMaxHeight: 0
         }
     },
-    props: ['smsxt', 'diff', 'tabLabel','size'],
+    props: ['smsxt', 'diff', 'tabLabel','size','assetnum'],
     computed: {
         ...mapGetters(['floorSelect'])
     },

+ 4 - 4
src/views/equipment/table/wxTable.vue

@@ -177,7 +177,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['smsxt', 'diff', 'tabLabel','size'],
+    props: ['smsxt', 'diff', 'tabLabel', 'size', 'assetnum'],
     methods: {
         //序号的方法
         indexMethod(index) {
@@ -258,13 +258,13 @@ export default {
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
         },
-        startMethods(){
+        startMethods() {
             this.getList()
             this.$nextTick(() => {
                 // 页面渲染完成后的回调
                 this.tableMaxHeight = this.$refs.tableBox.offsetHeight
             })
-        }
+        },
     },
     watch: {
         diff(newV, oldV) {
@@ -291,7 +291,7 @@ export default {
         },
     },
     mounted() {
-       this.startMethods()
+        this.startMethods()
     },
 }
 </script>