zhangyu 5 jaren geleden
bovenliggende
commit
48142682d3

+ 43 - 0
src/components/screen/integrateresults/buildfloorList.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="buildfloor-list" v-loading="loading">
+    <el-scrollbar style="height:100%;">
+      
+    </el-scrollbar>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { getTabFunNumOverview } from '@/api/scan/request'
+
+export default {
+  computed: {
+    ...mapGetters('layout', ['userInfo', 'projectId', 'projects', 'userId'])
+  },
+  props: {
+    queryParams: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      loading: false,
+    }
+  },
+  methods:{
+    
+  },
+  watch: {
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.buildfloor-list{
+  height: 100%;
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden;
+  }
+}
+</style>

+ 5 - 2
src/components/screen/integrateresults/realtimeData.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="data-box">
+  <div class="data-box" v-loading="loading">
     <p class="meter-func">表号-功能号:{{queryParams.MeterFunc || '--'}}</p>
     <p style="margin-top:17px;">当前读数:{{newData || '--'}}</p>
     <p style="margin-bottom:17px;">最后获取时间:{{lastTime || '--'}}</p>
@@ -21,14 +21,17 @@ export default {
   },
   data() {
     return {
+      loading: false,
       newData: '',
-      lastTime: ''
+      lastTime: '',
     }
   },
   methods:{
     getNewData() {
+      this.loading = true
       if(this.queryParams.MeterFunc){
         getTabFunNumOverview({MeterFunc: this.queryParams.MeterFunc}, res => {
+          this.loading = false
           if(res.Content[0] && res.Content[0].Data){
             let data = res.Content[0].Data
             this.newData = data.Data + (data.Unit?data.Unit:'')

+ 7 - 3
src/views/screen/splitscreen/integrateresults/index.vue

@@ -2,7 +2,7 @@
  * @Author: zhangyu
  * @Date: 2019-11-13 17:00:59
  * @Info: 系统集成成果辅助屏
- * @LastEditTime: 2019-11-14 18:54:18
+ * @LastEditTime: 2019-11-15 11:10:58
  -->
 <template>
   <div>
@@ -17,7 +17,9 @@
         <div class="data-box">
           <realtime-data :queryParams="queryParams"></realtime-data>
         </div>
-        <div class="buildFloor-box"></div>
+        <div class="buildFloor-box">
+          <buildfloor-list :queryParams="queryParams"></buildfloor-list>
+        </div>
       </div>
       <div class="content-right"></div>
     </div>
@@ -27,10 +29,12 @@
 <script>
 import { mapGetters } from 'vuex'
 import realtimeData from '@/components/screen/integrateresults/realtimeData'
+import buildfloorList from '@/components/screen/integrateresults/buildfloorList'
 
 export default {
   components: {
-    realtimeData
+    realtimeData,
+    buildfloorList
   },
   computed: {
     ...mapGetters('layout', ['userInfo', 'projectId', 'projects', 'userId'])