Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunw...

liukangdong

2025-02-06 698848bc8586f7c927e0468d6e60711c323d029d

 admin/src/views/roomStatus/index.vue

@@ -52,7 +52,7 @@
                                        </div>
                                        <div class="xm_one_row">
                                            <span>出租率</span>
                                            <span>{{(projectNums.leaseRoomAmount / projectNums.investmentRoomAmount).toFixed(2)}}%</span>
                                            <span>{{rentalRate()}}%</span>
                                            <span>待租面积：{{projectNums.investmentArea - projectNums.leaseArea}}m²</span>
                                        </div>
                                    </div>
@@ -330,7 +330,7 @@
                                        </div>
                                        <div class="xm_one_row">
                                            <span>出租率</span>
                                            <span>{{(projectNums.leaseRoomAmount / projectNums.investmentRoomAmount).toFixed(2)}}%</span>
                                            <span>{{rentalRate()}}%</span>
                                            <span>待租面积：{{projectNums.investmentArea - projectNums.leaseArea}}m²</span>
                                        </div>
                                    </div>
@@ -362,7 +362,7 @@
                                        </div>
                                        <div class="xm_info_row" style="width: 25%; margin-top: 15px;">
                                            <span>建筑面积</span>
                                            <span>{{buildingInfo.cqArea}}㎡</span>
                                            <span>{{buildingInfo.area}}㎡</span>
                                        </div>
                                        <div class="xm_info_row" style="width: 25%; margin-top: 15px;">
                                            <span>计租面积</span>
@@ -400,7 +400,7 @@
                                            <el-table-column
                                                label="合同编号">
                                                <template slot-scope="{row}">
                                                    <el-button type="text">{{row.code}}</el-button>
                                                    <el-button type="text" @click="$refs.ContractDetailRef.open('合同详情', row.id)">{{row.code}}</el-button>
                                                </template>
                                            </el-table-column>
                                            <el-table-column
@@ -641,6 +641,8 @@
        <Detail v-if="showDetail" ref="DetailRef" @close="showDetail = false" />
        <!--    新建设备    -->
        <Edit v-if="showEdit1" ref="EditRef" @success="getDevicePage" @close="showEdit1 = false" />
        <!--    合同详情    -->
        <ContractDetail ref="ContractDetailRef" />
    </div>
</template>

@@ -656,9 +658,10 @@
  import Detail from '../workorder/components/detail'
  import { fetchList as devicePage, getDeviceCateData, getDeviceStatus } from '@/api/Inspection/device'
  import Edit from '../operation/components/deviceEdit'
  import ContractDetail from '../contract/components/contractDetail'
  export default {
    name: 'index',
    components: { OperaYwWorkorderWindow, Detail, Edit },
    components: { OperaYwWorkorderWindow, Detail, Edit, ContractDetail },
    data() {
      return {
        showDetail: false,
@@ -746,6 +749,10 @@
        if (!value) return true;
        return data.name.indexOf(value) !== -1;
      },
      // 出租率
      rentalRate() {
        return ((this.projectNums.leaseArea / this.projectNums.investmentArea) * 100).toFixed(2)
      },
      // 判断房态宽度
      ifWidth(num) {
        if (num >= 0 && num <= 100) {