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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source 
# Conflicts:
#	src/pages/personal/pages/my-questions/components/answerItem.vue
This commit is contained in:
zyd
2022-06-15 00:34:42 +08:00
parent 7f18cb7a25 6110d20b0c
commit 09899b294a
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/personal/pages/my-questions/components/answerItem.vue
+2
View File
@@ -102,6 +102,7 @@ export default {
methods:{
//提交
handleSubmit(){
this.$emit('emitInsState',false)
let asdId = sessionStorage.getItem('queId')
this.form.fileList = this.fileList
this.form.askId = asdId
@@ -111,6 +112,7 @@ export default {
if(res.ok){
this.form.reply = ''
this.fileList = []
this.$emit('emitInsState',true)
//此处需要调用父组件中的方法，将问题列表进行刷新操作
}
}, e => {
src/pages/personal/pages/my-questions/index.vue
+32 -7
View File
@@ -88,6 +88,7 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</el-tab-pane>
</template>
@@ -145,6 +146,7 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</el-tab-pane>
</template>
@@ -202,6 +204,7 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</el-tab-pane>
</template>
@@ -259,6 +262,7 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</el-tab-pane>
</template>
@@ -324,13 +328,14 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :dataLoading="dataLoading"></question-item-info>
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
<div class="info-answer" >
<answer-item></answer-item>
<answer-item @emitInsState="emitInsState"></answer-item>
</div>
</el-tab-pane>
</template>
@@ -388,9 +393,10 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
<div class="info-answer" >
<answer-item></answer-item>
<answer-item @emitInsState="emitInsState"></answer-item>
</div>
</el-tab-pane>
</template>
@@ -448,9 +454,10 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
<div class="info-answer" >
<answer-item></answer-item>
<answer-item @emitInsState="emitInsState"></answer-item>
</div>
</el-tab-pane>
</template>
@@ -504,13 +511,16 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info
:answer="item"
></question-item-info>
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
<div class="info-answer" >
<answer-item></answer-item>
<answer-item @emitInsState="emitInsState"></answer-item>
</div>
</el-tab-pane>
</template>
@@ -580,6 +590,7 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</el-tab-pane>
</template>
@@ -638,6 +649,7 @@
</div>
</template>
</div>
<loading :loading="dataLoading">正在加载数据</loading>
</el-tab-pane>
</template>
</el-tabs>
@@ -694,6 +706,7 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</el-tab-pane>
</template>
@@ -751,6 +764,7 @@
</div>
</div>
</template>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</el-tab-pane>
</template>
@@ -1225,6 +1239,7 @@ export default {
},
data(){
return{
dataLoading: true,
mergeList: [],
historyList: [], //相似历史问题
handleSelectForm: {
@@ -1322,6 +1337,14 @@ export default {
}
},
methods:{
emitInsState(state){
console.log(state)
if(state){
this.questionClick()
}else {
this.dataLoading = true
}
},
changeInput:debounce(function(val){
if(val.length){
this.$http.get('lawss/AskQuestions/resemblance',{
@@ -1577,7 +1600,8 @@ export default {
})
},
questionClick(){
sessionStorage.setItem('queId', this.activeQue)
this.dataLoading = true
sessionStorage.setItem('queId', this.activeQue)
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
id: this.activeQue
},{
@@ -1593,6 +1617,7 @@ export default {
}else{
this.answerList = res.data
}
this.dataLoading = false
}, e => {
})
},