guoxiaohuan 4 rokov pred
rodič
commit
0a61d209ea

+ 0 - 4
src/components/Legend/src/legend.vue

@@ -390,7 +390,6 @@ export default {
             this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
             queryStatis({ data, postParams }).then(res => {
                 this.$store.commit('SETPLANNUM', '')
-                this.$store.commit('SETTYPENUM', '')
                 this.loading = false
                 let viewTable = []
                 viewTable = res.data.Data ? res.data.Data : []
@@ -400,9 +399,6 @@ export default {
                         if (el.Name == '主要设备房') {
                             this.$store.commit('SETPLANNUM', el.Num)
                         }
-                        if (el.Type == 'Image' && el.Num > 1) {
-                            this.$store.commit('SETTYPENUM', el.Num)
-                        }
                     })
                     if (this.remarksText) {
                         this.$store.commit('SETREMARKSTEXT', this.remarksText)

+ 24 - 12
src/components/floorMap/index.vue

@@ -193,6 +193,15 @@ export default {
                         console.log(arr)
                         this.$store.commit('SETSCPZTABLE', arr)
                     }
+                    if (data.Data[0].Elements.Nodes.length > 0) {
+                        this.$store.commit('SETTYPENUM', '')
+                        let Lengd = data.Data[0].Elements.Nodes
+                        Lengd.forEach(el => {
+                            if (el.Type == 'Image' && el.Num > 1) {
+                                this.$store.commit('SETTYPENUM', el.Num)
+                            }
+                        })
+                    }
                     // 放到后边 $cookie graphId
                     this.$cookie.set('graphId', data.Data[0].ID, 3)
                     if (this.$cookie.get('graphId')) {
@@ -390,10 +399,11 @@ export default {
         },
         getEvent() {
             bus.$on('changeShow', res => {
-                this.topologyParser && this.topologyParser.zoneLegendList.forEach(t => {
-                    let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
+                this.topologyParser &&
+                    this.topologyParser.zoneLegendList.forEach(t => {
+                        let id = t.data.GraphElementId
+                        t.maskFlag = !(res.indexOf(id) > -1)
+                    })
                 // this.topologyParser.textMarkerList.forEach(t => {
                 //     let id = t.data.GraphElementId
                 //     t.maskFlag = !(res.indexOf(id) > -1)
@@ -406,14 +416,16 @@ export default {
                 //     let id = t.data.GraphElementId
                 //     t.maskFlag = !(res.indexOf(id) > -1)
                 // })
-                this.topologyParser && this.topologyParser.imageLegendList.forEach(t => {
-                    let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
-                this.topologyParser && this.topologyParser.relationList.forEach(t => {
-                    let id = t.data.GraphElementId || t.data.GraphElementID
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
+                this.topologyParser &&
+                    this.topologyParser.imageLegendList.forEach(t => {
+                        let id = t.data.GraphElementId
+                        t.maskFlag = !(res.indexOf(id) > -1)
+                    })
+                this.topologyParser &&
+                    this.topologyParser.relationList.forEach(t => {
+                        let id = t.data.GraphElementId || t.data.GraphElementID
+                        t.maskFlag = !(res.indexOf(id) > -1)
+                    })
             })
         }
     },

+ 12 - 1
src/views/equipment/table/eqDetaileDialog.vue

@@ -58,7 +58,7 @@
             <!-- 多余的筛选 -->
             <input-dialog :type='1' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
+        <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable width='230'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
@@ -156,6 +156,12 @@ export default {
         this.getFloorAllSelect()
     },
     methods: {
+        innerTable(row) {
+            console.log(row)
+            if (row.assetuid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
+            }
+        },
         //序号的方法
         indexMethod(index) {
             return (this.page - 1) * this.size + index + 1
@@ -352,4 +358,9 @@ export default {
 }
 </style>
 <style lang="less">
+.gdqd-dialog {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 3 - 3
src/views/other/gcfz1.vue

@@ -13,14 +13,14 @@
         <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable>
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
-        <el-table-column prop='beforekf' :show-overflow-tooltip='true' label='总间数'>
-            <template slot-scope='{row}'>{{row.beforekf||'--'}}</template>
+        <el-table-column prop='afterkf' :show-overflow-tooltip='true' label='总间数'>
+            <template slot-scope='{row}'>{{row.afterkf||'--'}}</template>
         </el-table-column>
         <el-table-column prop='area' :show-overflow-tooltip='true' label='面积(㎡)'>
             <template slot-scope='{row}'>{{row.area||'--'}}</template>
         </el-table-column>
         <el-table-column prop label='记录日期' width='100'>
-            <template slot-scope='{row}'>{{row.changedate?formatter(row.changedate):'--'}}</template>
+            <template slot-scope='{row}'>{{row.recordtime?formatter(row.recordtime):'--'}}</template>
         </el-table-column>
     </el-table>
 </template>