diff --git a/src/assets/images/home/dyzxhClick.png b/src/assets/images/home/dyzxhClick.png index f8ee33195..26f1fa3e6 100644 Binary files a/src/assets/images/home/dyzxhClick.png and b/src/assets/images/home/dyzxhClick.png differ diff --git a/src/assets/images/home/dyzxhTree.png b/src/assets/images/home/dyzxhTree.png index 97e2c9fd2..e6c166b6a 100644 Binary files a/src/assets/images/home/dyzxhTree.png and b/src/assets/images/home/dyzxhTree.png differ diff --git a/src/assets/images/home/lydxzClick.png b/src/assets/images/home/lydxzClick.png index 7eeb24adb..ac288b3f0 100644 Binary files a/src/assets/images/home/lydxzClick.png and b/src/assets/images/home/lydxzClick.png differ diff --git a/src/assets/images/home/lydxzTree.png b/src/assets/images/home/lydxzTree.png index 3c2db15ae..381cbab6b 100644 Binary files a/src/assets/images/home/lydxzTree.png and b/src/assets/images/home/lydxzTree.png differ diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index b2964b318..0a9f4f2a4 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -145,7 +145,7 @@ export default { @mixin lastLevel { @include spanLevel; @include normalLevel; - height: 118px; + height: 137px; width: 30px; margin-top: -12px; background-size: 100%; @@ -186,7 +186,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; @@ -197,7 +197,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; @@ -207,54 +207,61 @@ 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 lastLevel; background-image: url(~@/assets/images/home/dyzxhTree.png); + background-repeat: no-repeat; } .dyzxhHover { @include lastLevel; background-image: url(~@/assets/images/home/dyzxhClick.png); + background-repeat: no-repeat; } .dyzxhGreen { @include lastLevel; background-image: url(~@/assets/images/home/gridGreen.png); + background-repeat: no-repeat; } .dyzxhRed { @include lastLevel; background-image: url(~@/assets/images/home/gridRed.png); + background-repeat: no-repeat; } .dyzxhYellow { @include lastLevel; background-image: url(~@/assets/images/home/gridYellow.png); + 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/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 6f0eb821b..d7ab6d270 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -164,7 +164,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; @@ -175,7 +175,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; @@ -185,41 +185,43 @@ 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 { @@ -227,12 +229,12 @@ export default { 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/components/NameSplit/index.vue b/src/components/NameSplit/index.vue index 188716506..94e26b7bc 100644 --- a/src/components/NameSplit/index.vue +++ b/src/components/NameSplit/index.vue @@ -4,8 +4,10 @@
{{ spliceNameFun(item[peopleName], 12) }}
{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }} - + +
+
({{ getPeopositionMap(item.partyOrgLevel) }})
@@ -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); },