From 523fef45be9669a20e8b256caea8eea57473c9a9 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 6 Jun 2022 10:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=BD=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/kicc/system/api/entity/User.java    |  5 +++++
 .../src/main/resources/bootstrap.yml          |  4 ++--
 kicc-ui/src/components/AMap/src/Amap.vue      | 21 +++++++++----------
 kicc-ui/src/components/AMap/src/TaskModal.vue |  3 +--
 kicc-ui/src/views/system/user/user.data.ts    | 16 ++++++++++++++
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
index 764df22d..1b3442a5 100644
--- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
@@ -50,6 +50,11 @@ public class User extends CommonEntity {
      */
     private String password;
 
+    /**
+     * 用户类型
+     */
+    private String userType;
+
     /**
      * 机构ID
      */
diff --git a/kicc-register/src/main/resources/bootstrap.yml b/kicc-register/src/main/resources/bootstrap.yml
index fc897b49..3faec1c2 100644
--- a/kicc-register/src/main/resources/bootstrap.yml
+++ b/kicc-register/src/main/resources/bootstrap.yml
@@ -5,10 +5,10 @@ server:
 db:
   num: 1
   user: ${MYSQL_USER:root}
-  password: ${MYSQL_PWD:root}
+  password: ${MYSQL_PWD:kanglai@2022}
   #password: ${MYSQL_PWD:kanglai@2022}
   url:
-    0: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    0: jdbc:mysql://${MYSQL_HOST:120.26.168.56}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     #0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
 
 nacos:
diff --git a/kicc-ui/src/components/AMap/src/Amap.vue b/kicc-ui/src/components/AMap/src/Amap.vue
index 69387ed5..fb875dbe 100644
--- a/kicc-ui/src/components/AMap/src/Amap.vue
+++ b/kicc-ui/src/components/AMap/src/Amap.vue
@@ -31,17 +31,8 @@
           <AFormItem label="起点">
             <ASelect v-model:value="mapState.modelRef.takeSpecimenId" :options="mapState.takeSpecimenList"/>
           </AFormItem>
-          <AFormItem label="途径点">
-            <ASelect v-model:value="mapState.modelRef.smallHospitalId"
-                     :options="[
-                       { value: '001', label: '下级医院:湘雅医院'},
-                       { value: '002', label: '下级医院:神经病医院'},
-                       { value: '003', label: '下级医院:第三医院'}
-                     ]"
-            />
-          </AFormItem>
-          <AFormItem label="终点">
-            <ASelect v-model:value="mapState.modelRef.largeHospitalId" :options="[]"/>
+          <AFormItem label="添加任务">
+            <a-button type="primary" @click="handleOpenTask">打开面板</a-button>
           </AFormItem>
         </AForm>
       </div>
@@ -49,6 +40,7 @@
         <BasicTable @register="registerTable"/>
       </div>
     </div>
+    <TaskModal @register="registerModal" @success="handleRefreshTable"/>
   </PageWrapper>
 </template>
 <script lang="ts" setup>
@@ -62,6 +54,8 @@
   import { PageWrapper } from '/@/components/Page';
   import { Form, Select } from 'ant-design-vue';
   import { BasicTable, useTable } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import TaskModal from './TaskModal.vue';
 
   let map;
   let largeHospitalMarkerCluster;
@@ -108,6 +102,7 @@
     bordered: true,
     showIndexColumn: true
   });
+  const [registerModal, { openModal }] = useModal();
 
   onBeforeMount(() => {
     if (!instance) return;
@@ -390,6 +385,10 @@
     }
   }
 
+  function handleOpenTask() {
+    openModal(true);
+  }
+
 </script>
 <style lang="less" scoped>
 
diff --git a/kicc-ui/src/components/AMap/src/TaskModal.vue b/kicc-ui/src/components/AMap/src/TaskModal.vue
index 402bdf17..e5bd43a0 100644
--- a/kicc-ui/src/components/AMap/src/TaskModal.vue
+++ b/kicc-ui/src/components/AMap/src/TaskModal.vue
@@ -90,13 +90,12 @@
     }
   });
   const emit = defineEmits(['success', 'register']);
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async () => {
     // 处理清除脏数据
     formElRef.value.resetFields();
     formElRef.value.clearValidate();
     // 处理设置数据
     state.tag = data._tag;
-    const taskId = data.record?.id;
     const props: Partial<ModalProps> = { confirmLoading: false };
     // 采用tag标签区分操作
     switch (state.tag) {
diff --git a/kicc-ui/src/views/system/user/user.data.ts b/kicc-ui/src/views/system/user/user.data.ts
index fb61584a..f7d8299c 100644
--- a/kicc-ui/src/views/system/user/user.data.ts
+++ b/kicc-ui/src/views/system/user/user.data.ts
@@ -251,6 +251,22 @@ export const userFormSchema: FormSchema[] = [
       span: 12
     }
   },
+  {
+    field: 'userType',
+    label: '用户类型',
+    component: 'Select',
+    required: true,
+    componentProps: {
+      options: [
+        { label: '收样员', value: '1' },
+        { label: '客服', value: '2' },
+        { label: '医生', value: '3' }
+      ]
+    },
+    colProps: {
+      span: 12
+    }
+  },
   {
     label: '备注',
     field: 'remarks',