From b0f25f6549053282fef7ee95ee9ee481d2edba4d Mon Sep 17 00:00:00 2001 From: PLUTO <> Date: Fri, 27 Oct 2023 14:40:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/home/dyzxhClick.png | Bin 0 -> 7835 bytes src/components/GridTree/nodeWrap.vue | 70 +++++++++++++-- src/components/JwTree/nodeWrap.vue | 35 +++++--- src/components/NameSplit/index.vue | 8 +- src/components/Tree/nodeWrap.vue | 83 ++++++++++++++---- .../organizational/dangTree/index.vue | 55 ++++++------ .../organizational/gridTree/index.vue | 66 +++++++++----- .../dataBoard/organizational/jwTree/index.vue | 29 +++--- 8 files changed, 240 insertions(+), 106 deletions(-) create mode 100644 src/assets/images/home/dyzxhClick.png diff --git a/src/assets/images/home/dyzxhClick.png b/src/assets/images/home/dyzxhClick.png new file mode 100644 index 0000000000000000000000000000000000000000..f8ee33195431a5a4d09ba4a87ba83f9773f43fe4 GIT binary patch literal 7835 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

-
+
+
+ + +
-
+
+
+ + +
-
+
{{ item.organizationName }}
+
+ + +
@@ -96,6 +108,20 @@ export default { } } }, + getChildrenData(item, idx, arr) { + arr.forEach((element, index) => { + if (index === idx) { + if (element.children) { + element._children = element.children; + element.children = null; + } else { + element.children = element._children; + } + } else { + element.children = null; + } + }); + }, gotoPersonnel(item) { const grandPid = this.findParentParentId(this.nodeConfig, item.pid); const name = item.organizationName ? item.organizationName : "四号楼二单元302"; @@ -157,27 +183,55 @@ export default { .auto-judge { .wgdzb { @include spanLevel; - width: 132px; - height: 96px; + min-width: 120px; + height: 126px; text-align: center; padding-top: 5px; background-image: url(~@/assets/images/home/zbbg.png); - background-size: 100%; + background-repeat: no-repeat; + background-position: center; + // background-size: 100%; + } + .wgdzbHover { + @include spanLevel; + min-width: 120px; + height: 126px; + text-align: center; + padding-top: 5px; + background-image: url(~@/assets/images/home/zbbgClick.png); + // background-size: 100%; + background-repeat: no-repeat; + background-position: center; } .lydxz { @include spanLevel; // @include normalLevel; text-align: center; - width: 216px; - height: 50px; + width: 90px; + height: 98px; padding-top: 5px; background-image: url(~@/assets/images/home/lydxzTree.png); background-size: 100%; } + .lydxzHover { + @include spanLevel; + // @include normalLevel; + text-align: center; + width: 90px; + height: 98px; + padding-top: 5px; + background-image: url(~@/assets/images/home/lydxzClick.png); + background-size: 100%; + } .dyzxh { @include lastLevel; background-image: url(~@/assets/images/home/dyzxhTree.png); } + .dyzxhHover { + @include lastLevel; + background-image: url(~@/assets/images/home/dyzxhClick.png); + } + .dyzxhGreen { @include lastLevel; background-image: url(~@/assets/images/home/gridGreen.png); diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 54303e526..6f0eb821b 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -26,7 +26,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
{{ spliceNameFun(item.organizationName, 3) }}
@@ -93,14 +93,6 @@ export default { }, getChildrenData(item, idx, arr) { - // if (!item._children) { - // this.$message({ - // message: "无下级数据", - // type: "error", - // }); - // return; - // } - // 遍历arr，找到当前点击的item，将其_children赋值给item.children arr.forEach((element, index) => { if (index === idx) { if (element.children) { @@ -169,21 +161,25 @@ export default { .auto-judge { .wgdzb { @include spanLevel; - width: 90px; + min-width: 120px; height: 126px; text-align: center; padding-top: 5px; background-image: url(~@/assets/images/home/zbbg.png); - background-size: 100%; + background-repeat: no-repeat; + background-position: center; + // background-size: 100%; } .wgdzbHover { @include spanLevel; - width: 90px; + min-width: 120px; height: 126px; text-align: center; padding-top: 5px; background-image: url(~@/assets/images/home/zbbgClick.png); - background-size: 100%; + // background-size: 100%; + background-repeat: no-repeat; + background-position: center; } .lydxz { @include spanLevel; @@ -215,6 +211,17 @@ export default { background-image: url(~@/assets/images/home/dyzxhTree.png); background-size: 100%; } + .dyzxhHover { + @include spanLevel; + @include normalLevel; + height: 118px; + width: 30px; + writing-mode: tb-rl; + margin-top: -12px; + background-image: url(~@/assets/images/home/dyzxhClick.png); + background-size: 100%; + } + .lxjt { @include spanLevel; display: flex; diff --git a/src/components/NameSplit/index.vue b/src/components/NameSplit/index.vue index 2fc49280e..188716506 100644 --- a/src/components/NameSplit/index.vue +++ b/src/components/NameSplit/index.vue @@ -1,6 +1,6 @@ @@ -43,7 +45,7 @@ export default { }, getItemNameArr(str) { - return str.split(",").slice(0, 2); + return str.split(",").slice(0, 1); }, spliceNameFun(row, num) { @@ -56,6 +58,19 @@ export default { this.$message.error("该人员暂无居民信息！"); } }, + getPeopositionMap(type) { + const positionMap = new Map([ + [1, "省委"], + [2, "市委"], + [3, "区委书记"], + [4, "党工委书记"], + [5, "党委书记"], + [6, "党总支书记"], + [7, "支部书记"], + [8, "组长"], + ]); + return positionMap.get(type); + }, }, }; diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue index b9b476dab..de9775831 100644 --- a/src/components/Tree/nodeWrap.vue +++ b/src/components/Tree/nodeWrap.vue @@ -71,8 +71,7 @@ export default { flag: true, }; }, - mounted() { - }, + mounted() {}, computed: {}, watch: {}, methods: { @@ -113,7 +112,7 @@ export default { display: inline-block; width: 168px; height: 164px; - padding-top: 10px; + // padding-top: 10px; text-align: center; background-image: url(~@/assets/images/home/firstLevel.png); background-size: 100%; @@ -125,7 +124,7 @@ export default { min-width: 120px; height: 126px; text-align: center; - padding-top: 5px; + padding-top: 9px; background-image: url(~@/assets/images/home/zbbg.png); background-repeat: no-repeat; background-position: center; @@ -135,7 +134,7 @@ export default { min-width: 120px; height: 126px; text-align: center; - padding-top: 5px; + padding-top: 9px; background-image: url(~@/assets/images/home/zbbgClick.png); // background-size: 100%; background-repeat: no-repeat; @@ -145,53 +144,55 @@ export default { @include spanLevel; // @include normalLevel; text-align: center; - width: 90px; - height: 98px; - padding-top: 5px; + min-width: 120px; + height: 126px; + padding-top: 25px; background-image: url(~@/assets/images/home/lydxzTree.png); - background-size: 100%; + background-repeat: no-repeat; + background-position: center; } .lydxzHover { @include spanLevel; // @include normalLevel; text-align: center; - width: 90px; - height: 98px; - padding-top: 5px; + min-width: 120px; + height: 126px; + padding-top: 25px; background-image: url(~@/assets/images/home/lydxzClick.png); - background-size: 100%; + background-repeat: no-repeat; + background-position: center; } .dyzxh { @include spanLevel; @include normalLevel; - height: 118px; + height: 137px; width: 30px; writing-mode: tb-rl; margin-top: -12px; background-image: url(~@/assets/images/home/dyzxhTree.png); - background-size: 100%; + background-repeat: no-repeat; } .dyzxhHover { @include spanLevel; @include normalLevel; - height: 118px; + height: 137px; width: 30px; writing-mode: tb-rl; margin-top: -12px; background-image: url(~@/assets/images/home/dyzxhClick.png); - background-size: 100%; + background-repeat: no-repeat; } .lxjt { @include spanLevel; display: flex; align-items: center; justify-content: space-around; - height: 118px; + height: 137px; width: 30px; writing-mode: tb-rl; margin-top: -12px; background-image: url(~@/assets/images/home/dyzxhTree.png); - background-size: 100%; + background-repeat: no-repeat; } } diff --git a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue index ce020c199..dca17a870 100644 --- a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue +++ b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue @@ -2,12 +2,12 @@
- + - - - - + + + +
diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue index a9161a5b5..a5a93de00 100644 --- a/src/views/dataBoard/organizational/dangTree/index.vue +++ b/src/views/dataBoard/organizational/dangTree/index.vue @@ -2,7 +2,7 @@
-
+
{{ getTitleNameMapFun(item) }}
@@ -35,9 +35,9 @@ export default { watch: { "$store.state.chooseArea.chooseName"(n, v) { if (n.orgId) { - this.levelArr = []; - this.nodeConfig = {}; - this.getTreeData(); + // this.levelArr = []; + // this.nodeConfig = {}; + // this.getTreeData(); } }, }, @@ -74,7 +74,7 @@ export default { } }); const myArray = [...new Set(this.levelArr)]; - this.treeHeight = myArray.length * 180 + 180; + this.treeHeight = myArray.length * 180 + 220; this.levelArr = this.getLevelArrNum(myArray); }, @@ -177,12 +177,12 @@ export default { } .lastLevel { - height: 160px !important; - margin-top: -45px !important; + height: 180px !important; + // margin-top: -45px !important; } .lastLevel1 { - height: 160px !important; - margin-top: -37px !important; + height: 180px !important; + // margin-top: -37px !important; } .flowLevel-1 { @@ -217,14 +217,14 @@ export default { .flowLevel-2 { top: 181px; - line-height: 178px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 59px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -235,14 +235,14 @@ export default { .flowLevel-3 { top: 379px; - line-height: 185px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 63px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -253,7 +253,7 @@ export default { .flowLevel-4 { top: 578px; - line-height: 177px; + line-height: 180px; div { padding-left: 80px; @@ -271,14 +271,14 @@ export default { .flowLevel-5 { top: 776px; - line-height: 130px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -289,13 +289,13 @@ export default { .flowLevel-6 { top: 974px; - line-height: 130px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -306,14 +306,14 @@ export default { .flowLevel-7 { top: 1172px; - line-height: 130px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -324,7 +324,7 @@ export default { .otherTop { &::after { - top: 46px !important; + top: 60px !important; } } @@ -332,14 +332,14 @@ export default { @include flowLevwlCommon; top: 1370px; height: 90px; - line-height: 90px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 14px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -350,16 +350,16 @@ export default { .flowLevel-9 { @include flowLevwlCommon; - top: 1587px; + top: 1569px; height: 160px; - line-height: 135px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -370,16 +370,16 @@ export default { .flowLevel-10 { @include flowLevwlCommon; - top: 1756px; - height: 135px; - line-height: 135px; + top: 1766px; + height: 180px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; diff --git a/src/views/dataBoard/organizational/gridTree/index.vue b/src/views/dataBoard/organizational/gridTree/index.vue index f2fb105c6..f38d68b80 100644 --- a/src/views/dataBoard/organizational/gridTree/index.vue +++ b/src/views/dataBoard/organizational/gridTree/index.vue @@ -2,7 +2,7 @@
-
+
{{ getTitleNameMapFun(item) }}
@@ -35,8 +35,8 @@ export default { watch: { "$store.state.chooseArea.chooseName"(n, v) { if (n.orgId) { - this.levelArr = []; - this.nodeConfig = {}; + // this.levelArr = []; + // this.nodeConfig = {}; // this.getTreeData(); } }, @@ -81,7 +81,7 @@ export default { } }); const myArray = [...new Set(this.levelArr)]; - this.treeHeight = myArray.length * 180 + 164; + this.treeHeight = myArray.length * 180 + 200; this.levelArr = this.getLevelArrNum(myArray); }, @@ -183,7 +183,7 @@ export default { .lastLevel { height: 145px !important; - margin-top: -45px !important; + // margin-top: -45px !important; } .flowLevel-1 { @@ -218,7 +218,7 @@ export default { .flowLevel-2 { top: 181px; - line-height: 178px; + line-height: 180px; div { padding-left: 80px; @@ -308,14 +308,14 @@ export default { .flowLevel-7 { top: 1171px; - line-height: 130px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -326,22 +326,22 @@ export default { .otherTop { &::after { - top: 45px !important; + top: 60px !important; } } .flowLevel-8 { @include flowLevwlCommon; - top: 1387px; - height: 90px; - line-height: 138px; + top: 1371px; + height: 180px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 40px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -353,14 +353,14 @@ export default { .flowLevel-9 { @include flowLevwlCommon; top: 1179px; - height: 135px; - line-height: 135px; + height: 180px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -372,15 +372,15 @@ export default { .flowLevel-10 { @include flowLevwlCommon; top: 1338px; - height: 135px; - line-height: 135px; + height: 180px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index effe1e58e..c614d45ad 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -2,7 +2,7 @@
-
+
{{ getTitleNameMapFun(item) }}
@@ -35,9 +35,9 @@ export default { watch: { "$store.state.chooseArea.chooseName"(n, v) { if (n.orgId) { - this.levelArr = []; - this.nodeConfig = {}; - this.getTreeData(); + // this.levelArr = []; + // this.nodeConfig = {}; + // this.getTreeData(); } }, }, @@ -83,7 +83,7 @@ export default { } }); const myArray = [...new Set(this.levelArr)]; - this.treeHeight = myArray.length * 180 + 164; + this.treeHeight = myArray.length * 180 + 220; this.levelArr = this.getLevelArrNum(myArray); }, @@ -185,12 +185,12 @@ export default { } .lastLevel { - height: 160px !important; - margin-top: -45px !important; + height: 180px !important; + // margin-top: -45px !important; } .lastLevel1 { - height: 145px !important; - margin-top: -37px !important; + height: 180px !important; + // margin-top: -37px !important; } .flowLevel-1 { @@ -243,14 +243,14 @@ export default { .flowLevel-3 { top: 379px; - line-height: 185px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 62px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -261,14 +261,14 @@ export default { .flowLevel-4 { top: 577px; - line-height: 175px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 58px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -287,7 +287,7 @@ export default { &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -298,7 +298,7 @@ export default { .flowLevel-6 { top: 974px; - line-height: 171px; + line-height: 180px; height: 180px !important; div { @@ -306,7 +306,7 @@ export default { &::after { @include flowLevelAfter; - top: 55px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -317,15 +317,15 @@ export default { .flowLevel-7 { top: 1172px; - line-height: 150px; - height: 150px !important; + line-height: 180px; + height: 180px !important; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 46px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -336,22 +336,22 @@ export default { .otherTop { &::after { - top: 43px !important; + top: 60px !important; } } .flowLevel-8 { @include flowLevwlCommon; - top: 1387px; + top: 1371px; height: 90px; - line-height: 90px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 14px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -362,16 +362,16 @@ export default { .flowLevel-9 { @include flowLevwlCommon; - top: 1558px; + top: 1568px; height: 135px; - line-height: 135px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; @@ -384,14 +384,14 @@ export default { @include flowLevwlCommon; top: 1738px; height: 135px; - line-height: 135px; + line-height: 180px; div { padding-left: 80px; &::after { @include flowLevelAfter; - top: 35px; + top: 60px; left: 15px; width: 180px; height: 60px; diff --git a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue index c1e470667..90f226d91 100644 --- a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue @@ -30,7 +30,7 @@ export default { value: 2, }, ], - typeCondition: 1, + typeCondition: 5, typeConditionList: [ { label: "本月", @@ -145,7 +145,7 @@ export default { max: datamax[i], axisLabel: { show: i === 0, - color:'rgba(255,255,255,1)', + color: "rgba(58,128,231,0.36)", formatter: function (value) { return Math.floor(value); },