From d91c9b6f7da08da14efe15e95b94b0bff0be8291 Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Sat, 13 Jul 2024 09:43:15 +0800
Subject: [PATCH] merge

---
 .../Upload/src/components/AuthImage.vue       |  8 ++++-
 .../tiankongdi/changearea/MapList/index.vue   | 24 +++++++-------
 .../demo/tiankongdi/changearea/index.vue      | 31 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/components/Upload/src/components/AuthImage.vue b/src/components/Upload/src/components/AuthImage.vue
index b95474b3..ceaac12a 100644
--- a/src/components/Upload/src/components/AuthImage.vue
+++ b/src/components/Upload/src/components/AuthImage.vue
@@ -2,7 +2,7 @@
     <div class="authImage-container" :style="props.style">
         <!-- native UI -->
         <div class="image-container" :style="props.style" v-if="props.type == 'native'">
-            <div class="image-operate"  @click="handlerPreviewImage" >
+            <div class="image-operate"  @click="handlerPreviewImage" v-if="props.preview" >
                 <div class="icon-box">
                     <EyeOutlined />
                     预览
@@ -13,8 +13,10 @@
         <!-- ant design UI -->
         <div class="ant-image-container" :style="props.style" v-if="props.type == 'ant'">
             <a-image
+                @click="handlerPreviewImage"
                 :style="props.style"
                 :src="blobUrl"
+                :preview="props.preview"
             />
         </div>
     </div>
@@ -41,6 +43,10 @@ const props = defineProps({
     },
     style:{
         type:Object,
+    },
+    preview:{
+        type:Boolean,
+        default:true
     }
 })
 
diff --git a/src/views/demo/tiankongdi/changearea/MapList/index.vue b/src/views/demo/tiankongdi/changearea/MapList/index.vue
index 9b086649..1115ff0f 100644
--- a/src/views/demo/tiankongdi/changearea/MapList/index.vue
+++ b/src/views/demo/tiankongdi/changearea/MapList/index.vue
@@ -42,9 +42,9 @@
         <a-select
           allowClear
           style="flex: 1"
-          v-model:value="infoScreenData.countyId"
+          v-model:value="infoScreenData.countyid"
           :options="props.municipalAreaOptions"
-          @change="(value) => emits('mapListScreenChange', value, 'countyId')"
+          @change="(value) => emits('mapListScreenChange', value, 'countyid')"
         />
       </div>
       <div class="screen-item" v-if="cityType.level === 0">
@@ -52,9 +52,9 @@
         <a-select
           allowClear
           style="flex: 1"
-          v-model:value="props.infoScreenData.streetId"
+          v-model:value="props.infoScreenData.streetid"
           :options="props.countiesAreaOptions"
-          @change="(value) => emits('mapListScreenChange', value, 'streetId')"
+          @change="(value) => emits('mapListScreenChange', value, 'streetid')"
         />
       </div>
       <div class="screen-item" >
@@ -62,9 +62,9 @@
         <a-select
           allowClear
           style="flex: 1"
-          v-model:value="infoScreenData.countyId"
+          v-model:value="infoScreenData.countyid"
           :options="municipalAreaOptions"
-          @change="(value) => mapListScreenChange( value, 'countyId')"
+          @change="(value) => mapListScreenChange( value, 'countyid')"
         />
       </div>
       <div class="screen-item" v-if="cityType.level !== 0">
@@ -72,9 +72,9 @@
         <a-select
           allowClear
           style="flex: 1"
-          v-model:value="infoScreenData.streetId"
+          v-model:value="infoScreenData.streetid"
           :options="streetsAreaOptions"
-          @change="(value) => emits('mapListScreenChange', value, 'streetId')"
+          @change="(value) => emits('mapListScreenChange', value, 'streetid')"
         />
       </div>
       <div class="screen-item">
@@ -437,12 +437,12 @@
       case 'caseNo':
         infoScreenData.value.caseNo = value;
         break;
-      case 'countyId':
-        infoScreenData.value.countyId = value;
+      case 'countyid':
+        infoScreenData.value.countyid = value;
         getStreetOrgs(value);
         break;
-      case 'streetId':
-        infoScreenData.value.streetId = value;
+      case 'streetid':
+        infoScreenData.value.streetid = value;
         break;
       case 'isIllegal':
         infoScreenData.value.isIllegal = value;
diff --git a/src/views/demo/tiankongdi/changearea/index.vue b/src/views/demo/tiankongdi/changearea/index.vue
index 5cb772a2..d6d7b33b 100644
--- a/src/views/demo/tiankongdi/changearea/index.vue
+++ b/src/views/demo/tiankongdi/changearea/index.vue
@@ -12,6 +12,31 @@
         @showInfo="changeShowInfo"
       />
 
+
+      <AuthImage 
+          style="width:180px;height:180px;" 
+          src="http://120.222.154.48:6050/DroneEnforcement/2024/20240712/2024071209474128610039.jpg"
+          type="native"
+          :preview="false"
+          @perviewImage="perviewImage"
+        ></AuthImage>
+
+      <AuthImage 
+          style="width:180px;height:180px;" 
+          src="http://120.222.154.48:6050/S_Common/2024/20240712/2024071209201354610087.jpg"
+          type="native"
+          :preview="false"
+          @perviewImage="perviewImage"
+        ></AuthImage>
+
+      <AuthImage 
+        style="width:180px;height:180px;" 
+        src="http://111.17.207.220:9001/2023/20231220/2023122014532130590143.png"
+        type="ant"
+        :preview="false"
+        @perviewImage="perviewImage"
+        ></AuthImage>
+
       <MapList
         v-if="showInfo"
         :infoScreenData="infoScreenData"
@@ -43,6 +68,7 @@
 </template>
 
 <script setup lang="ts">
+import AuthImage from '@/components/Upload/src/components/AuthImage.vue'
   import { ref, onMounted, onUnmounted, watch, defineAsyncComponent } from 'vue';
   import mapboxgl, { Map } from 'mapbox-gl';
   import { MapboxConfig, MapboxDefaultStyle } from '@/components/MapboxMaps/src/config.ts';
@@ -53,6 +79,7 @@
   import { getChildrenTree } from '@/api/demo/system.ts';
   import { getGeom,getConfig } from '@/api/sys/layerManagement';
   import { useMessage } from '@/hooks/web/useMessage';
+import axios from 'axios';
   const { createMessage } = useMessage();
 
   const MapboxMap = defineAsyncComponent(() => import('@/components/MapboxMaps/MapComponent.vue'));
@@ -67,9 +94,11 @@
   }
 
   function perviewImage(e):void{
-
+    alert(e);
   }
 
+
+
   const showInfo = ref(false);
   const year = ref<number>();
   const batch = ref();