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

src/pages/personal/pages/my-questions/components/questionDetail.vue

@@ -0,0 +1,76 @@
+<!--回答框-->
+<template>
+  <div>
+    <div class="contentTitle">
+      <div class="back" title="返回" @click="back">
+        <i class="el-icon-back"></i>
+      </div>
+    </div>
+    <div v-if="answerList.length !== 0" style="height: 90%;overflow-y: auto;">
+      <template v-for="(item, index) in answerList">
+        <div class="clearfix">
+          <div class="answer-box" >
+            <question-item-info :answer="item"></question-item-info>
+          </div>
+        </div>
+      </template>
+    </div>
+    <div v-else>
+      暂无数据
+    </div>
+  </div>
+</template>
+
+<script>
+import questionItemInfo from '../../../../regulatoryRepository/standQA/components/questionItemInfo'
+export default {
+  name: "QuestionDetail",
+  components: {
+    questionItemInfo
+  },
+  data(){
+    return{
+       attId: '',
+      answerList: []
+    }
+  },
+  mounted() {
+    this.attId = this.$route.query.id
+    this.getDetail()
+  },
+  methods:{
+    back() {
+      this.$router.push({path: "/questions"});
+    },
+    getDetail(){
+      this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
+        id: this.attId
+      },{
+        _this: this
+      }, res => {
+        this.answerList = res.data
+      }, e => {
+      })
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.answer-box{
+    height: auto;
+    width: auto;
+    background: #F5F7FA;
+    float: right;
+    margin: 20px 10px 0 80px;
+    word-break: break-word; /* 文本行的任意字内断开 */
+    word-wrap: break-word; /* IE */
+    white-space: -moz-pre-wrap; /* Mozilla */
+    white-space: -hp-pre-wrap; /* HP printers */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    white-space: -pre-wrap; /* Opera 4-6 */
+    white-space: pre; /* CSS2 */
+    white-space: pre-wrap; /* CSS 2.1 */
+    white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
+  }
+</style>

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

@@ -1399,16 +1399,22 @@ export default {
     //点击跳转问题详情
     historyJump(item){
       this.$router.push({
-        path: '/standQA',
-        query:{
-          standId: item.standardId,
-          queId: item.id,
-          standType: item.classification,
-          sourceType: 'dialog',
-          standName: item.standardName,
+        path: "/questionDetail",
+        query: {
+          id: item.id
         }
-      })
-      this.dialogVisible = false
+      });
+      // this.$router.push({
+      //   path: '/standQA',
+      //   query:{
+      //     standId: item.standardId,
+      //     queId: item.id,
+      //     standType: item.classification,
+      //     sourceType: 'dialog',
+      //     standName: item.standardName,
+      //   }
+      // })
+      // this.dialogVisible = false
     },
     // 点击查看
     handlePreview(item) {

src/router/index.js

@@ -323,6 +323,16 @@ const routes = [
           menuId: ''
         }
       },
+      {
+        path: '/questionDetail',
+        name: 'QuestionDetail',
+        component: resolve => require(['@/pages/personal/pages/my-questions/components/questionDetail.vue'], resolve),
+        meta: {
+          requireAuth: true,
+          title: '问题详情',
+          menuId: ''
+        }
+      }
       // {
       //   path: '/questionsAndAnswers',
       //   name: 'QuestionsAndAnswers',