diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
index bc31a6c57..7d622fa11 100644
--- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
@@ -24,7 +24,7 @@
- 归档
+ 归档
@@ -40,6 +40,8 @@ export default {
data(){
return{
checked: '',
+ answererNowUserId: this.$store.getters.userInfo.userId,
+ answererNowUserName: this.$store.getters.userInfo.userName,
}
},
methods:{
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index a65895680..3e2e90fb7 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -396,7 +396,7 @@
正在加载数据
@@ -457,7 +457,7 @@
正在加载数据
@@ -520,7 +520,7 @@
正在加载数据
@@ -872,7 +872,6 @@
@@ -1454,6 +1453,7 @@ export default {
},
//选择标准的查询按钮
searchLawBtn(){
+ this.lawNumberSearch()
this.lawInfoTableLoading = true
if (this.handleSelectForm.dataSource === 'INLAND'){
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{
@@ -1842,6 +1842,17 @@ export default {
this.activeName = "myQue"
this.activeType = this.standType
this.searchBtn()
+ this.queSearch()
+ this.handleSelectForm.lawNumber = ''
+ this.handleSelectForm.textStatus = ''
+ this.handleSelectForm.isRelateAccess = ''
+ this.handleSelectForm.standNumber = ''
+ this.handleSelectForm.lawsNumber = ''
+ this.handleSelectForm.standCode = ''
+ //清空标准名称/政策名称的查询
+ this.handleSelectForm.lawName = ''
+ this.handleSelectForm.standName = ''
+ this.handleSelectForm.numberName = ''
}, e => {
})
@@ -1860,13 +1871,13 @@ export default {
overflow: auto !important;
}
#my-questions{
- height: 100%;
+ height: calc(100vh - 75px);
display: flex;
flex-direction: column;
background: #F5F7FA;
margin-bottom: 10px;
.tab-box{
- height: 100%;
+ height: 93%;
}
.type-tabs {
/deep/.el-tabs__header {
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 166deac2e..354b897b5 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -1033,7 +1033,8 @@ export default {
questionClick(){
sessionStorage.setItem('queId', this.activeQue)
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
- id: this.activeQue
+ id: this.activeQue,
+ state: 'yes'
},{
_this: this
}, res => {
@@ -1258,13 +1259,13 @@ export default {
overflow: auto;
}
#my-questions{
- height: 100%;
+ height: calc(100vh - 75px);
display: flex;
flex-direction: column;
background: #F5F7FA;
margin-bottom: 10px;
.tab-box{
- height: 100%;
+ height: 93%;
}
.type-tabs {
/deep/.el-tabs__header {