diff --git a/src/assets/images/index/list-logo.png b/src/assets/images/index/list-logo.png new file mode 100644 index 000000000..7ee9dae3d Binary files /dev/null and b/src/assets/images/index/list-logo.png differ diff --git a/src/assets/scss/modules/board/listBox.scss b/src/assets/scss/modules/board/listBox.scss new file mode 100644 index 000000000..a262cc6ce --- /dev/null +++ b/src/assets/scss/modules/board/listBox.scss @@ -0,0 +1,197 @@ +.m-listbox-main{ + min-height: 100%; + box-sizing: border-box; + margin-left:16px; + + .g-listbox{ + + } + + +} + + + + + +.div_search_list { + margin: 44px auto; + text-align: center; + width: 750px; + height: 53px; + background: #01106800; + border-radius: 8px; + display: flex; + justify-content: flex-end; + + .icon { + display: flex; + align-items: center; + margin-left: 29px; + margin-top: 16px; + + > img { + width: 24px; + height: 24px; + } + } + + .btn { + text-align: center; + flex: 0 0 113px; + height: 53px; + background: #0082fb; + border-radius: 0px 8px 8px 0px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 53px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + } + .btn:hover { + cursor: pointer; + } +} + +.list_box1 { + margin: 76px auto 0; + box-sizing: border-box; + width: 80%; + // width: 1421px; + + // height: calc(88vh - 200px); + height: 485px; + color: #fff; + background: url("../../../img/modules/visual/warning-box.png") no-repeat center; + background-size: 100% 100%; +} + +.info_tip { + padding: 20px 0 0 19px; + display: flex; + + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 7px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } +} + +.warning-table { + margin: 21px 24px auto 24px; + box-sizing: border-box; + // height: 100%; + + .table { + width: 100%; + height: 100%; + + &-header { + width: 100%; + height: 50px; + display: flex; + justify-content: space-around; + align-items: center; + background: rgba(8, 37, 134, 0.85); + font-size: 16px; + font-weight: 400; + color: #ffffff; + } + + &-body { + box-sizing: border-box; + width: 100%; + height: calc(100% - 50px); + font-size: 18px; + font-weight: 400; + color: #ffffff; + + &-tr { + width: 100%; + height: 50px; + // height: calc(100% / 5); + // padding: 10px auto; + display: flex; + justify-content: space-around; + align-items: center; + + .btn_detail:hover { + cursor: pointer; + } + } + + &-tr:nth-child(2n) { + background: rgba(16, 75, 164, 0.24); + } + + &-tr:hover { + background: url("../../../img/modules/visual/hover-bac.png") no-repeat center; + background-size: 100% 100%; + } + } + + &-status { + margin-top: 20px; + + .no-data { + display: flex; + justify-content: center; + } + } + } +} + +.td { + text-align: center; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + + // width: calc(100% / 5); +} +.td1 { + width: calc(100% / 10); +} +.td2 { + width: calc(100% / 6); +} +.td3 { + width: calc(100% / 4); +} +.pagination { + box-sizing: border-box; + padding-right: 180px; + padding-bottom: 20px; + + margin-top: 40px; + width: 100%; + height: 40px; + display: flex; + justify-content: flex-end; + + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { + background: #0266d1; + color: #000d3f; + } + + /deep/ .el-pagination .el-pager li { + background: #002e74; + } + + /deep/ .el-pagination .btn-prev { + background: #002e74; + } + + /deep/ .el-pagination .btn-next { + background: #002e74; + } +} diff --git a/src/assets/scss/modules/board/searchPerson copy.scss b/src/assets/scss/modules/board/searchPerson copy.scss new file mode 100644 index 000000000..fe9489fd0 --- /dev/null +++ b/src/assets/scss/modules/board/searchPerson copy.scss @@ -0,0 +1,186 @@ +.div_people_search { + min-height: 100%; + box-sizing: border-box; +} + +.div_search_list { + margin: 44px auto; + text-align: center; + width: 750px; + height: 53px; + background: #01106800; + border-radius: 8px; + display: flex; + justify-content: flex-end; + + .icon { + display: flex; + align-items: center; + margin-left: 29px; + margin-top: 16px; + + > img { + width: 24px; + height: 24px; + } + } + + .btn { + text-align: center; + flex: 0 0 113px; + height: 53px; + background: #0082fb; + border-radius: 0px 8px 8px 0px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 53px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + } + .btn:hover { + cursor: pointer; + } +} + +.list_box { + margin: 76px auto 0; + box-sizing: border-box; + width: 80%; + // width: 1421px; + + // height: calc(88vh - 200px); + height: 485px; + color: #fff; + background: url("../../../img/modules/visual/warning-box.png") no-repeat center; + background-size: 100% 100%; +} + +.info_tip { + padding: 20px 0 0 19px; + display: flex; + + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 7px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } +} + +.warning-table { + margin: 21px 24px auto 24px; + box-sizing: border-box; + // height: 100%; + + .table { + width: 100%; + height: 100%; + + &-header { + width: 100%; + height: 50px; + display: flex; + justify-content: space-around; + align-items: center; + background: rgba(8, 37, 134, 0.85); + font-size: 16px; + font-weight: 400; + color: #ffffff; + } + + &-body { + box-sizing: border-box; + width: 100%; + height: calc(100% - 50px); + font-size: 18px; + font-weight: 400; + color: #ffffff; + + &-tr { + width: 100%; + height: 50px; + // height: calc(100% / 5); + // padding: 10px auto; + display: flex; + justify-content: space-around; + align-items: center; + + .btn_detail:hover { + cursor: pointer; + } + } + + &-tr:nth-child(2n) { + background: rgba(16, 75, 164, 0.24); + } + + &-tr:hover { + background: url("../../../img/modules/visual/hover-bac.png") no-repeat center; + background-size: 100% 100%; + } + } + + &-status { + margin-top: 20px; + + .no-data { + display: flex; + justify-content: center; + } + } + } +} + +.td { + text-align: center; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + + // width: calc(100% / 5); +} +.td1 { + width: calc(100% / 10); +} +.td2 { + width: calc(100% / 6); +} +.td3 { + width: calc(100% / 4); +} +.pagination { + box-sizing: border-box; + padding-right: 180px; + padding-bottom: 20px; + + margin-top: 40px; + width: 100%; + height: 40px; + display: flex; + justify-content: flex-end; + + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { + background: #0266d1; + color: #000d3f; + } + + /deep/ .el-pagination .el-pager li { + background: #002e74; + } + + /deep/ .el-pagination .btn-prev { + background: #002e74; + } + + /deep/ .el-pagination .btn-next { + background: #002e74; + } +} diff --git a/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue deleted file mode 100644 index 7dbe60f62..000000000 --- a/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue +++ /dev/null @@ -1,1017 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/views/modules/visual/basicinfo/peopleList copy.vue b/src/views/modules/visual/basicinfo/peopleList copy.vue new file mode 100644 index 000000000..b7d47fb8c --- /dev/null +++ b/src/views/modules/visual/basicinfo/peopleList copy.vue @@ -0,0 +1,258 @@ + + + + + + + + + + + diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue index 837582511..a5190562e 100644 --- a/src/views/modules/visual/basicinfo/peopleList.vue +++ b/src/views/modules/visual/basicinfo/peopleList.vue @@ -1,93 +1,40 @@ @@ -97,37 +44,88 @@ import { requestPost } from "@/js/dai/request"; import People from "./people"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more"; +import cptTb from "@/views/modules/visual/cpts/tb"; export default { name: "people-list", components: { - People, ScreenLoading, peopleMore + People, ScreenLoading, peopleMore, cptTb }, data () { return { showedMoreInfo: false, tableTitle: '党员', - loading: false, - headerList: [], - tableData: [], searchName: '', + + orgLevel: 'search', + orgId: '', pageSize: 10, pageNo: 1, total: 0, - orgLevel: 'search', - orgId: '', - selUserId: '', + //下钻层级记录 - runNum: 0, - runAgencyArray: [], info: {}, - breadList: [] + breadList: [], + + demand: { + loading: true, + colList: [ + { + align: "left", + width: "5%", + }, + { + align: "left", + width: "10%", + }, + { + align: "left", + width: "20%", + }, + { + align: "left", + width: "10%", + }, + { + align: "left", + width: "8%", + }, + { + align: "left", + width: "10%", + }, + { + align: "left", + width: "7%", + }, + { + align: "left", + width: "20%", + }, + { + align: "left", + width: "10%", + }, + ], + header: [ + "序号", + "姓名", + "所属网格", + "所属房屋", + "手机", + "身份证", + "性别", + "出生日期", + "操作", + ], + list: [], + + }, }; }, activated () { - this.searchName = '' - this.tableData = [] + const { columnName, label, id, level } = this.$route.query this.orgLevel = level this.orgId = id @@ -136,40 +134,72 @@ export default { this.loadList(id, level) }, - deactivated() { + deactivated () { this.orgLevel = '' this.orgId = '' this.pageNo = 1 }, - beforeRouteEnter(to, from, next) { - const arr = [ {...from }, { ...to, meta: { title: '人员列表'}}] - next((vm) =>{ - vm.breadList = [ ...arr ] + beforeRouteEnter (to, from, next) { + const arr = [{ ...from }, { ...to, meta: { title: '人员列表' } }] + next((vm) => { + vm.breadList = [...arr] }) }, methods: { handleSearch () { }, + toEventInfo () { + + }, + + handlePageNoChange (pageNo) { + this.pageNo = pageNo + this.loadList(this.orgId, this.orgLevel) + + }, + handleSizeChange (pageSize) { + this.pageSize = pageSize + this.loadList(this.orgId, this.orgLevel) + + }, async loadList (id, level) { - this.loading = true + this.demand.loading = true; + const url = "/epmetuser/icresiuser/searchbycategory" let params = { columnName: this.searchName, id, level, + pageNo: this.pageNo, pageSize: this.pageSize, - pageNo: this.pageNo } const { data, code, msg } = await requestPost(url, params) - this.loading = false + this.demand.loading = false; + if (code === 0) { - this.total = data.total - this.tableData = data.list + + + this.demand.total = data.total; + + this.demand.list = data.list.map((item, index) => { + return [ + index + 1, + item.name ? item.name : "--", + item.gridName ? item.gridName : "--", + item.neighborHoodName + item.buildNum ? item.neighborHoodName + item.buildNum : "--", + item.mobile ? item.mobile : "--", + item.idCard ? item.idCard : "--", + item.gender ? item.gender : "--", + item.birthday ? item.birthday : "--", + + { type: "operate", list: ["查看"] }, + ]; + }); } else { this.$message.error(msg) } @@ -177,7 +207,7 @@ export default { //点击查看 handelToPeople (item) { - // this.toSubAgency('people', this.tableData[index].userId) + this.info = { ...item } this.showedMoreInfo = true }, @@ -205,7 +235,7 @@ export default { @@ -230,26 +260,24 @@ export default { height: 780px; margin: 0 auto; } -.warning-table { - height: 640px; -} + .pagination { padding-right: 0; margin-top: 0; text-align: right; } .g-bread { - padding: 10px 10px 15px; - ::v-deep .el-breadcrumb__item { - font-size: 16px; - .el-breadcrumb__inner { - color: #fff; - } + padding: 10px 10px 15px; + ::v-deep .el-breadcrumb__item { + font-size: 16px; + .el-breadcrumb__inner { + color: #fff; } - ::v-deep .el-breadcrumb__item:first-child { - .el-breadcrumb__inner { - color: #a0c3d9; - } + } + ::v-deep .el-breadcrumb__item:first-child { + .el-breadcrumb__inner { + color: #a0c3d9; } } +} diff --git a/src/views/modules/visual/cpts/tb copy.vue b/src/views/modules/visual/cpts/tb copy.vue new file mode 100644 index 000000000..3b280dcb9 --- /dev/null +++ b/src/views/modules/visual/cpts/tb copy.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue index 3b280dcb9..73959e9f5 100644 --- a/src/views/modules/visual/cpts/tb.vue +++ b/src/views/modules/visual/cpts/tb.vue @@ -1,83 +1,111 @@ @@ -90,6 +118,17 @@ export default { ScreenLoading, }, props: { + //是否显示标题,默认为true + showTitle: { + type: Boolean, + default: true + }, + //列表标题名称 + titleName: { + type: String, + default: "列表" + }, + //各列对齐方式、宽度等属性 colList: { type: Array, default: () => { @@ -101,39 +140,27 @@ export default { ]; }, }, + //表头 header: { type: Array, required: false, default: () => { - return [ - // "序号", "所属网格", "操作" - ]; + return []; }, }, + //每行数据 list: { type: Array, required: false, default: () => { - return [ - // [ - // 1, - // "商丘路社区第一网格", - // { - // type: "operate", - // list: ["查看"], - // }, - // ], - // [ - // 2, - // "商丘路社区第一网格", - // { - // type: "operate", - // list: ["查看"], - // }, - // ], - ]; + return []; }, }, + //数据总数 + total: { + type: Number, + default: 0 + }, loading: { type: Boolean, default: true, @@ -144,7 +171,11 @@ export default { }, }, data () { - return {}; + return { + + pageSize: 10, + pageNo: 1, + }; }, watch: {}, @@ -165,12 +196,50 @@ export default { path: `/main-shuju/visual-basicinfo-people/${item.uid}`, }); }, + + handlePageNoChange (val) { + this.$emit("handlePageNoChange", val); + }, + handleSizeChange (val) { + this.$emit("handleSizeChange", val); + }, }, };