From 640d76faa877171a6d353ceee8be6312afd2872e Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Wed, 18 Sep 2024 10:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subPages/pages/policeDetails/index.scss   | 24 ++++++++++++++--
 .../subPages/pages/policeDetails/index.vue    | 28 +++++++++++++------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/collect_information/src/subPages/pages/policeDetails/index.scss b/collect_information/src/subPages/pages/policeDetails/index.scss
index b495b04..3bddb3c 100644
--- a/collect_information/src/subPages/pages/policeDetails/index.scss
+++ b/collect_information/src/subPages/pages/policeDetails/index.scss
@@ -5,8 +5,7 @@
   display: flex;
   flex-direction: column;
   .projectDetailsItem{
-    height: 18%;
-    margin: 20px;
+    margin: 10px 20px 10px 20px;
     border-radius: 10px;
     background: #ffffff;
     padding: 15px;
@@ -14,6 +13,10 @@
     line-height: 65px;
     color: #333333;
     .projectDetailsIndex{
+      display: flex;
+      flex-wrap: wrap;
+      line-height: 44rpx;
+      margin-bottom: 20px;
       .content{
         color:  #9b9b9f;
       }
@@ -35,7 +38,16 @@
         align-items: center;
         flex-wrap: wrap;
         font-size: 24px;
-        margin-bottom: 15px
+        margin-bottom: 15px;
+        .projectDetailsTableIndex{
+          display: flex;
+          justify-content: flex-end;
+          text-align: center;
+          view{
+            width: 70px;
+            margin-right: 20px;
+          }
+        }
       }
     }
   }
@@ -48,6 +60,12 @@
     right: 0;
     width: 100%;
   }
+  .nutPopup{
+    width: 300px;
+    height: 100px;
+    display: flex;
+    flex-wrap: wrap;
+  }
 }
 
 
diff --git a/collect_information/src/subPages/pages/policeDetails/index.vue b/collect_information/src/subPages/pages/policeDetails/index.vue
index fd91676..c6d5ba6 100644
--- a/collect_information/src/subPages/pages/policeDetails/index.vue
+++ b/collect_information/src/subPages/pages/policeDetails/index.vue
@@ -1,11 +1,26 @@
 <template>
   <view class="projectDetails">
-    <view class="projectDetailsItem">
-      <view style="display: flex;justify-content: space-between">
-        <text style="font-size: 18px">{{ nameValue ? nameValue : '' }}{{ '-----' + detailsList?.name }}项目</text>
-        <!--<text>进行中</text>-->
+    <view class="projectDetailsItem" style="line-height: 50rpx">
+      <view>
+        <view style="display: flex;justify-content: space-between">
+          <text style="font-size: 18px">{{ nameValue ? nameValue : '' }}{{ '-----' + detailsList?.name }}项目</text>
+          <!--          <text>进行中</text>-->
+        </view>
+        <view>
+          <view style="float: left;width: 50%;" class="content">
+            经理名称:{{ detailsList?.projectManagerMiniProgramUserInfo.name }}
+          </view>
+          <view class="content">手机号:{{ detailsList?.projectManagerMiniProgramUserInfo.telephone }}</view>
+        </view>
       </view>
+    </view>
+    <view class="projectDetailsItem">
       <view class="projectDetailsIndex">
+        <nut-row>
+          <nut-col :span="24">
+            <view class="content">保安证件号：{{ detailsList?.idNumber }}</view>
+          </nut-col>
+        </nut-row>
         <nut-row>
           <nut-col :span="12">
             <view class="content">工作人员数量:{{ detailsList?.staffTotal }}</view>
@@ -23,10 +38,7 @@
           </nut-col>
         </nut-row>
         <nut-row>
-          <nut-col :span="16">
-            <view class="content">证件号：{{ detailsList?.idNumber }}</view>
-          </nut-col>
-          <nut-col :span="8">
+          <nut-col :span="4">
             <view class="content">户数:{{ detailsList?.houseTotal }}</view>
           </nut-col>
         </nut-row>