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

src/utils/global.ts

@@ -35,6 +35,11 @@ export const mapTypeOptions = [
   { label: '非农化违法', value: 3 },
   { label: '非粮化违法', value: 4 },
 ];
+export const xcsjMapTypeOptions = [
+  { label: '合法', value: 0 },
+  { label: '违法', value: 1 },
+  { label: '其他', value: 2 },
+];
 export const keyIssuesIIMapTypeOptions = [
   { label: '合法', value: 0 },
   { label: '违法', value: 1 },
@@ -68,6 +73,13 @@ export const mapStatusOptions = [
   // { label: '市级驳回', value: '市级驳回' },
   // { label: '县级驳回', value: '县级驳回' },
 ];
+export const xcsjMapStatusOptions = [
+  { label: '待接收', value: '待接收' },
+  { label: '待填报', value: '待填报' },
+  { label: '待整改', value: '待整改' },
+  { label: '市级驳回', value: '市级驳回' },
+  { label: '县级驳回', value: '县级驳回' },
+];
 export const keyProblemSearchMapStatusOptions = [
   { label: '待接收', value: '待接收' },
   { label: '待填报', value: '待填报' },
@@ -174,7 +186,34 @@ 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: '待填报' },
+  { label: '已归档', value: '已归档' },
+];
+export const xcsjNowStatusOptions = [
   { label: '待接收', value: '待接收' },
   { label: '待填报', value: '待填报' },
   { label: '待整改', value: '待整改' },

src/views/demo/inspectionaudit/curbspotcity/MapList/index.vue

@@ -129,7 +129,7 @@
                   v-model:value="props.infoScreenData.mapStatus"
                   @change="(value) => emits('mapListScreenChange',value,'mapStatus')"
                   style="width: 100%" 
-                  :options="mapStatusOptions"></a-checkbox-group>
+                  :options="xcsjMapStatusOptions"></a-checkbox-group>
                 </div>
             </div>
             <!-- <div style="display:flex;">
@@ -297,7 +297,7 @@ import {
   mapTypeOptions,
   illegalTypeOptions,
   measureOptions,
-  mapStatusOptions,
+  xcsjMapStatusOptions,
   markTypeOptions,
   inspectionAuditPatchSourceOptions,
   isOverdueOptions,

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

@@ -13,7 +13,7 @@
             showArrow
             mode="multiple"
             v-model:value="nowStatus"
-            :options="nowStatusOptions"
+            :options="xcsjNowStatusOptions"
             :max-tag-count="1"
             placeholder="请选择"
             @change="changeStatus"
@@ -109,7 +109,7 @@
   import { PageWrapper } from '@/components/Page';
   import dayjs from 'dayjs';
   import { message } from 'ant-design-vue';
-  import { nowStatusOptions } from '@/utils/global';
+  import { xcsjNowStatusOptions } from '@/utils/global';
 
   const { VITE_GLOB_API_URL } = getAppEnvConfig();
 

src/views/demo/inspectionaudit/patchsummary/patchsummary.data.ts

@@ -5,8 +5,8 @@ import {
   patchSourceOptions,
   yearOptions,
   markTypeOptions,
-  nowStatusOptions,
-  mapTypeOptions,
+  xcsjNowStatusOptions,
+  xcsjMapTypeOptions,
 } from '@/utils/global';
 
 export const columns: BasicColumn[] = [
@@ -194,7 +194,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '当前状态',
     component: 'Select',
     componentProps: {
-      options: nowStatusOptions,
+      options: xcsjNowStatusOptions,
     },
     colProps: { span: 4 },
     slot: 'dangqianzhuangtai',
@@ -205,7 +205,7 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Select',
     colProps: { span: 4 },
     componentProps: {
-      options: mapTypeOptions,
+      options: xcsjMapTypeOptions,
     },
   },
   {

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="dayjs(showInfoData.synchronoustime).isAfter(newVersion)" :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/auditlist/uploadModal.vue

@@ -195,7 +195,7 @@
   // 持续监管-图片插入
   async function UpdateUploadCXJGData(value) {
     let querys = {
-      id: value.caseid,
+      caseno: value.caseid,
       path: value.path,
     };
     try {

src/views/demo/tiankongdi/auditlist/utils.ts

@@ -82,10 +82,6 @@ export const columns: BasicColumn[] = [
     title: '实际用途',
     dataIndex: 'actualuseto',
   },
-  {
-    title: '违法类型',
-    dataIndex: 'weifaleixing',
-  },
   {
     title: '整改措施',
     dataIndex: 'measurename',
@@ -234,7 +230,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'caseNo',
     label: '线索编号',
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 6 },
   },
 ];
 

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

@@ -225,6 +225,29 @@
             <a-descriptions-item label="填报时间">{{
               props.showInfoData.examine_time
             }}</a-descriptions-item>
+            <a-descriptions-item label="无人机复飞照片">
+              <div class="image-div">
+                <a-image-preview-group
+                  :preview="{
+                    getContainer: getContainer,
+                    onVisibleChange: handlerImageChange,
+                  }"
+                >
+                  <template v-for="(imageItem, imageIndex) in wrjffzhaopianList" :key="imageIndex">
+                    <a-image
+                      v-if="imageItem"
+                      @click="handlerPreviewImage(imageIndex, imageItem)"
+                      width="100px"
+                      height="100px"
+                      :src="`${VITE_GLOB_INFO_IMAGE_URL}/${imageItem}`"
+                      :preview="{
+                        getContainer,
+                      }"
+                    ></a-image>
+                  </template>
+                </a-image-preview-group>
+              </div>
+            </a-descriptions-item>
           </a-descriptions>
         </a-tab-pane>
       </a-tabs>
@@ -308,7 +331,7 @@
     markTypeOptions,
     illegalTypeList,
     resultOptions,
-    qitaUseTOOptions,
+    newQitaUseTOOptions,
   } from '@/utils/global';
 
   const MapboxComponent = ref();
@@ -443,7 +466,7 @@
         result = resultOptions;
         break;
       case 'qita_use_to':
-        result = qitaUseTOOptions;
+        result = newQitaUseTOOptions;
         break;
     }
     result.forEach((item) => {
@@ -609,7 +632,7 @@
   };
   const changeBiaozhu = (type: number) => {
     UpdateDroneCaseInfoBiaoZhu({id: props.showInfoData.id, biaozhu: type}).then(res => {
-      message.success(res)
+      message.success('标注成功')
     })
   }
 </script>