diff --git a/collect_information/src/pages/police/index/index.scss b/collect_information/src/pages/police/index/index.scss
index dac1e0d..6ff67f6 100644
--- a/collect_information/src/pages/police/index/index.scss
+++ b/collect_information/src/pages/police/index/index.scss
@@ -1,6 +1,6 @@
.nameTitle {
position: absolute;
- top: 277rpx;
+ top: 19%;
left: 55px;
height: 125rpx;
background-color: #fff;
diff --git a/collect_information/src/pages/projectManager/index/index.scss b/collect_information/src/pages/projectManager/index/index.scss
index 5308805..6ff67f6 100644
--- a/collect_information/src/pages/projectManager/index/index.scss
+++ b/collect_information/src/pages/projectManager/index/index.scss
@@ -1,6 +1,6 @@
.nameTitle {
position: absolute;
- top: 277rpx;
+ top: 19%;
left: 55px;
height: 125rpx;
background-color: #fff;
@@ -26,6 +26,9 @@
margin-left: -8px;
}
}
+.nameTitle .itemSchool:nth-child(4) {
+ border-right: none;
+}
.swiperDemoItem {
color: #3886d0;
display: flex;
diff --git a/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.scss b/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.scss
index 1cab77b..94a2385 100644
--- a/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.scss
+++ b/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.scss
@@ -17,16 +17,13 @@ page {
}
.project {
- display: flex;
- justify-content: space-between;
- flex-flow: wrap;
- text-align: center;
+ //display: flex;
+ //justify-content: space-between;
+ //flex-flow: wrap;
+ //text-align: center;
view {
- width: 45%;
- height: 100rpx;
- border: 1px solid #cccccc;
- line-height: 100rpx;
+ width: 100%;
margin: 8px 0 8px 0;
}
}
diff --git a/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue b/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue
index dbbdc4e..4ed49dc 100644
--- a/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue
+++ b/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue
@@ -3,7 +3,7 @@
{{ item?.name }}
-
+ 单位类型:{{ item?.type.label }}
地址:
@@ -15,7 +15,16 @@
- {{ serviceProject.name }}
+
+
+ 项目名称:{{serviceProject.name}}
+ 项目类型:{{serviceProject.type.label}}
+
+
+ 项目负责人:{{serviceProject.projectManagerMiniProgramUserInfo?.name?serviceProject.projectManagerMiniProgramUserInfo?.name:'无分配项目经理'}}
+
+ 责任单位:{{serviceProject.securityUnitName}}
+
diff --git a/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue b/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue
index 4c2c92e..306fcdd 100644
--- a/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue
@@ -61,7 +61,7 @@
职位:{{ item.workPost ? item.workPost : '创建者' }}
- 保安证件:{{ item.securityNumber ? item.securityNumber : '125241256451' }}
+ 保安证件:{{ item.securityNumber ? item.securityNumber : '无' }}
出生年月:{{ dayjs(item.dateOfBirth).format('YYYY-MM-DD') }}
diff --git a/collect_information/types/subPages/projectManager/myProject/index.ts b/collect_information/types/subPages/projectManager/myProject/index.ts
index bfeba41..4bbe728 100644
--- a/collect_information/types/subPages/projectManager/myProject/index.ts
+++ b/collect_information/types/subPages/projectManager/myProject/index.ts
@@ -15,6 +15,7 @@ export interface MyProjectList {
securityUnitId: string;
street?: string;
streetName?: string;
+ type?:any
}
export interface ContactPersonInfo {
@@ -30,17 +31,18 @@ export interface ServiceProjectList {
name?: string;
remark?: string;
securityUserTotal?: number;
+ securityUnitName?:string;
serviceArea?: number;
snowFlakeId?: string;
staffTotal?: number;
- type?: string;
+ type?: any;
projectManagerMiniProgramUserInfo?: ProgramUserInfo
}
export interface ProgramUserInfo {
- idCard: null
- name: string
- telephone: string
+ idCard?: null
+ name?: string
+ telephone?: string
}
export interface ServiceProjectSecurityUserPagerVo {