police

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;

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;

collect_information/src/subPages/police/dailyInspection/dailyInspection.vue

@@ -25,11 +25,11 @@
     <view class="exit" v-for="item in starRating" :key="item.snowFlakeId" @click="Onrating(item.name, item.snowFlakeId)">
       <view class="exitItem">
         <text style="margin-left: 30rpx; font-size: 16px">
-          <text>{{ item.name }}（{{ item.totalScore }}分） </text>
+          <text>{{ item.name }}（{{ item?.totalScore }}分） </text>
         </text>
       </view>
       <view style="margin-right: 30rpx; display: flex; align-items: center">
-        <view v-if="item.currentScore > 0" style="color: #ff0000"> -{{ item.currentScore }}</view>
+        <view v-if="item.currentScore > 0" style="color: #ff0000"> -{{ item?.currentScore }}</view>
         <IconFont name="arrow-right"></IconFont>
       </view>
     </view>

collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.scss

@@ -17,16 +17,13 @@ page {
     }
 
     .project {
-      display: flex;
+      //display: flex;
-      justify-content: space-between;
+      //justify-content: space-between;
-      flex-flow: wrap;
+      //flex-flow: wrap;
-      text-align: center;
+      //text-align: center;
 
       view {
-        width: 45%;
+        width: 100%;
-        height: 100rpx;
-        border: 1px solid #cccccc;
-        line-height: 100rpx;
         margin: 8px 0 8px 0;
       }
     }

collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue

@@ -3,7 +3,7 @@
     <view v-if="number !== 0" class="myProjectItem" v-for="(item, index) in myProjectList" :key="index">
       <view style="display: flex; justify-content: space-between">
         <text>{{ item?.name }}</text>
-        <!--<text>进行中</text>-->
+        <text>单位类型：{{ item?.type.label }}</text>
       </view>
       <view class="myProjectIndex"
         >地址：
@@ -15,7 +15,16 @@
       </view>
       <view class="project">
         <view @click="projectClick(item?.name, serviceProject)" v-for="(serviceProject, index) in item.serviceProjectList" :key="index">
-          {{ serviceProject.name }}
+            <view style="border: 1px solid #cccccc;color: #9b9b9f">
+               <view style="display: flex; justify-content: space-between">
+                  <text>项目名称：{{serviceProject.name}}</text>
+                  <text>项目类型：{{serviceProject.type.label}}</text>
+               </view>
+               <view style="display: flex; justify-content: space-between">
+                <text>项目负责人：{{serviceProject.projectManagerMiniProgramUserInfo?.name?serviceProject.projectManagerMiniProgramUserInfo?.name:'无分配项目经理'}}</text>
+               </view>
+               <view>责任单位：{{serviceProject.securityUnitName}}</view>
+            </view>
         </view>
       </view>
     </view>

collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue

@@ -61,7 +61,7 @@
                   <text>职位:{{ item.workPost ? item.workPost : '创建者' }}</text>
                 </view>
                 <view style="display: flex;justify-content: space-between">
-                  <text>保安证件:{{ item.securityNumber ? item.securityNumber : '125241256451' }}</text>
+                  <text>保安证件:{{ item.securityNumber ? item.securityNumber : '无' }}</text>
                   <text>出生年月:{{ dayjs(item.dateOfBirth).format('YYYY-MM-DD') }}</text>
                 </view>
                 <view style="display: flex;justify-content: space-between">

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
+  idCard?: null
-  name: string
+  name?: string
-  telephone: string
+  telephone?: string
 }
 
 export interface ServiceProjectSecurityUserPagerVo {