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

src/pages/personal/pages/my-questions/index.vue

@@ -396,7 +396,7 @@
                                 <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                               <div class="info-answer">
-                                <answer-item @emitInsState="emitInsState"></answer-item>
+                                <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc"  @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -457,7 +457,7 @@
                                 <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                               <div class="info-answer">
-                                <answer-item @emitInsState="emitInsState"></answer-item>
+                                <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc"  @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -520,7 +520,7 @@
                                 <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                               <div class="info-answer">
-                                <answer-item   @emitInsState="emitInsState"></answer-item>
+                                <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -830,7 +830,7 @@
       </el-form>
     </div>
     <span>相似历史问题：</span>
-    <div  style="height: 200px; width: 80%; margin-left: 80px;">
+    <div  style="height: 200px; width: 80%; margin-left: 80px;overflow-y: auto;">
       <div v-for="item in historyList" :key="item.id" @click="historyJump(item)">
           <span class="history-item">{{item.problemDescription}}</span>
           <span class="history-item">{{item.questionTime}}</span>
@@ -1860,13 +1860,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 {

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -220,7 +220,7 @@
                   align="center"
                   label="电话">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_phone" placeholder="请填写单位"/>
+                    <el-input v-model="scope.row.tel_phone" placeholder="请填写电话"/>
                   </template>
                 </el-table-column>
                 <el-table-column

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 {

src/pages/searchCenter/pages/standardSearch.vue

@@ -267,8 +267,8 @@
                                     <div class="AllBoxTitle">
                                         <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
                                         <span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
-                                        <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
                                     </div>
+                                    <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 0;top: 13px;">详情</span>
                                     <div class="AllBoxContent" v-html="item.textContent"></div>
                                     <div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
                                         <div style="margin-right: 15px;">发布日期:  {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time)  : '--' }} </div>
@@ -2809,6 +2809,7 @@
             height: 29px;
         }
         .AllBox {
+            position: relative;
             margin-top: 20px;
             background-color: #fff;
             border-radius: 20px;
@@ -2817,6 +2818,7 @@
                 margin-bottom: 20px;
             }
             .AllBoxTitle {
+                width: 98%;
                 position: relative;
                 overflow: hidden;
                 text-overflow:ellipsis;