guoxiaohuan 4 years ago
parent
commit
995189bc7d

+ 3 - 3
src/api/public.js

@@ -28,8 +28,8 @@ export function updateStatis({ postParams }) {
 }
 
 // 查询系统图备注-(后期可能不需要)
-export function queryRead({ postParams }) {
-    return httputils.fetchJson(`/serve/topology-wanda/graph/read`, postParams)
+export function queryRead({ data, postParams }) {
+    return httputils.fetchJson(`/serve/topology-wanda/graph/read`, data, postParams)
 }
 
 // 修改系统图备注
@@ -40,4 +40,4 @@ export function updateRead({ postParams }) {
 //查询系统图展示所需数据 --平面图业务数据
 export function readGroup(postParams) {
     return httputils.fetchJson(`/serve/topology-wanda/graph/read`, postParams)
-}
+}

+ 8 - 6
src/components/Legend/src/legend.vue

@@ -104,13 +104,15 @@ export default {
         },
         // 查询备注
         queryMarks() {
-            let params = {
-                postParams: {
-                    categoryId: this.$cookie.get('categoryId'),
-                    projectId: this.$store.state.plazaId
-                }
+            let postParams = {
+                categoryId: this.$cookie.get('categoryId'),
+                projectId: this.$store.state.plazaId,
+                BuildingID: '1',
+                FloorID: this.$cookie.get('floorNow')
             }
-            queryRead(params).then(res => {
+
+            let data = {}
+            queryRead({ data, postParams }).then(res => {
                 //console.log('备注', res.data.Data[0].Note)
                 if (res.data.Data[0].Note) {
                     let note = res.data.Data[0].Note

+ 11 - 0
src/views/room/detail.vue

@@ -203,6 +203,17 @@ export default {
             this.query()
         }
     },
+    watch: {
+        type_code: {
+            deep: true,
+            handler: function(newV, oldV) {
+                if (newV != oldV) {
+                    this.queryDetail()
+                    this.query()
+                }
+            }
+        }
+    },
     methods: {
         show() {
             this.dialogFormVisible = !this.dialogFormVisible

+ 6 - 6
src/views/room/index.vue

@@ -504,15 +504,15 @@ export default {
     },
     methods: {
         handleClick(tab) {
-            if (tab.index == '0') {
+            if (tab.label == '机房布置图') {
                 this.Index()
-            } else if (tab.index == '1') {
+            } else if (tab.label == '配电室低压柜及出线明细表') {
                 this.Index1()
-            } else if (tab.index == '2') {
+            } else if (tab.label == '机房内核心设备') {
                 this.Index2()
-            } else if (tab.index == '3') {
+            } else if (tab.label == '维修记录') {
                 this.Index3()
-            } else if (tab.index == '4') {
+            } else if (tab.label == '维保记录') {
                 this.Index4()
                 this.changeSelect()
             }
@@ -614,7 +614,7 @@ export default {
                 }
             }
             if (this.floorChange) {
-                data.floor = this.floorChange
+                data.gname = this.floorChange
             }
             queryHxsb({ data, postParams }).then(res => {
                 // console.log('核心设备', res)

+ 2 - 2
src/views/room/room3.vue

@@ -11,7 +11,7 @@
             >
                 <el-table-column type='index' label='序号' width='50'></el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable>
-                    <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
+                    <template slot-scope='{row}'>{{row.classqc||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='数量' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
@@ -23,7 +23,7 @@
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='楼层' :show-overflow-tooltip='true'>
-                    <template slot-scope='{row}'>{{row.floor||'--'}}</template>
+                    <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='生产厂商'>
                     <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>