监测图斑分析结果不显示项目名称\图斑数等数据;分析结果添加loading,取消全屏loading;分析结果套合整理数据整合一个列表显示

src/views/farmlandProtection/components/fxjg.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="fxjg">
-      <div class="downloadDiv">
+      <div class="downloadDiv" v-show="type != 'jctb'">
         <div>
           <span class="xmmc">
             项目名称：
@@ -10,7 +10,7 @@
           <span class="export" @click="download">导出报告</span>
         </div>
       </div>
-      <div class="divrow">
+      <div class="divrow" v-show="type != 'jctb'">
         <div class="divCol">
           <div class="divImg">
             <img :src="imgs.zd1" style="height: 2.5rem; width: 2.5rem" />
@@ -61,22 +61,29 @@
           <span>套合结果</span>
         </div>
       </div>
-      <div class="Integration">
-        <div
+      <div class="Integration" :class="type == 'jctb' ? 'Integrationmax' : ''">
+        <!-- <div
           class="Integration_list"
           v-for="(item, i) in resultData.yzjg"
           :key="i"
-        >
-          <div>{{ item.mx_bsmmc }}:</div>
-          <el-table :data="item.mx_data">
-            <el-table-column prop="bsmmc" label="类别" show-overflow-tooltip>
-            </el-table-column>
-            <el-table-column prop="sumcount" label="图斑数" align="center">
-            </el-table-column>
-            <el-table-column prop="sumvalue" label="面积(㎡)" align="center">
-            </el-table-column>
-          </el-table>
-          <!-- <div v-for="(item2, c) in item.mx_data" :key="c" class="list_Cont">
+        > -->
+        <!-- <div>{{ item.mx_bsmmc }}:</div> -->
+        <el-table :data="resultData.yzjglist">
+          <el-table-column prop="bsmmc" label="类别" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="sumcount" label="图斑数(个)" align="center">
+            <template slot-scope="scope">
+              <span
+                style="color: #2d8cf0; font-weight: bold; cursor: pointer"
+                @click="resultDeatils(scope.row, scope.row.mx_bsm)"
+                >{{ scope.row.sumcount }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="sumvalue" label="面积(㎡)" align="center">
+          </el-table-column>
+        </el-table>
+        <!-- <div v-for="(item2, c) in item.mx_data" :key="c" class="list_Cont">
             <div class="list_item">
               <div class="listText">
                 <span style="color: #fff">{{ item2.bsmmc }}图斑数</span>
@@ -94,7 +101,7 @@
               </div>
             </div>
           </div> -->
-        </div>
+        <!-- </div> -->
       </div>
     </div>
   </div>
@@ -111,6 +118,9 @@ export default {
     fxjgObj: {
       type: Object,
     },
+    type: {
+      type: String,
+    },
   },
 
   data() {
@@ -164,6 +174,16 @@ export default {
           if (res.data.xmxx.geom) {
             this.loadGeoJSON(parse(res.data.xmxx.geom), "#ff0000", "all");
           }
+          this.resultData.yzjglist = [];
+          this.resultData.yzjg.forEach((jsi) => {
+            jsi.mx_data.forEach((mx) => {
+              this.resultData.yzjglist.push({
+                ...mx,
+                mx_bsm: jsi.mx_bsm,
+                mx_bsmmc: jsi.mx_bsmmc,
+              });
+            });
+          });
         } else {
           this.$message.error(res.message);
         }
@@ -388,6 +408,9 @@ export default {
       }
     }
   }
+  .Integrationmax {
+    max-height: 24vh;
+  }
 }
 
 .sm-panel {