From b2605cb8169514e9cec9cbdbc01b873eac8baf9c Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Fri, 14 Jun 2024 17:33:42 +0800
Subject: [PATCH] merge

---
 src/components/FormViewer/index.vue           |  6 ++++-
 .../demo/workflow/task/process/audit.vue      | 26 +++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index 317831bc..7b8e2a7e 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -65,7 +65,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { onMounted, ref, defineProps } from 'vue';
+  import { onMounted, ref, defineProps,defineEmits } from 'vue';
   import { BasicForm, useForm } from '@/components/Form';
   import { functionGetFormDataFormScheme, LoadFormScheme } from '@/api/demo/formScheme';
   import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue';
@@ -77,6 +77,7 @@
   import { subTableStore } from '@/store/modules/subTable';
   import dayjs from 'dayjs';
 
+  const emit = defineEmits(["getFormSuccess"])
   const subTableDataStore = subTableStore();
 
   let formColumns: FormSchema[] = [];
@@ -381,6 +382,8 @@
         });
       });
     }
+
+    emit("getFormSuccess")
   }
   const groupRef = ref();
   async function getForm() {
@@ -449,6 +452,7 @@
   }
   .my-form-viewer {
     overflow: auto;
+    width:100%;
     height: calc(100vh - 350px);
   }
 </style>
diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue
index 1b358863..1c0dfa08 100644
--- a/src/views/demo/workflow/task/process/audit.vue
+++ b/src/views/demo/workflow/task/process/audit.vue
@@ -21,7 +21,7 @@
                 "
                 v-if="formVisble"
               >
-                <div :class="mapConfig?.isShowMap ? 'form-container' : ''">
+                <div >
                   <FormViewer
                     ref="formBoxRef"
                     :formConfig="formConfig"
@@ -29,6 +29,7 @@
                     :formVerison="designerData.formCurrentNode.formVerison"
                     :formRelationId="designerData.formCurrentNode.formRelationId"
                     :instanceInfo="designerData.process.instanceInfo"
+                    @getFormSuccess="getFormSuccess"
                     v-if="formVisble"
                   />
                 </div>
@@ -185,7 +186,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, onBeforeMount, defineAsyncComponent } from 'vue';
+  import { ref, reactive, onBeforeMount,watch,defineAsyncComponent } from 'vue';
   import { ProcessViewer } from '@/components/ProcessViewer';
   import { PageWrapper } from '@/components/Page';
   import { createAgain, signAudit, audit, ReadFlow } from '@/api/sys/WFProcess';
@@ -772,34 +773,31 @@
           } else if (key === targetKey && obj[key] == 'MapGeom') {
               // 如果当前键等于目标键，则返回对应的值
               chooseLayer.value = obj['mapSetData'].chooseLayer;
-              geomfield.value = obj['field']
+              geomfield.value = obj["field"]
               return obj[key];
           }
       }
   }
 
-  async function handlerShowGeomtrys(currentNode) {
-    findValue(currentNode.value.schemas,"component")
+  function getFormSuccess(){
+    handlerShowGeomtrys(designerData.currentNode);
+  }
 
+  async function handlerShowGeomtrys(currentNode) {
+    findValue(currentNode.authFields,"component")
     let info = currentNode.authFields?.find((item, index) => {
       return item.component == 'MapGeom';
     });
     let layer: string = chooseLayer.value;
-
-    // let layer:string="drone_shp_data";
-    // if (info) {
-    //   layer = info?.mapSetData?.chooseLayer;
-    // }
     if (!layer) {
       createMessage.error('图斑未绑定图层服务！');
       return;
     }
     let geomfiledValue = geomfield.value;
-
     let gids = '';
-
     try {
       await formBoxRef.value.getForm().then((res) => {
+        geomfiledValue = geomfiledValue.toLowerCase();
         gids = res[geomfiledValue];
         // 根据ids获取图斑
         if (gids) {
@@ -843,7 +841,7 @@
   }
 
   function onMapboxLoad() {
-    handlerShowGeomtrys(designerData.formCurrentNode);
+    
   }
   // 驳回到指定节点
   async function rejectHandleOk() {
@@ -863,6 +861,8 @@
   onBeforeMount(() => {
     getTaskInfo();
   });
+
+
 </script>
 <style lang="less" scoped>
   ::v-deep .ant-tabs-nav-wrap {