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

src/utils/global.ts

@@ -174,6 +174,28 @@ export const qitaUseTOOptions = [
     value: '5',
   },
 ];
+export const newQitaUseTOOptions = [
+  {
+    label: '光伏用地备案',
+    value: '1',
+  },
+  {
+    label: '设施农业用地备案',
+    value: '2',
+  },
+  {
+    label: '农村道路',
+    value: '3',
+  },
+  {
+    label: '实地未变化',
+    value: '4',
+  },
+  {
+    label: '临时用地备案',
+    value: '5',
+  },
+]
 export const nowStatusOptions = [
   { label: '待接收', value: '待接收' },
   { label: '待填报', value: '待填报' },

src/views/demo/statistical/patchsummary/index.vue

@@ -90,7 +90,7 @@
           <a-button type="primary" style="margin-right: 25px" @click="prevData">上一条</a-button>
           <a-button type="primary" @click="nextData">下一条</a-button>
         </div>
-        <NewShowInfoModal v-if="(showInfoData?.biaozhu && [0,1,2].includes(showInfoData?.biaozhu))" :showInfoData="showInfoData" />
+        <NewShowInfoModal v-if="(showInfoData.hasOwnProperty('biaozhu') && [0, 1, 2].includes(showInfoData['biaozhu']))" :showInfoData="showInfoData" />
         <ShowInfoModal v-else :showInfoData="showInfoData" />
       </div>
     </a-modal>

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

@@ -331,7 +331,7 @@
     markTypeOptions,
     illegalTypeList,
     resultOptions,
-    qitaUseTOOptions,
+    newQitaUseTOOptions,
   } from '@/utils/global';
 
   const MapboxComponent = ref();
@@ -466,7 +466,7 @@
         result = resultOptions;
         break;
       case 'qita_use_to':
-        result = qitaUseTOOptions;
+        result = newQitaUseTOOptions;
         break;
     }
     result.forEach((item) => {