From 815ce088fbe9ee9bd6569651f975d1b509c50f5c Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 9 Sep 2022 02:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20=E4=BA=A4=E6=8E=A5=E7=82=B9?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE=E4=B9=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B1=95=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AMap/src/AMapDesigner/index.vue      |  4 ++--
 src/components/AMap/src/amap.data.tsx               |  4 ++--
 .../AMap/src/components/MapPointModal.vue           | 13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/AMap/src/AMapDesigner/index.vue b/src/components/AMap/src/AMapDesigner/index.vue
index 7972dcf..7f7f9bf 100644
--- a/src/components/AMap/src/AMapDesigner/index.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -715,7 +715,7 @@
     isArray(mapData.fileId) && (mapData.fileId = mapData.fileId.join(','));
     mapData.mapTask.forEach(item => {
       const hospital = item.hospitalId && mapState.hospitalList.find(e => e.value == item.hospitalId),
-          org = item.orgId && mapState.orgList.find(e => e.value == item.orgId);
+            org = item.orgId && mapState.orgList.find(e => e.value == item.orgId);
       item.courierUserId = mapData.courierUserId;
       hospital && Object.assign(item,{
         hospitalName: hospital.label,
@@ -731,7 +731,7 @@
       if (~~item.taskType == 1) {
         item?.mapTaskPreset?.forEach(childItem => {
           const childHospital = childItem.orginPresetId && mapState.hospitalList.find(e => e.value == childItem.orginPresetId),
-              childOrg = childItem.destinationPresetId && mapState.orgList.find(e => e.value == childItem.destinationPresetId);
+                childOrg = childItem.destinationPresetId && mapState.orgList.find(e => e.value == childItem.destinationPresetId);
           childHospital && Object.assign(childItem,{
             orginPresetName: childHospital.label,
             orginPresetLat: childHospital.mapLat,
diff --git a/src/components/AMap/src/amap.data.tsx b/src/components/AMap/src/amap.data.tsx
index 8a7cf27..181d8ea 100644
--- a/src/components/AMap/src/amap.data.tsx
+++ b/src/components/AMap/src/amap.data.tsx
@@ -1,9 +1,9 @@
 import { BasicColumn } from '/@/components/Table';
-import { listOrg } from '/@/api/platform/common/controller/org';
 import { commonUpload } from '/@/api/platform/core/controller/upload';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { VxeTableDefines } from 'vxe-table/types/table';
+import Icon from '/@/components/Icon/index';
 
 /**
  * @program: kicc-ui
@@ -215,7 +215,7 @@ export const mapPointColumns: VxeTableDefines.ColumnOptions[] = [
       header ({ column }) {
         return [
           <vxe-tooltip content="按住后可以上下拖动排序!">
-            <i class="vxe-icon--question"/>
+            <Icon icon="fa6-solid:signature"/>
           </vxe-tooltip>
         ];
       }
diff --git a/src/components/AMap/src/components/MapPointModal.vue b/src/components/AMap/src/components/MapPointModal.vue
index 81b1593..313d576 100644
--- a/src/components/AMap/src/components/MapPointModal.vue
+++ b/src/components/AMap/src/components/MapPointModal.vue
@@ -33,6 +33,7 @@
   import { add, cloneDeep, concat } from 'lodash-es';
   import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic';
   import { VxeTableDefines } from 'vxe-table/types/table';
+  import Icon from '/@/components/Icon/index';
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
@@ -74,14 +75,14 @@
           default({row}) {
             return [
               <span>
-                <i class="vxe-icon-lock-fill"/>
+                <Icon icon="fa6-solid:lock"/>
               </span>
             ];
           },
           header({column}) {
             return [
               <vxe-tooltip content="此处数据只能展示不能操作!">
-                <i class="vxe-icon-info-circle-fill"/>
+                <Icon icon="fa6-solid:signature"/>
               </vxe-tooltip>
             ];
           }
@@ -156,18 +157,18 @@
 
   .rightTopLayout {
     position: absolute;
-    top: 70%;
+    top: 0;
     left: 50%;
     right: 0;
-    bottom: 0;
+    bottom: 30%;
   }
 
   .rightBottomLayout {
     position: absolute;
-    top: 0;
+    top: 70%;
     left: 50%;
     right: 0;
-    bottom: 30%;
+    bottom: 0;
   }
 
 }