FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-11-22 09:52:17 +08:00
parent 4e0f398ad7 7ae386be63
commit 09ab35e1b2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+4 -1
View File
@@ -135,7 +135,10 @@
this.isVisible2 = false this.isVisible2 = false
}, },
saveUserInfo () { saveUserInfo () {
if (this.nodeList.length > 0) { if (this.nodeList[0].length === 0) {
this.isVisible2 = false
this.$emit('checkedRole', this.roleList)
} else if (this.nodeList.length > 0) {
let ids = '' let ids = ''
this.nodeList.forEach(item => { this.nodeList.forEach(item => {
if (ids.length > 0) { if (ids.length > 0) {
src/pages/home/components/EnterCard.vue
+2 -2
View File
@@ -2,8 +2,8 @@
<div @click="toPage"> <div @click="toPage">
<div> <div>
<div v-if="label" class="icon-style"> <div v-if="label" class="icon-style">
<span v-for="item in icons" v-if="item.label === label" :class="item.icon"> <span v-for="item in icons" v-if="item.label === label" :class="item.icon" style="font-size: 20px;">
<span style="padding-left: 10px"> <span style="padding-left: 10px; font-size: 16px">
{{ label }} {{ label }}
</span> </span>
</span> </span>