Browse Source

Merge branch 'details-component' of http://39.106.8.246:3003/web/ibms into details-component

 Conflicts:
	src/views/ledger/facility/details/index.vue
shaun-sheep 5 years ago
parent
commit
15749cb563
1 changed files with 15 additions and 8 deletions
  1. 15 8
      src/views/ledger/facility/details/index.vue

+ 15 - 8
src/views/ledger/facility/details/index.vue

@@ -55,16 +55,14 @@
   import exhibitionCrux from "@/components/ledger/details/detail/exhibitionCrux";
   import exhibitionMaintain from "@/components/ledger/details/detail/exhibitionMaintain";
   import selectRadio from "@/components/ledger/details/detail/selectRadio";
-  import tools from "../../../../utils/buildfloor/tools";
-  import {getDataDictionary, queryEquip} from "@/api/scan/request";
-  import {mapGetters} from "vuex";
+  import tools from "@/utils/scan/tools"
+  import { getDataDictionary, queryEquip, BeatchQueryParam } from "@/api/scan/request";
+  import { mapGetters, mapActions } from "vuex";
   function flattenKeys(obj) {
     let res = {}
-
     function isObject(val) {
       return typeof val === 'object' && !Array.isArray(val)
     }
-
     function digKeys(prev, obj) {
       Object.entries(obj).forEach(([key, value]) => {
         const currentKey = prev ? `${prev}.${key}` : key
@@ -75,9 +73,7 @@
         }
       })
     }
-
     digKeys('', obj)
-
     return res
   }
   export default {
@@ -112,6 +108,7 @@
         pointData: [], //信息点数据
         exampleData: {}, //实例数据
         currentRadio: '',//当前选中的select
+        criterias: [], //动态参数
         selectRadio: {
           information: '设备信息点',
           radioList: [
@@ -173,8 +170,18 @@
         Promise.all([promise1, promise2]).then(values => {
           this.pointData = values[0].Content;
           this.exampleData = values[1].Content[0];
-
           this.handleRadios(1)
+          this.pointData.forEach(item => {
+            if (item.InputMode == "L" || item.InputMode == "L1" || item.InputMode == "L2" || item.InputMode == "M") {
+              let cur = tools.dataForKey(this.exampleData, item.Path);
+              if (cur) {
+                this.criterias.push({
+                  id: exampleData.EquipID,
+                  code: item.InfoPointCode
+                })
+              }
+            }
+          })
         })
       },
       handleRadios(val) { //判断radio的值显示关键信息,基本信息,图片,文件