浏览代码

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

yunxing 4 年之前
父节点
当前提交
19128809fd

+ 1 - 1
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') {

+ 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 - 140
src/views/equipment/table/eqDetaileDialog.vue

@@ -58,126 +58,42 @@
                 <!-- 多余的筛选 -->
                 <input-dialog :type='1' @confirm='confirm'></input-dialog>
             </div>
-            <div class='gdqd-dialog-bottom' ref='table-container-1'>
+            <div class='gdqd-dialog-bottom'>
+                <!-- 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'>
-                        <template slot-scope='{row,$index}'>
-                            <div v-if='!row.assetuid'>{{$index + 1}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{$index + 1}}</div>
-                            </el-popover>
-                        </template>
-                    </el-table-column>
+                    <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' popper-class='m-popover'>
-                                <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' popper-class='m-popover'>
-                                <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' popper-class='m-popover'>
-                                <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.sb_status || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.sb_status || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.brand || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.brand || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.sbxh || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.sbxh || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.floorcode || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.floorcode || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.wzjc || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.wzjc || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.manufacturer || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.manufacturer || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <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> -->
-                        <template slot-scope='{row}'>
-                            <div v-if='!row.assetuid'>{{row.fws || '--'}}</div>
-                            <el-popover v-else placement='top' width='100' trigger='click' popper-class='m-popover'>
-                                <el-button type='text' @click='goToGC(row.assetuid)'>跳转工程信息化</el-button>
-                                <div slot='reference'>{{row.fws || '--'}}</div>
-                            </el-popover>
-                        </template>
+                        <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' popper-class='m-popover'>
-                                <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>
@@ -210,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'
@@ -276,40 +187,16 @@ export default {
         if (document.body.clientWidth >= 1920) {
             this.size = 9
         }
-        // 滚动时,隐藏上部表格的popover
-        window.addEventListener('scroll', this.handleScroll, true)
-        this.$once('hook:beforeDestroy', () => {
-            window.removeEventListener('scroll', this.handleScroll)
-        })
     },
     props: ['row', 'major', 'sign', 'smsxt', 'diff'],
     methods: {
-        // 页面
-        handleScroll(e) {
-            // let popoverArr = Array.from(document.querySelectorAll('body>.m-popover'))
-            // if (popoverArr.length) {
-            //     popoverArr.map((item) => (item.style.display = 'none'))
-            // }
-            // 滚动时,如果是上部表格,隐藏上部表格的popover
-            this.$nextTick(() => {
-                if (this.$refs['table-container-1'].contains(e.target)) {
-                    document.body.click()
-                    document.dispatchEvent(new CustomEvent('mousedown'))
-                    document.dispatchEvent(new CustomEvent('mouseup'))
-                }
-            })
-        },
         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) {
@@ -611,14 +498,4 @@ export default {
         line-height: 24px;
     }
 }
-// 弹出弹窗样式修改
-.m-popover {
-    width: 105px !important;
-    max-width: 105px !important;
-    min-width: 105px !important;
-    height: 30px !important;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
 </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'>

+ 39 - 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 == "配电室低压柜及出线明细表") {