From 6ac00c6f7f8e6d0cc750082dd6df5341ce711f5f Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 16 Nov 2021 14:43:32 +0800 Subject: [PATCH] ss --- .../img/shuju/people/arrow-double-left.png | Bin 0 -> 226 bytes .../img/shuju/people/arrow-double-right.png | Bin 0 -> 262 bytes .../img/shuju/people/huzhu-kuang-you-on.png | Bin 0 -> 17433 bytes .../img/shuju/people/huzhu-kuang-zuo-on.png | Bin 0 -> 2895 bytes src/assets/scss/people.scss | 43 +- .../visual/basicinfo/cpts/people-more.vue | 997 ++++-------------- src/views/modules/visual/basicinfo/people.vue | 228 ++-- 7 files changed, 381 insertions(+), 887 deletions(-) create mode 100644 src/assets/img/shuju/people/arrow-double-left.png create mode 100644 src/assets/img/shuju/people/arrow-double-right.png create mode 100644 src/assets/img/shuju/people/huzhu-kuang-you-on.png create mode 100644 src/assets/img/shuju/people/huzhu-kuang-zuo-on.png diff --git a/src/assets/img/shuju/people/arrow-double-left.png b/src/assets/img/shuju/people/arrow-double-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9e54a25b8ba2eca3e76ece0bd67f0d42c7c86d11 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^AT|#RGmu>AYB(84F%}28J29*~C-V}>(GBnkaRt)< zi3STjR?h}%;4caC3uX{dFmMP+C}`+kzyJLG_pGrGx`0w1o-U3d9M_W*5vI-1wr{+K4$J0UP*yl8yn)xlD0UL7R$@ouP7W1I^%6$Uw#9c? e9fBqVGB8|e;HkZCvg9bxOa@O^KbLh*2~7ZbyAYB(84F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-4e$wZ1=9bC1`9n_&jxDXFA4GsW)M&?a0o~!Xy{+R|NQ;;tg#QefKr?V z9+AZi419+{nDKc2iWH!ryQhm|h{WaO1QCIhgoK3q0?aCsVFi8+lQ!|WH>!Mgjb&As zdbWzeLrXb4RypDz4T5>8W?O~YcVunU|6NZQ~UUP=5(Nu44$rj JF6*2UngBSRW^Vuh literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/people/huzhu-kuang-you-on.png b/src/assets/img/shuju/people/huzhu-kuang-you-on.png new file mode 100644 index 0000000000000000000000000000000000000000..ec9ea6aa6589d7cd1baf2dccb435406a58e74cc8 GIT binary patch literal 17433 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 r&%WTUkYcwE&aJLnj^x=9Y2DJ5AGD#W81 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 literal 0 HcmV?d00001 diff --git a/src/assets/scss/people.scss b/src/assets/scss/people.scss index 7f30634e..ea88d05f 100644 --- a/src/assets/scss/people.scss +++ b/src/assets/scss/people.scss @@ -214,7 +214,7 @@ .item { position: relative; box-sizing: border-box; - padding-left: 15px; + padding: 0 15px; width: 33%; color: #fff; font-size: 18px; @@ -227,9 +227,7 @@ &::before { position: absolute; left: 0; - top: 0; - bottom: 0; - margin: auto 0; + top: 9px; content: ""; display: block; width: 7px; @@ -246,6 +244,42 @@ height: 1px; border: 1px dashed #1257c9; } + + .tabs { + margin-top: 30px; + display: flex; + align-items: center; + padding-left: 20px; + + .tab-btn { + width: 30px; + text-align: center; + cursor: pointer; + } + + .tab { + margin: 0 5px; + min-width: 76px; + padding: 0 5px; + height: 30px; + 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-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 30px; + cursor: pointer; + transition: all ease 0.5s; + &.z-on { + background: linear-gradient(90deg, #1a5afd, #009cff); + box-shadow: none; + } + } + } } } @@ -339,6 +373,7 @@ font-size: 18px; font-family: PingFang SC; font-weight: 500; + cursor: pointer; .rel-name { font-size: 14px; diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index 1be440e7..b0615e19 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -1,816 +1,247 @@ - - + if (code === 0) { + return data; + } else { + return []; + } + }, + }, +}; + + + diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 67cefbb4..50929099 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -33,7 +33,11 @@
人员类别：

- {{ info.personCategory.join("、") }} + {{ + info.personCategory.length == 0 + ? "--" + : info.personCategory.join("、") + }}

@@ -45,7 +49,7 @@
工作单位：

- {{ info.workUnit }} + {{ info.workUnit || "--" }}

@@ -57,7 +61,11 @@
志愿者类别：

- {{ info.volunteerCategory.join("、") }} + {{ + info.volunteerCategory.length == 0 + ? "--" + : info.volunteerCategory.join("、") + }}

@@ -69,7 +77,11 @@
房屋信息：

- {{ info.houseInfo.join("、") }} + {{ + info.houseInfo.length == 0 + ? "--" + : info.houseInfo.join("、") + }}

@@ -80,75 +92,27 @@
经济状况：
-

月薪{{ info.financialSituation.monthlyIncome }}

+

+ 月薪: + {{ + info.financialSituation.monthlyIncome || "--" + }}，退休金：{{ + info.financialSituation.retirementAmount || "--" + }} +

-
-
- -
- - 更多信息 -
- -
- -
- - - -
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
- -
- -
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
- -
- -
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
- -
- -
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
所属网格：商区社区第一网格
-
- -
-
+
@@ -166,7 +130,12 @@
{{ houseInfo.ownerName }}

（户主）

-
+ +
-
- {{ houseInfo.list[0].relation }} +
+ {{ + houseInfo.userList[0].relation + }} （{{ houseInfo.list[0].userName }}）（{{ houseInfo.userList[0].userName }}）
-
+
-
- {{ houseInfo.list[1].relation }} +
+ {{ + houseInfo.userList[1].relation + }} （{{ houseInfo.list[1].userName }}）（{{ houseInfo.userList[1].userName }}）
-
+
-
- {{ houseInfo.list[2].relation }} +
+ {{ + houseInfo.userList[2].relation + }} （{{ houseInfo.list[2].userName }}）（{{ houseInfo.userList[2].userName }}）
-
+
-
- {{ houseInfo.list[3].relation }} +
+ {{ + houseInfo.userList[3].relation + }} （{{ houseInfo.list[3].userName }}）（{{ houseInfo.userList[3].userName }}）
-
+
-
- {{ houseInfo.list[4].relation }} +
+ {{ + houseInfo.userList[4].relation + }} （{{ houseInfo.list[4].userName }}）（{{ houseInfo.userList[4].userName }}）
-
+
-
- {{ houseInfo.list[5].relation }} +
+ {{ + houseInfo.userList[5].relation + }} （{{ houseInfo.list[5].userName }}）（{{ houseInfo.userList[5].userName }}）
@@ -279,12 +298,16 @@ import { Loading } from "element-ui"; //引入Loading服务 import { requestPost } from "@/js/dai/request"; import cptCard from "@/views/modules/visual/cpts/card"; +import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more"; export default { name: "HomeMap", data() { return { showedMoreInfo: false, + + userId: "", + info: { financialSituation: { monthlyIncome: "", retirementAmount: "" }, gridName: "", @@ -297,22 +320,22 @@ export default { houseInfo: { ownerName: "", - list: [ - { - userId: "", - userName: "", - isSelf: "", - relation: "", - }, + userList: [ + // { + // userId: "", + // userName: "", + // isSelf: "", + // relation: "", + // }, ], }, }; }, props: { - userId: { + uid: { type: String, - default: "", + default: "8ada68cb6f1e4b9a8333348a39ef3aee", }, }, @@ -320,15 +343,20 @@ export default { components: { cptCard, + peopleMore, }, watch: { + uid(id) { + this.userId = id; + }, userId() { this.getApiData(); }, }, async mounted() { + this.userId = this.uid; this.getApiData(); },