diff --git a/src/assets/images/home/dyzxhClick.png b/src/assets/images/home/dyzxhClick.png new file mode 100644 index 000000000..f8ee33195 Binary files /dev/null and b/src/assets/images/home/dyzxhClick.png differ diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index a56c7cbb9..b2964b318 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -17,20 +17,32 @@
-
+
+
+ + +
-
+
+
+ + +
-
+
{{ 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 @@