diff --git a/src/assets/scss/modules/visual/searchPerson.scss b/src/assets/scss/modules/visual/searchPerson.scss index 08be1a3c..6be528e1 100644 --- a/src/assets/scss/modules/visual/searchPerson.scss +++ b/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: 1021px; + width: 80%; + // 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; diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 6d84fe0e..fae09056 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -141,25 +141,25 @@ header-align="center" align="center" label="姓名" - width="100"> + min-width="100"> + min-width="110"> + min-width="170"> + min-width="150"> -
+ -
- + 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