zhulizhen1111 4 years ago
parent
commit
9c2f05ad7c

+ 4 - 2
src/components/floorMap/floorBase.vue

@@ -1,6 +1,6 @@
 <!-- 底图 -->
 <template>
-    <div id='floor_base'>
+    <div id='floor_base' v-loading='loading'>
         <div id='fengMap'></div>
         <div class='canvas-container' ref='graphy'>
             <canvas id='canvas' :width='canvasWidth' :height='canvasHeight' tabindex='0'></canvas>
@@ -24,7 +24,8 @@ export default {
             fmap: null,
             canvasWidth: 700,
             canvasHeight: 800,
-            fParser: null
+            fParser: null,
+            loading: true
         }
     },
     components: { computerTable },
@@ -51,6 +52,7 @@ export default {
                 this.fParser.casementList.forEach(t => this.scene.addItem(t))
                 this.view.scene = this.scene
                 this.view.fitSceneToView()
+                this.loading = false
             })
         },
         clearGraphy() {

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

@@ -21,7 +21,7 @@
             <el-pagination
                 background
                 layout='prev, pager, next'
-                :total='total/pageSize'
+                :total='total'
                 :page-size='size'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'

+ 4 - 5
src/views/floorFunc/index.vue

@@ -9,7 +9,6 @@
         <!-- <a-button type='primary' @click='legendClik'>点击出现编辑图例备注弹框</a-button>
         <br />
         <a-button type='primary' @click='picClik'>点击出现图片预览</a-button>-->
-
         <pic-large :imgUrl='imgUrl' ref='pic'></pic-large>
     </div>
 </template>
@@ -53,21 +52,21 @@ export default {
             ],
             floorInfo: {
                 floorName: 'F1',
-                floorId: 'f1'
+                floorId: '1'
             }
         }
     },
     methods: {
         emitFloor(item) {
-            this.floorInfo = item
-            this.$refs.floorMap.init()
+            this.floorInfo.floorId = item
+            this.$refs.floorMap.init(item)
         },
         picClik() {
             this.$refs.pic.open()
         }
     },
     mounted() {
-        // this.$refs.floorMap.init()
+        this.$refs.floorMap.init(1)
     }
 }
 </script>

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

@@ -111,7 +111,7 @@ export default {
         }
     },
     mounted() {
-        this.query()
+        // this.query()
         this.dsfrwQuery()
     },
     methods: {

+ 32 - 1
src/views/other/zhsxOther.vue

@@ -1,3 +1,4 @@
+<!-- 综合事项记录 -->
 <template>
     <div class='zhsx-box'>
         <div class='zhsx-top'>
@@ -65,6 +66,17 @@
                                 <el-table-column prop='thing' label='部门' :show-overflow-tooltip='true'></el-table-column>
                                 <el-table-column prop='name' label='检测结论'></el-table-column>
                             </el-table>
+                            <div class='foot'>
+                                <el-pagination
+                                    background
+                                    layout='prev, pager, next'
+                                    :total='total'
+                                    :page-size='size'
+                                    @prev-click='pageChanged'
+                                    @next-click='pageChanged'
+                                    @current-change='pageChanged'
+                                ></el-pagination>
+                            </div>
                         </div>
                     </el-tab-pane>
                 </el-tabs>
@@ -122,6 +134,7 @@
 <script>
 import Select from '@/components/Select/Select.vue'
 import ZhsxDialog from './zhsxDialog'
+import { queryGlams, querygcfzyfhz, queryfzyfchange } from '@/api/other.js'
 export default {
     data() {
         return {
@@ -205,7 +218,10 @@ export default {
                 { id: 'test2', name: '单平米' },
                 { id: 'test3', name: '下级分项' },
                 { id: 'test4', name: '滑动平均滑动平均' }
-            ]
+            ],
+            currentPage: 1,
+            total: 1,
+            size: 10
         }
     },
     props: ['everySystem'],
@@ -214,12 +230,27 @@ export default {
         zhsxLog() {
             this.$refs.Dialog.open()
         },
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.getList()
+        },
         handleClick(tab) {
             // this.param = tab.name
             console.log(tab)
+        },
+        getTableData() {
+            let getParams = {
+                plazaId: this.$store.state.plazaId,
+                page: this.page,
+                size: this.size
+            }
+            queryGlams({ getParams }).then(res => {
+                console.log(res)
+            })
         }
     },
     mounted() {
+        // this.getTableData()
         console.log(this.everySystem)
     }
 }