Przeglądaj źródła

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

shaun-sheep 4 lat temu
rodzic
commit
3241e2642d

+ 1 - 0
src/views/other/gcfz2.vue

@@ -98,6 +98,7 @@ export default {
             this.$emit('queryChange')
         },
         changelc() {
+            console.log(this.cg)
             this.$emit('changeEmit', this.cg)
         }
     }

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

@@ -66,19 +66,19 @@ export default {
         changeEmit(val) {
             console.log(val)
             if (val.floors) {
-                this.floor = val.floor
+                this.floors = val.floors
             }
             if (val.searVal) {
                 this.searVal = val.searVal
             }
+            this.queryChange()
         },
         // 变更记录
         queryChange() {
             let getParams = {
                 plazaId: this.$store.state.plazaId,
                 page: this.page,
-                size: this.size,
-                floor: this.floor
+                size: this.size
             }
             if (this.floors) {
                 getParams.floor = this.floors

+ 17 - 2
src/views/room/index.vue

@@ -363,7 +363,7 @@ import roomTable3 from './room3'
 import roomTable4 from './room4'
 import roomTable5 from './room5'
 import { mapGetters } from 'vuex'
-import { querySelect } from '@/api/public.js'
+import { querySelect, queryPic } from '@/api/public.js'
 import InputDialog from './inputDialog'
 
 export default {
@@ -385,6 +385,8 @@ export default {
             total: 0,
             page: 1,
             size: 10,
+            picFloor: '',
+            tableImg: '',
             //
             total1: 0,
             page1: 1,
@@ -464,7 +466,17 @@ export default {
                 this.changeSelect()
             }
         },
-        Index() {},
+        Index() {
+            this.picFloor = this.$cookie.get('floorNow')
+            let getParams = {
+                data: { tyepcode: 3, location: '1198', floor: this.picFloor, plazaId: this.$store.state.plazaId },
+                params: {}
+            }
+            queryPic(getParams).then(res => {
+                console.log('机房布置图', res)
+                this.tableImg = res.data ? res.data : []
+            })
+        },
         // 明细表
         Index1() {
             let getParams = {
@@ -742,6 +754,9 @@ export default {
             this.systemName = name
         }
     },
+    mounted() {
+        this.Index()
+    },
     watch: {}
 }
 </script>

+ 15 - 8
src/views/room/room1.vue

@@ -1,24 +1,31 @@
 <template>
-    <div>机房布置图</div>
+    <div class='jf-box'>
+        <div class='jf-inner'>
+            <!-- <rotation :rotationImg='tableImg'></rotation> -->
+        </div>
+    </div>
 </template>
 <script>
 import Select from '@/components/Select/Select.vue'
 
 export default {
-    props: ['table5', 'total', 'page', 'size', 'loading'],
+    props: ['tableImg', 'loading'],
     data() {
         return {}
     },
     components: { Select },
-    methods: {
-        pageChanged(page) {
-            this.page = page
-            this.$emit('Index')
-        }
-    }
+    methods: {}
 }
 </script>
 <style lang="less" scoped>
+.jf-box {
+    .jf-inner {
+        width: 1076px;
+        height: 566px;
+        margin: 0 auto;
+        margin-top: 8px;
+    }
+}
 </style>
 <style lang="less">
 .compute-item {

+ 1 - 1
vue.config.js

@@ -25,7 +25,7 @@ module.exports = {
             },
         },
         hot: true,
-        host: '192.168.200.82',
+        // host: '192.168.200.82',
         open: true,
         port: 8080,
         // 关闭esline