Bläddra i källkod

系统台账详情页,所属建筑楼层关联

LXXXY 5 år sedan
förälder
incheckning
59afdebf97

+ 14 - 27
src/components/ledger/handsontables/system.vue

@@ -32,18 +32,7 @@
     <details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
     <system-relevance @close="reset" :id="systemId" :dialog="myDialog"></system-relevance>
     <!-- 不支持的输入方式 -->
-    <el-dialog title="临时维护信息点" :visible.sync="myDialog.update" @close="handleCloseUpdate" width="670px">
-      <el-row>
-        该信息点未定义对应组件,现在维护数据不确定后续是否可用。如确实需要维护,请点击<el-link @click="updateInputShow = true" type="primary" :underline="false">继续维护</el-link>。
-      </el-row>
-      <el-row style="margin-top:20px;" v-show="updateInputShow">
-        <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" placeholder="请输入内容" v-model="updateInput"></el-input>
-      </el-row>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="myDialog.update = false">取 消</el-button>
-        <el-button type="primary" @click="handleClickUpdate">确 认</el-button>
-      </span>
-    </el-dialog>
+    <editSysfloor ref="editFloor" @handleClickUpdate="handleClickUpdate"></editSysfloor>
     <!-- 新增系统 -->
     <el-dialog title="确定新增系统的类型" :visible.sync="myDialog.addDevice" width="30%">
       <el-row>
@@ -78,6 +67,7 @@ import systemRelevance from "@/components/ledger/tableTransfers"
 import Handsontable from "handsontable-pro"
 import text from "@/utils/handsontable/mainText"
 import 'handsontable-pro/dist/handsontable.full.css'
+import editSysfloor from "@/components/ledger/lib/editSysFloor";
 
 import { mapGetters } from "vuex";
 export default {
@@ -90,7 +80,8 @@ export default {
     dialogAssets,
     detailsDialog,
     systemRelevance,
-    myCascader
+    myCascader,
+    editSysfloor
   },
   computed: {
     ...mapGetters("layout", ["projectId", "secret", "userId"]),
@@ -548,24 +539,20 @@ export default {
           break;
       }
       if (!this.onlyRead && showTools.InputModeArr.indexOf(inputMode) == '-1') {
-        this.updateInfoPoint = val
-        this.updateInput = tools.dataForKey(this.tableData[row.row], val)
-        this.myDialog.update = true
+        // this.updateInfoPoint = val
+        // this.updateInput = tools.dataForKey(this.tableData[row.row], val)
+        let floor = tools.dataForKey(this.tableData[row.row], val);
+        this.$refs.editFloor.showDialog();
       }
     },
-    //关闭临时维护弹窗回调
-    handleCloseUpdate() {
-      this.updateInputShow = false
-      this.updateInfoPoint = ''
-      this.updateInput = ''
-    },
     //更新临时维护信息点
     handleClickUpdate() {
-      tools.setDataForKey(this.tableData[this.row], this.updateInfoPoint, this.updateInput)
-      this.handleUpdataTable([[this.row, this.updateInfoPoint, null, this.updateInput]], "edit")
-      this.updateInputShow = false
-      this.myDialog.update = false
-      this.updateInput = ''
+      // this.$message("更新成功");
+      // tools.setDataForKey(this.tableData[this.row], this.updateInfoPoint, this.updateInput)
+      // this.handleUpdataTable([[this.row, this.updateInfoPoint, null, this.updateInput]], "edit")
+      // this.updateInputShow = false
+      // this.myDialog.update = false
+      // this.updateInput = ''
     },
     //获取被筛选掉的行号
     trimmedRows() {

+ 80 - 0
src/components/ledger/lib/editSysFloor.vue

@@ -0,0 +1,80 @@
+<template>
+  <el-dialog title="楼层贯通关系维护" :visible.sync="connectDialogVis" width="50%" id="messageDialog">
+    <el-row>
+      <div style="line-height:32px;">添加与{{floor.FloorLocalName}}层有贯通关系的楼层 : </div>
+      <div style="width:70%">
+        <bfCascader ref="bfCascader" :FloorID="floor.FloorID"></bfCascader>
+      </div>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="connectDialogVis=false">取消</el-button>
+      <el-button size="small" type="primary" @click="save">确认</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import bfCascader from '@/components/ready/buildfloor/buildfloorCascader'
+import { createRelationInFloor } from "@/api/scan/request";
+export default {
+  data() {
+    return {
+      buildName: '',
+      connectDialogVis: false,
+      floor: {}
+    }
+  },
+  components: {
+    bfCascader
+  },
+  methods: {
+    showDialog() {
+      this.connectDialogVis = true
+      this.$nextTick(() => {
+        this.$refs.bfCascader.getCascader()
+        let arr = this.floor.FloorThroughList || [];
+        let value = []
+        if (arr.length) {
+          arr.map(t => {
+            value.push([t.BuildID, t.FloorID])
+          })
+        }
+        this.$refs.bfCascader.value = value
+      })
+    },
+    save() {
+      let arr = this.$refs.bfCascader.value;
+      let param = {
+        FloorId: this.floor.FloorID,
+        FloorOtherIdList: []
+      }
+      arr.map(t => {
+        param.FloorOtherIdList.push(t[1])
+      })
+      // createRelationInFloor(param, res => {
+        this.connectDialogVis = false;
+        this.$message.success('关联成功');
+        this.$emit('handleClickUpdate')
+      // })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+#messageDialog {
+  .el-row{
+    height: 50px;
+    max-height: 200px;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+  .el-row > div {
+    float: left;
+  }
+  .el-row > div + div {
+    margin-left: 10px;
+  }
+  /deep/ .el-input__inner {
+    vertical-align: baseline;
+  }
+}
+</style>

+ 4 - 3
src/components/ledger/system/table/cenoteTable.vue

@@ -76,17 +76,18 @@ export default {
       res.Content.forEach(item => {
         this.shaftType[item.Code] = item.Name
       })
-      // this.getTableData()
+      this.getTableData()
     })
   },
   methods: {
     // 获取列表数据
     getTableData() {
       let params = {
-        Filters: `ShaftID='${this.params.ShaftID}'`,
+        Filters: `SysID='${this.params.SysID}'`,
         Cascade: [
           {
-            Name: 'shaftThroughList'
+            Name: 'shaftList',
+
           }
         ]
       }

+ 3 - 3
src/components/ledger/system/table/deviceTable.vue

@@ -69,13 +69,13 @@ export default {
     type: String
   },
   created() {
-    // this.getTableData()
+    this.getTableData()
   },
   methods: {
     // 获取列表数据
     getTableData() {
       let params = {
-        Filters: `ShaftID='${this.params.ShaftID}'`,
+        Filters: `SysID='${this.params.SysID}'`,
         Cascade: [
           {
             Name: 'equipmentList',
@@ -84,7 +84,7 @@ export default {
         ]
       }
       queryLinkSys(params, res => {
-        this.tableData = res.Content[0].EquipmentList || []
+        this.tableData = res.Content[0].Equipment || []
       })
     },
     // 删除关系

+ 3 - 4
src/components/ledger/system/table/spaceTable.vue

@@ -71,17 +71,16 @@ export default {
     type: String
   },
   created() {
-    // this.getTableData()
+    this.getTableData()
   },
   methods: {
     // 获取列表数据
     getTableData() {
       let params = {
-        Filters: `ShaftID='${this.params.ShaftID}'`,
+        Filters: `SysID='${this.params.SysID}'`,
         Cascade: [
           {
-            Name: 'systemList',
-            Cascade: [{ Name: 'categoryNames' }]
+            Name: 'zoneSpaceBaseTableList'
           }
         ]
       }