Browse Source

modify point config parts and buildfloor cascader

haojianlong 5 years ago
parent
commit
2cce4ca953

+ 2 - 2
package.json

@@ -12,7 +12,7 @@
     "dependencies": {
         "axios": "^0.18.0",
         "echarts": "^4.1.0",
-        "element-ui": "^2.6.1",
+        "element-ui": "^2.11.0",
         "font-awesome": "^4.7.0",
         "handsontable-pro": "^3.0.0",
         "jquery": "^3.3.1",
@@ -73,4 +73,4 @@
         "last 2 versions",
         "not ie <= 8"
     ]
-}
+}

+ 1 - 1
src/components/config_point/dictionaryCascader.vue

@@ -167,7 +167,7 @@ export default {
       })
     },
     changeSelect(val) {
-      let labels = this.$refs.dictCas.currentLabels
+      let labels = this.$refs.dictCas.getCheckedNodes()[0].pathLabels
       this.$emit('change', { val: val, labels: labels })
     },
     //减少请求次数

+ 1 - 1
src/components/point/dynamicdata/dataSource.vue

@@ -27,7 +27,7 @@ export default {
   methods: {
     init() {
       this.Datasource = [];
-      let param = { Related: this.Related, typeName: this.typeName };
+      let param = { Related: this.Related, TypeName: this.typeName };
       //数据源
       dynamicDataSource(param, res => {
         if (res.Result == "success") {

+ 1 - 1
src/components/point/dynamicdata/delRelationDialog.vue

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="18">
             <el-table :data="rtableData" style="width: 100%;max-height:400px;" height="calc(100% - 160px)" @selection-change="changeSelection"
-              ref="rtable" :cell-style="cellStyle">
+              ref="rtable">
               <el-table-column label="对象实例" class-name="bgfff">
                 <el-table-column type="selection" class-name="bgf5"></el-table-column>
                 <el-table-column v-for="(item,index) in rightTableHeader" :label="item.label" :key="item.prop" :class-name="index>0?'bgfff':'bgf5'">

+ 2 - 2
src/components/point/dynamicdata/dictionaryDevice.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form>
-      <el-form-item label="数据字典设备类型">
+      <el-form-item :label="`数据字典${typeName}类型`">
         <el-select v-model="SubTypeName" multiple collapse-tags placeholder="全部" filterable @change="changeType">
           <el-option v-for="item in DynEquipList" :key="item" :label="item" :value="item"></el-option>
         </el-select>
@@ -32,7 +32,7 @@ export default {
   },
   methods: {
     init() {
-      let param = { Related: this.Related, typeName: this.typeName };
+      let param = { Related: this.Related, TypeName: this.typeName };
       //数据字典
       dynamicDynEquipList(param, res => {
         if (res.Result == "success") {

+ 7 - 7
src/components/point/dynamicdata/equipRules.vue

@@ -8,7 +8,7 @@
           <el-form ref="form" :model="form" :inline="true">
             <el-row>
               <div class="query-item special">
-                <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
+                <el-input :placeholder="`请输入${typeName}标识关键字`" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
                   <i slot="suffix" class="el-input__icon el-icon-search" @click="queryTableData"></i>
                 </el-input>
               </div>
@@ -27,20 +27,20 @@
           </el-form>
         </el-col>
         <el-col :span="1">
-          <el-tooltip class="item" effect="dark" content="填充设备标识与实例对应规则" placement="left">
+          <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
             <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending"></el-button>
           </el-tooltip>
         </el-col>
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有设备</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的设备实例</el-col>
+      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">
       <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
-        <el-table-column prop="EquipmentMark" label="设备标识" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipmentMark" :label="`${typeName}标识`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="LocationFlag" label="位置标签" min-width="200">
           <template slot-scope="scope">
             <el-tooltip :content="scope.row.LocationFlag.toString()" placement="top">
@@ -49,8 +49,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="Datasource" label="数据源" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="SubTypeName" label="数字字典设备类型" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="ObjectLocalName" label="对应的设备实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
+        <el-table-column prop="SubTypeName" :label="`数字字典${typeName}类型`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="ObjectLocalName" :label="`对应的${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column label="实例所在建筑楼层" min-width="100">
           <template slot-scope="scope">
             <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''"

+ 1 - 1
src/components/point/dynamicdata/locationCascader.vue

@@ -30,7 +30,7 @@ export default {
   },
   methods: {
     init() {
-      let param = { Related: this.Related, typeName: this.typeName };
+      let param = { Related: this.Related, TypeName: this.typeName };
       dynamicLocationList(param, res => {
         this.LocationList = res.Content[0].List;
         //添加未明确对象

+ 1 - 1
src/components/point/dynamicdata/locationFlag.vue

@@ -27,7 +27,7 @@ export default {
   methods: {
     init() {
       this.Datasource = [];
-      let param = { Related: this.Related, typeName: this.typeName };
+      let param = { Related: this.Related, TypeName: this.typeName };
       // 位置标签
       dynamicLocFlagList(param, res => {
         if (res.Result == "success") {

+ 7 - 7
src/components/point/dynamicdata/partsRules.vue

@@ -8,7 +8,7 @@
           <el-form ref="form" :model="form" :inline="true">
             <el-row>
               <div class="query-item special">
-                <el-input placeholder="请输入部件标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
+                <el-input :placeholder="`请输入${typeName}标识关键字`" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
                   <i slot="suffix" class="el-input__icon el-icon-search" @click="queryTableData"></i>
                 </el-input>
               </div>
@@ -27,20 +27,20 @@
           </el-form>
         </el-col>
         <el-col :span="1">
-          <el-tooltip class="item" effect="dark" content="填充部件标识与实例对应规则" placement="left">
+          <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
             <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending"></el-button>
           </el-tooltip>
         </el-col>
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有部件</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的部件实例</el-col>
+      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">
       <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
-        <el-table-column prop="EquipmentMark" label="部件标识" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipmentMark" :label="`${typeName}标识`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="LocationFlag" label="位置标签" min-width="200">
           <template slot-scope="scope">
             <el-tooltip :content="scope.row.LocationFlag.toString()" placement="top">
@@ -49,8 +49,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="Datasource" label="数据源" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="SubTypeName" label="部件类型" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="ObjectLocalName" label="部件实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
+        <el-table-column prop="SubTypeName" :label="`${typeName}类型`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="ObjectLocalName" :label="`${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column label="所在建筑楼层" min-width="100">
           <template slot-scope="scope">
             <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''"

+ 1 - 1
src/components/ready/buildfloor/addBuild.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="buildTitle" :visible.sync="buildDialogVis" width="20%" @close="handleClose" id="messageDialog">
+  <el-dialog :title="buildTitle" :visible.sync="buildDialogVis" width="20%" id="messageDialog">
     <div>
       <label>建筑名称 : </label>
       <el-input placeholder="请输入建筑名称" v-model="buildName"></el-input>

+ 54 - 0
src/components/ready/buildfloor/addConnectivity.vue

@@ -0,0 +1,54 @@
+<template>
+  <el-dialog title="楼层贯通关系维护" :visible.sync="connectDialogVis" width="30%" id="messageDialog">
+    <el-row>
+      <div>添加与{{floor.FloorLocalName}}层有贯通关系的楼层 : </div>
+      <div :span="16">
+        <bfCascader ref="bfCascader"></bfCascader>
+      </div>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="small">取消</el-button>
+      <el-button size="small" type="primary" @click="save">确认</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import bfCascader from '@/components/ready/buildfloor/buildfloorCascader'
+export default {
+  data() {
+    return {
+      buildName: '',
+      connectDialogVis: false,
+      floor: {}
+    }
+  },
+  components: {
+    bfCascader
+  },
+  methods: {
+    showDialog() {
+      this.connectDialogVis = true
+      this.$nextTick(() => {
+        console.log(this.$refs.bfCascader)
+        this.$refs.bfCascader.value = [[1, 2, 3], [1, 2, 4], [1, 2, 5], [1, 7, 8], [1, 7, 9]]
+      })
+    },
+    save() {
+      console.log(this.$refs.bfCascader)
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+#messageDialog {
+  .el-row > div {
+    float: left;
+  }
+  .el-row > div + div {
+    margin-left: 10px;
+  }
+  /deep/ .el-input__inner {
+    vertical-align: baseline;
+  }
+}
+</style>

+ 73 - 0
src/components/ready/buildfloor/buildfloorCascader.vue

@@ -0,0 +1,73 @@
+<template>
+  <el-cascader v-model="value" :options="options" :props="props" clearable></el-cascader>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      value: [],
+      props: { multiple: true },
+      options: []
+    }
+  },
+  props: {
+    floorName: {
+      default: ""
+    }
+  },
+  created() {
+    setTimeout(() => {
+      this.options = [{
+        value: 1,
+        label: '东南',
+        children: [{
+          value: 2,
+          label: '上海',
+          children: [
+            { value: 3, label: '普陀' },
+            { value: 4, label: '黄埔' },
+            { value: 5, label: '徐汇' }
+          ]
+        }, {
+          value: 7,
+          label: '江苏',
+          children: [
+            { value: 8, label: '南京' },
+            { value: 9, label: '苏州' },
+            { value: 10, label: '无锡' }
+          ]
+        }, {
+          value: 12,
+          label: '浙江',
+          children: [
+            { value: 13, label: '杭州' },
+            { value: 14, label: '宁波' },
+            { value: 15, label: '嘉兴' }
+          ]
+        }]
+      }, {
+        value: 17,
+        label: '西北',
+        children: [{
+          value: 18,
+          label: '陕西',
+          children: [
+            { value: 19, label: '西安' },
+            { value: 20, label: '延安' }
+          ]
+        }, {
+          value: 21,
+          label: '新疆维吾尔族自治区',
+          children: [
+            { value: 22, label: '乌鲁木齐' },
+            { value: 23, label: '克拉玛依' }
+          ]
+        }]
+      }]
+    },600)
+  },
+  methods: {
+
+  }
+}
+</script>

+ 14 - 14
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -5,7 +5,7 @@
       <el-col :span="12">
         <el-button size="small" type="default" icon="el-icon-back" @click="goback"></el-button>
         <div style="display:inline-block;width:317px;margin-left:10px;">
-          <dictionary-device @change="changeDictionary" :Related="false"></dictionary-device>
+          <dictionary-device @change="changeDictionary" :Related="false" :typeName="typeName"></dictionary-device>
         </div>
       </el-col>
       <el-col :span="12" class="text-right">
@@ -20,12 +20,12 @@
     <!-- 列表及查询条件区域 -->
     <div class="table-container clearfix">
       <div class="left-table">
-        <h5>未对应的设备标识</h5>
+        <h5>未对应的{{typeName}}标识</h5>
         <!-- 查询条件 -->
         <div class="query-box clearfix">
           <div class="query-item">
-            <label>设备标识关键字</label>
-            <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryLeftTable">
+            <label>{{typeName}}标识关键字</label>
+            <el-input :placeholder="`请输入${typeName}标识关键字`" v-model="form.EquipmentMark" @keyup.enter.native="queryLeftTable">
               <i slot="suffix" class="el-input__icon el-icon-search" @click="queryLeftTable"></i>
             </el-input>
           </div>
@@ -53,8 +53,8 @@
                   </el-tooltip>
                 </template>
               </el-table-column>
-              <el-table-column prop="SubTypeName" label="设备类型关键字" align="right" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="EquipmentMark" label="设备标识" show-overflow-tooltip align="right" width="200" class-name="bgf5"></el-table-column>
+              <el-table-column prop="SubTypeName" :label="`${typeName}类型关键字`" align="right" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="EquipmentMark" :label="`${typeName}标识`" show-overflow-tooltip align="right" width="200" class-name="bgf5"></el-table-column>
               <el-table-column type="selection" width="35" class-name="bgf5"></el-table-column>
             </el-table>
           </div>
@@ -62,7 +62,7 @@
           <transition name="el-zoom-in-top">
             <div class="AIRecom" v-show="leftRecoList.length&&leftAI&&rArray.length">
               <div class="l-title">
-                可能对应的设备标识
+                可能对应的{{typeName}}标识
                 <i class="el-icon-close" @click="leftRecoList=[]"></i>
               </div>
               <div v-for="(t,i) in leftRecoList" :key="t.id" class="l-ai-recom-item ai-recom-item" @click="selectAI(i,'l')">
@@ -79,12 +79,12 @@
         </div>
       </div>
       <div class="right-table" style="float: right;">
-        <h5>未对应的设备实例</h5>
+        <h5>未对应的{{typeName}}实例</h5>
         <!-- 查询条件 -->
         <div class="query-box clearfix">
           <div class="query-item">
-            <label>设备实例关键字</label>
-            <el-input placeholder="请输入设备实例关键字" v-model="form.ObjectLocalName" @keyup.enter.native="queryRightTable">
+            <label>{{typeName}}实例关键字</label>
+            <el-input :placeholder="`请输入${typeName}实例关键字`" v-model="form.ObjectLocalName" @keyup.enter.native="queryRightTable">
               <i slot="suffix" class="el-input__icon el-icon-search" @click="queryRightTable"></i>
             </el-input>
           </div>
@@ -99,11 +99,11 @@
             <el-table ref="rTableBody" :data="RtableData" tooltip-effect="dark" style="width: 100%" height="100%" @row-click="clickRightRow"
               @selection-change="rightSelectionChange">
               <el-table-column type="selection" width="35" class-name="bgf5"></el-table-column>
-              <el-table-column label="设备实例名称" width="200" class-name="bgf5" show-overflow-tooltip>
+              <el-table-column :label="`${typeName}实例名称`" width="200" class-name="bgf5" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.ObjectLocalName }}</template>
               </el-table-column>
-              <el-table-column prop="ObjectID" label="设备实例编码" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="SubTypeName" label="设备类型" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="ObjectID" :label="`${typeName}实例编码`" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="SubTypeName" :label="`${typeName}类型`" show-overflow-tooltip></el-table-column>
               <el-table-column label="所在建筑楼层">
                 <template slot-scope="scope">
                   <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''"
@@ -120,7 +120,7 @@
           <transition name="el-zoom-in-top">
             <div class="AIRecom" v-show="rightRecoList.length&&!leftAI&&lArray.length">
               <div class="r-title">
-                可能对应的设备实例
+                可能对应的{{typeName}}实例
                 <i class="el-icon-close" @click="rightRecoList=[]"></i>
               </div>
               <div v-for="(t,i) in rightRecoList" :key="t.id" class="r-ai-recom-item ai-recom-item" @click="selectAI(i,'r')">

+ 14 - 14
src/views/point/dynamicdata/addRelation/partsRela/index.vue

@@ -5,7 +5,7 @@
       <el-col :span="12">
         <el-button size="small" type="default" icon="el-icon-back" @click="goback"></el-button>
         <div style="display:inline-block;width:317px;margin-left:10px;">
-          <dictionary-device @change="changeDictionary" :Related="false"></dictionary-device>
+          <dictionary-device @change="changeDictionary" :Related="false" :typeName="typeName"></dictionary-device>
         </div>
       </el-col>
       <el-col :span="12" class="text-right">
@@ -20,12 +20,12 @@
     <!-- 列表及查询条件区域 -->
     <div class="table-container clearfix">
       <div class="left-table">
-        <h5>未对应的部件标识</h5>
+        <h5>未对应的{{typeName}}标识</h5>
         <!-- 查询条件 -->
         <div class="query-box clearfix">
           <div class="query-item">
-            <label>部件标识关键字</label>
-            <el-input placeholder="请输入部件标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryLeftTable">
+            <label>{{typeName}}标识关键字</label>
+            <el-input :placeholder="`请输入${typeName}标识关键字`" v-model="form.EquipmentMark" @keyup.enter.native="queryLeftTable">
               <i slot="suffix" class="el-input__icon el-icon-search" @click="queryLeftTable"></i>
             </el-input>
           </div>
@@ -53,8 +53,8 @@
                   </el-tooltip>
                 </template>
               </el-table-column>
-              <el-table-column prop="SubTypeName" label="部件类型关键字" align="right" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="EquipmentMark" label="部件标识" show-overflow-tooltip align="right" width="200" class-name="bgf5"></el-table-column>
+              <el-table-column prop="SubTypeName" :label="`${typeName}类型关键字`" align="right" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="EquipmentMark" :label="`${typeName}标识`" show-overflow-tooltip align="right" width="200" class-name="bgf5"></el-table-column>
               <el-table-column type="selection" width="35" class-name="bgf5"></el-table-column>
             </el-table>
           </div>
@@ -62,7 +62,7 @@
           <transition name="el-zoom-in-top">
             <div class="AIRecom" v-show="leftRecoList.length&&leftAI&&rArray.length">
               <div class="l-title">
-                可能对应的部件标识
+                可能对应的{{typeName}}标识
                 <i class="el-icon-close" @click="leftRecoList=[]"></i>
               </div>
               <div v-for="(t,i) in leftRecoList" :key="t.id" class="l-ai-recom-item ai-recom-item" @click="selectAI(i,'l')">
@@ -79,12 +79,12 @@
         </div>
       </div>
       <div class="right-table" style="float: right;">
-        <h5>未对应的部件实例</h5>
+        <h5>未对应的{{typeName}}实例</h5>
         <!-- 查询条件 -->
         <div class="query-box clearfix">
           <div class="query-item">
-            <label>部件实例关键字</label>
-            <el-input placeholder="请输入部件实例关键字" v-model="form.ObjectLocalName" @keyup.enter.native="queryRightTable">
+            <label>{{typeName}}实例关键字</label>
+            <el-input :placeholder="`请输入${typeName}实例关键字`" v-model="form.ObjectLocalName" @keyup.enter.native="queryRightTable">
               <i slot="suffix" class="el-input__icon el-icon-search" @click="queryRightTable"></i>
             </el-input>
           </div>
@@ -99,11 +99,11 @@
             <el-table ref="rTableBody" :data="RtableData" tooltip-effect="dark" style="width: 100%" height="100%" @row-click="clickRightRow"
               @selection-change="rightSelectionChange">
               <el-table-column type="selection" width="35" class-name="bgf5"></el-table-column>
-              <el-table-column label="部件实例名称" width="200" class-name="bgf5" show-overflow-tooltip>
+              <el-table-column :label="`${typeName}实例名称`" width="200" class-name="bgf5" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.ObjectLocalName }}</template>
               </el-table-column>
-              <el-table-column prop="ObjectID" label="部件实例编码" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="SubTypeName" label="部件类型" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="ObjectID" :label="`${typeName}实例编码`" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="SubTypeName" :label="`${typeName}类型`" show-overflow-tooltip></el-table-column>
               <el-table-column prop="CascadeEquipLocalName" label="所属设备实例" show-overflow-tooltip></el-table-column>
               <el-table-column label="所在建筑楼层">
                 <template slot-scope="scope">
@@ -121,7 +121,7 @@
           <transition name="el-zoom-in-top">
             <div class="AIRecom" v-show="rightRecoList.length&&!leftAI&&lArray.length">
               <div class="r-title">
-                可能对应的部件实例
+                可能对应的{{typeName}}实例
                 <i class="el-icon-close" @click="rightRecoList=[]"></i>
               </div>
               <div v-for="(t,i) in rightRecoList" :key="t.id" class="r-ai-recom-item ai-recom-item" @click="selectAI(i,'r')">

+ 11 - 3
src/views/ready/buildfloor/index.vue

@@ -55,7 +55,7 @@
             <el-table-column prop="SubTypeName" label="楼层贯通关系">
               <template slot-scope="scope">
                 <span style="margin-right:20px">{{scope.row.EquipmentMark}}</span>
-                <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" plain icon="el-icon-edit-outline"></el-button>
+                <el-button size="mini" @click="changeConnection(scope.row)" plain icon="el-icon-edit-outline"></el-button>
               </template>
             </el-table-column>
             <el-table-column prop="action" label="操作">
@@ -83,13 +83,15 @@
         <el-button size="small" type="primary" @click="confirmDel">确认</el-button>
       </span>
     </el-dialog>
-
+    <!-- 添加贯通关系弹窗 -->
+    <addConnectivity ref="addConnectivity"></addConnectivity>
   </div>
 </template>
 
 <script>
 import addFloor from "@/views/ready/buildfloor/addFloor/index";
 import addBuild from "@/components/ready/buildfloor/addBuild";
+import addConnectivity from "@/components/ready/buildfloor/addConnectivity";
 import {
   buildingQuery,
   floorQuery,
@@ -98,7 +100,8 @@ import {
 export default {
   components: {
     addFloor,
-    addBuild
+    addBuild,
+    addConnectivity
   },
   data() {
     return {
@@ -213,6 +216,11 @@ export default {
     editFloorData(floor){
       this.curFloorId = floor.FloorID;
       this.$refs.addFloorDialog.showDialog(floor)
+    },
+    // 修改楼层贯通关系
+    changeConnection(row){
+      this.$refs.addConnectivity.showDialog()
+      this.$refs.addConnectivity.floor = row
     }
   }
 }