feat: 板块信息----将地图渲染数据与右侧展示数据分开

fix: 优化土拍详情 供求比提示信息修改

src/views/RegionalPlate/index.vue

@@ -128,8 +128,8 @@
             </el-col>
           </div>
           <div v-if="infotType === 1" style="margin-top: 10px;" class="soildInfo">
-            <el-collapse accordion v-model="soildInfoChange" class="sys-collapse" v-if="dataType.plateRegion.resultBnsLandDTOS.length > 0">
-              <el-card :body-style="{padding: '0'}" class="box-card" v-for="(item,index) in dataType.plateRegion.resultBnsLandDTOS" :key="index">
+            <el-collapse accordion v-model="soildInfoChange" class="sys-collapse" v-if="dataType.plateRegion.resultBnsLandDTOSDetail.length > 0">
+              <el-card :body-style="{padding: '0'}" class="box-card" v-for="(item,index) in dataType.plateRegion.resultBnsLandDTOSDetail" :key="index">
                 <el-collapse-item  :title="item.code" :name="index">
                   <p>行政分区：{{dataType.plateRegion.plateInfo.adminRegionName || '--'}}</p>
                   <p>板块: {{dataType.plateRegion.plateInfo.name || '--'}}</p>
@@ -150,9 +150,9 @@
             </div>
           </div>
           <div v-if="infotType === 2" style="margin-top: 10px;text-align: left">
-            <template v-if="dataType.plateRegion.resultBnsProjectDTOS.length > 0">
+            <template v-if="dataType.plateRegion.resultBnsProjectDTOSDetail.length > 0">
               <el-card
-                v-for="(item, index) in dataType.plateRegion.resultBnsProjectDTOS"
+                v-for="(item, index) in dataType.plateRegion.resultBnsProjectDTOSDetail"
                 class="box-card distanceCard"
                 :key="index"
                 :body-style="{ padding: '0'}">
@@ -230,8 +230,12 @@
           plate: [],
           plateRegion: {
             plateInfo: {},
+            // 展示坐标
             resultBnsProjectDTOS: [],
-            resultBnsLandDTOS: []
+            resultBnsLandDTOS: [],
+            // 展示信息
+            resultBnsProjectDTOSDetail: [],
+            resultBnsLandDTOSDetail: []
           },
           property: []
         },  // 四种的楼房显示类型 数据预览
@@ -364,6 +368,8 @@
             return
           }
           let info = JSON.parse(JSON.stringify(res.data))
+          this.dataType.plateRegion.resultBnsProjectDTOSDetail = info.resultBnsProjectDTOS
+          this.dataType.plateRegion.resultBnsLandDTOSDetail = info.resultBnsLandDTOS
           delete info.resultBnsProjectDTOS
           delete info.resultBnsLandDTOS
           this.showType = 'plateRegion'
@@ -372,6 +378,7 @@
           this.map.setZoom = this.zoomType['plateRegion']
           this.detailShow = true
           this.dataType.plateRegion.plateInfo = info
+          // 转化坐标   高德-----百度
           if(res.data.resultBnsProjectDTOS && res.data.resultBnsProjectDTOS.length > 0) {
             for(let i = 0, l = res.data.resultBnsProjectDTOS.length; i < l ; i++) {
               this.transform(res.data.resultBnsProjectDTOS[i].longitude || 0, res.data.resultBnsProjectDTOS[i].latitude || 0).then(point => {
@@ -428,6 +435,8 @@
          if(searchResult.type === 'plateRegion') {
            let resultData = JSON.parse(searchResult.data) // 解码data
            let info = JSON.parse(JSON.stringify(resultData))
+           this.dataType.plateRegion.resultBnsProjectDTOSDetail = info.resultBnsProjectDTOS
+           this.dataType.plateRegion.resultBnsLandDTOSDetail = info.resultBnsLandDTOS
            delete info.resultBnsProjectDTOS
            delete info.resultBnsLandDTOS
            // 赋值基本信息
@@ -495,6 +504,8 @@
           if(searchResult.type === 'plateRegion') {
             let resultData = JSON.parse(searchResult.data) // 解码data
             let info = JSON.parse(JSON.stringify(resultData))
+            this.dataType.plateRegion.resultBnsProjectDTOSDetail = info.resultBnsProjectDTOS
+            this.dataType.plateRegion.resultBnsLandDTOSDetail = info.resultBnsLandDTOS
             delete info.resultBnsProjectDTOS
             delete info.resultBnsLandDTOS
             // 楼盘基本信息的值渲染
@@ -747,18 +758,25 @@
       height 100%
       .sys-collapse{
         border: none;
-        .el-collapse-item__header{
-          padding: 0 20px 0;
-          border-bottom: none;
-          border-bottom: 1px solid #e6e6e6;
-          text-align center;
+        .el-card {
+          margin-bottom 5px
         }
-        .el-collapse-item__wrap{
-          padding: 0 20px;
-          border-bottom: none;
-          text-align center
-          .el-collapse-item__content{
-            padding-top: 10px;
+        .el-card:last-child {
+          margin-bottom 0
+        }
+        .el-collapse-item{
+          .el-collapse-item__header{
+            padding: 0 20px 0;
+            border-bottom: 1px solid #e6e6e6;
+            text-align center;
+          }
+          .el-collapse-item__wrap{
+            padding: 0 20px;
+            border-bottom: none;
+            text-align center
+            .el-collapse-item__content{
+              padding-top: 10px;
+            }
           }
         }
       }

src/views/plateSupplyData/index.vue

@@ -393,9 +393,9 @@
     white-space nowrap
   }
   .tips {
-    font-size 16px
+    font-size 14px
     font-weight 500
-    text-align center
+    text-align end
     margin-top 15px
   }
   .red {

src/views/propertiesDetail/index.vue

@@ -67,7 +67,7 @@
                 </el-table-column>
               </el-table>
             </div>
-            <div style="margin: 10px;color: red" v-if="item.remarks">{{`*${item.remarks}`}}</div>
+            <div style="margin: 15px" v-if="item.remarks">{{`*${item.remarks}`}}</div>
           </div>
         </div>
 
@@ -116,11 +116,11 @@
                   <table cellspacing="0" cellpadding="0" class="table" >
                     <tr v-for="(value, key) in supplyRateTable" :key="key">
                       <th>{{value.name}}</th>
-                      <td v-for="(item,index) in value.data" :key="index">{{key === 'rate' ? item.toFixed(1) : item}}</td>
+                      <td v-for="(item,index) in value.data" :key="index">{{key === 'rate' ? (item ? item.toFixed(1) : '0') : item}}</td>
                     </tr>
                   </table>
                   <!--            供求比提示信息-->
-                  <div class="tips" style="color: red">注：供求比=供应数量/销售数量，供应比越小，销售越好</div>
+                  <div class="tips" style="color: red;text-align: end">注：供求比=供应数量/销售数量，供应比越小，销售越好</div>
                 </el-col>
               </div>
             </el-row>
@@ -167,10 +167,10 @@
                     </tr>
                     <tr v-for="item in houseWidthTable">
                       <td>{{item.production || '--'}}</td>
-                      <td>{{item.nxmk.toFixed(1) || '0'}}</td>
-                      <td>{{item.qjsmk.toFixed(1) || '0'}}</td>
-                      <td>{{item.zwmk.toFixed(1) || '0'}}</td>
-                      <td>{{item.kwmk.toFixed(1) || '0'}}</td>
+                      <td>{{item.nxmk ? item.nxmk.toFixed(1) : '0'}}</td>
+                      <td>{{item.qjsmk ? item.qjsmk.toFixed(1) : '0'}}</td>
+                      <td>{{item.zwmk ? item.zwmk.toFixed(1) : '0'}}</td>
+                      <td>{{item.kwmk ? item.kwmk.toFixed(1) : '0'}}</td>
                     </tr>
                   </table>
                 </el-col>
@@ -707,10 +707,10 @@
         white-space nowrap
       }
       .tips {
-        font-size 16px
+        font-size 14px
         font-weight 500
         text-align center
-        margin-top 15px
+        margin 20px
       }
     }
     .title {