From 036526071c086381e1fbd0e48105f86223daf95c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 25 Apr 2022 09:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppInfotainment/AppInfotainment.vue |  4 ++--
 src/apps/AppMonitoringObject/Add.vue         | 11 +++++++++++
 src/apps/AppMonitoringObject/List.vue        | 11 +++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppInfotainment/AppInfotainment.vue b/src/apps/AppInfotainment/AppInfotainment.vue
index 6ca29823..8218bd7b 100644
--- a/src/apps/AppInfotainment/AppInfotainment.vue
+++ b/src/apps/AppInfotainment/AppInfotainment.vue
@@ -6,7 +6,7 @@
         <p>实现乡村振兴的物质基础</p>
       </div>
       <div class="list">
-        <div class="item" v-for="(item,index) in list" :key="index">
+        <div class="item">
           <span>产业资讯</span>
           <span><u-icon name="arrow-right"></u-icon></span>
         </div>
@@ -77,7 +77,7 @@ export default {
     .list {
       margin-top: 24px;
       background: #FFF;
-      padding: 0 32px;
+      padding: 0 32px 40px 32px;
       box-sizing: border-box;
       .item {
         display: flex;
diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 253caaf5..edd929ef 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -12,6 +12,17 @@
           </div>
         </div>
       </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i></i>
+            <span>选择户主</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+          </div>
+        </div>
+      </div>
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue
index 6b9c98cc..1071f513 100644
--- a/src/apps/AppMonitoringObject/List.vue
+++ b/src/apps/AppMonitoringObject/List.vue
@@ -2,7 +2,7 @@
   <div class="List">
     <div v-if="isAdmin">
       <AiTopFixed>
-        <!-- <div class="area">
+        <div class="area">
           <i>可选范围</i>
           <span class="separat">/</span>
           <AiAreaPicker ref="area" class="aiArea" :value="areaId" :areaId="user.areaId" :name.sync="areaName" mode="custom"
@@ -11,7 +11,7 @@
             <i v-else>请选择</i>
           </AiAreaPicker>
         </div>
-        <div class="line"></div> -->
+        <div class="line"></div>
         <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bar-width="150" @change="change"></u-tabs>
         <div class="seach-obj">
           <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/身份证号" :show-action="false" bg-color="#F5F5F5" 
@@ -63,10 +63,10 @@ export default {
       size: 10,
       tabList: [
         {
-          name: '已登记监测对象',
+          name: '监测对象',
         },
         {
-          name: '已消除风险对象',
+          name: '普通居民',
         },
       ],
       currentTabs: 0,
@@ -119,7 +119,7 @@ export default {
           current: this.current,
           size: 15,
           status: this.currentTabs,
-          // addressAreaId: this.areaId,
+          addressAreaId: this.areaId,
           name: this.keyword
         },
       })
@@ -131,7 +131,6 @@ export default {
             }
           })
           this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          console.log(this.list)
           this.pages = res.data.pages
         }
       })