diff --git a/collect_information/.env.development b/collect_information/.env.development index d7a068a..4e393f7 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" +TARO_APP_BASE_API="https://www.hnjinglian.cn:5678" diff --git a/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue b/collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue index e02963b..10b9a5c 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 }} + 单位类型:{{ item?.type?.label }} 地址: @@ -15,18 +15,17 @@ - - - 项目名称:{{serviceProject.name}} - 项目类型:{{serviceProject.type.label}} - - - 项目负责人:{{serviceProject.projectManagerMiniProgramUserInfo?.name?serviceProject.projectManagerMiniProgramUserInfo?.name:'无分配项目经理'}} - - 责任单位:{{serviceProject.securityUnitName}} + + + 项目名称:{{ 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 306fcdd..d71dd8a 100644 --- a/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue +++ b/collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue @@ -2,14 +2,12 @@ - + {{ enterprisesUnitName }}-----{{ serviceProject?.name }}项目 - - 经理名称:{{ serviceProject?.projectManagerMiniProgramUserInfo.name }} - + 经理名称:{{ serviceProject?.projectManagerMiniProgramUserInfo.name }} 手机号:{{ serviceProject?.projectManagerMiniProgramUserInfo.telephone }} @@ -47,26 +45,33 @@ 项目人员 - - + - + 姓名:{{ item?.name ? item?.name : '创建者' }} 性别:{{ item.sex?.label ? item.sex?.label : ' 隐藏' }} 职位:{{ item.workPost ? item.workPost : '创建者' }} - + 保安证件:{{ item.securityNumber ? item.securityNumber : '无' }} 出生年月:{{ dayjs(item.dateOfBirth).format('YYYY-MM-DD') }} - + 创建时间:{{ item.createTime }} - 身份证:{{ item.idCard }} + 身份证:{{ item.idCard?.desensitizedValue }} @@ -74,16 +79,15 @@ - + +