diff --git a/collect_information/.env.development b/collect_information/.env.development
index 4e393f7..1f4b2bd 100644
--- a/collect_information/.env.development
+++ b/collect_information/.env.development
@@ -1,7 +1,7 @@
# 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config
TARO_APP_ID="wx0acd1c4fcf94bdd3"
# TARO_APP_BASE_API="http://172.10.10.93:8765"
-TARO_APP_BASE_API="https://www.hnjinglian.cn:5678"
+TARO_APP_BASE_API="http://172.10.10.93:8765"
diff --git a/collect_information/package.json b/collect_information/package.json
index 348ad9a..1830680 100644
--- a/collect_information/package.json
+++ b/collect_information/package.json
@@ -59,7 +59,6 @@
"dayjs": "^1.11.13",
"pinia": "^2.2.2",
"vue": "^3.0.0"
-
},
"devDependencies": {
"@babel/core": "^7.8.0",
diff --git a/collect_information/src/pages/projectManager/index/index.vue b/collect_information/src/pages/projectManager/index/index.vue
index 13de3c5..e4c007c 100644
--- a/collect_information/src/pages/projectManager/index/index.vue
+++ b/collect_information/src/pages/projectManager/index/index.vue
@@ -42,6 +42,7 @@
+
diff --git a/collect_information/src/request/index.ts b/collect_information/src/request/index.ts
index 9c89ee8..b1dacfa 100644
--- a/collect_information/src/request/index.ts
+++ b/collect_information/src/request/index.ts
@@ -30,7 +30,7 @@ class CustomRequest {
BASE_API: string = process.env.TARO_APP_BASE_API;
private request(url: string, method: keyof Taro.request.Method, options: ApiOptions, params?: object,): Promise> {
- // console.log(this.BASE_API,'0000000')
+ console.log(this.BASE_API,'0000000')
return new Promise>((resolve, reject) => {
if (options.loading) {
Taro.showLoading({
diff --git a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue
index 535d4c7..cabc5fa 100644
--- a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue
@@ -189,7 +189,9 @@ const formAdd = () => {
securityNumber: '',
remark: '',
homeAddress: '',
- telephone: ''
+ telephone: '',
+ photo:'',
+ noSecurityNumberDesc:''
} as SecurityUserFormParams
Taro.navigateTo({url: `/subPages/projectManager/securityUserForm/securityUserForm?securityUser=${JSON.stringify(params)}&&type=formInput`})
}
@@ -237,6 +239,7 @@ const detail = (item: ServiceProjectSecurityUserPagerVo) => {
securityUserDetail.value = item
}
const securityUserEdit = (item: ServiceProjectSecurityUserPagerVo) => {
+ console.log(item)
const params = {...item, sex: item.sex.value}
Taro.navigateTo({url: `/subPages/projectManager/securityUserForm/securityUserForm?securityUser=${JSON.stringify(params)}&type=formInput`})
}
diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss
index 4dd980a..c0a88ff 100644
--- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss
+++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss
@@ -1,8 +1,12 @@
.form {
.formButton {
+ //position: fixed;
+ bottom: 60px;
display: flex;
- margin-top: auto;
- justify-content: space-around;
- margin-bottom: 30px
+ -webkit-justify-content: space-around;
+ margin-bottom: 10rpx;
+ right: 0;
+ width: 100%;
+ height: 140px
}
}
diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue
index e0ccea7..b75519c 100644
--- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue
+++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue
@@ -1,6 +1,18 @@
+
+
+
+
+
+
+
+
+
+ 查询
+
+
@@ -11,9 +23,6 @@
-
-
-
{{
@@ -34,16 +43,19 @@
-
+
+
+
+
提交
- 重置表单
+ 重置表单
+
+
+
+ 姓名:{{ securityNumberByIdCard?.name ? securityNumberByIdCard?.name : '无' }}
+ 保安证件号:{{ securityNumberByIdCard?.bayzh ? securityNumberByIdCard?.bayzh : '无' }}
+ 身份证:{{ securityNumberByIdCard?.sfzhm ? securityNumberByIdCard?.sfzhm : "无" }}
+
+
+
diff --git a/collect_information/src/utils/index.ts b/collect_information/src/utils/index.ts
index e69de29..97e1e48 100644
--- a/collect_information/src/utils/index.ts
+++ b/collect_information/src/utils/index.ts
@@ -0,0 +1,23 @@
+import dayjs from "dayjs";
+import api from "@/request";
+
+export const generateSimpleObjectName = (fileName: string, parentDir?: String): string => {
+ const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+ const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+ return v.toString(16);
+ });
+ let objectName = parentDir + dayjs().format('/YYYY/MM/DD/') + uuid.replace(/-/g, '');
+ console.log(fileName,objectName,'4444')
+ if (fileName && fileName.length > 0) {
+ objectName += fileName.substring(fileName.lastIndexOf('.'))
+ }
+ console.log(objectName,'888')
+ return objectName;
+}
+
+export const getResignedObjectUrl = async (bucketName: string, objectName: string): Promise => {
+ return (await api.get('/common/getResignedObjectUrl', {
+ bucketName,
+ objectName
+ })).data as string;
+}
diff --git a/collect_information/types/global.d.ts b/collect_information/types/global.d.ts
index 541699b..7aadb7f 100644
--- a/collect_information/types/global.d.ts
+++ b/collect_information/types/global.d.ts
@@ -25,6 +25,10 @@ declare namespace NodeJS {
TARO_APP_ID: string
/** 后台服务接口地址 **/
TARO_APP_BASE_API: string
+
+ TARO_APP_MINIO_BUCKET:string
+
+ TARO_APP_MINIO_URL:string
}
}
diff --git a/collect_information/types/subPages/projectManager/securityUserForm/index.ts b/collect_information/types/subPages/projectManager/securityUserForm/index.ts
index 11484dd..a86cb44 100644
--- a/collect_information/types/subPages/projectManager/securityUserForm/index.ts
+++ b/collect_information/types/subPages/projectManager/securityUserForm/index.ts
@@ -2,7 +2,7 @@ export interface SecurityUserFormParams {
snowFlakeId?: string;
securityUnitId: string;
serviceProjectId: string;
- name?: string;
+ name: string | undefined;
workPost?: string;
telephone: value | null;
sex: number;
@@ -10,7 +10,9 @@ export interface SecurityUserFormParams {
idCard: value | null;
dateOfBirth?: Date | null;
securityNumber?: string;
+ photo?:string;
remark?: string;
+ noSecurityNumberDesc:string;
homeAddress?: string
}
@@ -18,3 +20,9 @@ export interface value{
desensitizedValue?:string
originalValue?:string
}
+
+export interface securityNumberByIdCard{
+ name: string | undefined
+ bayzh?: string
+ sfzhm?: string
+}
diff --git a/securityManagement/src/components/layout/SystemMenus.vue b/securityManagement/src/components/layout/SystemMenus.vue
index 4e34340..8429600 100644
--- a/securityManagement/src/components/layout/SystemMenus.vue
+++ b/securityManagement/src/components/layout/SystemMenus.vue
@@ -18,7 +18,6 @@ import MenuItem from "@/components/layout/MenuItem.vue";
const route = useRoute()
const activeMenus = computed(() => [route.path]);
-console.log(activeMenus)
diff --git a/securityManagement/src/views/serviceManagement/index.vue b/securityManagement/src/views/serviceManagement/index.vue
index 9430a8e..dd36fff 100644
--- a/securityManagement/src/views/serviceManagement/index.vue
+++ b/securityManagement/src/views/serviceManagement/index.vue
@@ -206,7 +206,6 @@ const columns: TableProps['columns'] = [
删除
{
- console.log(record,'9999999')
visible.value = true
serviceTitle.value = '编辑服务项目'
idNumberDisabled.value = record.twoType.value !== 'outsource';
@@ -402,7 +401,6 @@ const formItemOptions = ref{
- console.log(13123)
await formRef.value.validate()
const snowFlakeId = ref('')
if (serviceTitle.value === '新增服务项目') {