Browse Source

修改M类型不可输入问题

chuwu 6 years ago
parent
commit
1151be76a3

+ 1 - 1
config/index.js

@@ -7,7 +7,7 @@ const path = require('path')
 const proxyTable = {
     '/api': {
         // target: 'http://mbi.sagacloud.cn:8080', //扫楼revit
-        target: 'http://172.16.0.157:8080', //扫楼revit
+        target: 'http://172.16.0.235:8080', //扫楼revit
         changeOrigin: true,
         pathRewrite: {
             '^/api': ''

+ 1 - 1
config/prod.env.js

@@ -1,7 +1,7 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    BASE_URL: '"http://localhost"', //线上iframe地址
     UPLOAD_URL: '"http://prod.dp.sagacloud.cn:28888"', //上传地址
     // BASE_URL: '"http://172.16.0.181"', //测试环境iframe的地址/
     // UPLOAD_URL: '"http://192.168.20.225:8080"', //上传地址

+ 1 - 1
src/components/business/handsontable.vue

@@ -465,7 +465,7 @@ export default {
     delHeader(list) {
       let arr = tools.copyArr(list)
       // 如果不是只读状态,添加四大厂商选择
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "M"]
       if (!this.onlyRead) {
         arr = showTools.arrToArr(arr)
         readArr.push("Own")

+ 1 - 1
src/components/dialogs/addDialog/dialogAssets.vue

@@ -433,7 +433,7 @@ export default {
       let arr = tools.copyArr(list)
       // 如果不是只读状态,添加四大厂商选择
       arr = showTools.arrToArr(arr)
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2","M"]
       readArr.push("Own")
       let data = showTools.changeHeader(arr, readArr, false, this.isWatch, false, true)
       data.unshift("所属建筑楼层");

+ 1 - 1
src/components/dialogs/addDialog/dialogDevice.vue

@@ -531,7 +531,7 @@ export default {
       if (!this.onlyRead) {
         arr = showTools.arrToArr(arr)
       }
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2", "M"]
       readArr.push("Own")
       let data = showTools.changeHeader(arr, readArr, false, this.isWatch, true)
       data.unshift("同时创建资产", "所属系统实例");

+ 1 - 1
src/components/handsontables/assets.vue

@@ -406,7 +406,7 @@ export default {
     delHeader(list) {
       let arr = tools.copyArr(list)
       // 如果不是只读状态,添加四大厂商选择
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2", "M"]
       if (!this.onlyRead) {
         arr = showTools.arrToArr(arr)
         readArr.push("Own")

+ 1 - 1
src/components/handsontables/device.vue

@@ -500,7 +500,7 @@ export default {
       if (!this.onlyRead) {
         // arr = showTools.arrToArr(arr)
       }
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2", "M"]
       if (!this.onlyRead) {
         readArr.push("Own")
       }

+ 2 - 2
src/components/handsontables/system.vue

@@ -261,7 +261,7 @@ export default {
       //     arr = showTools.assetToArr(arr)
       //   }
       //   console.log(arr)
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2", "M"]
       let data = showTools.changeHeader(arr, readArr, this.onlyRead, this.isWatch, this.allMess)
       data.unshift("操作", "关联设备数量");
       return data;
@@ -555,7 +555,7 @@ export default {
               if (!!item.infos[key]) {
                 this.headers.map(child => {
                   //如果一级标签为动态参数或者设定参数放入数据等待请求
-                  if (key == child.infoPointCode && (child.InputMode == "L" || child.InputMode == "L1" || child.InputMode == "L2")) {
+                  if (key == child.InfoPointCode && (child.InputMode == "L" || child.InputMode == "L1" || child.InputMode == "L2")) {
                     param.data.criterias.push({
                       id: item.id,
                       code: key

+ 2 - 1
src/utils/hansontable/notShow.js

@@ -453,7 +453,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