Merge branch 'main' of http://123.132.248.154:3000/zzq/NONGYESHUZIDIZUO

src/components/map/index.vue

@@ -35,8 +35,8 @@
         <div style="overflow-y:scroll;height:150px" id="tableContainer">
           <table id="tab">
             <tr v-for="(item,index) in roleInfo.tableDataList" :key="index">
-              <td>{{item.name}}</td>
-              <td class="ta-l">{{item.value}}</td>
+                <td>{{item.name}}</td>
+                <td class="ta-l">{{item.value}}</td>
             </tr>
           </table>
         </div>
@@ -572,12 +572,12 @@ export default defineComponent({
               // arr.unshift(firstLayer);
               let arr1 = []
               arr.forEach(item =>{
-                if(item.name !== "高清影像"){
+                if(item.name !== "高清影像" && item.name !== "上冶镇高清影像"){
                     arr1.push(item)
                   }
               })
               arr.forEach(item =>{
-                if(item.name == "高清影像"){
+                if(item.name == "高清影像" || item.name == "上冶镇高清影像"){
                     arr1.push(item)
                   }
               })
@@ -820,7 +820,13 @@ export default defineComponent({
                 }
               })
             })
-            data.roleInfo.tableDataList = tableData
+            let arr = []
+            tableData.forEach(item =>{
+                if(item.name!=='图层id'&&item.name!=='SMUSERID'&&item.name!=='SMAREA'&&item.name!=='SMPERIMETER'&&item.name!=='SMGEOMETRY'){
+                  arr.push(item)
+                }
+              })
+            data.roleInfo.tableDataList = arr
             data.roleInfo.MVTBubbleShow = true
           }
         }else{
@@ -1735,7 +1741,13 @@ export default defineComponent({
                   value: resultFeature.fieldValues[index]
                 })
               })
-              data.roleInfo.tableDataList = tableData
+              let arr = []
+              tableData.forEach(item =>{
+                if(item.name!=='图层id'&&item.name!=='SMUSERID'&&item.name!=='SMAREA'&&item.name!=='SMPERIMETER'&&item.name!=='SMGEOMETRY'){
+                  arr.push(item)
+                }
+              })
+              data.roleInfo.tableDataList = arr
               console.log('data.roleInfo.MVTBubbleShow',)
               if(data.roleInfo.s3mvisible){
                 data.roleInfo.BubbleShow = true