diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index 01c04348..aac6c66a 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -184,7 +184,7 @@ .wrap { position: relative; margin: 120px auto; - width: 1000px; + width: 1180px; .title { padding: 10px; @@ -265,18 +265,18 @@ .tab { margin: 0 5px; min-width: 76px; - padding: 0 5px; - height: 30px; + padding: 0 10px; + height: 36px; background: rgba(255, 255, 255, 0); border: 1px solid #1257c9; box-shadow: 0 0 10px 0 inset #1257c9; border-radius: 2px; text-align: center; - font-size: 14px; + font-size: 18px; font-family: PingFang SC; font-weight: 400; color: #ffffff; - line-height: 30px; + line-height: 36px; cursor: pointer; transition: all ease 0.5s; &.z-on { diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss index 24428cdd..c2c80ef6 100644 --- a/src/assets/scss/people-info.scss +++ b/src/assets/scss/people-info.scss @@ -10,14 +10,14 @@ position: relative; margin: 5vh auto; height: 90vh; - width: 1040px; + width: 1180px; background-color: #fff; .wrap2 { box-sizing: border-box; padding: 20px; height: 90vh; - width: 1040px; + width: 1180px; overflow-y: auto; overflow-x: hidden; } @@ -102,18 +102,18 @@ .tab { margin: 0 5px; min-width: 76px; - padding: 0 5px; - height: 30px; + padding: 0 10px; + height: 36px; background: #fff; border: 1px solid #eee; box-shadow: 0 0 10px 0 inset #ddd; border-radius: 2px; text-align: center; - font-size: 14px; + font-size: 18px; font-family: PingFang SC; font-weight: 400; color: #333; - line-height: 30px; + line-height: 36px; cursor: pointer; transition: all ease 0.1s; &.z-on { diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue index e1b5d045..de4a8bc5 100644 --- a/src/views/modules/communityService/sqzzz/cpts/edit.vue +++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue @@ -134,6 +134,23 @@ + + + + + + + + + + - {{ - item - }} +
+ {{ item }} +
{{ btn }} + {{ item.name }} @@ -139,6 +144,11 @@ export default { handleClickBtn(index, type) { this.$emit("operate", index, type); }, + handleClickPeople(item) { + this.$router.push({ + path: `/main-shuju/visual-basicinfo-people/${item.uid}`, + }); + }, }, }; @@ -150,6 +160,7 @@ export default { width: 100%; height: 100%; border: none; + table-layout: fixed; &-header { width: 100%; @@ -179,9 +190,18 @@ export default { min-height: 50px; .td { + box-sizing: border-box; text-align: center; border: none; - padding: 10px 0; + padding: 10px 5px; + + > div { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + word-wrap: normal; + } + a { font-size: 16px; font-weight: 400; diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue index b960eb6b..e299606f 100644 --- a/src/views/modules/visual/heart/index.vue +++ b/src/views/modules/visual/heart/index.vue @@ -266,7 +266,7 @@ export default { this.tb2.list = data.map((item) => { return [ { type: "index" }, - item.userName, + { type: "people", name: item.userName, uid: item.userId }, item.gridName, item.pointTotal, ]; @@ -296,7 +296,7 @@ export default { this.tb3.list = data.map((item) => { return [ { type: "index" }, - item.userName, + { type: "people", name: item.userName, uid: item.userId }, item.gridName, item.pointTotal, ]; diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue index 11d0b783..e5606ec9 100644 --- a/src/views/modules/visual/warning/components/screen-table/index.vue +++ b/src/views/modules/visual/warning/components/screen-table/index.vue @@ -236,13 +236,16 @@ export default { width: 5%; } &:nth-child(2) { - width: 25%; + width: 20%; } &:nth-child(3) { - width: 25%; + width: 20%; + } + &:nth-child(4) { + width: 15%; } &:nth-child(5) { - width: 25%; + width: 40%; } } } @@ -266,22 +269,28 @@ export default { .td { text-align: center; width: 20%; + display: flex; + justify-content: center; &:nth-child(1) { width: 5%; } &:nth-child(2) { - width: 25%; + width: 20%; } &:nth-child(3) { - width: 25%; + width: 20%; + } + &:nth-child(4) { + width: 15%; } &:nth-child(5) { - width: 25%; + width: 40%; } a { cursor: pointer; } .more { + margin: 0 10px; font-size: 18px; font-weight: 400; color: #e4dc00; @@ -292,17 +301,19 @@ export default { box-sizing: border-box; display: block; box-sizing: border-box; - width: 215px; + width: 600px; + max-height: 300px; height: auto; + overflow-y: auto; line-height: 20px; border: 1px solid red; position: absolute; - right: -100%; - top: 150%; + right: 0; + bottom: 150%; background: #06186d; border: 1px solid #1a64cc; border-radius: 5px; - font-size: 9px; + font-size: 18px; font-weight: 400; color: #ffffff; padding: 16px 8px 10px 9px; diff --git a/src/views/modules/warning/components/screen-table/index.vue b/src/views/modules/warning/components/screen-table/index.vue index 522556fe..3aa87112 100644 --- a/src/views/modules/warning/components/screen-table/index.vue +++ b/src/views/modules/warning/components/screen-table/index.vue @@ -263,13 +263,16 @@ export default { width: 5%; } &:nth-child(2) { - width: 25%; + width: 20%; } &:nth-child(3) { - width: 25%; + width: 20%; + } + &:nth-child(4) { + width: 15%; } &:nth-child(5) { - width: 25%; + width: 40%; } } } @@ -296,25 +299,28 @@ export default { height: 50px; display: flex; align-items: center; - justify-content: space-around; + justify-content: center; &:nth-child(1) { width: 5%; - border-left: 0; } &:nth-child(2) { - width: 25%; + width: 20%; } &:nth-child(3) { - width: 25%; + width: 20%; + } + &:nth-child(4) { + width: 15%; } &:nth-child(5) { - width: 25%; + width: 40%; } a { cursor: pointer; } .more { + margin: 0 10px; font-size: 16px; font-weight: 400; color: #e4dc00; @@ -325,37 +331,25 @@ export default { box-sizing: border-box; display: block; box-sizing: border-box; - width: 500px; + width: 600px; + max-height: 300px; height: auto; + overflow-y: auto; line-height: 20px; border: 1px solid red; position: absolute; - right: -100%; + right: 0; bottom: 150%; background: #fff; box-shadow: 0 0 10px 0 #2194fe; border: 1px solid #42a4fe; border-radius: 5px; - font-size: 9px; + font-size: 16px; font-weight: 400; color: #333; padding: 16px 8px 10px 9px; z-index: 1; cursor: default; - // &::after{ - // position: absolute; - // left: 30%; - // top: -30%; - // display: flex; - // content:''; - // width: 0; - // height: 0; - // border-width: 13px; - // border-style: solid; - // border-color: transparent transparent rgba(26, 100, 204,0.5) transparent; - // // border-color: transparent transparent red transparent; - // transform: translate(-50%,0); - // } } } }