Merge branch 'dev-fangyi' into test

src/assets/scss/modules/visual/searchPerson.scss

@@ -1,5 +1,10 @@
+.div_people_search{
+  min-height:100%;
+  box-sizing: border-box;
+}
+
 .div_search_list {
-  margin: 54px auto;
+  margin: 44px auto;
   text-align: center;
   width: 750px;
   height: 53px;
@@ -38,13 +43,13 @@
 }
 
 .list_box {
-  margin: 96px auto 0;
+  margin: 76px auto 0;
   box-sizing: border-box;
-  // width: 70%;
+  width: 80%;
-  width: 1021px;
+  // width: 1421px;
 
   // height: calc(88vh - 200px);
-  height: 349px;
+  height: 485px;
   color: #fff;
   background: url('../../../img/modules/visual/warning-box.png') no-repeat
     center;
@@ -73,8 +78,7 @@
 .warning-table {
   margin: 21px 24px auto 24px;
   box-sizing: border-box;
-
+  // height: 100%;
-  height: 100%;
 
   .table {
     width: 100%;
@@ -124,6 +128,15 @@
         background-size: 100% 100%;
       }
     }
+
+    &-status{
+      margin-top:20px;
+
+      .no-data{
+        display: flex;
+        justify-content: center;
+      }
+    }
   }
 }
 
@@ -139,14 +152,17 @@
   width: calc(100% / 10);
 }
 .td2 {
-  width: calc(100% / 5);
+  width: calc(100% / 6);
 }
 .td3 {
   width: calc(100% / 4);
 }
 .pagination {
   box-sizing: border-box;
-  margin-top: 20px;
+  padding-right:180px;
+  padding-bottom: 20px;
+
+  margin-top: 40px;
   width: 100%;
   height: 40px;
   display: flex;

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -141,25 +141,25 @@
                          header-align="center"
                          align="center"
                          label="姓名"
-                         width="100">
+                         min-width="100">
         </el-table-column>
         <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
                          label="手机号"
-                         width="110">
+                         min-width="110">
         </el-table-column>
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
                          label="身份证"
-                         width="170">
+                         min-width="170">
         </el-table-column>
         <el-table-column prop="natTime"
                          header-align="center"
                          align="center"
                          label="检测时间"
-                         width="170">
+                         min-width="150">
         </el-table-column>
         <el-table-column prop="natAddress"
                          header-align="center"

src/views/modules/visual/basicinfo/peopleSearch.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="div_people_search">
     <!-- 组织路由 -->
     <div class="div_top">
       <div class="router_line"></div>
@@ -46,37 +46,53 @@
               <div class="td td2">姓名</div>
               <div class="td td3">所属网格</div>
               <div class="td td3">所属小区</div>
-              <div class="td td3">所属楼栋</div>
+              <div class="td td1">所属楼栋</div>
-              <div class="td td2">操作</div>
+              <div class="td td1">操作</div>
 
             </div>
-            <div class="table-body">
+            <div v-if="!loading && tableData.length> 0"
+                 class="table-body">
               <div class="table-body-tr"
                    v-for="(item,index) in tableData"
                    :key='index'>
-                <div class="td td1">{{item.sort+1}} </div>
+                <div class="td td1">{{item.sort}} </div>
                 <div class="td td2">{{item.name}} </div>
                 <div class="td td3">{{item.gridName}} </div>
                 <div class="td td3">{{item.neighborHoodName}} </div>
-                <div class="td td3">{{item.buildNum}} </div>
+                <div class="td td1">{{item.buildNum}} </div>
                 <div @click="handelToPeople(index)"
-                     class="td td2 btn_detail">{{'查看'}} </div>
+                     class="td td1 btn_detail">{{'查看'}} </div>
 
               </div>
             </div>
+
+            <div class="table-status"
+                 v-if="loading">
+              <screen-loading>加载中</screen-loading>
+            </div>
+
+            <div class="table-status"
+                 v-if="tableData.length == 0 && !loading">
+              <div class="no-data">
+                <img src="@/assets/img/modules/visual/noData.png"
+                     class="no-data-img" />
+              </div>
+            </div>
+
           </div>
-        </div>
+
-        <div class="pagination">
-          <el-pagination background
-                         layout="prev, pager, next"
-                         :current-page="pageNo"
-                         :page-size="pageSize"
-                         :total="total"
-                         @current-change="pageCurrentChangeHandle">
-          </el-pagination>
         </div>
 
       </div>
+      <div class="pagination">
+        <el-pagination background
+                       layout="prev, pager, next"
+                       :current-page="pageNo"
+                       :page-size="pageSize"
+                       :total="total"
+                       @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+      </div>
     </div>
 
     <people v-if="orgLevel==='people'"
@@ -90,18 +106,20 @@
 <script>
 import { requestPost } from "@/js/dai/request";
 import People from "./people";
+import ScreenLoading from "@/views/modules/visual/cpts/loading";
 
 export default {
   name: "people-list",
   components: {
-    People
+    People, ScreenLoading
   },
   data () {
     return {
+      loading: false,
       headerList: [],
       tableData: [],
       searchName: '',
-      pageSize: 4,
+      pageSize: 7,
       pageNo: 1,
       total: 0,
       orgLevel: 'search',
@@ -111,18 +129,23 @@ export default {
       runAgencyArray: [],
     };
   },
+  activated () {
+
+    this.searchName = ''
+    this.tableData = []
+
+  },
+
   methods: {
     handleSearch () {
 
     },
 
 
-    reset () {
+
-      this.searchName = ''
-      this.tableData = []
-    },
     async loadList () {
       if (this.searchName) {
+        this.loading = true
         const url = "/epmetuser/icresiuser/searchbyname"
         // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icresiuser/searchbyname"
         let params = {
@@ -132,7 +155,7 @@ export default {
         }
 
         const { data, code, msg } = await requestPost(url, params)
-
+        this.loading = false
         if (code === 0) {
           this.total = data.total
           this.tableData = data.list