maxiaoxiao 7 сар өмнө
parent
commit
96f36520c0

+ 36 - 27
src/views/farmlandProtection/components/interDetails.vue

@@ -64,35 +64,35 @@
           <el-tab-pane label="套合结果" name="thjg">
             <!-- <div class="inter_result"></div> -->
             <div class="Integration inter_result">
-              <div
+              <!-- <div
                 class="Integration_list"
                 v-for="(item, i) in yzjgData"
                 :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"
-                    width="80"
-                  >
-                  </el-table-column>
-                  <el-table-column
-                    prop="sumvalue"
-                    label="面积(㎡)"
-                    align="center"
-                    show-overflow-tooltip
-                  >
-                  </el-table-column>
-                </el-table>
-                <!-- <div
+                <div>{{ item.mx_bsmmc }}:</div> -->
+              <el-table :data="yzjgData">
+                <el-table-column
+                  prop="bsmmc"
+                  label="套合数据"
+                  show-overflow-tooltip
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="sumcount"
+                  label="监测图斑数(个)"
+                  align="center"
+                  width="80"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="sumvalue"
+                  label="重叠面积(㎡)"
+                  align="center"
+                  show-overflow-tooltip
+                >
+                </el-table-column>
+              </el-table>
+              <!-- <div
                   v-for="(item2, c) in item.mx_data"
                   :key="c"
                   class="list_Cont"
@@ -118,7 +118,7 @@
                     </div>
                   </div>
                 </div> -->
-              </div>
+              <!-- </div>-->
             </div>
           </el-tab-pane>
           <el-tab-pane label="基本信息" name="jbxx">
@@ -209,7 +209,16 @@ export default {
       }).then((res) => {
         if (res.statuscode == 200) {
           this.viewsData = res.data;
-          this.yzjgData = res.data.yzjg;
+          this.yzjgData = []; // res.data.yzjg;
+          res.data.yzjg.forEach((jsi) => {
+            jsi.mx_data.forEach((mx) => {
+              this.yzjgData.push({
+                ...mx,
+                mx_bsm: jsi.mx_bsm,
+                mx_bsmmc: jsi.mx_bsmmc,
+              });
+            });
+          });
           let geomJson = JSON.parse(res.data.tbxx.geomJson);
           this.jbxxData = Object.keys(geomJson).map((key) => ({
             name: key,