Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue

@@ -95,16 +95,10 @@
             }}</a-descriptions-item>
           </a-descriptions>
           <div
-            v-if="isKeepSupervision"
+            v-if="isKeepSupervision && props.showInfoRecord.piccheck == '待审核'"
             style="display: flex; justify-content: right; margin-top: 10px; gap: 10px"
           >
-            <a-button
+            <a-button type="primary" @click="funCheckCxjgPic"> 继续持续监管 </a-button>
-              v-if="props.showInfoRecord.piccheck == '待审核'"
-              type="primary"
-              @click="funCheckCxjgPic"
-            >
-              继续持续监管
-            </a-button>
             <a-button type="primary" @click="moveInIllegalSubejctOpen = true">
               转入违法用地
             </a-button>

src/views/demo/tiankongdi/keepSupervision/index.vue

@@ -324,10 +324,14 @@
       await getTableData(searchParams.value);
       setTimeout(() => {
         showInfoId.value = tableData.value[tableData.value.length - 1].Id;
+        let index = tableData.value.findIndex((item) => item.Id == showInfoId.value);
+        showInfoRecord.value = tableData.value[index];
       }, 10);
       return;
     } else {
       showInfoId.value = prevShowDataId.value;
+      let index = tableData.value.findIndex((item) => item.Id == showInfoId.value);
+      showInfoRecord.value = tableData.value[index];
     }
   }
   async function nextData() {
@@ -344,9 +348,13 @@
       await getTableData(searchParams.value);
       setTimeout(() => {
         showInfoId.value = tableData.value[0].Id;
+        let index = tableData.value.findIndex((item) => item.Id == showInfoId.value);
+        showInfoRecord.value = tableData.value[index];
       }, 10);
     } else {
       showInfoId.value = nextShowDataId.value;
+      let index = tableData.value.findIndex((item) => item.Id == showInfoId.value);
+      showInfoRecord.value = tableData.value[index];
     }
   }
   // 上传