From a3715593d91691866e33e2c6933b0170d72c703c Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 18 Jul 2024 09:08:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E5=9B=BE=E7=89=87=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E5=9B=BE=E7=89=87=E8=A7=86=E9=A2=91=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.tiankongdi                               |  8 ++-
 src/utils/env.ts                              |  2 +
 .../MapList/ShowInfoModal/index.vue           | 59 +++++++++++--------
 types/config.d.ts                             |  2 +
 4 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/.env.tiankongdi b/.env.tiankongdi
index c0e67aaf..cf4e7d10 100644
--- a/.env.tiankongdi
+++ b/.env.tiankongdi
@@ -12,7 +12,13 @@ VITE_BUILD_COMPRESS = 'none'
 
 # Basic interface address SPA
 # 天空地项目
-VITE_GLOB_API_URL=http://120.222.154.7:6050
+# VITE_GLOB_API_URL=http://120.222.154.7:6050
+VITE_GLOB_API_URL=http://192.168.10.102:9023
+# VITE_GLOB_API_URL=http://120.222.154.7:6050
+# VITE_GLOB_API_URL=http://120.222.154.7:6050
+# VITE_GLOB_API_URL=http://192.168.10.131:8989
+
+VITE_INFO_IMAGE_URL=http://120.222.154.48:6050
 
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
diff --git a/src/utils/env.ts b/src/utils/env.ts
index 3aad5d79..1466c3d4 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -35,6 +35,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_API_URL_PREFIX,
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_APP_LOGO,
+    VITE_INFO_IMAGE_URL,
   } = ENV;
   let { VITE_GLOB_API_URL } = ENV;
   if (localStorage.getItem(API_ADDRESS)) {
@@ -47,6 +48,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_API_URL_PREFIX,
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_APP_LOGO,
+    VITE_INFO_IMAGE_URL,
   };
 }
 
diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue
index 84efe313..f776e60d 100644
--- a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue
+++ b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue
@@ -44,17 +44,19 @@
             <a-descriptions-item label="案件备注">{{ remark }}</a-descriptions-item>
             <a-descriptions-item label="下发时间">{{ createtime }}</a-descriptions-item>
             <a-descriptions-item label="案件图片">
-              <template v-for="(imageItem, imageIndex) in casepicList" :key="imageIndex">
-                <a-image
-                  v-if="imageItem"
-                  width="100px"
-                  height="100px"
-                  :src="`${VITE_GLOB_API_URL}/${imageItem}`"
-                  :preview="{
-                    getContainer,
-                  }"
-                ></a-image>
-              </template>
+              <div class="image-div">
+                <template v-for="(imageItem, imageIndex) in casepicList" :key="imageIndex">
+                  <a-image
+                    v-if="imageItem"
+                    width="100px"
+                    height="100px"
+                    :src="`${VITE_INFO_IMAGE_URL}/${imageItem}`"
+                    :preview="{
+                      getContainer,
+                    }"
+                  ></a-image>
+                </template>
+              </div>
               <!-- {{ anjianzhaopian }} -->
             </a-descriptions-item>
           </a-descriptions>
@@ -103,19 +105,19 @@
               <!-- {{ fujian }} -->
             </a-descriptions-item>
             <a-descriptions-item label="照片">
-              <template v-for="(imageItem, imageIndex) in anjianzhaopianList" :key="imageIndex">
-                <div style="margin-top: 10px">
+              <div class="image-div">
+                <template v-for="(imageItem, imageIndex) in anjianzhaopianList" :key="imageIndex">
                   <a-image
                     v-if="imageItem"
                     width="100px"
                     height="100px"
-                    :src="`${VITE_GLOB_API_URL}/${imageItem}`"
+                    :src="`${VITE_INFO_IMAGE_URL}/${imageItem}`"
                     :preview="{
                       getContainer,
                       }"
                   ></a-image>
-                </div>
-              </template>
+                </template>
+              </div>
               <!-- {{ casepic }} -->
             </a-descriptions-item>
             <a-descriptions-item label="填报人">{{ examiner_name }}</a-descriptions-item>
@@ -149,22 +151,22 @@
               <!-- {{ yanshoubiao }} -->
             </a-descriptions-item>
             <a-descriptions-item label="拆除复耕后照片">
-              <template
-                v-for="(imageItem, imageIndex) in chaichufugenghoupicList"
-                :key="imageIndex"
-              >
-                <div style="margin-top: 10px">
+              <div class="image-div">
+                <template
+                  v-for="(imageItem, imageIndex) in chaichufugenghoupicList"
+                  :key="imageIndex"
+                >
                   <a-image
                     v-if="imageItem"
                     width="100px"
                     height="100px"
-                    :src="`${VITE_GLOB_API_URL}/${imageItem}`"
+                    :src="`${VITE_INFO_IMAGE_URL}/${imageItem}`"
                     :preview="{
                       getContainer,
                     }"
                   ></a-image>
-                </div>
-              </template>
+                </template>
+              </div>
               <!-- {{ chaichufugenghoupic }} -->
             </a-descriptions-item>
             <a-descriptions-item label="附件">
@@ -212,7 +214,7 @@
   const { createMessage } = useMessage();
   import Icon from '@/components/Icon/Icon.vue';
   import { getAppEnvConfig } from '@/utils/env';
-  const { VITE_GLOB_API_URL } = getAppEnvConfig();
+  const { VITE_INFO_IMAGE_URL } = getAppEnvConfig();
   import {
     mapTypeOptions,
     illegalTypeOptions,
@@ -412,7 +414,7 @@
     }
   }
   const downLoadFile = (url) => {
-    window.open(`${VITE_GLOB_API_URL}/${url}`, 'mozillaTab');
+    window.open(`${VITE_INFO_IMAGE_URL}/${url}`, 'mozillaTab');
   };
   const getContainer = () => {
     return document.getElementById('info-container')
@@ -420,6 +422,11 @@
 </script>
 
 <style lang="scss" scoped>
+  .image-div{
+    width: 300px;
+    max-height: 200px;
+    overflow: auto;
+  }
   .detail-container {
     width: 100vw;
     height: calc(100vh - 120px);
diff --git a/types/config.d.ts b/types/config.d.ts
index 11a80daa..eef4c17c 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -161,4 +161,6 @@ export interface GlobEnvConfig {
   VITE_GLOB_UPLOAD_URL?: string;
   // logo
   VITE_GLOB_APP_LOGO?: string;
+  // info image video
+  VITE_INFO_IMAGE_URL?: string;
 }

From edd2ea09b6cf2126f125c63c4c6fff77b761d13c Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 18 Jul 2024 09:41:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE[=E5=B8=82=E7=BA=A7?=
 =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=A1=A8=E5=8D=95-=E6=9C=89=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9]2024-07-17=2009:59:20=E7=89=88=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MapList/ShowInfoModal/index.vue           | 47 ++++++++-----------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue
index f776e60d..25e8695d 100644
--- a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue
+++ b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue
@@ -24,26 +24,20 @@
             <a-descriptions-item label="案件类型">{{ typename }}</a-descriptions-item>
             <a-descriptions-item label="县区">{{ countyname }}</a-descriptions-item>
             <a-descriptions-item label="乡镇">{{ streetname }}</a-descriptions-item>
-            <a-descriptions-item label="村/社区">{{ communityname }}</a-descriptions-item>
+            <a-descriptions-item label="图斑描述">{{ case_description }}</a-descriptions-item>
+            <a-descriptions-item label="图斑地址">{{ address }}</a-descriptions-item>
+            <a-descriptions-item label="备注">{{ remark }}</a-descriptions-item>
+            <a-descriptions-item label="下发时间">{{ createtime }}</a-descriptions-item>
+            <a-descriptions-item label="图斑面积(亩)">{{ area }}</a-descriptions-item>
+            <a-descriptions-item label="农用地面积(亩)">{{ nongyongdi_area }}</a-descriptions-item>
+            <a-descriptions-item label="耕地面积(亩)">{{ gengdi_area }}</a-descriptions-item>
+            <a-descriptions-item label="基本农田面积(亩)">{{ yongjiujibennongtian_area }}</a-descriptions-item>
+            <a-descriptions-item label="占重点区域面积(亩)">{{ zhongdianquyu_area }}</a-descriptions-item>
+            <a-descriptions-item label="占生态红线面积(亩)">{{ shengtaibaohuhongxian_area }}</a-descriptions-item>
+            <a-descriptions-item label="占空间规划面积(亩)">{{ guotukongjianguihua_area }}</a-descriptions-item>
             <a-descriptions-item label="经度">{{ lng }}</a-descriptions-item>
             <a-descriptions-item label="纬度">{{ lat }}</a-descriptions-item>
-            <a-descriptions-item label="农用地面积">{{ nongyongdi_area }}</a-descriptions-item>
-            <a-descriptions-item label="耕地面积">{{ gengdi_area }}</a-descriptions-item>
-            <a-descriptions-item label="永久基本农田面积">{{
-              yongjiujibennongtian_area
-            }}</a-descriptions-item>
-            <a-descriptions-item label="生态保护红线面积">{{
-              shengtaibaohuhongxian_area
-            }}</a-descriptions-item>
-            <a-descriptions-item label="国土空间规划面积">{{
-              guotukongjianguihua_area
-            }}</a-descriptions-item>
-            <a-descriptions-item label="案件面积">{{ area }}</a-descriptions-item>
-            <a-descriptions-item label="案件描述">{{ case_description }}</a-descriptions-item>
-            <a-descriptions-item label="判读时间">{{ identification_time }}</a-descriptions-item>
-            <a-descriptions-item label="案件备注">{{ remark }}</a-descriptions-item>
-            <a-descriptions-item label="下发时间">{{ createtime }}</a-descriptions-item>
-            <a-descriptions-item label="案件图片">
+            <a-descriptions-item label="图斑照片">
               <div class="image-div">
                 <template v-for="(imageItem, imageIndex) in casepicList" :key="imageIndex">
                   <a-image
@@ -57,7 +51,6 @@
                   ></a-image>
                 </template>
               </div>
-              <!-- {{ anjianzhaopian }} -->
             </a-descriptions-item>
           </a-descriptions>
         </a-tab-pane>
@@ -80,14 +73,15 @@
             <a-descriptions-item label="违法类型">{{
               getLabel('weifaleixing', weifaleixing)
             }}</a-descriptions-item>
-            <a-descriptions-item label="处理方式">{{
+            <a-descriptions-item label="实际用途">{{ qita_use_to }}</a-descriptions-item>
+            <!-- <a-descriptions-item label="处理方式">{{
               getLabel('result_name', result_name)
-            }}</a-descriptions-item>
-            <a-descriptions-item label="立案号">{{ registr_number }}</a-descriptions-item>
+            }}</a-descriptions-item> -->
+            <!-- <a-descriptions-item label="立案号">{{ registr_number }}</a-descriptions-item>
             <a-descriptions-item label="违法联系人">{{ illegal_contact }}</a-descriptions-item>
             <a-descriptions-item label="违法人身份证号">{{
               illegal_shenfenzhenghao
-            }}</a-descriptions-item>
+            }}</a-descriptions-item> -->
             <a-descriptions-item label="判定依据说明">{{
               pandingyijushuoming
             }}</a-descriptions-item>
@@ -118,7 +112,6 @@
                   ></a-image>
                 </template>
               </div>
-              <!-- {{ casepic }} -->
             </a-descriptions-item>
             <a-descriptions-item label="填报人">{{ examiner_name }}</a-descriptions-item>
             <a-descriptions-item label="填报时间">{{ examine_time }}</a-descriptions-item>
@@ -148,7 +141,6 @@
                   {{ item }}
                 </div>
               </template>
-              <!-- {{ yanshoubiao }} -->
             </a-descriptions-item>
             <a-descriptions-item label="拆除复耕后照片">
               <div class="image-div">
@@ -167,7 +159,6 @@
                   ></a-image>
                 </template>
               </div>
-              <!-- {{ chaichufugenghoupic }} -->
             </a-descriptions-item>
             <a-descriptions-item label="附件">
               <template v-for="(item, itemIndex) in zhenggaifujianList" :key="itemIndex">
@@ -430,6 +421,7 @@
   .detail-container {
     width: 100vw;
     height: calc(100vh - 120px);
+    display: flex;
   }
   .detail-container::after {
     content: '';
@@ -445,7 +437,7 @@
     margin-right: 20px;
   }
   .info-container {
-    float: left;
+    // float: left;
     position: relative;
     :deep(.ant-image-preview-wrap){
       position: absolute;
@@ -466,5 +458,6 @@
     overflow: auto;
     height: 80vh;
     overflow: auto;
+    padding-right: 10px;
   }
 </style>