YaolongHan 4 years ago
parent
commit
46dacc4481

+ 3 - 0
src/views/equipment/eqDialog.vue

@@ -319,6 +319,9 @@ export default {
                     })
                 })
             }
+            if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             queryTab({ data, postParams }).then((res) => {
                 this.tabCount = []
                 let data = res.data.data || []

+ 7 - 0
src/views/equipment/table/eqDetaileDialog.vue

@@ -206,6 +206,9 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId,
             }
+            if(major!='土建'){
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let sb_status = res.data.data.sms_asset.sb_status
@@ -259,6 +262,10 @@ export default {
                 page: this.page,
                 size: this.size,
             }
+            //区分主要设备
+            if(this.major != '土建'){
+                data.onlyMainAsset = true
+            }
             //输入框搜索
             data.keyword = ''
             if (this.sbjc) {

+ 4 - 0
src/views/equipment/table/eqListTable.vue

@@ -146,6 +146,10 @@ export default {
                 plazaId: this.$store.state.plazaId,
                 major: this.major,
             }
+            //区分土建主要设备
+            if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             //下拉
             if (this.floor && this.floor != 1) {
                 postParams.gname = this.floor

+ 4 - 0
src/views/equipment/table/equipDetail.vue

@@ -162,6 +162,10 @@ export default {
                 brand: this.row.brand || '--',
                 assetnum: this.assetnum,
             }
+            //区分主要设备
+            if (this.smsxt != '1008') {
+                data.onlyMainAsset = true
+            }
             queryAsset({ data, postParams }).then((res) => {
                 //console.log(res)
                 this.tableData = res.data.data

+ 3 - 0
src/views/equipment/table/otherTable.vue

@@ -187,6 +187,9 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId
             }
+             if(major!='土建'){
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then(res => {
                 //console.log(res)
                 let handleresults = res.data.data?res.data.data.sms_qtsx.handleresults:[]

+ 7 - 0
src/views/equipment/table/rcwbTable.vue

@@ -250,6 +250,9 @@ export default {
             let data = {
                 plazaId: this.plazaId,
             }
+            if(this.smsxt!='1008'){
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 let status = [],
                     zt = [],
@@ -288,6 +291,10 @@ export default {
                 size: this.size,
                 orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;',
             }
+            //区分主要设备和全部设备
+            if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             if (this.assetnum) {
                 data.assetnum = this.assetnum
             }

+ 8 - 1
src/views/equipment/table/rcwxTable.vue

@@ -197,6 +197,10 @@ export default {
                     size: this.size,
                 },
             }
+            //区分主要设备和全部设备
+            if(this.smsxt != '1008'){
+                getParams.data.onlyMainAsset = true
+            }
             if (this.assetnum) {
                 getParams.data.assetnum = this.assetnum
             }
@@ -218,7 +222,7 @@ export default {
                 getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`
             }
             if (this.matters) {
-                getParams.data.keyword += `${this.matters}:description,matters;`
+                getParams.data.keyword += `${this.matters}:description;`
             }
             if (this.locationName) {
                 getParams.data.keyword += `${this.locationName}:location;`
@@ -268,6 +272,9 @@ export default {
             let data = {
                 plazaId: this.$store.state.plazaId,
             }
+            if(this.smsxt!='1008'){
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let bxfwlymc = res.data && res.data.data && res.data.data.sms_wxzy ? res.data.data.sms_wxzy.bxfwly : []

+ 4 - 0
src/views/equipment/table/standTable.vue

@@ -152,6 +152,10 @@ export default {
                 major: major,
                 // floor:this.floor
             }
+             //区分土建主要设备
+            if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             //下拉
             if (this.floor && this.floor != 1) {
                 postParams.gname = this.floor

+ 4 - 0
src/views/equipment/table/wbTable.vue

@@ -221,6 +221,10 @@ export default {
                     size: this.size,
                 },
             }
+            //区分主要设备和全部设备
+            if(this.smsxt != '1008'){
+                getParams.data.onlyMainAsset = true
+            }
             if (this.diff) {
                 getParams.data.diff = this.diff
             }

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

@@ -211,6 +211,10 @@ export default {
                     size: this.size,
                 },
             }
+            //区分主要设备
+            if(this.smsxt != '1008'){
+                getParams.data.onlyMainAsset = true
+            }
             if (this.diff) {
                 getParams.data.diff = this.diff
             }

+ 4 - 7
src/views/equipment/table/zwTable.vue

@@ -63,13 +63,7 @@
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @confirm='confirm'></input-dialog>
         </div>
         <div ref='tableBox'>
-            <el-table
-                :data='tableData'
-                :border='true'
-                style='width: 100%'
-                @row-click='innerTable'
-                v-if='tableData.length>=0'
-            >
+            <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable' v-if='tableData.length>=0'>
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
                 <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='60'>
                     <template slot-scope='{row}'>{{row.nd || '--'}}</template>
@@ -215,6 +209,9 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId,
             }
+            if (this.major != '土建') {
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let lb = res.data.data.sms_zw.lb

+ 3 - 0
src/views/other/index.vue

@@ -108,6 +108,9 @@ export default {
                     postParams.push(obj)
                 })
             }
+             if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             queryTab({ data, postParams }).then((res) => {
                 //console.log('查询哪几层楼有图', res)
                 this.floorData = []

+ 315 - 27
src/views/room/index.vue

@@ -744,33 +744,321 @@ export default {
       this.page1 = val;
       this.Index1();
     },
-    Index2Emit(val) {
-      this.page2 = val;
-      this.Index2();
-    },
-    Index3Emit(val) {
-      this.page3 = val;
-      this.Index3();
-    },
-    Index4Emit(val) {
-      this.page4 = val;
-      this.Index4();
-    },
-    // 机房维修记录
-    Index3() {
-      let getParams = {
-        data: {
-          smsxt: this.smsxtArr.smsxt,
-          // diff: this.diff,
-          plazaId: this.plazaId,
-          page: this.page3,
-          size: this.size3
-        }
-      };
-      //////////待定
-    //   if (this.assetnum) {
-    //     getParams.data.assetnum = this.assetnum;
-    //   }
+    methods: {
+        handleClick(tab) {
+            if (tab.label == '机房布置图') {
+                this.Index(this.smsxtArr.smsxt)
+            } else if (tab.label == '配电室低压柜及出线明细表') {
+                this.Index1()
+                this.$refs.roomTable2.computedHeight()
+            } else if (tab.label == '机房内核心设备') {
+                this.Index2()
+                this.$refs.roomTable3.computedHeight()
+            } else if (tab.label == '核心设备日常维修') {
+                this.Index3()
+                this.$refs.roomTable4.computedHeight()
+            } else if (tab.label == '核心设备日常维保') {
+                this.Index4()
+                this.changeSelect()
+                this.$refs.roomTable5.computedHeight()
+            }
+        },
+        // 右上角的筛选点击按钮
+        show() {
+            this.dialogFormVisible = !this.dialogFormVisible
+        },
+        Index(system) {
+            this.picFloor = this.$cookie.get('floorNow')
+            let getParams = {
+                typename: '位置布置图',
+                location: this.location,
+                module: '1002',
+                // system: system,
+                plazaId: this.plazaId,
+            }
+            if (system) {
+                getParams.system = system
+            }
+            queryPic({ getParams }).then((res) => {
+                //console.log('机房布置图', res)
+                this.tableImg = res.data ? res.data : []
+                //判断有没有图片,有图片默认显示按钮是第一个tab,没有图片显示的是第二个tab
+                if (this.tableImg.length > 0) {
+                    this.activeName = '1'
+                } else if (this.showLocationflid) {
+                    this.activeName = '2'
+                    this.Index1()
+                } else {
+                    this.activeName = '3'
+                    this.Index2()
+                }
+            })
+        },
+        // 明细表
+        Index1() {
+            let getParams = {
+                location: this.location,
+                plazaId: this.plazaId,
+                page: this.page1,
+                size: this.size1
+            }
+            if (this.floor2 && this.floor2 != '全部') {
+                getParams.floor = this.floor2
+            }
+            if (this.ctbhInput) {
+                if (getParams.keyword) {
+                    getParams.keyword = `${getParams.keyword + ';' + this.ctbhInput}:drawernum`
+                } else {
+                    getParams.keyword = `${this.ctbhInput}:drawernum`
+                }
+            }
+            if (this.cxggInput) {
+                if (getParams.keyword) {
+                    getParams.keyword = `${getParams.keyword + ';' + this.cxggInput}:outspec`
+                } else {
+                    getParams.keyword = `${this.cxggInput}:outspec`
+                }
+            }
+            if (this.djbhInput) {
+                if (getParams.keyword) {
+                    getParams.keyword = `${getParams.keyword + ';' + this.djbhInput}:wellnum`
+                } else {
+                    getParams.keyword = `${this.djbhInput}:wellnum`
+                }
+            }
+            if (this.kzhlInput) {
+                if (getParams.keyword) {
+                    getParams.keyword = `${getParams.keyword + ';' + this.kzhlInput}:control`
+                } else {
+                    getParams.keyword = `${this.kzhlInput}:control`
+                }
+            }
+            queryDygjcxline({ getParams }).then((res) => {
+                if (res.result == 'success') {
+                    this.loading1 = false
+                    this.total1 = res.count
+                    this.table2 = res.data ? res.data : []
+                    //console.log('明细表', res)
+                    if (this.table2.length == 0) {
+                    }
+                }
+            })
+        },
+        // 核心设备
+        Index2() {
+            let postParams = {
+                location: this.location,
+                system_code:this.smsxtArr.smsxt
+            }
+            let data = {
+                plazaId: this.plazaId,
+                page: this.page2,
+                size: this.size2,
+            }
+            if (this.sbjcInput) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.sbjcInput}:type_name`
+                } else {
+                    data.keyword = `${this.sbjcInput}:type_name`
+                }
+            }
+            if (this.ppxhInput) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.ppxhInput}:brand,sbxh`
+                } else {
+                    data.keyword = `${this.ppxhInput}:brand,sbxh`
+                }
+            }
+            if (this.sccsInput) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.sccsInput}:manufacturer`
+                } else {
+                    data.keyword = `${this.sccsInput}:manufacturer`
+                }
+            }
+            // if (this.floorChange) {
+            //     postParams.gcname = this.floorChange
+            // }
+            queryHxsb({ data, postParams }).then((res) => {
+                this.loading2 = false
+                this.total2 = res.data.count
+                this.table3 = res.data.data ? res.data.data : []
+            })
+        },
+        Index1Emit(val) {
+            this.page1 = val
+            this.Index1()
+        },
+        Index2Emit(val) {
+            this.page2 = val
+            this.Index2()
+        },
+        Index3Emit(val) {
+            this.page3 = val
+            this.Index3()
+        },
+        Index4Emit(val) {
+            this.page4 = val
+            this.Index4()
+        },
+        // 机房维修记录
+        Index3() {
+            let getParams = {
+                location: this.location,
+                plazaId: this.plazaId,
+                page: this.page3,
+                size: this.size3,
+                orderBy: 'sjjssj,0;location,1',
+                smsxt:this.smsxtArr.smsxt
+            }
+            if (this.sfghSelect && this.sfghSelect != '全部') {
+                getParams.ismodel = this.sfghSelect
+            }
+            // 设备名称、编号
+            if (this.sbmcInput4) {
+                if (getParams.keyword) {
+                    getParams.keyword = `${getParams.keyword + ';' + this.sbmcInput4}:sbmc`
+                } else {
+                    getParams.keyword = `${this.sbmcInput4}:sbmc,location`
+                }
+            }
+            // 重要事项记录、描述
+            if (this.zysxInput4) {
+                if (getParams.keyword) {
+                    getParams.keyword = `${getParams.keyword + ';' + this.zysxInput4}:matters`
+                } else {
+                    getParams.keyword = `${this.zysxInput4}:matters,manufacturer`
+                }
+            }
+            // 搜索工单编号
+            if (this.gdbhInput4) {
+                if (getParams.keyword) {
+                    getParams.keyword = `${getParams.keyword + ';' + this.gdbhInput4}:wonum`
+                } else {
+                    getParams.keyword = `${this.gdbhInput4}:wonum`
+                }
+            }
+            // 填报时间
+            if (this.tbsjDate) {
+                getParams.reportedbyStartDate = this.tbsjDate[0] + '000000'
+                getParams.reportedbyEndDate = this.tbsjDate[1] + '000000'
+            }
+            // 验收时间
+            if (this.yssjDate) {
+                getParams.sjjssjStartDate = this.yssjDate[0] + '000000'
+                getParams.sjjssjEndDate = this.yssjDate[1] + '000000'
+            }
+
+            queryWxjf({ getParams }).then((res) => {
+                //console.log('维修', res)
+                if (res.result == 'success') {
+                    this.loading3 = false
+                    this.total3 = res.count
+                    this.table4 = res.data ? res.data : []
+                }
+            })
+        },
+        // 机房维保记录
+        Index4() {
+            let data = {
+                location: this.location,
+                plazaId: this.plazaId,
+                page: this.page4,
+                size: this.size4,
+                orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;',
+                smsxt:this.smsxtArr.smsxt
+            }
+            if(this.smsxtArr.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
+            // 任务开始日期
+            if (this.rwksrq) {
+                data.sjkssjStartDate = this.rwksrq[0] + '000000'
+                data.sjkssjEndDate = this.rwksrq[1] + '000000'
+            }
+            // 任务完成日期
+            if (this.rwwcrq) {
+                data.sjwcsjStartDate = this.rwwcrq[0] + '000000'
+                data.sjwcsjEndDate = this.rwwcrq[1] + '000000'
+            }
+            // 异常工单填报时间
+            if (this.ycgdtbsj) {
+                data.reportdateStartDate = this.ycgdtbsj[0] + '000000'
+                data.reportdateEndDate = this.ycgdtbsj[1] + '000000'
+            }
+            // 异常工单验收时间
+            if (this.ycgdyssj) {
+                data.sjjssjStartDate = this.ycgdyssj[0] + '000000'
+                data.sjjssjEndDate = this.ycgdyssj[1] + '000000'
+            }
+            //
+            // 是否正常
+            if (this.iszcSelect5 && this.iszcSelect5 != '全部') {
+                data.zt = this.iszcSelect5
+            }
+            // 任务状态
+            if (this.statuSelect5 && this.statuSelect5 != '全部') {
+                data.status = this.statuSelect5
+            }
+            if (this.sbmcInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.sbmcInput5}:sbmc,assetnum`
+                } else {
+                    data.keyword = `${this.sbmcInput5}:sbmc,assetnum`
+                }
+            }
+            if (this.wbsxjlInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.wbsxjlInput5}:matters`
+                } else {
+                    data.keyword = `${this.wbsxjlInput5}:matters,description`
+                }
+            }
+            if (this.rwbhInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.rwbhInput5}:wb_gzglid`
+                } else {
+                    data.keyword = `${this.rwbhInput5}:wb_gzglid`
+                }
+            }
+            if (this.ycgdbhInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.ycgdbhInput5}:wonum`
+                } else {
+                    data.keyword = `${this.ycgdbhInput5}:wonum`
+                }
+            }
+            queryWb({getParams:data}).then((res) => {
+                //console.log('维保', res)
+                this.loading4 = false
+                this.total4 = res.count
+                this.table5 = res.data ? res.data : []
+            })
+        },
+        confirm() {
+            this.Index3()
+        },
+        confirm2() {
+            this.Index4()
+        },
+        // 下拉框数据
+        changeSelect() {
+            this.department = []
+            let postParams = [
+                {
+                    columnName: { status: 'status', zt: 'zt' },
+                    tableName: 'sms_wbzy',
+                },
+            ]
+            let data = {
+                plazaId: this.plazaId,
+            }
+            querySelect({ data, postParams }).then((res) => {
+                //console.log('下拉框', res)
+                let status = [],
+                    zt = [],
+                    arr = [],
+                    arr1 = []
 
       //下拉
     // 监听下拉框

+ 4 - 0
vue.config.js

@@ -34,7 +34,11 @@ module.exports = {
             // 图例库服务
             "/serve": {
                 // target: 'http://192.168.200.87:8088',
+<<<<<<< HEAD
                 // target: 'http://10.199.143.129:8080',
+=======
+               // target: 'http://10.199.143.129:8080',
+>>>>>>> 3a6ed3b20db14fc2004f10c84ce0e9f3f6869cfb
                 target: 'http://60.205.177.43:8080',
                 changeOrigin: true,
                 pathRewrite: {