diff --git a/src/assets/images/home/gridGreen.png b/src/assets/images/home/gridGreen.png new file mode 100644 index 000000000..bd0089d35 Binary files /dev/null and b/src/assets/images/home/gridGreen.png differ diff --git a/src/assets/images/home/gridRed.png b/src/assets/images/home/gridRed.png new file mode 100644 index 000000000..86bff43c6 Binary files /dev/null and b/src/assets/images/home/gridRed.png differ diff --git a/src/assets/images/home/gridYellow.png b/src/assets/images/home/gridYellow.png new file mode 100644 index 000000000..0e8b94604 Binary files /dev/null and b/src/assets/images/home/gridYellow.png differ diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 72864caae..a56c7cbb9 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -27,7 +27,7 @@
-
+
{{ item.organizationName }}
@@ -116,6 +116,18 @@ export default { justify-content: space-around; } +@mixin lastLevel { + @include spanLevel; + @include normalLevel; + height: 118px; + width: 30px; + margin-top: -12px; + background-size: 100%; + cursor: pointer; + writing-mode: tb-rl; + text-orientation: upright; +} + .name_more { span { &:hover { @@ -163,15 +175,20 @@ export default { background-size: 100%; } .dyzxh { - @include spanLevel; - @include normalLevel; - height: 118px; - width: 30px; - writing-mode: tb-rl; - margin-top: -12px; + @include lastLevel; background-image: url(~@/assets/images/home/dyzxhTree.png); - background-size: 100%; - cursor: pointer; + } + .dyzxhGreen { + @include lastLevel; + background-image: url(~@/assets/images/home/gridGreen.png); + } + .dyzxhRed { + @include lastLevel; + background-image: url(~@/assets/images/home/gridRed.png); + } + .dyzxhYellow { + @include lastLevel; + background-image: url(~@/assets/images/home/gridYellow.png); } .lxjt { @include spanLevel; diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 424869801..ac36790f5 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -27,8 +27,8 @@
-
- {{ spliceNameFun(item.name, 3) }} +
+ {{ spliceNameFun(item.organizationName, 3) }}
diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue index 8c261a1db..5b76a6a46 100644 --- a/src/components/Tree/nodeWrap.vue +++ b/src/components/Tree/nodeWrap.vue @@ -17,12 +17,12 @@
-
+
-
+
@@ -62,7 +62,16 @@ export default { mounted() {}, computed: {}, watch: {}, - methods: {}, + methods: { + getChildrenData(item) { + // if (item.children) { + // item._children = item.children; + // item.children = null; + // } else { + // item.children = item._children; + // } + }, + }, };