zhulizhen1111 4 years ago
parent
commit
a0656a1b83

BIN
node_modules.zip


+ 4 - 0
src/api/equipmentList.js

@@ -29,6 +29,10 @@ export function queryWbsms({ data, getParams }) {
 export function queryWx({ data, getParams }) {
     return httputils.getJson(`/data/sms_wx/query`, data, getParams)
 }
+// 设备设施-维修专业事项
+export function queryWxzy({ data, getParams }) {
+    return httputils.getJson(`/data/sms_wxzy/query`, data, getParams)
+}
 
 // 设备设施-专维
 export function queryZw({ data, getParams }) {

+ 52 - 54
src/views/equipment/table/eqDetaileDialog.vue

@@ -1,11 +1,11 @@
 
 <template>
     <!-- 详情页面 -->
-    <div class='gdqd-dialog'>
+    <div class='gdqd-dialog1'>
         <div class='top'></div>
         <div class='qdxq-top'>
             <div class='gdqd-dialog-top'>
-                <el-input
+                <!-- <el-input
                     placeholder='搜索设备简称编号'
                     style='width:192px;margin-right:12px'
                     size='small'
@@ -55,12 +55,12 @@
                     size='small'
                     prefix-icon='el-icon-search'
                     v-model='wzjc'
-                ></el-input>
+                ></el-input>-->
                 <!-- 多余的筛选 -->
-                <input-dialog :type='1' @confirm='confirm'></input-dialog>
+                <!-- <input-dialog :type='1' @confirm='confirm'></input-dialog> -->
             </div>
-            <div class="gdqd-dialog-bottom">
-                <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
+            <div class='gdqd-dialog-bottom'>
+                <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;margin-bottom:30px'>
                     <el-table-column type='index' label='序号' width='60'></el-table-column>
                     <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='338'>
                         <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
@@ -100,30 +100,29 @@
                     </el-table-column>
                 </el-table>
             </div>
-           
         </div>
         <div class='qdxq-bottom'>
-            <div class="wb-title">
-                <div class="tab-title" id="1" :class='activeId==1?"active-is":""' @click="tabClick(1)">维保</div>
-                <div class="tab-title" id="2" :class='activeId==2?"active-is":""' @click="tabClick(2)">维修</div>
+            <div class='wb-title'>
+                <div class='tab-title' id='1' :class='activeId==1?"active-is":""' @click='tabClick(1)'>维保</div>
+                <div class='tab-title' id='2' :class='activeId==2?"active-is":""' @click='tabClick(2)'>维修</div>
             </div>
-            <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>
+            <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>
                     </el-tab-pane>
-                    <el-tab-pane label="日常维保" name="wb2">
-                        <rcwbTable ref="wb2" :smsxt='smsxt' tabLabel='日常维保'  :diff='diff' :size='3'></rcwbTable>
+                    <el-tab-pane label='日常维保' name='wb2'>
+                        <rcwbTable ref='wb2' :smsxt='smsxt' tabLabel='日常维保' :diff='diff' :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>
+            <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>
                     </el-tab-pane>
-                    <el-tab-pane label="日常维修" name="wx2">
-                        <rcwxTable ref="wx2" :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :size='3'></rcwxTable>
+                    <el-tab-pane label='日常维修' name='wx2'>
+                        <rcwxTable ref='wx2' :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :size='3'></rcwxTable>
                     </el-tab-pane>
                 </el-tabs>
             </div>
@@ -136,10 +135,10 @@ import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
 import { querySelect } from '@/api/public.js'
 import inputDialog from './inputDIalog'
-import rcwbTable  from './rcwbTable'
-import wbTable  from './wbTable'
-import rcwxTable  from './rcwxTable'
-import  wxTable  from './wxTable'
+import rcwbTable from './rcwbTable'
+import wbTable from './wbTable'
+import rcwxTable from './rcwxTable'
+import wxTable from './wxTable'
 export default {
     data() {
         return {
@@ -164,9 +163,9 @@ export default {
             sbglgsOption: [],
             statusOption: [],
             floorAllSelect: [],
-            activeId:'1',
-            activeName1:'wb1',
-            activeName2:'wx1'
+            activeId: '1',
+            activeName1: 'wb1',
+            activeName2: 'wx1',
         }
     },
     components: {
@@ -175,28 +174,28 @@ export default {
         rcwbTable,
         wbTable,
         rcwxTable,
-        wxTable
+        wxTable,
     },
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['row', 'major','smsxt','diff'],
+    props: ['row', 'major', 'smsxt', 'diff'],
     mounted() {
         this.queryTableList()
         this.tabFind()
         this.getFloorAllSelect()
     },
     methods: {
-        tabClick(item){
+        tabClick(item) {
             this.activeId = item
         },
-        handleClickWb(label){
+        handleClickWb(label) {
             console.log(label)
             console.log(this.$refs[`${label.name}`])
             this.$refs[`${label.name}`].startMethods()
         },
-        handleClickWx(label){
-             this.$refs[`${label.name}`].startMethods()
+        handleClickWx(label) {
+            this.$refs[`${label.name}`].startMethods()
         },
         innerTable(row) {
             console.log(row)
@@ -285,7 +284,7 @@ export default {
             }
             let data = {
                 major: major,
-                plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
             }
             //输入框搜索
             data.keyword = ''
@@ -364,7 +363,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.gdqd-dialog {
+.gdqd-dialog1 {
     height: 100vh;
     display: flex;
     flex-direction: column;
@@ -372,31 +371,30 @@ export default {
         .gdqd-dialog-top {
             margin-bottom: 20px;
         }
-        .gdqd-dialog-bottom{
+        .gdqd-dialog-bottom {
             overflow: auto;
-            max-height: calc(24vh - 32px);
-            
+            max-height: 10vh;
         }
     }
     .qdxq-bottom {
         //max-height: 76vh;
         flex: 1;
-        .wb-title{
-            display:flex;
+        .wb-title {
+            display: flex;
             height: 48px;
             line-height: 48px;
-            background: #F5F6F7;
+            background: #f5f6f7;
             margin: 20px 0;
-            .tab-title{
+            .tab-title {
                 padding: 4px 16px;
             }
-            &:hover{
+            &:hover {
                 cursor: pointer;
-                color: #025BAA;
+                color: #025baa;
             }
-            .active-is{
-                color: #025BAA;
-                border-bottom:2px solid #025BAA;
+            .active-is {
+                color: #025baa;
+                border-bottom: 2px solid #025baa;
                 cursor: pointer;
             }
         }
@@ -409,7 +407,7 @@ export default {
 }
 </style>
 <style lang="less">
-.gdqd-dialog {
+.gdqd-dialog1 {
     /deep/.el-table td {
         cursor: pointer;
     }
@@ -430,7 +428,7 @@ export default {
             height: 0;
         }
         .el-tabs {
-            height: 38vh;
+            height: 80vh;
         }
         .el-tabs__content {
             height: calc(100% - 45px);
@@ -463,10 +461,10 @@ export default {
         }
         .el-tabs__active-bar {
             background-color: transparent !important;
-        } 
+        }
     }
 }
-/deep/.el-dialog{
-    margin-top:5vh!important
+/deep/.el-dialog {
+    margin-top: 5vh !important;
 }
 </style>

+ 14 - 12
src/views/equipment/table/rcwxTable.vue

@@ -123,7 +123,7 @@
     </div>
 </template>
 <script>
-import { queryWx } from '@/api/equipmentList.js'
+import { queryWxzy } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
 import { Select } from 'meri-design'
@@ -188,21 +188,23 @@ export default {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
-                    diff: this.diff,
+                    // diff: this.diff,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
                     size: this.size,
                 },
             }
             //下拉
-
-            if (this.sjjssj) {
-                getParams.data.sjjssjStartDate = this.sjjssj[0] + '000000'
-                getParams.data.sjjssjEndDate = this.sjjssj[1] + '000000'
-            }
             if (this.reportdate) {
-                getParams.data.reportdateStartDate = this.reportdate[0] + '000000'
-                getParams.data.reportdateEndDate = this.reportdate[1] + '000000'
+                getParams.data.schedfinishStartDate = this.reportdate[0] + '000000'
+                getParams.data.schedfinishEndDate = this.reportdate[1] + '000000'
+            }
+            if (this.real) {
+                getParams.data.wotjyssjStartDate = this.real[0] + '000000'
+                getParams.data.wotjyssjEndDate = this.real[1] + '000000'
+            }
+            if(this.source && this.source != '全部'){
+                 getParams.data.bxfwlymc = this.source
             }
             //输入框搜索
             getParams.data.keyword = ''
@@ -212,13 +214,13 @@ export default {
             if (this.matters) {
                 getParams.data.keyword += `${this.matters}:description,matters;`
             }
-            if (this.wonum2) {
-                getParams.data.keyword += `${this.wonum2}:wonum`
+            if (this.locationName) {
+                getParams.data.keyword += `${this.locationName}:wzjc`
             }
             if (getParams.data.keyword == '') {
                 delete getParams.data.keyword
             }
-            queryWx(getParams).then((res) => {
+            queryWxzy(getParams).then((res) => {
                 this.tableData = res.data || []
                 this.total = res.count
             })