From a80fcaaf130286f215a35aa62450421b480b4d5a Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 二月 2025 11:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/roomStatus/index.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/roomStatus/index.vue b/admin/src/views/roomStatus/index.vue
index 3ef5bef..33d9a28 100644
--- a/admin/src/views/roomStatus/index.vue
+++ b/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) {
--
Gitblit v1.9.3