From 0103d34c21b12608f0db4b86cf3185bcf8111978 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 25 Aug 2022 06:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=9C=B0=E5=9B=BE=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AMap/index.ts                  |  4 ++++
 .../src/AMapDesigner/index.vue}               | 13 +++++-------
 .../src/map.data.ts => AMap/src/amap.data.ts} |  0
 .../src/components/HandoverPresetModal.vue}   |  6 +++---
 .../src/components/MapPointModal.vue}         |  8 +++----
 .../src => AMap/src/components}/TaskModal.vue | 21 +++++++++----------
 src/components/AMapDesigner/index.ts          |  4 ----
 .../common/mapLogistic/MapLogisticModal.vue   |  6 +++---
 8 files changed, 29 insertions(+), 33 deletions(-)
 create mode 100644 src/components/AMap/index.ts
 rename src/components/{AMapDesigner/src/Amap.vue => AMap/src/AMapDesigner/index.vue} (98%)
 rename src/components/{AMapDesigner/src/map.data.ts => AMap/src/amap.data.ts} (100%)
 rename src/components/{AMapDesigner/src/MutualTaskModal.vue => AMap/src/components/HandoverPresetModal.vue} (97%)
 rename src/components/{AMapDesigner/src/MapDataSettingsModal.vue => AMap/src/components/MapPointModal.vue} (94%)
 rename src/components/{AMapDesigner/src => AMap/src/components}/TaskModal.vue (95%)
 delete mode 100644 src/components/AMapDesigner/index.ts

diff --git a/src/components/AMap/index.ts b/src/components/AMap/index.ts
new file mode 100644
index 0000000..fd8f26c
--- /dev/null
+++ b/src/components/AMap/index.ts
@@ -0,0 +1,4 @@
+import { withInstall } from '/@/utils';
+import aMapDesigner from './src/AMapDesigner/index.vue';
+
+export const AMapDesigner = withInstall(aMapDesigner);
diff --git a/src/components/AMapDesigner/src/Amap.vue b/src/components/AMap/src/AMapDesigner/index.vue
similarity index 98%
rename from src/components/AMapDesigner/src/Amap.vue
rename to src/components/AMap/src/AMapDesigner/index.vue
index e8aaf0a..c21b57c 100644
--- a/src/components/AMapDesigner/src/Amap.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -74,15 +74,15 @@
 <script lang="ts" setup>
   import AMapLoader from '@amap/amap-jsapi-loader';
   import { reactive, watchEffect, getCurrentInstance, onBeforeMount, onUnmounted } from 'vue';
-  import { smallHospitalMapList, specimenMapList,  columns } from './map.data';
+  import { smallHospitalMapList, specimenMapList,  columns } from '../amap.data';
   import hospital from '/@/assets/images/hospital.svg';
   import medicalKit from '/@/assets/images/medical-kit.svg';
   import hospitalTwinkle from '/@/assets/images/hospital-twinkle.gif';
   import redFlag from '/@/assets/images/redFlag.svg';
-  import { Form, Select, Button, Tooltip } from 'ant-design-vue';
+  import { Form, Select, Tooltip } from 'ant-design-vue';
   import { BasicTable, useTable } from '/@/components/Table';
   import { useModal } from '/@/components/Modal';
-  import TaskModal from './TaskModal.vue';
+  import TaskModal from '../components/TaskModal.vue';
   import { propTypes } from '/@/utils/propTypes';
   import { listHospital } from '/@/api/platform/common/controller/hospital';
   import { listUser } from '/@/api/platform/system/controller/user';
@@ -132,10 +132,9 @@
   const AForm = Form;
   const AFormItem = Form.Item;
   const ASelect = Select;
-  const AButtonGroup = Button.Group;
   const ATooltip = Tooltip;
   const [registerTable, { reload }] = useTable({
-    title: '地图任务列表',
+    title: '任务列表',
     rowKey: 'id',
     dataSource: [{
       id: '001',
@@ -551,7 +550,7 @@
     }
 
     .operatePanel-form {
-      margin-top: 10px;
+      margin-top: 20px;
     }
 
     .operatePanel-list {
@@ -576,8 +575,6 @@
     .ant-btn  {
       font-size: 13px;
       margin-right: 1px;
-
-
     }
   }
 }
diff --git a/src/components/AMapDesigner/src/map.data.ts b/src/components/AMap/src/amap.data.ts
similarity index 100%
rename from src/components/AMapDesigner/src/map.data.ts
rename to src/components/AMap/src/amap.data.ts
diff --git a/src/components/AMapDesigner/src/MutualTaskModal.vue b/src/components/AMap/src/components/HandoverPresetModal.vue
similarity index 97%
rename from src/components/AMapDesigner/src/MutualTaskModal.vue
rename to src/components/AMap/src/components/HandoverPresetModal.vue
index f4328f9..49391d9 100644
--- a/src/components/AMapDesigner/src/MutualTaskModal.vue
+++ b/src/components/AMap/src/components/HandoverPresetModal.vue
@@ -26,7 +26,7 @@
   import { reactive } from 'vue';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
   import { BasicTable, useTable, EditRecordRow, BasicColumn, ActionItem, TableAction } from '/@/components/Table';
-  import { formTaskColumns, formMutualTaskColumns, largeHospitalMapList, smallHospitalMapList, formMutualTaskSettingColumns } from './map.data';
+  import { formTaskColumns, formMutualTaskColumns, largeHospitalMapList, smallHospitalMapList, formMutualTaskSettingColumns } from '../amap.data';
   import { Form, Select } from 'ant-design-vue';
 
   const AForm = Form;
@@ -51,12 +51,12 @@
   const emit = defineEmits(['success', 'register']);
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async data => {
     const props: Partial<ModalProps> = { confirmLoading: false };
-    props.title = '交接任务弹出框';
+    props.title = '转办任务配置';
     // 尾部:设置处理后的最终配置数据
     setModalProps(props);
   });
   const [registerTable, { reload, getDataSource }] = useTable({
-    title: '交接任务表格',
+    title: '转办任务',
     columns: formMutualTaskSettingColumns,
     pagination: {
       pageSize: 3,
diff --git a/src/components/AMapDesigner/src/MapDataSettingsModal.vue b/src/components/AMap/src/components/MapPointModal.vue
similarity index 94%
rename from src/components/AMapDesigner/src/MapDataSettingsModal.vue
rename to src/components/AMap/src/components/MapPointModal.vue
index 3c1b00d..fc3460f 100644
--- a/src/components/AMapDesigner/src/MapDataSettingsModal.vue
+++ b/src/components/AMap/src/components/MapPointModal.vue
@@ -2,8 +2,8 @@
   import { reactive, nextTick, ref, h } from 'vue';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
   import { Form, Select, Row, Col } from 'ant-design-vue';
-  import { AMap } from '/@/components/AMapDesigner';
-  import { formMapDataSettingsColumns } from '/@/components/AMapDesigner/src/map.data';
+  import { AMapDesigner } from '/@/components/AMap';
+  import { formMapDataSettingsColumns } from '/@/components/AMap/src/amap.data';
   import Sortable from 'sortablejs';
   import { VxeGridProps } from 'vxe-table';
 
@@ -65,7 +65,7 @@
   const emit = defineEmits(['success', 'register']);
   const [registerModal, { setModalProps, closeModal }] = useModalInner(data => {
     const props: Partial<ModalProps> = { confirmLoading: false };
-    props.title = '地图标记点数据设置弹出框';
+    props.title = '标记点配置';
 
     nextTick(() => {
       mapSettingsState.sortable = Sortable.create(VxeGridEl.value!.$el.querySelector('.body--wrapper>.vxe-table--body tbody'), {
@@ -95,7 +95,7 @@
   >
     <ARow>
       <ACol :span="12">
-        <AMap :sidebarControl="false"/>
+        <AMapDesigner :sidebarControl="false"/>
       </ACol>
       <ACol :span="12">
         <vxe-grid ref="VxeGridEl" v-bind="gridOptions"/>
diff --git a/src/components/AMapDesigner/src/TaskModal.vue b/src/components/AMap/src/components/TaskModal.vue
similarity index 95%
rename from src/components/AMapDesigner/src/TaskModal.vue
rename to src/components/AMap/src/components/TaskModal.vue
index 5923f80..feb8bea 100644
--- a/src/components/AMapDesigner/src/TaskModal.vue
+++ b/src/components/AMap/src/components/TaskModal.vue
@@ -8,10 +8,10 @@
       <template #toolbar>
         <a-button type="primary"
                   @click="handleMapDataSettings()"
-        >调整地图标记点数据</a-button>
+        >标记点</a-button>
         <a-button type="primary"
                   @click="handleTaskAdd()"
-        >新增任务</a-button>
+        >新增</a-button>
       </template>
       <template #action="{ record, column }">
         <TableAction :actions="createActions(record, column)"/>
@@ -21,12 +21,12 @@
       <template #toolbar>
         <a-button type="primary"
                   @click="handleMutualTaskAdd()"
-        >新增任务</a-button>
+        >新增</a-button>
       </template>
       <template #action="{ record, column }">
         <TableAction :actions="[
           {
-            label: '设置为交接任务',
+            label: '转办',
             icon: 'fa6-regular:pen-to-square',
             onClick: handleMutualTask.bind(null, record)
           }]"
@@ -42,11 +42,10 @@
   import { reactive } from 'vue';
   import {BasicModal, ModalProps, useModal, useModalInner} from '/@/components/Modal';
   import { BasicTable, useTable, EditRecordRow, BasicColumn, ActionItem, TableAction } from '/@/components/Table';
-  import { formTaskColumns, formMutualTaskColumns, largeHospitalMapList, smallHospitalMapList, } from './map.data';
+  import { formTaskColumns, formMutualTaskColumns, largeHospitalMapList, smallHospitalMapList, } from '../amap.data';
   import { buildUUID } from '/@/utils/uuid';
-  import { add, divide } from 'lodash-es';
-  import MutualTaskModal from './MutualTaskModal.vue';
-  import MapDataSettingsModal from './MapDataSettingsModal.vue';
+  import MutualTaskModal from './HandoverPresetModal.vue';
+  import MapDataSettingsModal from './MapPointModal.vue';
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
@@ -70,14 +69,14 @@
     driving = data.driving;
     state.formData = data.formData;
     const props: Partial<ModalProps> = { confirmLoading: false };
-    props.title = '添加收样员任务';
+    props.title = '任务配置';
     // 尾部:设置处理后的最终配置数据
     setModalProps(props);
   });
   const [mutualRegisterModal, { openModal }] = useModal();
   const [mapDataRegisterModal, { openModal: mapDataOpenModal }] = useModal();
   const [registerTable, { reload, getDataSource }] = useTable({
-    title: '任务设置',
+    title: '普通任务',
     columns: formTaskColumns,
     pagination: {
       pageSize: 3,
@@ -97,7 +96,7 @@
     }
   });
   const [schemeRegisterTable, { reload: schemeReload, getDataSource: getMutualDataSource, setProps }] = useTable({
-    title: '交接任务设置',
+    title: '交接任务',
     columns: formMutualTaskColumns,
     pagination: {
       pageSize: 3,
diff --git a/src/components/AMapDesigner/index.ts b/src/components/AMapDesigner/index.ts
deleted file mode 100644
index 12f708a..0000000
--- a/src/components/AMapDesigner/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { withInstall } from '/@/utils';
-import Amap from './src/Amap.vue';
-
-export const AMap = withInstall(Amap);
diff --git a/src/views/common/mapLogistic/MapLogisticModal.vue b/src/views/common/mapLogistic/MapLogisticModal.vue
index af57373..dbd83e4 100644
--- a/src/views/common/mapLogistic/MapLogisticModal.vue
+++ b/src/views/common/mapLogistic/MapLogisticModal.vue
@@ -5,7 +5,7 @@
               :showCancelBtn="false"
               @register="registerModal"
   >
-    <AMap/>
+    <AMapDesigner/>
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -17,7 +17,7 @@
    */
   import { ref, unref } from 'vue';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
-  import { AMap } from '/@/components/AMapDesigner';
+  import { AMapDesigner } from '/@/components/AMap';
 
   /** 通用变量统一声明区域 */
   const tag = ref<Nullable<string>>('');
@@ -30,7 +30,7 @@
     // 处理设置数据
     tag.value = data._tag;
     const deptId = data.record?.deptId;
-    const props: Partial<ModalProps> = { confirmLoading: false, title: '地图设计' };
+    const props: Partial<ModalProps> = { confirmLoading: false, title: '地图设计器' };
     // 采用tag标签区分操作
     switch (unref(tag)) {
       case 'add':