Преглед на файлове

系统对业务空间接口调试

LXXXY преди 5 години
родител
ревизия
57eab9a1fb

+ 15 - 1
src/api/scan/request.js

@@ -1379,17 +1379,31 @@ export function linkSySh(param, success) {
     let url = `${baseUrl}/datacenter/sy-in-sh/link-sy-sh`;
     http.postJson(url, param, success)
 }
+//系统所在业务空间关系,系统一对多,不覆盖
+export function linkSysSp(param, success) {
+    let url = `${baseUrl}/datacenter/sy-in-sp-base/link-sy-sps`;
+    http.postJson(url, param, success)
+}
 //系统所在竖井,系统一对多,此方法会覆盖以前的记录
 export function linkSh(param, success) {
     let url = `${baseUrl}/datacenter/sy-in-sh/link-sh`;
     http.postJson(url, param, success)
 }
+//系统所在竖井,系统一对多,此方法不会覆盖以前的记录
+export function linkSysSh(param, success) {
+    let url = `${baseUrl}/datacenter/sy-in-sh/link-sy-shs`;
+    http.postJson(url, param, success)
+}
 //根据对象删除系统和设备的关系,只针对一个对象
 export function eqInSysUnlink(param, success) {
     let url = `${baseUrl}/datacenter/sy-in-eq/unlink`;
     http.postJson(url, param, success)
 }
-
+//根据对象删除系统所在业务空间关系
+export function spaceInSysUnlink(param, success) {
+    let url = `${baseUrl}/datacenter/sy-in-sp-base/unlink-list`;
+    http.postJson(url, param, success)
+}
 //关系-----设备所在业务空间--删除关系
 export function eqInSpaceDelete(param, success) {
     let url = `${baseUrl}/datacenter/eq-in-sp-base/unlink-list?type=${param.type}`;

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

@@ -541,8 +541,9 @@ export default {
       if (!this.onlyRead && showTools.InputModeArr.indexOf(inputMode) == '-1') {
         // 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();
+        // console.log("this is ",this.tableData[row.row])
+        // let floor = tools.dataForKey(this.tableData[row.row], val);
+        this.$refs.editFloor.showDialog(this.tableData[row.row]);
       }
     },
     //更新临时维护信息点

+ 6 - 3
src/components/ledger/lib/editSysFloor.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-dialog title="楼层贯通关系维护" :visible.sync="connectDialogVis" width="50%" id="messageDialog">
+  <el-dialog title="所属建筑楼层" :visible.sync="connectDialogVis" width="50%" id="messageDialog">
     <el-row>
-      <div style="line-height:32px;">添加与{{floor.FloorLocalName}}层有贯通关系的楼层 : </div>
+      <div style="line-height:32px;">添加{{floor.SysLocalName}}所属建筑楼层 : </div>
       <div style="width:70%">
         <bfCascader ref="bfCascader" :FloorID="floor.FloorID"></bfCascader>
       </div>
@@ -27,7 +27,10 @@ export default {
     bfCascader
   },
   methods: {
-    showDialog() {
+    showDialog(floor=null) {
+      if(floor){
+        this.floor = floor
+      }
       this.connectDialogVis = true
       this.$nextTick(() => {
         this.$refs.bfCascader.getCascader()

+ 2 - 1
src/components/ledger/lib/spaceSelect.vue

@@ -2,7 +2,7 @@
   <div id="spaceSelect">
     <span class="buildFloor" style="padding-right:12px">业务空间</span>
     <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
-      <el-option v-for="item in options" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
+      <el-option v-for="(item, key) in options" :key="key" :label="item.Name" :value="item.Code"></el-option>
     </el-select>
   </div>
 </template>
@@ -39,6 +39,7 @@ export default {
           }
           return t;
         }).filter(item => item);
+        this.options.unshift({Code:null, CreateTime:null, LastUpdate:null, Name:'全部', ObjectType: null, ParentId: null, Statistics: {}});
       })
     },
     //改变空间

+ 2 - 2
src/components/ledger/system/dialog/addCenoteDialog.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { unSysShaft, queryShaftType, linkSh } from "@/api/scan/request";
+import { unSysShaft, queryShaftType, linkSysSh } from "@/api/scan/request";
 import cenoteType from "@/components/ledger/lib/cenoteType";
 import { mapGetters } from "vuex";
 export default {
@@ -136,7 +136,7 @@ export default {
             return item.ShaftID
           })
         }
-        linkSh(params, res => {
+        linkSysSh(params, res => {
           this.dialogVisible = false
           this.$message.success('关联成功!')
           this.$emit('refresh')

+ 4 - 15
src/components/ledger/system/dialog/addEquipDialog.vue

@@ -1,19 +1,15 @@
 <template>
   <el-dialog :title="title" :visible.sync="dialogVisible" width="900px" id="addEqDialog">
-    <el-row class="filters">
-      <el-col :span="7" style="width:268px">
+    <el-row class="filters" style="margin-bottom:10px;">
+      <el-col :span="8">
         <el-input placeholder="输入设备名称或设备本地编码进行查询" v-model="keycode" clearable @keyup.enter.native="getTableData">
           <i slot="suffix" class="el-input__icon el-icon-search" @click="getTableData"></i>
         </el-input>
       </el-col>
-      <el-col :span="8.5" style="padding:0 0;">
+      <el-col :span="9" style="padding:0 0;">
         <floor-cascader @change="changeFloor" style="margin-left:5px;"></floor-cascader>
       </el-col>
-      <el-col :span="8.5" style="padding-right:0;">
-        <myCascader @change="changeDevice" :params="params"></myCascader>
-      </el-col>
     </el-row>
-
     <div class="table-box">
       <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle" ref="multipleTable"
         @selection-change="handleSelectionChange">
@@ -48,12 +44,10 @@
 <script>
 import { sysLinkEquip, unSysEq} from "@/api/scan/request";
 import floorCascader from "@/components/ledger/lib/floorCascader";
-import myCascader from "@/components/ledger/system/lib/equipType";
 import { mapGetters } from "vuex";
 export default {
   components: {
-    floorCascader,
-    myCascader
+    floorCascader
   },
   computed: {
     ...mapGetters("layout", ["projectId"])
@@ -93,11 +87,6 @@ export default {
       this.Buildfloor = value
       this.getTableData()
     },
-    //修改设备类别
-    changeDevice(value) {
-      this.Equipcategory = value.code
-      this.getTableData()
-    },
     // 显示弹窗
     showDialog() {
       this.dialogVisible = true

+ 5 - 6
src/components/ledger/system/dialog/addSpaceDialog.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { unSysZoneSpace, linkSySh, queryDictionaryHead } from "@/api/scan/request";
+import { unSysZoneSpace, linkSysSp, queryDictionaryHead } from "@/api/scan/request";
 import floorCascader from "@/components/ledger/lib/floorCascader";
 import dictionaryCas from '@/components/config_point/dictionaryCascader'
 import spaceSelect from '@/components/ledger/lib/spaceSelect'
@@ -155,7 +155,6 @@ export default {
       }
 
       unSysZoneSpace(params, res => {
-        console.log("hh ",this.floorType)
         this.tableData = res.Content
         this.page.total = res.Total
       })
@@ -170,12 +169,12 @@ export default {
     savaRelation() {
       if (this.selections.length) {
         let params = {
-          ShaftId: this.params.ShaftID,
-          SysIdList: this.selections.map(item => {
-            return item.SysID
+          SysId: this.$route.query.SysID,
+          SpaceIdList: this.selections.map(item => {
+            return item.RoomID
           })
         }
-        linkSySh(params, res => {
+        linkSysSp(params, res => {
           this.dialogVisible = false
           this.$message.success('关联成功!')
           this.$emit('refresh')

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

@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import { queryLinkSys, syinshUnlink } from "@/api/scan/request";
+import { queryLinkSys, spaceInSysUnlink } from "@/api/scan/request";
 import { mapGetters } from "vuex";
 import addSpaceDialog from "@/components/ledger/system/dialog/addSpaceDialog"
 export default {
@@ -99,8 +99,8 @@ export default {
         type: 'warning'
       }).then(() => {
         let params = {
-          SysId: row.SysID,
-          ShaftId: this.params.ShaftID
+          SysId: this.params.SysID,
+          SpaceId: row.RoomID
         }
         this.deleteSyInSh(params);
       }).catch(() => {
@@ -109,7 +109,7 @@ export default {
     },
     // 删除系统所在竖井关系
     deleteSyInSh(params) {
-      syinshUnlink(params, res => {
+      spaceInSysUnlink(params, res => {
         this.$message.success('删除成功')
         this.getTableData()
       })