From d0e517cfcc8e4120f42ea80b81d3d25c59a3bf39 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 11 Feb 2022 10:05:02 +0800
Subject: [PATCH] bug

---
 src/saas/AppBackUserList/AppBackUserList.vue  | 19 +++++++++++++++---
 src/saas/AppBackUserList/ErrorInfo.vue        |  2 +-
 src/saas/AppBackUserList/UserInfo.vue         |  2 +-
 src/saas/AppGridManagement/AddGird.vue        |  5 ++---
 .../AppGridManagement/AppGridManagement.vue   | 15 +++++++++++---
 src/saas/AppGridManagement/FamilyList.vue     |  9 +++++++++
 src/saas/AppGridManagement/Map.vue            |  8 ++++----
 src/saas/AppHealthUp/OtherStatistics.vue      |  4 ++--
 src/saas/AppWalkask/AppWalkask.vue            | 20 +++++++++----------
 9 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/saas/AppBackUserList/AppBackUserList.vue b/src/saas/AppBackUserList/AppBackUserList.vue
index 51818b0a..634226ce 100644
--- a/src/saas/AppBackUserList/AppBackUserList.vue
+++ b/src/saas/AppBackUserList/AppBackUserList.vue
@@ -3,9 +3,9 @@
     <AiTopFixed v-if="isAdmin">
       <div class="pad-t32"></div>
       <div class="select-gird" @click="showSelect=true">
-        <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
-        <div>
-          {{girdName}}
+        <div class="gird-name-div">
+          <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
+          <div class="gird-name">{{girdName}}</div>
           <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
         </div>
       </div>
@@ -393,6 +393,19 @@ export default {
       color: #3F8DF5;
       line-height: 48px;
     }
+    .gird-name-div{
+      display: inline-block;
+      width: 100%;
+      padding-left: 0;
+    }
+    .gird-name{
+      display: inline-block;
+      max-width: calc(100% - 80px);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      vertical-align: middle;
+    }
   }
   .empty{
     text-align: center;
diff --git a/src/saas/AppBackUserList/ErrorInfo.vue b/src/saas/AppBackUserList/ErrorInfo.vue
index c094efe0..11385e42 100644
--- a/src/saas/AppBackUserList/ErrorInfo.vue
+++ b/src/saas/AppBackUserList/ErrorInfo.vue
@@ -15,7 +15,7 @@
         <div class="item" v-for="(item, index) in list" :key="index">
           <p>{{item.content}}</p>
           <div>{{item.createTime}}
-            <span>{{item.createUserName}}</span>
+            <span><AiOpenData v-if="item.createUserName" type="userName" :openid="item.createUserName" /></span>
           </div>
         </div>
       </div>
diff --git a/src/saas/AppBackUserList/UserInfo.vue b/src/saas/AppBackUserList/UserInfo.vue
index 584e4ba1..47205017 100644
--- a/src/saas/AppBackUserList/UserInfo.vue
+++ b/src/saas/AppBackUserList/UserInfo.vue
@@ -109,7 +109,7 @@
           <p>{{item.content}}</p>
           <div>{{item.createTime}}
             <span>
-              网格员：<AiOpenData v-if="item.createUserName" type="userName" :openid="item.createUserName" />
+              网格员：<span style="margin-left:0;"><AiOpenData v-if="item.createUserName" type="userName" :openid="item.createUserName" /></span>
             </span>
           </div>
         </div>
diff --git a/src/saas/AppGridManagement/AddGird.vue b/src/saas/AppGridManagement/AddGird.vue
index cb198ee2..c0be8fa4 100644
--- a/src/saas/AppGridManagement/AddGird.vue
+++ b/src/saas/AppGridManagement/AddGird.vue
@@ -165,10 +165,9 @@ export default {
       color: #666;
 
       img {
-        width: 32px;
-        height: 32px;
+        width: 44px;
+        height: 44px;
         vertical-align: middle;
-        margin-left: 8px;
       }
     }
 
diff --git a/src/saas/AppGridManagement/AppGridManagement.vue b/src/saas/AppGridManagement/AppGridManagement.vue
index 125551e8..8d540277 100644
--- a/src/saas/AppGridManagement/AppGridManagement.vue
+++ b/src/saas/AppGridManagement/AppGridManagement.vue
@@ -3,8 +3,8 @@
     <div class="pad-t32" v-if="component != 'Map' && isAdmin"></div>
     <div class="select-gird" v-if="component != 'Map' && isAdmin">
       <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
-      <div @click="linkTo('./SelectGird')">
-        {{ params.girdName }}
+      <div @click="linkTo('./SelectGird')" class="gird-name-div">
+        <div class="gird-name">{{ params.girdName }}</div>
         <img src="./components/img/down-icon.png" alt="" class="down-icon">
       </div>
       <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
@@ -147,7 +147,7 @@ export default {
     vertical-align: middle;
   }
 
-  div {
+  .gird-name-div {
     display: inline-block;
     width: calc(100% - 144px);
     padding-left: 20px;
@@ -161,6 +161,15 @@ export default {
     img {
       margin-left: 8px;
     }
+
+    .gird-name{
+      display: inline-block;
+      max-width: calc(100% - 50px);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      vertical-align: middle;
+    }
   }
 
   span {
diff --git a/src/saas/AppGridManagement/FamilyList.vue b/src/saas/AppGridManagement/FamilyList.vue
index 95212203..e4142320 100644
--- a/src/saas/AppGridManagement/FamilyList.vue
+++ b/src/saas/AppGridManagement/FamilyList.vue
@@ -57,6 +57,15 @@ export default {
     }
   },
   methods: {
+    handerSearch() {
+      this.list = []
+      this.current = 1
+      this.getList()
+    },
+    handerClear() {
+      this.keyword = ''
+      this.handerSearch()
+    },
     getList(){
       this.$http.post(`/app/appgirdmemberresident/listByGirdMember?current=${this.current}&girdMemberId=${this.userId}&girdId=${this.girdId}&name=${this.keyword}`).then((res) => {
         if (res.code == 0) {
diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue
index e0c3014d..051ba4dd 100644
--- a/src/saas/AppGridManagement/Map.vue
+++ b/src/saas/AppGridManagement/Map.vue
@@ -73,10 +73,10 @@ export default {
     // this.getLeafNodes()
     uni.$on('goback', e => {
       if (e.girdLevel == '0') {
-        setTimeout(() => {
-          this.$u.toast('请选择二级或者三级网格')
-        }, 400)
-        return false
+        // setTimeout(() => {
+        //   this.$u.toast('请选择二级或者三级网格')
+        // }, 400)
+        // return false
       }
       this.getGridList(e.id, true)
     })
diff --git a/src/saas/AppHealthUp/OtherStatistics.vue b/src/saas/AppHealthUp/OtherStatistics.vue
index 07ad2fc5..a9683c81 100644
--- a/src/saas/AppHealthUp/OtherStatistics.vue
+++ b/src/saas/AppHealthUp/OtherStatistics.vue
@@ -58,10 +58,10 @@
         </div>
       </div>
     </div>
-    <div class="pad-b112"></div>
+    <!-- <div class="pad-b112"></div>
     <div class="add-btn" @click="back">
       <div>查看其他成员</div>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/saas/AppWalkask/AppWalkask.vue b/src/saas/AppWalkask/AppWalkask.vue
index 8eb2c43c..f6ef1f10 100644
--- a/src/saas/AppWalkask/AppWalkask.vue
+++ b/src/saas/AppWalkask/AppWalkask.vue
@@ -115,6 +115,11 @@ export default {
   },
   mounted() {},
   methods: {
+    getListInit() {
+      this.data = []
+      this.current = 1
+      this.getList()
+    },
     getList() {
       this.$http
         .post('/app/appvisitvondolence/list', null, {
@@ -140,17 +145,14 @@ export default {
     areaSelect(e) {
       this.data = []
       this.areaId = e
-      this.current = 1
-      this.getList()
+      this.getListInit()
     },
 
     change(index) {
-      this.data = []
       this.areaId = this.user.areaId
       this.keyword = ''
       this.currentTabs = index
-      this.current = 1
-      this.getList()
+      this.getListInit()
     },
 
     goDetail(item, hint) {
@@ -183,21 +185,19 @@ export default {
       this.$http.post(`/app/appvisitvondolence/delete?ids=${this.deletId}`).then((res) => {
         if (res.code == 0) {
           this.$u.toast('删除成功！')
-          this.getList()
+          this.getListInit()
         }
       })
     },
 
     handerSearch(e) {
       this.keyword = e
-      this.current = 1
-      this.getList()
+      this.getListInit()
     },
 
     handerClear() {
       this.keyword = ''
-      this.current = 1
-      this.getList()
+      this.getListInit()
     },
 
     previewImage(images, img) {