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

src/pages/regulatoryRepository/standQA/components/questions-item.vue

@@ -2,7 +2,7 @@
 <template>
 <div id="questions-item">
   <div>
-    <el-button class="dybtn"  size="mini" type="primary">订阅</el-button>
+    <el-button class="dybtn"  size="mini" type="primary" @click.stop="subscribe">订阅</el-button>
   </div>
   <div>
     <div class="row">
@@ -34,6 +34,18 @@ export default {
       userName: this.$store.getters.userInfo.userName,
     }
   },
+  methods:{
+    subscribe(){
+      this.$http.postData('lawss/Subscription/insertSubscription',{
+        askId: this.question.id,
+        usId: this.$store.getters.userInfo.userId,
+      },{
+        _this: this
+      }, res => {
+        console.log(res);
+      })
+    },
+  },
   watch:{
     question: {
       immediate: true,

src/pages/regulatoryRepository/standQA/index.vue

@@ -13,7 +13,7 @@
          <el-input v-model="questionSerach.problemDescription" placeholder="根据关键词查询"></el-input>
        </el-form-item>
        <el-form-item>
-         <el-button size="mini"  @click="standSearch">查询</el-button>
+         <el-button size="mini"  @click="searchBtn">查询</el-button>
        </el-form-item>
        <el-form-item>
          <el-button size="mini"  @click="delSearch">清空</el-button>
@@ -290,7 +290,7 @@
           <el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
         </el-form-item>
         <el-form-item label="问题" prop="problemDescription"  class="serch-form-item">
-          <el-input v-model="questionForm.problemDescription"></el-input>
+          <el-input v-model="questionForm.problemDescription"  @input="changeInput"></el-input>
         </el-form-item>
         <el-form-item label="附件">
           <el-upload
@@ -312,8 +312,11 @@
       </el-form>
     </div>
     <span>相似历史问题：</span>
-    <div style="height: 200px; width: 80%; margin-left: 80px;">
-
+    <div  style="height: 200px; width: 80%; margin-left: 80px;">
+      <div v-for="item in historyList" :key="item.id" @click="historyJump(item.id)">
+        <span class="history-item">{{item.problemDescription}}</span>
+        <span class="history-item">{{item.questionTime}}</span>
+      </div>
     </div>
     <span slot="footer" class="dialog-footer">
     <el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -698,6 +701,15 @@ import answerItem from "./components/answerItem";
 import questionItemInfo from "./components/questionItemInfo";
 import standItem from './components/stand-item'
 
+function debounce(func, wait = 500){
+  let timeout;
+  return function(event){
+    clearTimeout(timeout)
+    timeout = setTimeout(() => {
+      func.call(this, event)
+    },wait)
+  }
+}
 export default {
   name: "standQA",
   components:{
@@ -708,6 +720,7 @@ export default {
   },
   data(){
     return{
+      historyList: [],
       pubOptions: [], //公共问题
       handleSelectForm: {
         standName: '', //标准名称
@@ -783,6 +796,21 @@ export default {
     });
   },
   methods:{
+    changeInput:debounce(function(val){
+      if(val.length){
+        this.$http.get('lawss/AskQuestions/resemblance',{
+          problemDescription: val,
+        },{
+          _this: this
+        }, res => {
+          this.historyList = res.data
+        })
+      }
+    }),
+    //点击跳转问题详情
+    historyJump(id){
+      this.$router.push('/standQA')
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({
@@ -992,7 +1020,24 @@ export default {
     },
     //清空
     delSearch(){
-
+      this.questionSerach = {
+        classification: 'INLAND',
+        standardName: '',  //标准名称
+        standardEncdoing: '', //标准编号
+        questioner: this.$store.getters.userInfo.userId,   //提问人
+        problemDescription: '',  //关键词/问题描述
+      }
+    },
+    searchBtn(){
+      this.questionSerach.classification = this.activeType
+      this.questionSerach.questioner = ''
+      this.$http.get('lawss/AskQuestions/retrieve',{
+        ...this.questionSerach
+      },{
+        _this: this
+      }, res => {
+        this.standList = res.data
+      })
     },
     //问题查询
     queSearch(){
@@ -1208,4 +1253,11 @@ export default {
  /deep/.el-upload-dragger {
   height: 90px;
 }
+.history-item{
+  padding: 15px;
+  line-height: 1.5;
+  font-size: 14px;
+  color: #409EFF;
+  cursor: pointer;
+}
 </style>