Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-06-16 16:06:39
+ * @LastEditTime: 2023-07-11 09:51:07
  */
 import request from "@/utils/request";
 let SERVER = window.config
@@ -16,7 +16,7 @@ const url = SERVER.SERVERAPI + "/rest/zhcx/lpcx/";
  */
 export function getLpZrz(data) {
   return request({
-    url: "service-lpb-zq/rest/zhcx/lpcx/getLpZrz",
+    url: "service-lpb/rest/zhcx/lpcx/getLpZrz",
     method: "post",
     data: data,
   });
@@ -29,7 +29,7 @@ export function getLpZrz(data) {
  */
 export function getLpb(zrzbsm) {
   return request({
-    url: "service-lpb-zq/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm,
+    url: "service-lpb/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm,
     method: "get",
   });
 }
@@ -41,7 +41,7 @@ export function getLpb(zrzbsm) {
 export function getLpbFwytAndQlxz(zrzbsm) {
   return request({
     url:
-      "service-lpb-zq/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=0&zrzbsm=" +
+      "service-lpb/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=0&zrzbsm=" +
       zrzbsm,
     method: "get",
   });
@@ -53,7 +53,7 @@ export function getLpbFwytAndQlxz(zrzbsm) {
  */
 export function getLpbQsxtj(zrzbsm) {
   return request({
-    url: "service-lpb-zq/rest/zhcx/lpcx/getLpbQsxtj?scyclx=0&zrzbsm=" + zrzbsm,
+    url: "service-lpb/rest/zhcx/lpcx/getLpbQsxtj?scyclx=0&zrzbsm=" + zrzbsm,
     method: "get",
   });
 }
@@ -67,7 +67,7 @@ export function getLpbQsxtj(zrzbsm) {
  */
 export function getLpbTj(zrzbsm) {
   return request({
-    url: "service-lpb-zq/rest/zhcx/lpcx/getLpbTj?scyclx=0&zrzbsm=" + zrzbsm,
+    url: "service-lpb/rest/zhcx/lpcx/getLpbTj?scyclx=0&zrzbsm=" + zrzbsm,
     method: "get",
   });
 }

@@ -381,8 +381,8 @@ aside {
 
 //楼盘表的幢/幢单元名称
 .lpb-xmmc {
-  height: 60px;
-  line-height: 60px;
+  height: 34px;
+  line-height: 34px;
   background-color: #ffffff;
   border: 1px solid #e6e6e6;
   text-align: center;

@@ -112,7 +112,6 @@ export default {
                 this.$message.error(res.message);
               }
             });
-        alert(1)
       } else {
          return false;
       }

@@ -456,6 +456,7 @@ table {
   background-color: #f4f9ff;
   .tab-content {
     border: 1px solid #dedede;
+    border-left: 0;
     background-color: #ffffff;
     display: flex;
     &::-webkit-scrollbar {

@@ -159,7 +159,7 @@ export default {
   overflow: hidden;
   .lpbContent {
     width: 100%;
-    height: calc(100% - 62px);
+    height: calc(100% - 36px);
     position: relative;
     overflow: scroll;
     -webkit-user-select: none;

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Date: 2023-02-28 17:25:45
  * @LastEditors: yangwei
- * @LastEditTime: 2023-03-02 17:34:24
+ * @LastEditTime: 2023-07-11 10:05:55
  * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
  * @Description: 
  * 
@@ -10,7 +10,7 @@
 -->
 <template>
   <div class="ljzs-wrap">
-    <div v-for="ljzarr in ljzsCptd" :style="{'margin-bottom': ljzarr.length == 1 ? '34px':'80px'}" :key="ljzarr[0].bsm">
+    <div v-for="ljzarr in ljzsCptd" :style="{'margin-bottom': ljzarr.length == 1 ? '44px':'80px'}" :key="ljzarr[0].bsm">
       <!-- 多个同起始层逻辑幢 横向排列  -->
       <div class="ch-zdy-wrap" v-if="ljzarr.length > 1">
         <div v-for="ljz in ljzarr" :key="ljz.ljzmc" class="same-floor-ljz">
@@ -110,7 +110,8 @@ export default {
       }
       .ljz-xmmc {
         position: absolute;
-        width: calc(100% - 4px);
+        // width: calc(100% - 4px);
+        width: 100%;
         bottom: -34px;
       }
     }

@@ -80,7 +80,7 @@
         getLpZrz({ ...this.queryForm, ...this.pageData }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
-            this.tableData.total = total ? total : 0;
+            this.tableData.total = res.result.total ? res.result.total : 0;
             this.tableData.data = res.result.records;
           }
         });