Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web
Showing
2 changed files
with
6 additions
and
8 deletions
... | @@ -5,7 +5,7 @@ | ... | @@ -5,7 +5,7 @@ |
5 | {{ logoName[0] && logoName[0].DNAME }} | 5 | {{ logoName[0] && logoName[0].DNAME }} |
6 | </div> | 6 | </div> |
7 | <div class="user"> | 7 | <div class="user"> |
8 | 欢迎进入系统 {{ userInfo.name }} | 8 | 欢迎进入系统 {{ userName }} |
9 | <span @click="onCancel"> | 9 | <span @click="onCancel"> |
10 | <svg-icon icon-class="close" class="closeStyle" />退出系统</span> | 10 | <svg-icon icon-class="close" class="closeStyle" />退出系统</span> |
11 | </div> | 11 | </div> |
... | @@ -29,11 +29,14 @@ export default { | ... | @@ -29,11 +29,14 @@ export default { |
29 | sidebarRight, | 29 | sidebarRight, |
30 | }, | 30 | }, |
31 | computed: { | 31 | computed: { |
32 | ...mapGetters(["sidebar", "dicData", "userInfo"]), | 32 | ...mapGetters(["sidebar", "dicData"]), |
33 | logoName: function () { | 33 | logoName() { |
34 | return this.dicData['sysCode'] && this.dicData['sysCode'].filter(item => | 34 | return this.dicData['sysCode'] && this.dicData['sysCode'].filter(item => |
35 | item.DCODE == "systemTitle" | 35 | item.DCODE == "systemTitle" |
36 | ) | 36 | ) |
37 | }, | ||
38 | userName(){ | ||
39 | return this.$store.state.userInfo ? this.$store.state.userInfo.name : "" | ||
37 | } | 40 | } |
38 | }, | 41 | }, |
39 | methods: { | 42 | methods: { | ... | ... |
... | @@ -128,11 +128,6 @@ export default { | ... | @@ -128,11 +128,6 @@ export default { |
128 | }); | 128 | }); |
129 | }, | 129 | }, |
130 | }, | 130 | }, |
131 | computed: { | ||
132 | productName() { | ||
133 | return this.$store.state.products.products.name; | ||
134 | }, | ||
135 | }, | ||
136 | components: {}, | 131 | components: {}, |
137 | }; | 132 | }; |
138 | </script> | 133 | </script> | ... | ... |
-
Please register or sign in to post a comment