From 4155711861a20b7de093ce9763adbac360341236 Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Sat, 14 Sep 2024 16:25:34 +0800
Subject: [PATCH] merge
---
.../Upload/src/components/ImageUpload.vue | 4 +-
.../MapList/SplitPolygonModal/index.vue | 445 +++++-------------
.../MapList/SplitPolygonModal/index.vue | 20 +-
3 files changed, 133 insertions(+), 336 deletions(-)
diff --git a/src/components/Upload/src/components/ImageUpload.vue b/src/components/Upload/src/components/ImageUpload.vue
index 11b62eca..506f0013 100644
--- a/src/components/Upload/src/components/ImageUpload.vue
+++ b/src/components/Upload/src/components/ImageUpload.vue
@@ -7,6 +7,7 @@
src:currentImageSrcUrl,
onVisibleChange:handlerImageChange
}"
+ @keydown.native.stop
>
@@ -16,6 +17,7 @@
style="width:100px;height:100px;"
:src="item.url"
@click="handlerPreviewImage(item,index)"
+ @keydown.native.stop
>
@@ -404,7 +406,7 @@
margin-bottom: 10px;
}
#process-form-container{
- width:50%;height:500px;background:red;
+ width:50%;height:500px;
overflow: hidden;
float: left;
position: relative;
diff --git a/src/views/demo/illegalmining/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/illegalmining/curbspotcity/MapList/SplitPolygonModal/index.vue
index 9d52d278..9a3a2464 100644
--- a/src/views/demo/illegalmining/curbspotcity/MapList/SplitPolygonModal/index.vue
+++ b/src/views/demo/illegalmining/curbspotcity/MapList/SplitPolygonModal/index.vue
@@ -16,11 +16,12 @@
-
+
{{ countyname }}
{{ streetname }}
{{ communityname }}
- {{
- dataProcessing(area)
- }}
- {{
- dataProcessing(nongyongdi_area)
- }}
- {{
- dataProcessing(gengdi_area)
- }}
- {{
- dataProcessing(yongjiujibennongtian_area)
- }}
+ {{ dataProcessing(area) }}
+ {{ dataProcessing(nongyongdi_area) }}
+ {{ dataProcessing(gengdi_area) }}
+ {{ dataProcessing(yongjiujibennongtian_area) }}
- {{
- dataProcessing(shengtaibaohuhongxian_area)
- }}
+ {{ dataProcessing(shengtaibaohuhongxian_area) }}
{{ case_description }}
{{ remark }}
{{ lng }}
{{ lat }}
- {{ synchronoustime }}
+ {{ createtime }}
{{ jieshou_people }}
- {{ jieshou_time?.split('.')[0] }}
+ {{ jieshou_time?.split('.')[0] }}
-
+
{{
getLabel('is_illegal', is_illegal)
}}
- {{
- xiangmumc
- }}
- {{
- xiangmuzhuti
- }}
- {{
- actual_use_to
- }}
+ {{ xiangmumc }}
+ {{ xiangmuzhuti }}
+ {{ actual_use_to }}
{{
getLabel('weifaleixing', weifaleixing)
}}
-
-
-
-
-
- {{ item }}
-
-
-
+
+
+
+ {{ item }}
+
+
-
-
-
-
-
- {{ item }}
-
-
-
+
+
+
+ {{ item }}
+
+
- {{
- getLabel('qita_use_to', qita_use_to)
- }}
+ {{ getLabel('qita_use_to',qita_use_to) }}
-
-
-
-
-
- {{ item }}
-
-
-
+
+
+
+ {{ item }}
+
+
{{
pandingyijushuoming
}}
{{ examiner_name }}
{{ examine_time }}
-
+
-
-
-
-
-
- {{ item }}
-
-
-
+
+
+
+ {{ item }}
+
+
-
-
-
-
-
- {{ item }}
-
-
-
+
+
+
+ {{ item }}
+
+
+
{{ transactor_name }}
{{ transact_time }}
-
+
{{ verifytime }}
-
-
- {{ hexiaoren }}
- {{ hexiaotime?.split('.')[0] }}
-
-
-
-
-
-
@@ -606,7 +457,7 @@
import MapboxMap from '@/components/MapboxMaps/MapComponent.vue';
import { getConfig } from '@/api/sys/layerManagement';
import { getGeom } from '@/api/sys/layerManagement';
- import { splitCase,getLoadCaseImgList } from '@/api/tiankongdi';
+ import { splitCase } from '@/api/tiankongdi';
import { useMessage } from '@/hooks/web/useMessage';
const { createMessage } = useMessage();
import Icon from '@/components/Icon/Icon.vue';
@@ -1021,66 +872,6 @@
}
return true;
};
-
- const imageList = ref([])
- async function getCaseImgList(){
-
- imageList.value = await getLoadCaseImgList({caseid:id});
-
-
-
- // 匹配去除无效图片
- let zhengshiImageList = [];
- imageList.value?.forEach((item,index)=>{
- let obj = anjianzhaopianList.value?.find((it,idx)=>{
- return item.filePath == it;
- })
- if(obj){
- zhengshiImageList.push(imageList.value[index]);
- }
- })
-
- // console.log("imageList",imageList.value);
- // console.log("anjianzhaopianList",anjianzhaopianList.value);
- // console.log("zhengshiImageList",zhengshiImageList);
-
- MapboxComponent.value.handlerLoadPictureAzimuth(zhengshiImageList);
- }
-
- function handlerPreviewImage(index,url){
-
- const regex = /([^/\\]+)(?=\.[^/\\]*$|$)/;
- const match = url.match(regex);
- if (match) {
- MapboxComponent.value.handlerCurrentImageChange(match[1]);
- }
-
- }
-
- const isInitImageLisener = ref(false);
- // 监听预览图片地址变化进行箭头切换
- function handlerImageChange(e):void{
- if(e && !isInitImageLisener.value){
- setTimeout(function(){
- const targetNode = document.getElementsByClassName('ant-image-preview-img');
- // 创建一个观察器实例,并传入回调函数
- const observer = new MutationObserver((mutationsList) => {
- for (const mutation of mutationsList) {
- if (mutation.type === 'attributes') {
- if(targetNode[0].getAttribute(mutation.attributeName).match("http")){
- handlerPreviewImage(0,targetNode[0].getAttribute(mutation.attributeName))
- }
- }
- }
- });
- // 配置观察选项
- const config = { attributes: true };
- // 开始观察目标节点
- observer.observe(targetNode[0], config);
- isInitImageLisener.value = true;
- },250)
- }
- }