From 5fb6f28c9633dc8faa24debbbe91f705f83980aa Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 13 Jan 2023 10:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=BF=E5=B1=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/detail-main.scss  |  24 ++--
 .../modules/base/community/roomDetail.vue     | 110 ++++++++----------
 .../modules/base/community/roomTable.vue      |   2 +-
 3 files changed, 66 insertions(+), 70 deletions(-)

diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index 19420ef94..cf7cc4fd6 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -15,7 +15,7 @@
     
     margin: 10px 0;
     display: flex;
-    padding-left: 15px;
+    // padding-left: 15px;
     padding-top:10px;
     // border-bottom: 1px solid #d8d8d8;
   
@@ -51,6 +51,10 @@
       text-align: right;
       margin-right:8px;
     }
+    .u-info-title-80 {
+      flex: 0 0 80px;
+     
+    }
     .u-info-title-100 {
       flex: 0 0 100px;
      
@@ -84,15 +88,17 @@
     }
   }
 
-  //一行两列
-  .m-detail-main-2row{
-    display: flex;
-    justify-content: space-between;
+  
+}
 
-    .m-info-2row{
-      flex:0 0 1;
-      width:50%;
-    }
+//一行两列
+.m-detail-main-2row{
+  display: flex;
+  justify-content: space-between;
+
+  .m-info-2row{
+    flex:0 0 1;
+    width:45%;
   }
 }
 
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index 4717052e3..11b2d6180 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -1,109 +1,99 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <div v-if="initLoading" class="m-detail-main m-detail-main-2row">
+      <div v-if="initLoading"
+           class="m-detail-main m-detail-main-2row">
         <div class="m-info-2row">
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">所属楼栋：</span>
-            <span
-              >{{ dataForm.neighborHoodName }}-{{ dataForm.buildingName }}</span
-            >
+            <span class="u-info-title u-info-title-80">所属楼栋：</span>
+            <span>{{ dataForm.neighborHoodName }}-{{ dataForm.buildingName }}</span>
           </div>
 
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">单元号：</span>
+            <span class="u-info-title u-info-title-80">单元号：</span>
             <span>{{ dataForm.unitName ? dataForm.unitName : "--" }}</span>
           </div>
 
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">门牌号：</span>
+            <span class="u-info-title u-info-title-80">门牌号：</span>
             <span>{{ dataForm.doorName }}</span>
           </div>
 
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">房屋类型：</span>
+            <span class="u-info-title u-info-title-80">房屋类型：</span>
             <span>{{
               dataForm.houseTypeName ? dataForm.houseTypeName : "--"
             }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">房屋用途：</span>
+            <span class="u-info-title u-info-title-80">房屋用途：</span>
             <span>{{
               dataForm.purposeName ? dataForm.purposeName : "--"
             }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">房屋状态：</span>
+            <span class="u-info-title u-info-title-80">房屋状态：</span>
             <span>{{ dataForm.rentName ? dataForm.rentName : "--" }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">房主姓名：</span>
+            <span class="u-info-title u-info-title-80">房主姓名：</span>
             <span>{{ dataForm.ownerName ? dataForm.ownerName : "--" }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">联系方式：</span>
+            <span class="u-info-title u-info-title-80">联系电话：</span>
             <span class="info-mingan">{{
               dataForm.showOwnerPhone ? dataForm.showOwnerPhone : "--"
             }}</span>
-            <el-button
-              v-if="view_real_data && dataForm.showOwnerPhone"
-              style="margin-left: 10px"
-              type="text"
-              class="div-table-button--blue"
-              icon="el-icon-view"
-              size="small"
-              @click="handleTuomin('phone')"
-              >显示</el-button
-            >
+            <el-button v-if="view_real_data && dataForm.showOwnerPhone"
+                       style="margin-left: 10px"
+                       type="text"
+                       class="div-table-button--blue"
+                       icon="el-icon-view"
+                       size="small"
+                       @click="handleTuomin('phone')">显示</el-button>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">房主身份证：</span>
+            <span class="u-info-title u-info-title-80">证件号：</span>
             <span class="info-mingan">{{
               dataForm.showOwnerIdCard ? dataForm.showOwnerIdCard : "--"
             }}</span>
-            <el-button
-              v-if="view_real_data && dataForm.showOwnerIdCard"
-              style="margin-left: 10px"
-              type="text"
-              class="div-table-button--blue"
-              icon="el-icon-view"
-              size="small"
-              @click="handleTuomin('idcard')"
-              >显示</el-button
-            >
+            <el-button v-if="view_real_data && dataForm.showOwnerIdCard"
+                       style="margin-left: 10px"
+                       type="text"
+                       class="div-table-button--blue"
+                       icon="el-icon-view"
+                       size="small"
+                       @click="handleTuomin('idcard')">显示</el-button>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">备注：</span>
+            <span class="u-info-title u-info-title-80">备注：</span>
             <span>{{ dataForm.remark ? dataForm.remark : "--" }}</span>
           </div>
         </div>
 
         <div class="m-info-2row">
           <div class="m-info-prop">
-            <span class="u-info-title u-info-title-100">房屋编码：</span>
+            <span class="u-info-title u-info-title-80">房屋编码：</span>
             <span>{{ dataForm.coding ? dataForm.coding : "--" }}</span>
           </div>
-          <div v-if="dataForm.houseQrcodeUrl" class="m-info-prop">
-            <span class="u-info-title u-info-title-100">二维码：</span>
+          <div v-if="dataForm.houseQrcodeUrl"
+               class="m-info-prop">
+            <span class="u-info-title u-info-title-80">二维码：</span>
             <div style="display: flex; flex-direction: column">
-              <img
-                style="margin-left: 20px; width: 150px"
-                :src="dataForm.houseQrcodeUrl"
-              />
-              <a
-                style="margin-left: 30px; margin-top: 20px"
-                class="div-table-button--blue"
-                :href="dataForm.houseQrcodeUrl"
-                target="_blank"
-                ><i class="el-icon-download"></i>下载</a
-              >
+              <img style="margin-left: 0; width: 150px"
+                   :src="dataForm.houseQrcodeUrl" />
+              <a style="margin-left: 0; margin-top: 20px"
+                 class="div-table-button--blue"
+                 :href="dataForm.houseQrcodeUrl"
+                 target="_blank"><i class="el-icon-download"></i>下载</a>
             </div>
           </div>
         </div>
       </div>
     </div>
     <div class="m-detail-btn">
-      <el-button size="small" @click="handleCancle">关 闭</el-button>
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
     </div>
   </div>
 </template>
@@ -115,7 +105,7 @@ import { requestPost, requestGet } from "@/js/dai/request";
 
 let loading; // 加载动画
 export default {
-  data() {
+  data () {
     return {
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
@@ -149,26 +139,26 @@ export default {
     };
   },
   components: {},
-  mounted() {},
+  mounted () { },
 
   methods: {
-    handleCancle() {
+    handleCancle () {
       this.$emit("diaDetailClose");
     },
 
-    diaDestroy() {
+    diaDestroy () {
       if (map) {
         map.destroy();
       }
     },
 
-    async initForm(row) {
+    async initForm (row) {
       this.houseId = row.houseId;
       await this.loadHouseInfo();
       this.initLoading = true;
     },
 
-    async handleTuomin(type) {
+    async handleTuomin (type) {
       const url = "/data/aggregator/epmetuser/detailByType";
 
       const { data, code, msg } = await requestPost(url, {
@@ -188,7 +178,7 @@ export default {
       }
     },
 
-    async loadHouseInfo() {
+    async loadHouseInfo () {
       const url =
         "/actual/base/communityHouse/getHouseDeatilById/" + this.houseId;
       let params = {};
@@ -207,7 +197,7 @@ export default {
       }
     },
 
-    resetData() {
+    resetData () {
       this.houseId = ""; //房屋ID
       this.houseType = "1";
       this.purpose = "1";
@@ -229,7 +219,7 @@ export default {
       };
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -237,7 +227,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -245,7 +235,7 @@ export default {
     },
   },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         buildingUnitId: [
           { required: true, message: "所属单元不能为空", trigger: "blur" },
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index b5e91b7f6..a11e5f458 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -277,7 +277,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'查看房屋'"
-               width="950px"
+               width="820px"
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">