Sfoglia il codice sorgente

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

fujunwen 4 anni fa
parent
commit
453bf7e127

+ 7 - 11
src/components/floorMap/index.vue

@@ -165,13 +165,13 @@ export default {
     methods: {
         handleClickLegendItem(item, events) {
             this.tabData = { tableData: [], pointData: [] }
+            this.equipIds = []
             this.showBtnWell = false
             this.visible = false
             this.activeItem = null
             this.isLoading = true
             if (item.data.AttachObjectIds && item.data.AttachObjectIds.length) {
                 const e = events[0]
-                this.equipIds = []
                 this.activeItem = item
                 item.data.AttachObjectIds.forEach((v) => {
                     if (v.type == 'Image') {
@@ -714,19 +714,15 @@ export default {
         },
         /**
          * @description 处理popover显隐
-         * 当点击位置不在canvas内部时 ( 如点击 页面空白,图例,楼层,设备设施左侧列表项时),将popover的display置为none,
-         * 当点击位置在canvas内部时,将popover的display设置为'block'
+         * 当点击位置不在canvas内部时 ( 如点击 页面空白,图例,楼层,设备设施左侧列表项时),将visible置为false,隐藏popover
          */
         handlePopover(e) {
-            if (this.$refs.graphy.contains(e.target)) {
-                if (this.$refs.popover && this.$refs.popover.popperElm) {
-                    this.$refs.popover.popperElm.style.display = 'block'
-                }
-            } else {
-                if (this.$refs.popover && this.$refs.popover.popperElm) {
-                    this.$refs.popover.popperElm.style.display = 'none'
+            this.$nextTick(()=>{
+                if(!this.$refs.graphy.contains(e.target)){
+                    console.log(1111)
+                    this.visible = false
                 }
-            }
+            })
         },
     },
     watch: {

+ 2 - 1
src/lib/items/SCustomLegendItem.ts

@@ -211,7 +211,8 @@ export class SCustomLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 2 - 1
src/lib/items/SFHFQZoneLegendItem.ts

@@ -206,7 +206,8 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 2 - 1
src/lib/items/SSCPZZoneLegendItem.ts

@@ -214,7 +214,8 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 2 - 1
src/lib/items/SZoneLegendItem.ts

@@ -207,7 +207,8 @@ export class SZoneLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 17 - 115
src/views/equipment/table/eqDetaileDialog.vue

@@ -59,118 +59,41 @@
                 <input-dialog :type='1' @confirm='confirm'></input-dialog>
             </div>
             <div class='gdqd-dialog-bottom'>
-                <el-table
-                    @row-click='innerTable'
-                    :data='tableData'
-                    :key='key'
-                    :border='true'
-                    style='width: 100%'
-                    :highlight-current-row='true'
-                >
-                    <el-table-column type='index' label='序号' width='60'>
-                        <template slot-scope='{row,$index}'>
-                            <div v-if='row.assetuid'>{{$index + 1}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{$index + 1}}</div>
-                            </el-popover>
-                        </template>
-                    </el-table-column>
+                <!-- TODO: 宽度修改 -->
+                <el-table @row-click='innerTable' :data='tableData' :key='key' :border='true' style='width: 100%' :highlight-current-row='true'>
+                    <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.sbjc || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.sbjc || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
-                        <!-- <template slot-scope='{row}'>{{row.assetnum || '--'}}</template> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.assetnum || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.assetnum || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
-                        <!-- <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.sbglgs || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.sbglgs || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='sb_status' label='设备状态' width='80' show-overflow-tooltip resizable>
-                        <!-- <template slot-scope='{row}'>{{row.sb_status || '--'}}</template> -->
-                        <div v-if='!row.assetuid'>{{row.sb_status || '--'}}</div>
-                        <el-popover v-else placement='top' width='100' trigger='click'>
-                            <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                            <div slot='reference'>{{row.sb_status || '--'}}</div>
-                        </el-popover>
+                        <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
-                        <!-- <template slot-scope='{row}'>{{row.brand || '--'}}</template> -->
-                        <div v-if='!row.assetuid'>{{row.brand || '--'}}</div>
-                        <el-popover v-else placement='top' width='100' trigger='click'>
-                            <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                            <div slot='reference'>{{row.brand || '--'}}</div>
-                        </el-popover>
+                        <template slot-scope='{row}'>{{row.brand || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='100'>
-                        <!-- <template slot-scope='{row}'>{{row.sbxh || '--'}}</template> -->
-                        <div v-if='!row.assetuid'>{{row.sbxh || '--'}}</div>
-                        <el-popover v-else placement='top' width='100' trigger='click'>
-                            <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                            <div slot='reference'>{{row.sbxh || '--'}}</div>
-                        </el-popover>
+                        <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='floor' sortable label='楼层' width='70' show-overflow-tooltip resizable>
-                        <!-- <template slot-scope='{row}'>{{row.floorcode || '--'}}</template> -->
-                        <div v-if='!row.assetuid'>{{row.floorcode || '--'}}</div>
-                        <el-popover v-else placement='top' width='100' trigger='click'>
-                            <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                            <div slot='reference'>{{row.floorcode || '--'}}</div>
-                        </el-popover>
+                        <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='250'>
-                        <!-- <template slot-scope='{row}'>{{row.wzjc || '--'}}</template> -->
-                        <div v-if='!row.assetuid'>{{row.wzjc || '--'}}</div>
-                        <el-popover v-else placement='top' width='100' trigger='click'>
-                            <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                            <div slot='reference'>{{row.wzjc || '--'}}</div>
-                        </el-popover>
+                        <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
-                        <!-- <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template> -->
-                        <div v-if='!row.assetuid'>{{row.manufacturer || '--'}}</div>
-                        <el-popover v-else placement='top' width='100' trigger='click'>
-                            <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                            <div slot='reference'>{{row.manufacturer || '--'}}</div>
-                        </el-popover>
+                        <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='300'>
-                        <!-- <template slot-scope='{row}'>{{row.fws || '--'}}</template> -->
-                        <div v-if='!row.assetuid'>{{row.fws || '--'}}</div>
-                        <el-popover v-else placement='top' width='100' trigger='click'>
-                            <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                            <div slot='reference'>{{row.fws || '--'}}</div>
-                        </el-popover>
+                        <template slot-scope='{row}'>{{row.fws || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
-                        <!-- <template slot-scope='{row}'>{{'--'}}</template> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>--</div>
-                            <el-popover v-else placement='top' width='100' trigger='click'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>--</div>
-                            </el-popover>
-                        </template>
+                        <template slot-scope='{row}'>{{'--'}}</template>
                     </el-table-column>
                 </el-table>
             </div>
@@ -203,11 +126,6 @@
     </div>
 </template>
 <script>
-/**
- * @author yunxing
- * @date 2020年08月18日18:01
- * @description 上部表格添加popover,点击后,如果有assetuid,显示popover,可以进行跳转工程信息化
- */
 import { Select } from 'meri-design'
 import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
@@ -269,27 +187,16 @@ export default {
         if (document.body.clientWidth >= 1920) {
             this.size = 9
         }
-        window.addEventListener('scroll', this.handleScroll, true)
     },
     props: ['row', 'major', 'sign', 'smsxt', 'diff'],
     methods: {
-        handleScroll() {
-            // console.log('handleScroll')
-            // let arr = Array.from(window.document.querySelector('.el-popover'))
-            // arr.map((item) => (item.style.display = 'none'))
-            // window.document.querySelector('.el-popover').style.display = 'none'
-        },
         innerTable(row) {
             this.assetnum = row.assetnum
             this.changeTab(0)
             // this.$refs.wbTable.startMethods()
-            // if (row.assetuid) {
-            //     window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
-            // }
-        },
-        // 跳转工程信息化
-        goToGC(assetuid) {
-            window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${assetuid}`)
+            if (row.assetuid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
+            }
         },
         //多余输入框监听
         confirm(fws, manufacturer) {
@@ -591,9 +498,4 @@ export default {
         line-height: 24px;
     }
 }
-// 弹出弹窗样式修改
-.el-popover {
-    padding: 0 !important;
-    text-align: center !important;
-}
 </style>

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

@@ -213,7 +213,7 @@ export default {
             .tab-title {
                 padding: 4px 16px;
             }
-            &:hover {
+            .tab-title:hover {
                 cursor: pointer;
                 color: #025baa;
             }

+ 5 - 3
src/views/other/zhsxOtherTable1.vue

@@ -51,10 +51,12 @@
             <el-table-column prop sortable label='日期' width='100' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='政府部门' :show-overflow-tooltip='true' width='160'>
-                <template slot-scope='{row}'>{{row.department||'--'}}</template>
+            <el-table-column prop label='政府部门' :show-overflow-tooltip='true' width='200'>
+                <template slot-scope='{row}'>
+                    {{row.department?row.department == '其他部门'?`${row.department} - ${row.otherdescription}`:row.department:'--'}}
+                </template>
             </el-table-column>
-            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='700'>
+            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='660'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='工作要求' :show-overflow-tooltip='true' width='160'>

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

@@ -553,7 +553,8 @@ export default {
       inputForm: {
         reportdate: "",
         real: "",
-        locationName: ""
+        locationName: "",
+        people: ''
       },
       sjjssj: "",
       real: "",
@@ -583,7 +584,44 @@ export default {
     ...mapGetters(["floorSelect", "plazaId"])
   },
   methods: {
+      /**
+       * @description 清楚筛选条件
+       * @param {number} key 点击的tab页
+       *    1 : 机房布置图,
+            2 : 配电室低压柜及出线明细表,
+            3 : 机房内核心设备,
+            4 : 核心设备日常维修,
+            5: 核心设备日常维保
+       */
+    clearQuery(key){
+        switch (key) {
+            case 4:
+                this.reportdate = '' //要求完成日期
+                this.real = '' //时间完成日期
+                this.people = '' //填报人
+                this.$set(this.inputForm,'reportdate','')  //要求完成日期
+                this.$set(this.inputForm,'real','') //时间完成日期
+                this.$set(this.inputForm,'people','') //搜索执行人
+                break;
+            case 5:
+                this.rwksrq = '' //任务开始日期
+                this.rwwcrq = '' //任务完成日期
+                this.ycgdbhInput5 = '' //异常工单编号
+                this.ycgdtbsj = '' //异常工单填报日期
+                this.ycgdyssj = '' //异常工单验收日期
+            default:
+                break;
+        }
+    },
     handleClick(tab) {
+        const tabDict = {
+            '机房布置图': 1,
+            '配电室低压柜及出线明细表': 2,
+            '机房内核心设备': 3,
+            '核心设备日常维修': 4,
+            '核心设备日常维保' :5
+        }
+        this.clearQuery(tabDict[tab.label])
       if (tab.label == "机房布置图") {
         this.Index(this.smsxtArr.smsxt);
       } else if (tab.label == "配电室低压柜及出线明细表") {
@@ -907,6 +945,7 @@ export default {
       });
     },
     confirm() {
+      this.dialogFormVisible = false
       this.reportdate = this.inputForm.reportdate;
       this.sjjssj = this.inputForm.real;
       this.real = this.inputForm.real;
@@ -915,6 +954,7 @@ export default {
       this.Index3Emit(1);
     },
     confirm2() {
+      this.dialogFormVisible = false
       this.Index4Emit(1);
     },
     // 下拉框数据

+ 16 - 7
src/views/room/room2.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class='compute-item'>
+    <div class='compute-item cursor-none'>
         <div ref='tableBox2' class='compute-table'>
             <el-table
                 :border='true'
@@ -39,7 +39,7 @@
                 background
                 layout='prev, pager, next'
                 :total='total'
-                  :current-page.sync="page"
+                :current-page.sync='page'
                 :page-size='size'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
@@ -60,14 +60,14 @@ export default {
                 { id: 'test1', name: '选择项' },
                 { id: 'test2', name: '单平米' },
                 { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
+                { id: 'test4', name: '滑动平均滑动平均' },
             ],
             searVal: '',
-            tableMaxHeight: 0
+            tableMaxHeight: 0,
         }
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     components: { Select },
     methods: {
@@ -82,17 +82,26 @@ export default {
                 // 页面渲染完成后的回调
                 this.tableMaxHeight = this.$refs.tableBox2.offsetHeight
             })
-        }
+        },
     },
     updated() {
         this.$nextTick(() => {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox2.offsetHeight
         })
-    }
+    },
 }
 </script>
 <style lang="less" scoped>
+// 该表格,鼠标显示默认指针
+.cursor-none {
+    cursor: default !important;
+    /deep/ .el-table {
+        td {
+            cursor: default !important;
+        }
+    }
+}
 </style>
 <style lang="less">
 .compute-item {