Browse Source

🍽 修复数据库

master
wangxiang 3 years ago
parent
commit
523fef45be
  1. 5
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
  2. 4
      kicc-register/src/main/resources/bootstrap.yml
  3. 21
      kicc-ui/src/components/AMap/src/Amap.vue
  4. 3
      kicc-ui/src/components/AMap/src/TaskModal.vue
  5. 16
      kicc-ui/src/views/system/user/user.data.ts

5
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 password;
/**
* 用户类型
*/
private String userType;
/** /**
* 机构ID * 机构ID
*/ */

4
kicc-register/src/main/resources/bootstrap.yml

@ -5,10 +5,10 @@ server:
db: db:
num: 1 num: 1
user: ${MYSQL_USER:root} user: ${MYSQL_USER:root}
password: ${MYSQL_PWD:root} password: ${MYSQL_PWD:kanglai@2022}
#password: ${MYSQL_PWD:kanglai@2022} #password: ${MYSQL_PWD:kanglai@2022}
url: 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 #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: nacos:

21
kicc-ui/src/components/AMap/src/Amap.vue

@ -31,17 +31,8 @@
<AFormItem label="起点"> <AFormItem label="起点">
<ASelect v-model:value="mapState.modelRef.takeSpecimenId" :options="mapState.takeSpecimenList"/> <ASelect v-model:value="mapState.modelRef.takeSpecimenId" :options="mapState.takeSpecimenList"/>
</AFormItem> </AFormItem>
<AFormItem label="途径点"> <AFormItem label="添加任务">
<ASelect v-model:value="mapState.modelRef.smallHospitalId" <a-button type="primary" @click="handleOpenTask">打开面板</a-button>
:options="[
{ value: '001', label: '下级医院:湘雅医院'},
{ value: '002', label: '下级医院:神经病医院'},
{ value: '003', label: '下级医院:第三医院'}
]"
/>
</AFormItem>
<AFormItem label="终点">
<ASelect v-model:value="mapState.modelRef.largeHospitalId" :options="[]"/>
</AFormItem> </AFormItem>
</AForm> </AForm>
</div> </div>
@ -49,6 +40,7 @@
<BasicTable @register="registerTable"/> <BasicTable @register="registerTable"/>
</div> </div>
</div> </div>
<TaskModal @register="registerModal" @success="handleRefreshTable"/>
</PageWrapper> </PageWrapper>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -62,6 +54,8 @@
import { PageWrapper } from '/@/components/Page'; import { PageWrapper } from '/@/components/Page';
import { Form, Select } from 'ant-design-vue'; import { Form, Select } from 'ant-design-vue';
import { BasicTable, useTable } from '/@/components/Table'; import { BasicTable, useTable } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import TaskModal from './TaskModal.vue';
let map; let map;
let largeHospitalMarkerCluster; let largeHospitalMarkerCluster;
@ -108,6 +102,7 @@
bordered: true, bordered: true,
showIndexColumn: true showIndexColumn: true
}); });
const [registerModal, { openModal }] = useModal();
onBeforeMount(() => { onBeforeMount(() => {
if (!instance) return; if (!instance) return;
@ -390,6 +385,10 @@
} }
} }
function handleOpenTask() {
openModal(true);
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

3
kicc-ui/src/components/AMap/src/TaskModal.vue

@ -90,13 +90,12 @@
} }
}); });
const emit = defineEmits(['success', 'register']); 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.resetFields();
formElRef.value.clearValidate(); formElRef.value.clearValidate();
// //
state.tag = data._tag; state.tag = data._tag;
const taskId = data.record?.id;
const props: Partial<ModalProps> = { confirmLoading: false }; const props: Partial<ModalProps> = { confirmLoading: false };
// tag // tag
switch (state.tag) { switch (state.tag) {

16
kicc-ui/src/views/system/user/user.data.ts

@ -251,6 +251,22 @@ export const userFormSchema: FormSchema[] = [
span: 12 span: 12
} }
}, },
{
field: 'userType',
label: '用户类型',
component: 'Select',
required: true,
componentProps: {
options: [
{ label: '收样员', value: '1' },
{ label: '客服', value: '2' },
{ label: '医生', value: '3' }
]
},
colProps: {
span: 12
}
},
{ {
label: '备注', label: '备注',
field: 'remarks', field: 'remarks',

Loading…
Cancel
Save