Browse Source

根据关键内容批量对应数据字典问题修改

zhangyu 5 years ago
parent
commit
d7ebc64b9b

+ 1 - 1
src/components/business_space/dialogs/changeRea.vue

@@ -233,7 +233,7 @@ export default {
         data: {
           directOnly: false,
           criteria: {
-            EquipLocalName: [this.search],
+            EquipLocalName: [this.search == ""? null: this.search],
             id: "",
             type: [],
             exclude: [{

+ 2 - 1
src/components/config_point/step3_point/steps3_main.vue

@@ -123,7 +123,8 @@
                 } else {
                     //不是空的情况查询点位列表
                     console.log(param)
-                    if (param && param.EquipmentMark) {
+                    // if (param && param.EquipmentMark) {
+                    if (param) {// 临时修改
                         queryPoint({
                             data: {
                                 Filters: {

+ 1 - 1
src/components/dialogs/changeRea.vue

@@ -248,7 +248,7 @@ export default {
         data: {
           directOnly: false,
           criteria: {
-            EquipLocalName: [this.search],
+            EquipLocalName: [this.search == ""? null: this.search],
             id: "",
             type: [],
             exclude: [{

+ 8 - 0
src/utils/handsontable/fillterField.js

@@ -0,0 +1,8 @@
+const data = {
+  equipment: {
+    read: {
+      show: [],
+      hidden: []
+    }
+  }
+}

+ 3 - 2
src/utils/handsontable/notShow.js

@@ -366,7 +366,8 @@ const showTools = {
                     item.InputMode == "B1" ||
                     item.InputMode == "L" ||
                     item.InputMode == "L1" ||
-                    item.InputMode == "L2"
+                    item.InputMode == "L2" ||
+                    item.InputMode == "M"
                 ) {
                     return {
                         data: "Infos." + item.InfoPointCode
@@ -419,7 +420,7 @@ const showTools = {
             if (item.InfoPointCode == "BIMLocation") {
                 return undefined
             }
-            if (!!typeArr && typeArr.indexOf(item.InputMode) > -1) {
+            if (onlyRead || (!!typeArr && typeArr.indexOf(item.InputMode) > -1)) {
                 return undefined
             }
             if (item.Visible || !allMess) {