点位配置bug修改添加输入类型为M的字段可编辑,在只读状态下可以动态获取参数

src/components/business_space/business/handsontable.vue

@@ -474,7 +474,7 @@
              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")

src/components/business_space/dialogs/changeRea.vue

@@ -62,6 +62,7 @@ import myPagination from "@/components/ledger/lib/myPagination";
 import paramDetails from "@/components/dialogs/list/paramDetails"
 import { getBillPropList, getEquipmentFamily, getSpaceFloor, getBussines, upDateTableMain } from "@/api/scan/request"
 import floorCascader from "@/components/ledger/lib/floorCascader";
+import {mapGetters, mapActions} from "vuex"
 
 export default {
   components: {
@@ -109,6 +110,13 @@ export default {
   created() {
     this.getCode()
   },
+  computed: {
+    ...mapGetters("layout", [
+        "projectId",
+        "secret",
+        "userId"
+    ])
+  },
   mounted() { },
   methods: {
     getFloor(relation) {
@@ -134,8 +142,8 @@ export default {
     clickTrue() {
       if (!!this.radio) {
         let param = {
-          UserId: this.$route.query.userId,
-          ProjId: this.$route.query.projId
+          UserId: this.userId,
+          ProjId: this.projectId
         }
         let paramList = [{
           EquipmentId: this.category.id,
@@ -171,8 +179,8 @@ export default {
     },
     getFloorList() {
       let param = {
-        secret: this.$route.query.secret,
-        ProjId: this.$route.query.projId
+        secret: this.secret,
+        ProjId: this.projectId
       }
       getSpaceFloor(param).then(res => {
         if (res.data.Result == "success") {
@@ -235,8 +243,8 @@ export default {
       //         "family": ["XXX"]         // 必填, 要查询的类型, 只能是设备类型
       //       }
       //     },
-      //     secret: this.$route.query.secret,
-      //     ProjId: this.$route.query.projId
+      //     secret: this.secret,
+      //     ProjId: this.projectId
       //   }
       //   if (this.mess.buildId == "all") {
       //     param.data.criteria.id = this.mess.ProjId
@@ -251,7 +259,7 @@ export default {
       //   } else if (this.mess.floorId == 'all') {
       //     param.data.criteria.id = this.mess.buildId
       //   } else {
-      //     param.data.criteria.id = this.$route.query.projId
+      //     param.data.criteria.id = this.projectId
       //   }
       //   console.log("category", this.category)
       //   param.data.criteria.family = [this.getType(this.category.category)]
@@ -289,7 +297,7 @@ export default {
       } else if (this.mess.floorId == 'all') {
         param.data.criteria.id = this.mess.buildId
       } else {
-        param.data.criteria.id = this.$route.query.projId
+        param.data.criteria.id = this.projectId
       }
       param.data.criteria.type = [this.getType(this.category.category)]
       console.log(param)

src/components/config_point/ip_input.vue

@@ -4,8 +4,8 @@
             <li class="saga-border bg-write" :key="index">
                 <input type="text" @input="checkIpVal(item,index)" @keyup="turnIpPOS(item,index,$event)" v-model="item.value" ref="ipInput" @blur="setDefaultVal(item)">
             </li>
-            <span v-if="!!value && index == 3" :key="index">：</span>
-            <li v-if="!!value && index == 3" class="saga-border bg-write" :key="index">
+            <span v-if="!!value && index == 3" v-show="ProtocolType != 'opc'">：</span>
+            <li v-if="!!value && index == 3" v-show="ProtocolType != 'opc'" class="saga-border bg-write">
                 <input type="text" @input="checkIpVal(value[0],4)" @keyup="turnIpPOS(value[0],4,$event)" v-model="value[0].value" ref="ipInput" @blur="setDefaultVal(value)">
             </li>
         </template>
@@ -22,6 +22,10 @@
             port: {
                 type: [Number, String],
                 default: ""
+            },
+            ProtocolType: {
+                type: String,
+                default: ""
             }
         },
         data() {
@@ -115,7 +119,7 @@
                     }
                 }
                 //右箭头、回车键、空格键、冒号均向右跳转，右一不做任何措施
-                if (e.keyCode == 39 || e.keyCode == 13 || e.keyCode == 32 || e.keyCode == 190) {
+                if (e.keyCode == 39 || e.keyCode == 13 || e.keyCode == 32 || e.keyCode == 190 || e.keyCode == 110) {
                     if (index == 4) {} else {
                         self.$refs.ipInput[index + 1].focus();
                     }
@@ -141,6 +145,12 @@
         watch: {
             ip: function() {
                 this.changeData()
+            },
+            ProtocolType: function () {
+                if (this.ProtocolType == "opc") {
+                    this.$emit("deletePort")
+                }
+                this.changeData()
             }
         }
     }

src/components/config_point/step3_edit/index.vue

@@ -503,7 +503,7 @@ export default {
                     } else {
                         let str = ''
                         this.unitObj.dataSource.forEach(ele => {
-                            str = ele.code + '、' + ele.name + ' '
+                            str += ele.code + '.' + ele.name + ' '
                         })
                         this.ValueDescription = str
                     }

src/components/config_point/step3_point/3_temps.vue

@@ -173,6 +173,7 @@
         },
         methods: {
             getMain(param) {
+                debugger
                 this.activeName = 0
                 this.dealType = {}
                 this.form1 = {
@@ -193,6 +194,7 @@
                 }
                 console.log(params, 'params')
                 queryDescription(params, res => {
+                    debugger
                     console.log(res)
                     this.pointDes = !!res.Content ? res.Content.join("、") : "--"
                 })
@@ -603,6 +605,7 @@
             },
             //处理函数
             delDataSource(val){
+
                 if(!val){
                     return '--'
                 }
@@ -615,7 +618,7 @@
                 }else {
                     let str = ''
                     val.forEach(el => {
-                        str = el.code + '、' + el.name + ' '
+                        str += el.code + '.' + el.name + ' '
                     })
                     return str
                 }

src/components/config_point/step3_point/steps3_main.vue

@@ -157,7 +157,6 @@
                         },
                         type: this.protocolType
                     }, res => {
-                        debugger
                         this.identifyArr = res.Content.map(item => {
                             item.ownMess = item.EquipmentParameter
                             return item

src/components/data_admin/buildData/recommend.vue

@@ -63,10 +63,8 @@
     import getJson from "@/utils/buildData/vendersUtils"
     import buildJson from "@/utils/buildData/buildJson"
     import cutHeader from "@/utils/scan/cutHeader"
-    import {
-        upDateTableMain,
-        getBasicMatch
-    } from "@/api/scan/request"
+    import { upDateTableMain, getBasicMatch } from "@/api/scan/request"
+    import {mapGetters, mapActions} from "vuex"
     export default {
         components: {
             sagaButton,
@@ -107,6 +105,13 @@
         },
         created() {},
         mounted() {},
+        computed: {
+            ...mapGetters("layout", [
+                "projectId",
+                "secret",
+                "userId"
+            ])
+        },
         methods: {
             //主页面重新加载
             loadFm() {
@@ -217,7 +222,7 @@
                 } else if (keysArr.indexOf(this.obj.infosKey) > -1) {
                     let param = {
                         venderId: this.fm.Infos[this.obj.infosKey],
-                        projectId: this.$route.query.projId
+                        projectId: this.projectId
                     }
                     //如果存在content的联系人
                     console.log(this.content, "content")
@@ -455,7 +460,7 @@
                 if (venderIdArr.indexOf(infosKey) > -1) {
                     let param = {
                         venderId: this.fm.Infos[infosKey],
-                        projectId: this.$route.query.projId
+                        projectId: this.projectId
                     }
                     if (infosKey == "DPBrandID") {
                         param = {
@@ -568,8 +573,8 @@
             },
             updateMain(param) {
                 upDateTableMain({
-                    ProjId: this.$route.query.projId,
-                    UserId: this.$route.query.userId
+                    ProjId: this.projectId,
+                    UserId: this.userId
                 }, [param]).then(res => {
                     if (res.data.Result == "success") {
                         this.loadFm()
@@ -584,7 +589,7 @@
                 let infos = tools.deepCopyObj(this.fm.Infos)
                 infos[this.key] = data.value
                 let param = {
-                    "projectId": this.$route.query.projId,
+                    "projectId": this.projectId,
                     "criterias": [{
                         id: this.fm.FmId,
                         family: this.fm.Family,

src/components/data_admin/buildData/vendersChange.vue

@@ -85,12 +85,10 @@
 <script>
 import dataFill from "./dataFill"
 import getJson from "@/utils/buildData/vendersUtils"
-import {
-  upDateTableMain,
-  getProductList
-} from "@/api/scan/request"
+import { upDateTableMain, getProductList } from "@/api/scan/request"
 import cutHeader from "@/utils/scan/cutHeader"
 import tools from "@/utils/scan/tools"
+import {mapGetters, mapActions} from "vuex"
 export default {
   components: {
     dataFill
@@ -138,6 +136,13 @@ export default {
   },
   created() { },
   mounted() { },
+  computed: {
+    ...mapGetters("layout", [
+        "projectId",
+        "secret",
+        "userId"
+    ])
+  },
   methods: {
     isShow(item, index) {
       let falg = false
@@ -213,7 +218,7 @@ export default {
           this.fm.Infos[this.obj.infosKey] = res.id
           param = {}
           param.venderId = this.fm.Infos[this.obj.infosKey]
-          param.projectId = this.$route.query.projId
+          param.projectId = this.projectId
           //如果存在联系人请求
           if (!!this.obj.update) {
             if (this.obj.name == "生产商") {
@@ -358,7 +363,7 @@ export default {
       if (!!this.obj) {
         let param = {
           venderId: this.fm.Infos[this.obj.infosKey],
-          projectId: this.$route.query.projId
+          projectId: this.projectId
         }
         if (this.obj.infosKey == "DPBrandID") {
           param = {
@@ -488,7 +493,7 @@ export default {
     updateVender() {
       let param = {}
       param.venderId = this.fm.Infos[this.obj.infosKey]
-      param.projectId = this.$route.query.projId
+      param.projectId = this.projectId
       param.name = this.getMess('vender.name')
       param.website = this.getMess('vender.website')
       if (this.obj.infosKey == "DPBrandID") {
@@ -506,7 +511,7 @@ export default {
     updatePhone() {
       let param = {}
       param.venderId = this.fm.Infos[this.obj.infosKey]
-      param.projectId = this.$route.query.projId
+      param.projectId = this.projectId
       if (this.obj.name == "生产商") {
         param.name = this.getMess('vender.name')
       } else {
@@ -527,8 +532,8 @@ export default {
     updateFm(param) {
       let list = tools.copyArr(param)
       upDateTableMain({
-        ProjId: this.$route.query.projId,
-        UserId: this.$route.query.userId
+        ProjId: this.projectId,
+        UserId: this.userId
       }, [list]).then(res => {
         if (res.data.Result == "success") {
           this.$emit("change")

src/components/dialogs/addDialog/dialogAssets.vue

@@ -445,7 +445,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("所属建筑楼层");

src/components/dialogs/addDialog/dialogDevice.vue

@@ -547,7 +547,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("同时创建资产", "所属系统实例");

src/components/dialogs/changeRea.vue

@@ -62,7 +62,7 @@ import myPagination from "@/components/ledger/lib/myPagination";
 import paramDetails from "@/components/dialogs/list/paramDetails"
 import { getBillPropList, getEquipmentFamily, getSpaceFloor, getBussines, upDateTableMain } from "@/api/scan/request"
 import floorCascader from "@/components/ledger/lib/floorCascader";
-import {mapGetters, mapActions} from "vuex";
+import {mapGetters, mapActions} from "vuex"
 export default {
   components: {
     myPagination,
@@ -110,11 +110,11 @@ export default {
     this.getCode()
   },
   computed: {
-      ...mapGetters("layout", [
-          "projectId",
-          "secret",
-          "userId"
-      ])
+    ...mapGetters("layout", [
+        "projectId",
+        "secret",
+        "userId"
+    ])
   },
   mounted() { },
   methods: {
@@ -242,8 +242,8 @@ export default {
       //         "family": ["XXX"]         // 必填, 要查询的类型, 只能是设备类型
       //       }
       //     },
-      //     secret: this.$route.query.secret,
-      //     ProjId: this.$route.query.projId
+      //     secret: this.secret,
+      //     ProjId: this.projectId
       //   }
       //   if (this.mess.buildId == "all") {
       //     param.data.criteria.id = this.mess.ProjId
@@ -258,7 +258,7 @@ export default {
       //   } else if (this.mess.floorId == 'all') {
       //     param.data.criteria.id = this.mess.buildId
       //   } else {
-      //     param.data.criteria.id = this.$route.query.projId
+      //     param.data.criteria.id = this.projectId
       //   }
       //   console.log("category", this.category)
       //   param.data.criteria.family = [this.getType(this.category.category)]
@@ -296,7 +296,7 @@ export default {
       } else if (this.mess.floorId == 'all') {
         param.data.criteria.id = this.mess.buildId
       } else {
-        param.data.criteria.id = this.$route.query.projId
+        param.data.criteria.id = this.projectId
       }
       param.data.criteria.type = [this.getType(this.category.category)]
       console.log(param)

src/components/ledger/addDialog/dialogAssets.vue

@@ -447,7 +447,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("所属建筑楼层");

src/components/ledger/addDialog/dialogDevice.vue

@@ -533,7 +533,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("同时创建资产", "所属系统实例");

src/components/ledger/handsontables/assets.vue

@@ -475,7 +475,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")

src/components/ledger/handsontables/device.vue

@@ -449,7 +449,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" || child.InputMode == "M")) {
                     param.data.criterias.push({
                       id: item.id,
                       code: key
@@ -550,7 +550,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")
       }

src/components/ledger/handsontables/system.vue

@@ -321,7 +321,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;
@@ -615,7 +615,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" || child.InputMode == "M")) {
                     param.data.criterias.push({
                       id: item.id,
                       code: key

src/utils/buildData/buildJson.js

@@ -1,4 +1,4 @@
-import { physics } from '@/api/scan/config'
+import { venders } from '@/api/scan/config'
 import http from '@/api/scan/httpUtil'
 
 /**** 修改 */
@@ -6,110 +6,110 @@ import http from '@/api/scan/httpUtil'
 
 //生产商修改
 function updateVenderManufacturer(param, success) {
-    let url = `${physics}/venders/manufacturer/update`
+    let url = `${venders}/manufacturer/update`
     http.postJson(url, param, success)
 }
 
 //保险商修改
 function updateVenderInsurer(param, success) {
-    let url = `${physics}/venders/insurance/update`
+    let url = `${venders}/insurance/update`
     http.postJson(url, param, success)
 }
 
 //保险商修改
 function updateVenderMaintainer(param, success) {
-    let url = `${physics}/venders/maintainer/update`
+    let url = `${venders}/maintainer/update`
     http.postJson(url, param, success)
 }
 
 //供应商修改
 function updateVenderSupplier(param, success) {
-    let url = `${physics}/venders/supplier/update`
+    let url = `${venders}/supplier/update`
     http.postJson(url, param, success)
 }
 
 //品牌修改
 function updateVenderBrand(param, success) {
-    let url = `${physics}/venders/manufacturer/brand/update`
+    let url = `${venders}/manufacturer/brand/update`
     http.postJson(url, param, success)
 }
 
 //型号修改
 function updateVenderSpecification(param, success) {
-    let url = `${physics}/venders/manufacturer/specification/update`
+    let url = `${venders}/manufacturer/specification/update`
     http.postJson(url, param, success)
 }
 
 /** 获取 */
 function getList(param, success) {
-    let url = `${physics}/venders/basic/vender/query`
+    let url = `${venders}/basic/vender/query`
     http.postJson(url, param, success)
 }
 
 function getManufacturer(param, success) {
-    let url = `${physics}/venders/manufacturer/brand/findOne`
+    let url = `${venders}/manufacturer/brand/findOne`
     http.postJson(url, param, success)
 }
 
 function getSpecification(param, success) {
-    let url = `${physics}/venders/manufacturer/specification/findOne`
+    let url = `${venders}/manufacturer/specification/findOne`
     http.postJson(url, param, success)
 }
 
 /** 创建 */
 //创建品牌
 function createBrand(param, success) {
-    let url = `${physics}/venders/manufacturer/brand/create`
+    let url = `${venders}/manufacturer/brand/create`
     http.postJson(url, param, success)
 }
 //创建生产商
 function createManufacturer(param, success) {
-    let url = `${physics}/venders/manufacturer/create`
+    let url = `${venders}/manufacturer/create`
     http.postJson(url, param, success)
 }
 //创建供应商
 function createSupplier(param, success) {
-    let url = `${physics}/venders/supplier/create`
+    let url = `${venders}/supplier/create`
     http.postJson(url, param, success)
 }
 //创建保险商
 function createInsurance(param, success) {
-    let url = `${physics}/venders/insurance/create`
+    let url = `${venders}/insurance/create`
     http.postJson(url, param, success)
 }
 //创建维修商
 function createMaintainance(param, success) {
-    let url = `${physics}/venders/maintainance/create`
+    let url = `${venders}/maintainance/create`
     http.postJson(url, param, success)
 }
 
 //创建产品
 function createProduct(param, success) {
-    let url = `${physics}/venders/manufacturer/product/create`
+    let url = `${venders}/manufacturer/product/create`
     http.postJson(url, param, success)
 }
 
 //创建型号
 function createSpecification(param, success) {
-    let url = `${physics}/venders/manufacturer/specification/create`
+    let url = `${venders}/manufacturer/specification/create`
     http.postJson(url, param, success)
 }
 
 /***  联系人信息 */
 //添加修改维修商联系信息
 function updateMaintainance(param, success) {
-    let url = `${physics}/venders/maintainance/link/create`
+    let url = `${venders}/maintainance/link/create`
     http.postJson(url, param, success)
 }
 
 //修改创建供应商联系人
 function updateSupplier(param, success) {
-    let url = `${physics}/venders/supplier/link/create`
+    let url = `${venders}/supplier/link/create`
     http.postJson(url, param, success)
 }
 //修改创建保险商联系人
 function updateInsurance(param, success) {
-    let url = `${physics}/venders/insurance/link/create`
+    let url = `${venders}/insurance/link/create`
     http.postJson(url, param, success)
 }
 

src/views/data_admin/buildData/index.vue

@@ -335,10 +335,7 @@
         getdelMain, //获取过滤掉后的表格主体
         getBasicMatch, //获取完全匹配的厂商库id
     } from "@/api/scan/request";
-    import {
-        mapGetters,
-        mapActions
-    } from "vuex"
+    import { mapGetters, mapActions } from "vuex"
     export default {
         components: {
             "build-time": buildTime,
@@ -1751,7 +1748,7 @@
             },
             //处理头部header方法
             delHeader(arr) {
-                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"]
                 let data = showTools.changeHeader(arr, readArr, false, false, true, true, true)
                 data.unshift("标记", "点位标签", "设备族");
                 console.log(data)

src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -146,7 +146,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.changeHeader(arr, readArr, this.onlyRead, false, this.allMess)
       // data.unshift("关联的元空间");
       return data;
@@ -156,7 +156,7 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       // data.unshift({
       //   data: "SpaceCount",

src/views/ledger/cenotelist/index.vue

@@ -292,7 +292,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.changeHeader(arr, readArr, this.onlyRead, false, this.allMess)
       data.unshift("关联的元空间");
       return data;
@@ -302,7 +302,7 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       data.unshift({
         data: "SpaceCount",

src/views/ledger/facility/parts/index.vue

@@ -135,7 +135,7 @@ export default {
         "L",
         "L1",
         "L2",
-        "X"
+        "M"
       ],
       myDialog: {
         qrcode: false, //二维码弹窗

src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -156,7 +156,8 @@ export default {
         "F2",
         "L",
         "L1",
-        "L2"
+        "L2",
+        "M"
       ],
       EquipmentList: [],
       firmId: "" //品牌型号所需字段

src/views/ledger/facility/partsmanage/index.vue

@@ -176,7 +176,8 @@ export default {
         "F2",
         "L",
         "L1",
-        "L2"
+        "L2",
+        "M"
       ],
       EquipmentList: [],
       firmId: "" //品牌型号所需字段

src/views/point/config_point/edit_origin/index.vue

@@ -19,7 +19,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="主机IP地址">
-                    <ip-input :ip="formData.ProtocolInfo.Ip" :port="formData.ProtocolInfo.Port" @change="changeItem"></ip-input>
+                    <ip-input :ip="formData.ProtocolInfo.Ip" :port="formData.ProtocolInfo.Port" :ProtocolType="formData.ProtocolType" @change="changeItem" @deletePort="deletePort"></ip-input>
                 </el-form-item>
                 <el-form-item label="用户名/密码" v-if="(passWordArr.indexOf(formData.ProtocolType) > -1)">
                     <el-input v-model="formData.ProtocolInfo.User" style="display:inline-block;width:100px;"></el-input>/
@@ -173,6 +173,9 @@
                     })
                 }
             },
+            deletePort() {
+                this.formData.ProtocolInfo.Port = ""
+            }
         },
         watch: {
             projectId(){

src/views/rent/rentlist/index.vue

@@ -296,7 +296,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.changeHeader(arr, readArr, this.onlyRead, false, this.allMess)
       data.unshift("操作","所属楼层","租赁空间");
       return data;
@@ -306,7 +306,7 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       data.unshift({
         data: "caozuo",

src/views/rent/rentlist/rentadd/index.vue

@@ -147,7 +147,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.changeHeader(arr, readArr, this.onlyRead, false, this.allMess)
       // data.unshift("关联的元空间");
       return data;
@@ -157,7 +157,7 @@ export default {
       arr.map((item) => { //缺少信息点
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
       // data.unshift({
       //   data: "SpaceCount",

src/views/rent/rentlist/rentadd/index_1.vue

@@ -141,7 +141,7 @@ export default {
       arr.map((item) => {
         item.Visible = true
       })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "N2", "X"]
+      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
       if (!this.onlyRead) {
         readArr.push("Own")
       }