Commit 0de58315 authored by kaitly205422@163.com's avatar kaitly205422@163.com
Browse files

修复fix

parent 28e9ec0d

src/views/drawCanvas/riskView.vue

+13 −10
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ 
      </van-cell-group>

    </van-dialog>

    <van-popup v-model="showPicker" round position="bottom">

      <van-picker v-if="!copyRoom.isCopy" show-toolbar :columns="isRoom ? roomArr : baseArr" @cancel="showPicker = false"

        @confirm="onConfirm" value-key="dictLabel" />

      <van-picker v-if="!copyRoom.isCopy" show-toolbar :columns="isRoom ? roomArr : baseArr"

        @cancel="showPicker = false" @confirm="onConfirm" value-key="dictLabel" />

      <van-picker v-else show-toolbar :columns="copyRoom.copyArr" @cancel="showPicker = false" @confirm="onConfirm"

        :value-key="copyRoom.type != 'type' ? 'name' : 'dictLabel'" />

    </van-popup>
@@ -220,6 +220,7 @@ export default { 
      this.copyRoom.type = "floor";

      this.showPicker = true;

      this.copyRoom.roomData = [];

      debugger

      if (this.copyRoom.floorData.length) {

        this.copyRoom.copyArr = this.copyRoom.floorData;

        return;
@@ -465,7 +466,9 @@ export default { 
      this.isRoom = false;

      this.isBase = true;

      this.show = true;

      this.copyRoom.isCopy = false;

    },



    // 更新画布高度

    updateLayoutHeight() {

      const max = Math.max(

src/views/riskProject/add/addInherent.vue

+1 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,7 @@ export default { 
        params: {

          floorId: this.form.floorId,

          isView: false,

          buildingId: this.form.buildingIds

        },

      });

    },