Merge branch 'dev' of git.sagacloud.cn:web/ibms into dev

src/components/business_space/business/handsontable.vue

@@ -1,15 +1,15 @@
 <template>
   <div id="handsontable" v-loading="isLoading">
     <el-row class="left">
-      <div style="display: inline-block" v-show="zoneCode === 'OtherZone'">
+      <!-- <div style="display: inline-block" v-show="zoneCode === 'OtherZone'"> -->
         <!--              <div style="display: inline-block" v-show="!onlyRead && zoneCode === 'OtherZone'">-->
-        <el-button @click="addZoneBtn" type="primary">添加分区</el-button>
+        <!-- <el-button @click="addZoneBtn" type="primary">添加分区</el-button>
         <el-select v-model="OtherValue" placeholder="请选择分区类型" @change="changeOtherZone">
           <el-option v-for="item in OtherList" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
         &nbsp;&nbsp; | &nbsp;&nbsp;
-      </div>
+      </div> -->
       <el-select v-model="onlyRead" @change="getData(false)" style="width:100px;margin-right:20px;vertical-align:bottom;">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
@@ -173,7 +173,7 @@
       },
       imgsArr: [], //空间图片
       OtherList: [],//其他分区筛选框
-      OtherValue: '',
+      // OtherValue: '',
       addData: {},
     };
   },
@@ -237,24 +237,24 @@
       if (this.zoneItemID) {
         this.zoneParam.Filters = `RoomID="${this.zoneItemID}"`
       }
-      if (this.zoneCode != 'OtherZone') {
+      // if (this.zoneCode != 'OtherZone') {
         this.isLoading = true
         this.getZoneMessage(this.zoneParam)
-      } else {
-        // 其他分区类型查询表数据接口
-        // if (localStorage.getItem('otherZone')) {
-        //   // this.OtherValue = (localStorage.getItem('otherZone'))
-        //   localStorage.removeItem('otherZone')
-        // }
-        if (this.OtherValue) {
-          this.zoneParam.ZoneType = this.OtherValue;
-          this.getZoneMessage(this.zoneParam)
-        } else {
-          this.main = []
-        }
-        this.isLoading = false
-        this.getOtherType();
-      }
+      // } else {
+      //   // 其他分区类型查询表数据接口
+      //   // if (localStorage.getItem('otherZone')) {
+      //   //   // this.OtherValue = (localStorage.getItem('otherZone'))
+      //   //   localStorage.removeItem('otherZone')
+      //   // }
+      //   // if (this.OtherValue) {
+      //   //   this.zoneParam.ZoneType = this.OtherValue;
+      //   //   this.getZoneMessage(this.zoneParam)
+      //   // } else {
+      //     this.main = []
+      //   // }
+      //   this.isLoading = false
+      //   this.getOtherType();
+      // }
     },
     //查询空间信息
     getZoneMessage(param) {
@@ -834,11 +834,12 @@
         this.$nextTick(() => {
           this.$refs.cascader.setValue([this.zoneCode])
         })
-      } else if (this.zoneCode == 'OtherZone' && this.OtherValue) {
-        this.$nextTick(() => {
-          this.$refs.cascader.setValue([this.zoneCode,this.OtherValue])
-        })
-      }
+      } 
+      // else if (this.zoneCode == 'OtherZone' && this.OtherValue) {
+      //   this.$nextTick(() => {
+      //     this.$refs.cascader.setValue([this.zoneCode,this.OtherValue])
+      //   })
+      // }
       // if (this.main && this.main.length && this.main[0].RoomID) {
       //   this.hot.destroy()
       //   this.hot = null

src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -198,7 +198,7 @@ export default {
     },
     // 获取列表成功回调
     getDataSuc(res, zonespacebase) {
-      let response = res.Content.map(t => {
+      let response = res.Content&&res.Content.map(t => {
         let otherSpace = [];
         if (t[zonespacebase] && t[zonespacebase].length) {
           t[zonespacebase].map(item => {

src/components/business_space/newGraphy/graphy.vue

@@ -1,14 +1,14 @@
 <template>
   <div id="graphy" ref="graphy" v-loading="canvasLoading">
     <div v-show="!FloorMap">
-      <div style="margin-right:10px;width: 100%;margin-bottom: 10px" v-if="showOtherFlag">
+      <!-- <div style="margin-right:10px;width: 100%;margin-bottom: 10px" v-if="showOtherFlag"> -->
         <!-- 平面图其他分区 -->
-        <el-button type="primary" @click="addZoneBtn">添加分区</el-button>
+        <!-- <el-button type="primary" @click="addZoneBtn">添加分区</el-button>
         <el-select v-model="OtherValue" placeholder="请选择分区类型" @change="changeOtherZone">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
       <div class="center" style="height: 400px;padding-top:182px;box-sizing:border-box;">
         <i class="icon-wushuju iconfont"></i>
         暂无数据
@@ -18,14 +18,14 @@
       <canvas id="floorCanvas" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"></canvas>
       <!-- 初始两个按钮 -->
       <el-row class="buttons-box">
-        <div style="margin-right:10px;width: 100%;margin-bottom: 10px" v-if="showOtherFlag">
+        <!-- <div style="margin-right:10px;width: 100%;margin-bottom: 10px" v-if="showOtherFlag"> -->
           <!-- 平面图其他分区 -->
-          <el-button type="primary" @click="addZoneBtn">添加分区</el-button>
+          <!-- <el-button type="primary" @click="addZoneBtn">添加分区</el-button>
           <el-select v-model="OtherValue" placeholder="请选择分区类型" @change="changeOtherZone">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
-        </div>
+        </div> -->
         <div>
           <el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找"
             width="180px" @select="handleSelect">
@@ -181,7 +181,7 @@
       areaValue: 40,
       areaMarks: { 0: '0m²', 100: '1m²' },
       options: [], //其他分区类型
-      OtherValue: '',
+      // OtherValue: '',
       showOtherFlag: false, //是否显示其他分区类型添加
       buildFloorName: "", //建筑楼层名称
       spaceHeight: 0,
@@ -264,9 +264,9 @@
       })
     },
     //添加其他分区
-    addZoneBtn() {
-      this.$refs.zone.dialogFormVisible = true
-    },
+    // addZoneBtn() {
+    //   this.$refs.zone.dialogFormVisible = true
+    // },
     // 搜索
     querySearch(queryString, cb) {
       let restaurants = this.zoneList;
@@ -334,10 +334,10 @@
       })
     },
     // 其他类型下拉change
-    changeOtherZone(val) {
-      this.init(2);
-      // localStorage.setItem('otherZone', val)
-    },
+    // changeOtherZone(val) {
+    //   this.init(2);
+    //   // localStorage.setItem('otherZone', val)
+    // },
     // 获取未绑定业务空间的元空间
     getISPSPUnrelaBSP() {
       let pa = {
@@ -346,11 +346,13 @@
           PageSize: 1000,
           FloorId: this.buildFloor[1]
         },
-        objectType: this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code
+        objectType: this.tab.code
+        // objectType: this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code
       }
       getIspNotInSpace(pa, res => {
         // 类型需要重新获取,直接取pa.objecttype有问题
-        let tempType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code
+        // let tempType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code
+        let tempType = this.tab.code
         if (res.FloorId == this.buildFloor[1] && res.ZoneType == tempType) {
           this.allUnRelatISP = res.Content;
         }
@@ -379,7 +381,7 @@
       that.canvasLoading = false;
       if (res == 'error') {
         this.FloorMap = '';
-        this.$message.warning('数据解析异常');
+        console.log('数据解析异常');
         return;
       }
       that.view.scene = that.scene;
@@ -402,7 +404,8 @@
     // 获取当前分区下的业务空间
     getBusinessSpace() {
       this.canvasLoading = true
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
       let pa = {
         ZoneType: ObjectType,
         Filters: `not RoomID isNull`,
@@ -415,7 +418,8 @@
       }
       zoneQueryOutline(pa, res => {
         // 类型需要重新获取,直接取pa.ZoneType
-        let tempType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+        let tempType = this.tab.code;
+        // let tempType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
         if (res.FloorId == this.buildFloor[1] && res.ZoneType == tempType) {
           // 所有业务空间
           this.businessSpaceList = res.Content;
@@ -777,7 +781,8 @@
     },
     // 确认业务空间
     confirmZoneSpace() {
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let space = {
         RoomID: this.curZoneItem.data.RoomID,
         State: 0,
@@ -800,6 +805,12 @@
     },
     // 重新划分--保存
     saveRefactorBSP() {
+      if (this.scene && this.scene.cutItem) {
+        if (!this.scene.cutItem.closeFlag) {
+          this.$message.warning('未产生闭合区域')
+          return
+        }
+      }
       let selectSpace = this.scene.getSelectedSpaces();
       let selectLikeSpace = this.scene.getSelectedLikeSpace();
       //更新业务空间
@@ -994,7 +1005,8 @@
     },
     // 更新业务空间和元空间的关系
     relationInBSPandISP(SpaceId, IspaceIdList) {
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let pa = {
         data: { SpaceId: SpaceId, IspaceIdList: IspaceIdList },
         type: ObjectType
@@ -1013,7 +1025,8 @@
     // 批量更新业务空间和元空间的关系
     groupCreRelaZoneAndISp(Spaces) {
       Spaces = Spaces.filter(item => item.IspaceId);
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       if (Spaces.length) {
         let param = {
           data: {
@@ -1034,7 +1047,8 @@
     },
     // 批量创建
     groupCreateBSP(spaces) {
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       spaces = spaces.map(t => {
         t.ObjectType = ObjectType;
         t.BIMLocation = this.getAverageVal(t.Outline);
@@ -1058,7 +1072,8 @@
     },
     // 单个创建
     createSingleBSP(space, IspaceIdList) {
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;/
       space.BIMLocation = space.Outline ? this.getAverageVal(space.Outline) : null;
       space.ObjectType = ObjectType;
       let pa = {
@@ -1070,7 +1085,8 @@
     },
     // 更新业务空间区域
     updateBSPOutline(zoneObj, IspaceIdList) {
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       zoneObj.BIMLocation = zoneObj.Outline ? this.getAverageVal(zoneObj.Outline) : null;
       zoneObj.ObjectType = ObjectType;
       zoneObj.BuildingId = this.buildFloor[0];
@@ -1097,7 +1113,8 @@
     },
     // 查询未关联平面图的业务空间(项目下+当前分区)
     getBSPunrelaISP() {
-      let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
+      let ObjectType = this.tab.code;
+      // let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let pa = {
         Filters: `Outline isNull;ObjectType="${ObjectType}"`
       }

src/components/ledger/lib/bimDialog.vue

@@ -139,7 +139,7 @@
           this.canvasLoading = false
           if (res == 'error') {
             this.FloorMap = ''
-            this.$message.warning('数据解析异常')
+            console.log('数据解析异常')
             return
           }
           if (res.Result == 'failure') {

src/components/ledger/lib/cenoteGraphy.vue

@@ -114,7 +114,7 @@ export default {
         that.canvasLoading = false;
         if (res == 'error') {
           this.floorMap = '';
-          this.$message.warning('数据解析异常');
+          console.log('数据解析异常');
           return;
         }
         that.view.scene = that.scene;

src/utils/handsontable/notShow.js

@@ -1234,7 +1234,7 @@ const showTools = {
         } else { //(未支持的输入方式)暂不支持编辑
             return {
                 data: item.Path,
-                readOnly: onlyReadc
+                readOnly: onlyRead
             }
         }
     },

src/views/data_admin/buildGraphy/graphyCanvas.vue

@@ -95,7 +95,7 @@ export default {
         that.canvasLoading = false;
         if (res == 'error') {
           this.floorMap = '';
-          this.$message.warning('数据解析异常');
+          console.log('数据解析异常');
           return;
         }
         that.view.scene = that.scene;

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

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData">创建竖井</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" :disabled="createDisable">创建竖井</el-button>
     </el-row>
   </div>
 </template>
@@ -52,7 +52,8 @@ export default {
       showType: this.$route.query.showType,
       tableHeader: [],
       tableData: session.get("cenoteAddData")? session.get("cenoteAddData").length? session.get("cenoteAddData"): [{}]: [{}],
-      copyTableData: []
+      copyTableData: [],
+      createDisable: false
     };
   },
   computed: {
@@ -116,7 +117,9 @@ export default {
         return
       }
       params.Content = newData
+      this.createDisable = true
       await createCenoteTableData(params, (res) => {
+        this.createDisable = false
         this.$message.success("添加成功!")
         session.remove("cenoteAddData")
         this.$router.push({ name: 'cenotelist'})

src/views/ledger/cenotelist/relatedSpace.vue

@@ -3,7 +3,7 @@
     <div class="condition">
       <div class="header">
         <el-button style="float:left;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
-        <div class="edit-tool" v-if="!(cenoteObj.onlyRead == 'true')">
+        <div class="edit-tool" v-if="!(cenoteObj.onlyRead.toString() == 'true')">
           <el-button v-if="isMyTab == 2" size="small" style="float:right" @click="dialogVisible = true">添加</el-button>
           <div v-else>
             <el-button v-show="!isEdit" @click="changeEditType" size="small" style="float:right">编辑</el-button>
@@ -33,7 +33,7 @@
               :value="item.BuildID"></el-option>
           </el-select>
         </el-badge>
-        <el-switch v-if="!(cenoteObj.onlyRead == 'true')" style="margin-left:15px;" v-model="isAI" @change="handleChangeAI" active-text="打开AI">
+        <el-switch v-if="!(cenoteObj.onlyRead.toString() == 'true')" style="margin-left:15px;" v-model="isAI" @change="handleChangeAI" active-text="打开AI">
         </el-switch>
         <div style="height:calc(100% - 42px);margin:10px 0 0 0;width:100%;">
           <el-row style="height:100%;margin:0;width:55%;position:relative;display:inline-block;border:1px solid #e4e4e4;">
@@ -53,7 +53,7 @@
             </el-col>
           </el-row>
           <div class="elevation-box">
-            <elevation-map ref="elevationMap" :onlyRead="cenoteObj.onlyRead=='true'" :isEdit="isEdit" :isAI="isAI" @elevationChecked="handleCheckedSpace"
+            <elevation-map ref="elevationMap" :onlyRead="cenoteObj.onlyRead.toString()=='true'" :isEdit="isEdit" :isAI="isAI" @elevationChecked="handleCheckedSpace"
               @elevationUncheck="handleUncheckSpace" :params="{BuildingId: building, ObjectType: ObjectType, ShaftId: $route.query.ShaftId}">
             </elevation-map>
           </div>
@@ -103,10 +103,10 @@ export default {
       return this.$route.query;
     },
     showSpaceDot() {
-      return this.spaceList.length > 1 && this.cenoteObj.onlyRead == 'true' ? true : false;
+      return this.spaceList.length > 1 && this.cenoteObj.onlyRead.toString() == 'true' ? true : false;
     },
     showBuildDot() {
-      return this.buildingList.length > 1 && this.cenoteObj.onlyRead == 'true' ? true : false;
+      return this.buildingList.length > 1 && this.cenoteObj.onlyRead.toString() == 'true' ? true : false;
     },
     ...mapGetters("layout", ["projectId"])
   },
@@ -127,7 +127,8 @@ export default {
   methods: {
     //获取空间信息
     getSpaceData() {
-      if (this.cenoteObj.onlyRead == 'true') {
+      console.log(this.cenoteObj);
+      if (this.cenoteObj.onlyRead.toString() == 'true') {
         let pa = {
           shaftId: this.$route.query.ShaftId
         }
@@ -171,7 +172,7 @@ export default {
     },
     //默认显示默认分区，无默认分区显示第一个分区
     showDefaultSpace() {
-      if (this.spaceList.length && this.cenoteObj.onlyRead == "true") {
+      if (this.spaceList.length && this.cenoteObj.onlyRead.toString() == "true") {
         this.space = this.spaceList.find((item) => { return item.Code == "GeneralZone" }) ? ["GeneralZone"] : [this.spaceList[0].Code];
         this.ObjectType = this.space[0];
       }
@@ -186,7 +187,7 @@ export default {
     },
     //获取楼层信息
     loadBuildingData() {
-      if (this.cenoteObj.onlyRead == 'true') {
+      if (this.cenoteObj.onlyRead.toString() == 'true') {
         let param = {
           ShaftId: this.$route.query.ShaftId,
           ObjectType: this.ObjectType

src/views/ledger/facility/addfacility.vue

@@ -25,7 +25,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建设备</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button" :disabled="createDisable">创建设备</el-button>
     </el-row>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
@@ -142,6 +142,7 @@ export default {
       firmId: "", //品牌型号所需字段--族id三位编码(传设备类id或部件类id)
       buildFloorData: [],
       floorFlag: true,
+      createDisable: false
     };
   },
   computed: {
@@ -311,7 +312,9 @@ export default {
         Cascade: [],
         Content: newData
       }
+      this.createDisable = true
       createEquipAndProperty(param, res => {
+      this.createDisable = false
         this.$message.success('创建成功')
         session.remove("deviceAddData")
         this.$router.push({

src/views/ledger/facility/batchPoint.vue

@@ -525,7 +525,7 @@ export default {
       this.canvasLoading = false;
       if (res == 'error') {
         this.FloorMap = '';
-        this.$message.warning('数据解析异常');
+        console.log('数据解析异常');
         return;
       }
       this.view.scene = this.scene;

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

@@ -27,7 +27,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建部件</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button" :disabled="createDisable">创建部件</el-button>
     </el-row>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
@@ -150,7 +150,8 @@ export default {
       graphyId: null,
       id: 0,
       EquipmentList: [],
-      firmId: "" //品牌型号所需字段--族id三位编码(传设备类id或部件类id)
+      firmId: "", //品牌型号所需字段--族id三位编码(传设备类id或部件类id)
+      createDisable: false
     };
   },
   computed: {
@@ -236,13 +237,14 @@ export default {
           Cascade:[],
           Content:[newData[i]]
         }
-
+        this.createDisable = true;
         await createPart(param, async res => {
           if (newData[i].Checked) {//同时创建资产
             param.Content[0].EquipmentId = res.EntityList[0].EquipID
             await createPropertyData(param, res => { })
           }
           if (i == newData.length - 1) {
+            this.createDisable = false;
             this.$message.success('创建成功')
             session.remove("partsAddData")
             this.$router.push({

src/views/ledger/property/addproperty.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建资产</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button" :disabled="createDisable">创建资产</el-button>
     </el-row>
     <!-- 型号弹窗 -->
     <firm :mess="{deviceId: category.Family}" ref="firm" @changeFirm="firmChange" :dialog="myDialog"></firm>
@@ -119,7 +119,8 @@ export default {
       graphyId: null,
       id: 0,
       showType: this.$route.query.showType,
-      EquipmentList: []
+      EquipmentList: [],
+      createDisable: false
     };
   },
   computed: {
@@ -194,7 +195,9 @@ export default {
         return;
 			}
 			params.Content = newData
+      this.createDisable = true
 			await createPropertyData(params, res => {
+        this.createDisable = false
         this.$message.success("添加成功!")
         session.remove("propertyAddData")
 				this.$router.push({

src/views/ledger/rentlist/manageTenantZone.vue

@@ -389,7 +389,7 @@ export default {
         this.canvasLoading = true;
         this.scene.loadUrl(`/image-service/common/file_get?systemId=revit&key=${floorMap}`).then(res => {
           if (res == 'error') {
-            this.$message.warning('数据解析异常');
+            console.log('数据解析异常');
             this.hasMap = false;
             this.canvasLoading = false;
             return;

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

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center create_button">
-      <el-button type="primary" size="medium" @click="handleCreateTableData">创建租户</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" :disabled="createDisable">创建租户</el-button>
     </el-row>
   </div>
 </template>
@@ -63,7 +63,8 @@ export default {
       showType: this.$route.query.showType,
       tableHeader: [],
       tableData: session.get("rentAddData")? session.get("rentAddData").length? session.get("rentAddData"): [{}]: [{}],
-      copyTableData: []
+      copyTableData: [],
+      createDisable: false
     };
   },
   computed: {
@@ -122,7 +123,9 @@ export default {
         return
       }
       params.Content = newData
+      this.createDisable = true
       await createRentTableData(params, (res) => {
+        this.createDisable = false
         this.$message.success("添加成功!")
         session.remove("rentAddData")
         this.$router.push({ name: 'rentlist'})

src/views/ledger/spacelist/index.vue

@@ -367,6 +367,9 @@ export default {
     },
     relaSuc() {
       this.init();
+      if (this.buildFloorSelectd.length > 1) {
+        this.changeCascader(this.buildFloorSelectd)
+      }
     },
     // 受影响业务空间确认成功回调
     updateStateSuc() {

src/views/ledger/spacelist/spaceadd/index.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建业务空间</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button" :disabled="createDisable">创建业务空间</el-button>
     </el-row>
 
     <!--二维码弹窗 -->
@@ -101,6 +101,7 @@ export default {
       imgsArr: [], //临时保存的图片key数组
       showType: this.$route.query.showType,
       buildFloorData: [],
+      createDisable: false
     };
   },
   computed: {
@@ -195,7 +196,9 @@ export default {
       let param = {
         Content: newData
       }
+      this.createDisable = true
       zoneCreate(param, res => {
+      this.createDisable = false
         this.$message.success('创建成功')
         session.remove("spaceAddData")
         this.$router.push({

src/views/ledger/system/addsystem.vue

@@ -25,7 +25,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建系统</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button" :disabled="createDisable">创建系统</el-button>
     </el-row>
 
     <!-- 关联楼层 -->
@@ -106,6 +106,7 @@ export default {
       id: 0,
       showType: this.$route.query.showType,
       EquipmentList: [],
+      createDisable: false
     };
   },
   computed: {
@@ -211,7 +212,9 @@ export default {
       params.Content = newData
       console.log(params)
       // return
+      this.createDisable = true
       createSystemBuildFloor(params, res => {
+        this.createDisable = false
         this.$message.success('创建成功')
         session.remove("systemAddData")
         this.$router.push({

src/views/model/report/deleted.vue

@@ -247,7 +247,7 @@ export default {
         that.canvasLoading = false;
         if (res == 'error') {
           this.FloorMap = '';
-          this.$message.warning('数据解析异常');
+          console.log('数据解析异常');
           return;
         }
         let modelID = can[this.i].dataset.modelid

src/views/model/report/supplement.vue

@@ -214,7 +214,7 @@ export default {
         that.canvasLoading = false;
         if (res == 'error') {
           this.FloorMap = '';
-          this.$message.warning('数据解析异常');
+          console.log('数据解析异常');
           return;
         }
         let modelID = can[this.i].dataset.modelid

src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -109,7 +109,7 @@ export default {
       this.canvasLoading = false;
       if (res == 'error') {
         this.FloorMap = '';
-        this.$message.warning('数据解析异常');
+        console.log('数据解析异常');
         return;
       }
       if (res.Result == 'failure') {

src/views/relation/overview/detail/index.vue

@@ -187,7 +187,7 @@ export default {
         this.canvasLoading = false;
         if (res == 'error') {
           this.FloorMap = '';
-          this.$message.warning('数据解析异常');
+          console.log('数据解析异常');
           return;
         }
         this.view.scene = this.scene;

src/views/screen/splitscreen/spaceledger/index.vue

@@ -276,7 +276,7 @@
           that.canvasLoading = false;
           if (res == 'error') {
             this.FloorMap = '';
-            this.$message.warning('数据解析异常');
+            console.log('数据解析异常');
             return;
           }
           that.view.scene = that.scene;