diff --git a/src/assets/images/home/top1.png b/src/assets/images/home/top1.png new file mode 100644 index 000000000..743df5b0d Binary files /dev/null and b/src/assets/images/home/top1.png differ diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss index 87919319e..a7d3a4d66 100644 --- a/src/assets/scss/dataBoardMain.scss +++ b/src/assets/scss/dataBoardMain.scss @@ -44,9 +44,9 @@ z-index: 1; width: 100%; height: 101px; - background-image: url(../images/home/top.png); + background-image: url(../images/home/top1.png); background-repeat: no-repeat; - background-position: top center; + background-position: top center; background-size: 100%; .back { diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 9270e78c7..335bb9119 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -17,7 +17,7 @@
-
+
{{ spliceNameFun(item.organizationName, 8) }}
{{ spliceNameFun(item.name, 12) }}
@@ -57,6 +57,7 @@ export default { data() { return { homeTypeArr: [], + sixLevelArr: ["province", "city", "district", "street", "community", "grid_manager"], }; }, mounted() {}, @@ -74,6 +75,10 @@ export default { return row; }, + getOnerSixLevelFlag(item) { + return this.sixLevelArr.includes(item.level); + }, + gotoPersonnel() { this.$router.push("/organizational/orgPersonnel"); }, diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue index ddefb2f45..29fa0ca9f 100644 --- a/src/views/dataBoard/organizational/dangTree/index.vue +++ b/src/views/dataBoard/organizational/dangTree/index.vue @@ -2,7 +2,7 @@
-
+
{{ getTitleNameMapFun(item) }}
@@ -37,7 +37,6 @@ export default { }, computed: {}, mounted() { - // console.log(this.$store.state.chooseArea.chooseName); this.getTreeData(); }, methods: { @@ -150,6 +149,10 @@ export default { height: 145px !important; margin-top: -45px !important; } + .lastLevel1 { + height: 145px !important; + margin-top: -37px !important; + } .flowLevel-1 { @include flowLevwlCommon; diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index 538d5765d..d44934d76 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -2,7 +2,7 @@
-
+
{{ getTitleNameMapFun(item) }}
@@ -68,7 +68,6 @@ export default { this.getDataPLevel(item.children); } }); - console.log(this.levelArr); const myArray = [...new Set(this.levelArr)]; this.levelArr = this.getLevelArrNum(myArray); }, @@ -155,6 +154,10 @@ export default { height: 145px !important; margin-top: -45px !important; } + .lastLevel1 { + height: 145px !important; + margin-top: -37px !important; + } .flowLevel-1 { @include flowLevwlCommon;