Merge remote-tracking branch 'origin/develop' into develop

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 => {
@@ -1068,6 +1069,7 @@ export default {
         questioner: this.$store.getters.userInfo.userId,   //提问人
         problemDescription: '',  //关键词/问题描述
       }
+      this.standSearch2()
     },
     searchBtn(){
       this.questionSerach.classification = this.activeType
@@ -1256,13 +1258,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 {