clay commit : 一些小bug调整完毕
Reviewed-on: http://git.hchyun.com/feashow/sist_web/pulls/28
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row v-for="(chile,index) in dire.children" :key="index">
|
<el-row v-for="(chile,index) in dire.children" :key="index">
|
||||||
<el-col class="name" :offset="1" :span="23">
|
<el-col class="name" :offset="1" :span="23">
|
||||||
{{ chile.name }}<span v-if="chile.children.length>1">({{chile.children.length}}人)</span>
|
{{ chile.name }}
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col class="text" :offset="1" :span="23">
|
<el-col class="text" :offset="1" :span="23">
|
||||||
<div v-for="(item,index) in chile.children" :key="index" @click="linkClick(item)">
|
<div v-for="(item,index) in chile.children" :key="index" @click="linkClick(item)">
|
||||||
|
|||||||
@@ -208,6 +208,7 @@ export default {
|
|||||||
watch: {
|
watch: {
|
||||||
$route(to, from) {
|
$route(to, from) {
|
||||||
console.log("我被触发了")
|
console.log("我被触发了")
|
||||||
|
this.showIndex = 0
|
||||||
let arcId = this.$route.params && this.$route.query.id
|
let arcId = this.$route.params && this.$route.query.id
|
||||||
this.navId = this.$route.params && this.$route.params.navId;
|
this.navId = this.$route.params && this.$route.params.navId;
|
||||||
let id = this.$route.params && this.$route.params.secondId
|
let id = this.$route.params && this.$route.params.secondId
|
||||||
@@ -229,7 +230,6 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
console.log(this.navId, "this.navId")
|
console.log(this.navId, "this.navId")
|
||||||
if (undefined == this.navId) {
|
if (undefined == this.navId) {
|
||||||
this.showIndex = 0
|
|
||||||
this.getNodes()
|
this.getNodes()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -249,6 +249,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
this.navList = []
|
||||||
this.secondId = id
|
this.secondId = id
|
||||||
this.getNav()
|
this.getNav()
|
||||||
}
|
}
|
||||||
@@ -256,10 +257,11 @@ export default {
|
|||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
setLanguage(this)
|
setLanguage(this)
|
||||||
|
this.showIndex = 0
|
||||||
this.secondId = this.$route.params && this.$route.params.secondId;
|
this.secondId = this.$route.params && this.$route.params.secondId;
|
||||||
this.navId = this.$route.params && this.$route.params.navId;
|
this.navId = this.$route.params && this.$route.params.navId;
|
||||||
this.type = this.$route.query && this.$route.query.type
|
this.type = this.$route.query && this.$route.query.type
|
||||||
console.log(this.type,"this.type")
|
console.log(this.type, "this.type")
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.getNav()
|
this.getNav()
|
||||||
}, 200);
|
}, 200);
|
||||||
@@ -317,7 +319,7 @@ export default {
|
|||||||
/**
|
/**
|
||||||
* 获得节点信息
|
* 获得节点信息
|
||||||
*/
|
*/
|
||||||
async getNodes() {
|
async getNodes() {
|
||||||
this.navList = []
|
this.navList = []
|
||||||
// await getNode({id: this.secondId}).then(res => {
|
// await getNode({id: this.secondId}).then(res => {
|
||||||
// this.navList = res.data
|
// this.navList = res.data
|
||||||
@@ -348,9 +350,11 @@ export default {
|
|||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
// })
|
// })
|
||||||
let res = await getNode({id: this.secondId})
|
let res = await getNode({id: this.secondId})
|
||||||
// todo 延时异步问题
|
// todo 延时异步问题
|
||||||
this.$refs.lab.style.height = res.data.length * 8 + 10 + 'rem'
|
setTimeout(() => {
|
||||||
|
this.$refs.lab.style.height = res.data.length * 8 + 10 + 'rem'
|
||||||
|
}, 100);
|
||||||
this.navList = res.data
|
this.navList = res.data
|
||||||
// if (!this.navList){
|
// if (!this.navList){
|
||||||
// return
|
// return
|
||||||
@@ -379,7 +383,7 @@ export default {
|
|||||||
getContent(menu) {
|
getContent(menu) {
|
||||||
console.log("getContent内部,menu:", menu)
|
console.log("getContent内部,menu:", menu)
|
||||||
console.log(menu)
|
console.log(menu)
|
||||||
if (menu == undefined){
|
if (menu == undefined) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.type = menu.type
|
this.type = menu.type
|
||||||
@@ -393,7 +397,7 @@ export default {
|
|||||||
pageSize: 5
|
pageSize: 5
|
||||||
}
|
}
|
||||||
this.listDataType = 0
|
this.listDataType = 0
|
||||||
if (this.type === 4||menu.isSimple == 1) {
|
if (this.type === 4 || menu.isSimple == 1) {
|
||||||
data.pageSize = 10
|
data.pageSize = 10
|
||||||
this.listDataType = 1
|
this.listDataType = 1
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user