Browse Source

调试系统集成成果辅助屏

zhangyu 5 years ago
parent
commit
1e58babdbe

+ 2 - 2
src/api/scan/httpUtil.js

@@ -32,7 +32,7 @@ function errorResponse(vm, response, err) {
 
 export default {
     getJson: function(url, data, success, failed, err) {
-        let ProjectId = storage.get("global_project_selected")
+        let ProjectId = localStorage.getItem("projectId")
         let userName = storage.get("user_name")
         let vm = this;
         fetch({ url: url, method: 'get', params: data, headers: {'ProjectId': ProjectId, 'Comming': 'adm' ,'Account': userName}}).then((response) => {
@@ -42,7 +42,7 @@ export default {
         });
     },
     postJson: function(url, data, success, failed, err) {
-        let ProjectId = storage.get("global_project_selected")
+        let ProjectId = localStorage.getItem("projectId")
         let userName = storage.get("user_name")
         let vm = this;
         fetch({ url: url, method: 'post', data: data, headers: {'ProjectId': ProjectId, 'Comming': 'adm' ,'Account': userName} }).then((response) => {

+ 66 - 0
src/components/screen/integrateresults/realtimeData.vue

@@ -0,0 +1,66 @@
+<template>
+  <div class="data-box">
+    <p class="meter-func">表号-功能号:{{queryParams.MeterFunc || '--'}}</p>
+    <p style="margin-top:17px;">当前读数:{{newData || '--'}}</p>
+    <p style="margin-bottom:17px;">最后获取时间:{{lastTime || '--'}}</p>
+  </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 {
+      newData: '',
+      lastTime: ''
+    }
+  },
+  methods:{
+    getNewData() {
+      if(this.queryParams.MeterFunc){
+        getTabFunNumOverview({MeterFunc: this.queryParams.MeterFunc}, res => {
+          if(res.Content[0] && res.Content[0].Data){
+            let data = res.Content[0].Data
+            this.newData = data.Data + (data.Unit?data.Unit:'')
+            this.lastTime = data.Time
+          }
+        })
+      }
+    },
+  },
+  watch: {
+    'queryParams.MeterFunc': {
+      handler(newdata, olddata) {
+        this.newData = ''
+        this.lastTime = ''
+        this.getNewData()
+      },
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+$borderColor: rgba(201, 201, 201, 1);
+.data-box{
+  border: 1px solid $borderColor;
+  .meter-func{
+    border-bottom: 1px solid $borderColor;
+  }
+  p{
+    line-height: 35px;
+    padding-left: 10px;
+  }
+}
+</style>

+ 5 - 1
src/views/screen/splitscreen/index.vue

@@ -2,7 +2,7 @@
  * @Author: zhangyu
  * @Date: 2019-11-05 15:36:21
  * @Info: 
- * @LastEditTime: 2019-11-07 16:13:07
+ * @LastEditTime: 2019-11-14 15:46:27
  -->
 <template>
   <div id="screenBox">
@@ -93,10 +93,14 @@ export default {
     }
   }
   .screen-router{
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
     padding: 10px;
     width: 100%;
     height: 100%;
     box-sizing: border-box;
+    overflow: hidden;
   }
 }
 </style>

+ 79 - 11
src/views/screen/splitscreen/integrateresults/index.vue

@@ -1,34 +1,102 @@
-
+<!--
+ * @Author: zhangyu
+ * @Date: 2019-11-13 17:00:59
+ * @Info: 系统集成成果辅助屏
+ * @LastEditTime: 2019-11-14 18:54:18
+ -->
 <template>
   <div>
-    <h1>系统集成成果辅助屏</h1>
+    <div class='page-bar'>
+      <el-breadcrumb separator='/'>
+      <el-breadcrumb-item>系统集成</el-breadcrumb-item>
+      <el-breadcrumb-item>系统集成成果管理</el-breadcrumb-item>                       
+      </el-breadcrumb>
+    </div>
+    <div class="page-content">
+      <div class="content-left">
+        <div class="data-box">
+          <realtime-data :queryParams="queryParams"></realtime-data>
+        </div>
+        <div class="buildFloor-box"></div>
+      </div>
+      <div class="content-right"></div>
+    </div>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
+import realtimeData from '@/components/screen/integrateresults/realtimeData'
 
 export default {
-  data() {
-    return {
-      
-    }
+  components: {
+    realtimeData
+  },
+  computed: {
+    ...mapGetters('layout', ['userInfo', 'projectId', 'projects', 'userId'])
   },
   created() {
-
+    
   },
   mounted() {
 
   },
-  computed: {
-    ...mapGetters('layout', ['userInfo', 'projectId', 'projects', 'userId'])
+  data() {
+    return {
+      queryParams: this.$route.query
+    }
   },
   methods:{
     
-  }
+  },
+  watch: {
+    $route(to,from){
+      this.queryParams = this.$route.query
+    }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-
+$borderColor: rgba(201, 201, 201, 1);
+.page-bar{
+  flex-grow: 0;
+  flex-shrink: 0;
+  height: 24px;
+  padding: 0 10px;
+  margin-bottom: 10px;
+  border-bottom: 1px solid $borderColor;
+  /deep/ .el-breadcrumb {
+    font-size: 14px;
+  }
+}
+.page-content{
+  display: flex;
+  flex-grow: 1;
+  flex-shrink: 1;
+  flex-direction: row;
+  justify-content: flex-start;
+  overflow-y: auto;
+  .content-left{
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    width: 260px;
+    margin-right: 15px;
+    .data-box{
+      height: 140px;
+      margin-bottom: 15px;
+    }
+    .buildFloor-box{
+      flex-grow: 1;
+      flex-shrink: 1;
+      border: 1px solid $borderColor;
+    }
+  }
+  .content-right{
+    flex-grow: 1;
+    flex-shrink: 1;
+    border: 1px solid $borderColor;
+  }
+}
 </style>